Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
This commit is contained in:
commit
004250f55d
|
@ -2630,7 +2630,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
|
||||||
post.setHeader(key, headers.get(key));
|
post.setHeader(key, headers.get(key));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
StringBuilder body = new StringBuilder();
|
byte[] body = null;
|
||||||
boolean flag = true;
|
boolean flag = true;
|
||||||
try {
|
try {
|
||||||
if (byteBodys != null && !"".equals(byteBodys)) {
|
if (byteBodys != null && !"".equals(byteBodys)) {
|
||||||
|
@ -2642,13 +2642,12 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
|
||||||
|
|
||||||
HttpEntity entity = response.getEntity();
|
HttpEntity entity = response.getEntity();
|
||||||
synchronized (lock) {
|
synchronized (lock) {
|
||||||
body.append(EntityUtils.toString(entity,"UTF-8"));
|
body = EntityUtils.toByteArray(entity);
|
||||||
}
|
}
|
||||||
flag = true;
|
flag = true;
|
||||||
logger.info("返回结果:" + body);
|
logger.info("返回结果:" +Base64.getEncoder().encodeToString(body));
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error("请求错误:" + e.getMessage());
|
logger.error("请求错误:" + e.getMessage());
|
||||||
body.append(e.getMessage());
|
|
||||||
flag = false;
|
flag = false;
|
||||||
} finally {
|
} finally {
|
||||||
try {
|
try {
|
||||||
|
@ -2666,7 +2665,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
|
||||||
|
|
||||||
}
|
}
|
||||||
logger.info("保存日志开始");
|
logger.info("保存日志开始");
|
||||||
SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,String.valueOf(byteBodys), oldheaderMap,headers, headers, oldquerys,querys, body.toString(),true,null);
|
SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,Base64.getEncoder().encodeToString(byteBodys) , oldheaderMap,headers, headers, oldquerys,querys, body.toString(),true,null);
|
||||||
if (methods != null && methods.length > 0) {
|
if (methods != null && methods.length > 0) {
|
||||||
for (Method m : methods) {
|
for (Method m : methods) {
|
||||||
if (null != m) {
|
if (null != m) {
|
||||||
|
@ -2747,7 +2746,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
logger.info("保存日志开始");
|
logger.info("保存日志开始");
|
||||||
SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,String.valueOf(byteBodys), oldheaderMap,headers, headers, oldquerys,querys, body.toString(), true,null);
|
SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,Base64.getEncoder().encodeToString(byteBodys) , oldheaderMap,headers, headers, oldquerys,querys, body.toString(), true,null);
|
||||||
if (methods != null && methods.length > 0) {
|
if (methods != null && methods.length > 0) {
|
||||||
for (Method m : methods) {
|
for (Method m : methods) {
|
||||||
if (null != m) {
|
if (null != m) {
|
||||||
|
|
Loading…
Reference in New Issue