zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
潘荣晟
2026-01-15 17:54:28 +08:00
parent 08a0b4c1c9 2466b022cc
commit 3277fd5d89
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
base-server/src/main/resources/application-dev.yml
View File

@@ -120,8 +120,10 @@ justauth:
# erp相关配置
erp:
address: hana-dev.yncic.com
sapsys: ZTDEV203
secret-key: 123456789 # erp秘钥
sapsys: ZTQAS600 # 测试
#sapsys: ZTPRD800 # 正式
srcsys: JYGK
secret-key: JYGK # erp秘钥
eplat:
share:

6
base-server/src/main/resources/application-local.yml
View File

@@ -104,8 +104,10 @@ zt:
# erp相关配置
erp:
address: hana-dev.yncic.com
sapsys: ZTDEV203
secret-key: 123456789 # erp秘钥
sapsys: ZTQAS600 # 测试
#sapsys: ZTPRD800 # 正式
srcsys: JYGK
secret-key: JYGK # erp秘钥
eplat:
share:

13
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java
View File

@@ -32,6 +32,9 @@ public class ErpConfig {
@Value("${erp.sapsys:}")
private String sapsys;
@Value("${erp.srcsys:JYGK}")
private String srcsys;
@Value("${erp.secret-key:}")
private String secretKey;
@@ -78,14 +81,14 @@ public class ErpConfig {
boolean succeed = jsonResponse.getBoolean("succeed");
if (succeed && "S".equals(dataObject.getString("E_FLAG"))) {
String flag = "S";
JSONArray E_RESP = dataObject.getJSONArray("E_DATA");
String E_MSG = dataObject.getString("E_MSG");
JSONArray E_RESP = dataObject.containsKey("E_DATA") ? dataObject.getJSONArray("E_DATA") : null;
String E_MSG = dataObject.containsKey("E_MSG") ? dataObject.getString("E_MSG") : null;
resMap.put("E_RESP", E_RESP);
resMap.put("resStr", E_MSG);
resMap.put("flag", flag);
return resMap;
} else {
String E_MSG = dataObject.getString("E_MSG");
String E_MSG = dataObject.containsKey("E_MSG") ? dataObject.getString("E_MSG") : null;
String flag = "E";
resMap.put("E_RESP", null);
resMap.put("resStr", E_MSG);
@@ -110,14 +113,14 @@ public class ErpConfig {
String uuid = UUID.randomUUID().toString();
requestBody.put("uuid", uuid);
requestBody.put("sapsys", sapsys);
requestBody.put("srcsys", "DSC");
requestBody.put("srcsys", srcsys);
requestBody.put("funcnr", reqDTO.getFuncnr());
requestBody.put("bskey", reqDTO.getBskey());
requestBody.put("usrid", reqDTO.getUsrid());
requestBody.put("usrnm", reqDTO.getUsrnm());
// todo 密码另行约定
if (StringUtils.isBlank(reqDTO.getSign())) {
requestBody.put("sign", DigestUtil.md5Hex(uuid + "DSC" + secretKey, StandardCharsets.UTF_8));
requestBody.put("sign", DigestUtil.md5Hex(uuid + srcsys + secretKey, StandardCharsets.UTF_8));
} else {
requestBody.put("sign", reqDTO.getSign());
}