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:04:18 +08:00
parent 5d812fb149 e7e1f0ace6
commit f2f4170b0e
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,7 @@ justauth:
erp: erp:
address: hana-dev.yncic.com address: hana-dev.yncic.com
sapsys: ZTDEV203 sapsys: ZTDEV203
secretKey: 123456789 # erp秘钥 secret-key: 123456789 # erp秘钥
eplat: eplat:
share: share:

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

@@ -105,7 +105,7 @@ zt:
erp: erp:
address: hana-dev.yncic.com address: hana-dev.yncic.com
sapsys: ZTDEV203 sapsys: ZTDEV203
secretKey: 123456789 # erp秘钥 secret-key: 123456789 # erp秘钥
eplat: eplat:
share: share:

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

@@ -32,7 +32,7 @@ public class ErpConfig {
@Value("${erp.sapsys:}") @Value("${erp.sapsys:}")
private String sapsys; private String sapsys;
@Value("${erp.secretKey:}") @Value("${erp.secret-key:}")
private String secretKey; private String secretKey;
/** /**
@@ -153,18 +153,21 @@ public class ErpConfig {
throw exception(ERP_NOT_EXISTS); throw exception(ERP_NOT_EXISTS);
} else if (succeed && "S".equals(data.getString("E_FLAG"))) { } else if (succeed && "S".equals(data.getString("E_FLAG"))) {
String flag = "S"; String flag = "S";
String E_RESP = data.getString("E_RESP"); String E_RESP = data.containsKey("E_RESP") ? data.getString("E_RESP") : null;
String E_MSG = data.getString("ET_MSG"); String E_MSG = data.containsKey("ET_MSG") ? data.getString("ET_MSG") : null;
if (StrUtil.isBlank(E_MSG)) {
E_MSG = jsonResponse.getString("msg");
}
resMap.put("E_RESP", E_RESP); resMap.put("E_RESP", E_RESP);
resMap.put("resStr", E_MSG); resMap.put("resStr", E_MSG);
resMap.put("flag", flag); resMap.put("flag", flag);
} else if (!succeed && "E".equals(data.getString("E_FLAG"))) { } else if (!succeed && "E".equals(data.getString("E_FLAG"))) {
String flag = "E"; String flag = "E";
String E_MSG = data.getString("ET_MSG"); String E_RESP = data.containsKey("E_RESP") ? data.getString("E_RESP") : null;
String E_MSG = data.containsKey("ET_MSG") ? data.getString("ET_MSG") : null;
if (StrUtil.isBlank(E_MSG)) { if (StrUtil.isBlank(E_MSG)) {
E_MSG = jsonResponse.getString("msg"); E_MSG = jsonResponse.getString("msg");
} }
String E_RESP = data.getString("E_RESP");
resMap.put("E_RESP", E_RESP); resMap.put("E_RESP", E_RESP);
resMap.put("resStr", E_MSG); resMap.put("resStr", E_MSG);
resMap.put("flag", flag); resMap.put("flag", flag);