erp修改
This commit is contained in:
@@ -120,8 +120,10 @@ justauth:
|
|||||||
# erp相关配置
|
# erp相关配置
|
||||||
erp:
|
erp:
|
||||||
address: hana-dev.yncic.com
|
address: hana-dev.yncic.com
|
||||||
sapsys: ZTDEV203
|
sapsys: ZTQAS600 # 测试
|
||||||
secret-key: 123456789 # erp秘钥
|
#sapsys: ZTPRD800 # 正式
|
||||||
|
srcsys: JYGK
|
||||||
|
secret-key: JYGK # erp秘钥
|
||||||
|
|
||||||
eplat:
|
eplat:
|
||||||
share:
|
share:
|
||||||
|
|||||||
@@ -104,8 +104,10 @@ zt:
|
|||||||
# erp相关配置
|
# erp相关配置
|
||||||
erp:
|
erp:
|
||||||
address: hana-dev.yncic.com
|
address: hana-dev.yncic.com
|
||||||
sapsys: ZTDEV203
|
sapsys: ZTQAS600 # 测试
|
||||||
secret-key: 123456789 # erp秘钥
|
#sapsys: ZTPRD800 # 正式
|
||||||
|
srcsys: JYGK
|
||||||
|
secret-key: JYGK # erp秘钥
|
||||||
|
|
||||||
eplat:
|
eplat:
|
||||||
share:
|
share:
|
||||||
|
|||||||
@@ -32,6 +32,9 @@ public class ErpConfig {
|
|||||||
@Value("${erp.sapsys:}")
|
@Value("${erp.sapsys:}")
|
||||||
private String sapsys;
|
private String sapsys;
|
||||||
|
|
||||||
|
@Value("${erp.srcsys:JYGK}")
|
||||||
|
private String srcsys;
|
||||||
|
|
||||||
@Value("${erp.secret-key:}")
|
@Value("${erp.secret-key:}")
|
||||||
private String secretKey;
|
private String secretKey;
|
||||||
|
|
||||||
@@ -78,14 +81,14 @@ public class ErpConfig {
|
|||||||
boolean succeed = jsonResponse.getBoolean("succeed");
|
boolean succeed = jsonResponse.getBoolean("succeed");
|
||||||
if (succeed && "S".equals(dataObject.getString("E_FLAG"))) {
|
if (succeed && "S".equals(dataObject.getString("E_FLAG"))) {
|
||||||
String flag = "S";
|
String flag = "S";
|
||||||
JSONArray E_RESP = dataObject.getJSONArray("E_DATA");
|
JSONArray E_RESP = dataObject.containsKey("E_DATA") ? dataObject.getJSONArray("E_DATA") : null;
|
||||||
String E_MSG = dataObject.getString("E_MSG");
|
String E_MSG = dataObject.containsKey("E_MSG") ? dataObject.getString("E_MSG") : null;
|
||||||
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);
|
||||||
return resMap;
|
return resMap;
|
||||||
} else {
|
} else {
|
||||||
String E_MSG = dataObject.getString("E_MSG");
|
String E_MSG = dataObject.containsKey("E_MSG") ? dataObject.getString("E_MSG") : null;
|
||||||
String flag = "E";
|
String flag = "E";
|
||||||
resMap.put("E_RESP", null);
|
resMap.put("E_RESP", null);
|
||||||
resMap.put("resStr", E_MSG);
|
resMap.put("resStr", E_MSG);
|
||||||
@@ -110,14 +113,14 @@ public class ErpConfig {
|
|||||||
String uuid = UUID.randomUUID().toString();
|
String uuid = UUID.randomUUID().toString();
|
||||||
requestBody.put("uuid", uuid);
|
requestBody.put("uuid", uuid);
|
||||||
requestBody.put("sapsys", sapsys);
|
requestBody.put("sapsys", sapsys);
|
||||||
requestBody.put("srcsys", "DSC");
|
requestBody.put("srcsys", srcsys);
|
||||||
requestBody.put("funcnr", reqDTO.getFuncnr());
|
requestBody.put("funcnr", reqDTO.getFuncnr());
|
||||||
requestBody.put("bskey", reqDTO.getBskey());
|
requestBody.put("bskey", reqDTO.getBskey());
|
||||||
requestBody.put("usrid", reqDTO.getUsrid());
|
requestBody.put("usrid", reqDTO.getUsrid());
|
||||||
requestBody.put("usrnm", reqDTO.getUsrnm());
|
requestBody.put("usrnm", reqDTO.getUsrnm());
|
||||||
// todo 密码另行约定
|
// todo 密码另行约定
|
||||||
if (StringUtils.isBlank(reqDTO.getSign())) {
|
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 {
|
} else {
|
||||||
requestBody.put("sign", reqDTO.getSign());
|
requestBody.put("sign", reqDTO.getSign());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user