统一转发接口,添加日志记录
This commit is contained in:
parent
3826d2a967
commit
6b422b6e13
|
@ -1647,44 +1647,52 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
|
||||||
|
|
||||||
SysApplicationEntity sendApp = getAppByPublicKeySecretKey(publicKey, secretKey);
|
SysApplicationEntity sendApp = getAppByPublicKeySecretKey(publicKey, secretKey);
|
||||||
if (sendApp == null) {
|
if (sendApp == null) {
|
||||||
return BaseResult.getFailureMessageEntity("系统错误请联系中台管理员,请联系管理员");
|
//saveLog(new SysApplicationEntity(), new SysApplicationEntity(), new SysApplicationApiEntity(), oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,"公钥、密钥错误");
|
||||||
|
return BaseResult.getFailureMessageEntity("公钥、密钥错误,请联系管理员");
|
||||||
}
|
}
|
||||||
//判断应用是否启用
|
//判断应用是否启用
|
||||||
if (sendApp.getAppStatus() == null || !"1".equals(sendApp.getAppStatus())) {
|
if (sendApp.getAppStatus() == null || !"1".equals(sendApp.getAppStatus())) {
|
||||||
|
saveLog(sendApp, new SysApplicationEntity(), new SysApplicationApiEntity(), oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,sendApp.getName() + "应用未启用");
|
||||||
return BaseResult.getFailureMessageEntity(sendApp.getName() + "应用未启用,请联系管理员");
|
return BaseResult.getFailureMessageEntity(sendApp.getName() + "应用未启用,请联系管理员");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SysApplicationEntity receiveApp = getAppByAppId(appId);
|
SysApplicationEntity receiveApp = getAppByAppId(appId);
|
||||||
if (receiveApp == null) {
|
if (receiveApp == null) {
|
||||||
|
saveLog(sendApp, new SysApplicationEntity(), new SysApplicationApiEntity(), oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,"根据appId:" + appId + "未匹配到应用");
|
||||||
return BaseResult.getFailureMessageEntity("根据appId:" + appId + "未匹配到应用,请联系管理员");
|
return BaseResult.getFailureMessageEntity("根据appId:" + appId + "未匹配到应用,请联系管理员");
|
||||||
}
|
}
|
||||||
//判断应用是否启用
|
//判断应用是否启用
|
||||||
if (receiveApp.getAppStatus() == null || !"1".equals(receiveApp.getAppStatus())) {
|
if (receiveApp.getAppStatus() == null || !"1".equals(receiveApp.getAppStatus())) {
|
||||||
|
saveLog(sendApp, receiveApp, new SysApplicationApiEntity(), oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,receiveApp.getName() + "应用未启用" );
|
||||||
return BaseResult.getFailureMessageEntity(receiveApp.getName() + "应用未启用,请联系管理员");
|
return BaseResult.getFailureMessageEntity(receiveApp.getName() + "应用未启用,请联系管理员");
|
||||||
}
|
}
|
||||||
//判断应用接口是否启用
|
//判断应用接口是否启用
|
||||||
if (receiveApp.getInterfaceStatus() == null || !"1".equals(receiveApp.getInterfaceStatus())) {
|
if (receiveApp.getInterfaceStatus() == null || !"1".equals(receiveApp.getInterfaceStatus())) {
|
||||||
|
saveLog(sendApp, receiveApp, new SysApplicationApiEntity(), oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,receiveApp.getName() + "应用接口环境未启用" );
|
||||||
return BaseResult.getFailureMessageEntity(receiveApp.getName() + "应用接口环境未启用,请联系管理员");
|
return BaseResult.getFailureMessageEntity(receiveApp.getName() + "应用接口环境未启用,请联系管理员");
|
||||||
}
|
}
|
||||||
|
|
||||||
SysApplicationApiEntity receiveApi = getApiByAppIdApiCode(receiveApp.getId(), apiCode);
|
SysApplicationApiEntity receiveApi = getApiByAppIdApiCode(receiveApp.getId(), apiCode);
|
||||||
if (receiveApi == null) {
|
if (receiveApi == null) {
|
||||||
|
saveLog(sendApp, receiveApp, receiveApi, oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,receiveApp.getName() + ":" + apiCode + "未启用或者未创建" );
|
||||||
return BaseResult.getFailureMessageEntity(receiveApp.getName() + ":" + apiCode + "未启用或者未创建");
|
return BaseResult.getFailureMessageEntity(receiveApp.getName() + ":" + apiCode + "未启用或者未创建");
|
||||||
}
|
}
|
||||||
|
|
||||||
SysApplicationApiAuthEntity sysApplicationApiAuthEntity = getApiAuthByNameAppId(sendApp.getId(), receiveApp.getId());
|
SysApplicationApiAuthEntity sysApplicationApiAuthEntity = getApiAuthByNameAppId(sendApp.getId(), receiveApp.getId());
|
||||||
if (sysApplicationApiAuthEntity == null) {
|
if (sysApplicationApiAuthEntity == null) {
|
||||||
|
saveLog(sendApp, receiveApp, receiveApi, oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,receiveApp.getName() + "应用权限配置错误" );
|
||||||
return BaseResult.getFailureMessageEntity(receiveApp.getName() + "应用权限配置错误");
|
return BaseResult.getFailureMessageEntity(receiveApp.getName() + "应用权限配置错误");
|
||||||
}
|
}
|
||||||
if (sysApplicationApiAuthEntity.getSystemAddress() != null && !"".equals(sysApplicationApiAuthEntity.getSystemAddress())
|
if (sysApplicationApiAuthEntity.getSystemAddress() != null && !"".equals(sysApplicationApiAuthEntity.getSystemAddress())
|
||||||
&& !sysApplicationApiAuthEntity.getSystemAddress().contains(ip)) {
|
&& !sysApplicationApiAuthEntity.getSystemAddress().contains(ip)) {
|
||||||
|
saveLog(sendApp, receiveApp, receiveApi, oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,receiveApp.getName() + "发送应用" + receiveApp.getName() + "的ip白名单配置错误" );
|
||||||
return BaseResult.getFailureMessageEntity(receiveApp.getName() + "发送应用" + receiveApp.getName() + "的ip白名单配置错误");
|
return BaseResult.getFailureMessageEntity(receiveApp.getName() + "发送应用" + receiveApp.getName() + "的ip白名单配置错误");
|
||||||
}
|
}
|
||||||
|
|
||||||
SysApplicationApiAuthDetailEntity sysApplicationApiAuthDetailEntity = getApiAuthDetailByAppIdApiIdTripartiteSystemId(receiveApp.getId(), receiveApi.getId(), sysApplicationApiAuthEntity.getId());
|
SysApplicationApiAuthDetailEntity sysApplicationApiAuthDetailEntity = getApiAuthDetailByAppIdApiIdTripartiteSystemId(receiveApp.getId(), receiveApi.getId(), sysApplicationApiAuthEntity.getId());
|
||||||
if (sysApplicationApiAuthDetailEntity == null) {
|
if (sysApplicationApiAuthDetailEntity == null) {
|
||||||
saveLog(sendApp, receiveApp, receiveApi, oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false);
|
saveLog(sendApp, receiveApp, receiveApi, oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,receiveApi.getApiName() + "未授权给" + sendApp.getName() );
|
||||||
return BaseResult.getFailureMessageEntity(receiveApi.getApiName() + "未授权给" + sendApp.getName() + ",请联系管理员");
|
return BaseResult.getFailureMessageEntity(receiveApi.getApiName() + "未授权给" + sendApp.getName() + ",请联系管理员");
|
||||||
}
|
}
|
||||||
SysExtensionApiEntity sysExtensionApiEntity = new SysExtensionApiEntity();
|
SysExtensionApiEntity sysExtensionApiEntity = new SysExtensionApiEntity();
|
||||||
|
@ -1817,7 +1825,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
|
||||||
|
|
||||||
}
|
}
|
||||||
logger.info("保存日志开始");
|
logger.info("保存日志开始");
|
||||||
SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,bodys, oldheaderMap,headerMap, headers, oldquerys,querys, body.toString(),true);
|
SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,bodys, oldheaderMap,headerMap, 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) {
|
||||||
|
@ -1898,7 +1906,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
logger.info("保存日志开始");
|
logger.info("保存日志开始");
|
||||||
SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,bodys, oldheaderMap,headerMap, headers, oldquerys,querys, body.toString(), true);
|
SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,bodys, oldheaderMap,headerMap, 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) {
|
||||||
|
@ -2000,7 +2008,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
|
||||||
Map<String, String> oldheaderMap,Map<String, String> headerMap,
|
Map<String, String> oldheaderMap,Map<String, String> headerMap,
|
||||||
Map<String, String> headers,
|
Map<String, String> headers,
|
||||||
String oldquerys, String querys,
|
String oldquerys, String querys,
|
||||||
String body, boolean flag) {
|
String body, boolean flag,String msg) {
|
||||||
SysMessageManageLogEntity sysMessageManageLogEntity = new SysMessageManageLogEntity();
|
SysMessageManageLogEntity sysMessageManageLogEntity = new SysMessageManageLogEntity();
|
||||||
//messageManageId 消息主表主键
|
//messageManageId 消息主表主键
|
||||||
//theme 消息主题
|
//theme 消息主题
|
||||||
|
@ -2027,7 +2035,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
|
||||||
//校验返回
|
//校验返回
|
||||||
if (!flag) {
|
if (!flag) {
|
||||||
sysMessageManageLogEntity.setStatus("4");//返回信息
|
sysMessageManageLogEntity.setStatus("4");//返回信息
|
||||||
sysMessageManageLogEntity.setRemark("API未授权,请联系管理员");//返回信息
|
sysMessageManageLogEntity.setRemark(msg);//返回信息
|
||||||
} else {
|
} else {
|
||||||
if (receiveApi.getReturnSuccessField() != null && !"".equals(receiveApi.getReturnSuccessField())
|
if (receiveApi.getReturnSuccessField() != null && !"".equals(receiveApi.getReturnSuccessField())
|
||||||
&& receiveApi.getReturnSuccessValue() != null && !"".equals(receiveApi.getReturnSuccessValue())) {
|
&& receiveApi.getReturnSuccessValue() != null && !"".equals(receiveApi.getReturnSuccessValue())) {
|
||||||
|
|
Loading…
Reference in New Issue