Merge remote-tracking branch 'origin/dev-nwcc' into dev-nwcc
This commit is contained in:
commit
7c42f093d4
|
|
@ -178,10 +178,10 @@ public class MaMachineServiceImpl implements MaMachineService {
|
||||||
String encrypt;
|
String encrypt;
|
||||||
try {
|
try {
|
||||||
encrypt = RsaUtil.encryptByPublicKey(content, Constants.publicKey);
|
encrypt = RsaUtil.encryptByPublicKey(content, Constants.publicKey);
|
||||||
/* Map<String, String> map = new HashMap<String, String>();
|
Map<String, String> map = new HashMap<String, String>();
|
||||||
map.put("body", encrypt);
|
map.put("body", encrypt);
|
||||||
String body = JSONObject.toJSONString(map);*/
|
String body = JSONObject.toJSONString(map);
|
||||||
String data = HttpHelper.sendHttpPost(zlptUrl, encrypt);
|
String data = HttpHelper.sendHttpPost(zlptUrl, body);
|
||||||
log.info("dataString-=========:" + data);
|
log.info("dataString-=========:" + data);
|
||||||
//对返回的结果进行处理
|
//对返回的结果进行处理
|
||||||
resultDataHandler(data);
|
resultDataHandler(data);
|
||||||
|
|
@ -205,6 +205,7 @@ public class MaMachineServiceImpl implements MaMachineService {
|
||||||
JSONArray dataArray = JSONArray.parseArray(dataArrayString);
|
JSONArray dataArray = JSONArray.parseArray(dataArrayString);
|
||||||
if (dataArray != null && dataArray.size() > 0) {
|
if (dataArray != null && dataArray.size() > 0) {
|
||||||
|
|
||||||
|
|
||||||
}else {
|
}else {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue