gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

捕捉异常后增加记录异常日志的操作

Browse Source
This commit is contained in:
李皓宸
2019-04-25 14:42:41 +08:00
parent 6223c66618
commit 26097409d6
106 changed files with 814 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/main/java/com/nis/web/controller/configuration/AppCfgController.java
View File

@@ -56,6 +56,7 @@ import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.FileUtils;
import com.nis.util.JsonMapper;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -230,9 +231,11 @@ public class AppCfgController extends BaseController {
} catch (MaatConvertException e) {
logger.error("app 协议配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("app 协议配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/app/policyCfgList?functionId=" + entity.getFunctionId();
@@ -270,8 +273,10 @@ public class AppCfgController extends BaseController {
logger.error("app策略配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -287,8 +292,10 @@ public class AppCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -324,8 +331,10 @@ public class AppCfgController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -407,9 +416,11 @@ public class AppCfgController extends BaseController {
}catch (MaatConvertException e) {
logger.error("APP IP配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("APP IP配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/app/ipCfgList?functionId=" + entity.getFunctionId();
@@ -457,8 +468,10 @@ public class AppCfgController extends BaseController {
logger.error("app协议IP配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -474,8 +487,10 @@ public class AppCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -511,8 +526,10 @@ public class AppCfgController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -592,8 +609,10 @@ public class AppCfgController extends BaseController {
logger.error("saveAppHttpCfg failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -633,8 +652,10 @@ public class AppCfgController extends BaseController {
logger.error("app http配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -650,8 +671,10 @@ public class AppCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -751,9 +774,11 @@ public class AppCfgController extends BaseController {
} catch (MaatConvertException e) {
logger.error("APP域名配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("APP域名配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/app/domainCfgList?functionId=" + entity.getFunctionId();
@@ -790,8 +815,10 @@ public class AppCfgController extends BaseController {
logger.error("app协议domain配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -807,8 +834,10 @@ public class AppCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -843,8 +872,10 @@ public class AppCfgController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -922,8 +953,10 @@ public class AppCfgController extends BaseController {
logger.error("saveAppByteCfg failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -943,7 +976,7 @@ public class AppCfgController extends BaseController {
@RequestMapping(value = { "auditAppByteCfg" })
// @RequiresPermissions(value={"app:byte:confirm"})
public String auditAppByteCfg(Integer isAudit, Integer isValid, String ids, Integer functionId,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
AppByteCfg entity = new AppByteCfg();
String[] idArray = ids.split(",");
for (String id : idArray) {
@@ -961,8 +994,10 @@ public class AppCfgController extends BaseController {
logger.error("app协议byte配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -1055,8 +1090,10 @@ public class AppCfgController extends BaseController {
logger.error("saveAppSslCfg failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -1095,8 +1132,10 @@ public class AppCfgController extends BaseController {
logger.error("app SSL配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -1112,8 +1151,10 @@ public class AppCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -1210,8 +1251,10 @@ public class AppCfgController extends BaseController {
logger.error("saveAppTcpCfg failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -1246,7 +1289,7 @@ public class AppCfgController extends BaseController {
@RequestMapping(value = { "auditAppTcpCfg" })
@RequiresPermissions(value = { "app:tcp:confirm" })
public String auditAppTcpCfg(Integer isAudit, Integer isValid, String ids, Integer functionId,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
AppTcpCfg entity = new AppTcpCfg();
String[] idArray = ids.split(",");
for (String id : idArray) {
@@ -1263,8 +1306,10 @@ public class AppCfgController extends BaseController {
logger.error("app SSL配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -1342,8 +1387,10 @@ public class AppCfgController extends BaseController {
logger.error("saveAppHeaderCfg failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -1363,7 +1410,7 @@ public class AppCfgController extends BaseController {
@RequestMapping(value = { "auditAppHeaderCfg" })
@RequiresPermissions(value = { "app:header:confirm" })
public String auditAppHeaderCfg(Integer isAudit, Integer isValid, String ids, Integer functionId,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
AppHeaderCfg entity = new AppHeaderCfg();
String[] idArray = ids.split(",");
for (String id : idArray) {
@@ -1381,8 +1428,10 @@ public class AppCfgController extends BaseController {
logger.error("app Header配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -1524,9 +1573,11 @@ public class AppCfgController extends BaseController {
} catch (MaatConvertException e) {
logger.error("APP主题网站配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("APP主题网站配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/app/topicDomainCfgList?functionId=" + entity.getFunctionId();
@@ -1562,8 +1613,10 @@ public class AppCfgController extends BaseController {
logger.error("app主题网站配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -1579,8 +1632,10 @@ public class AppCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -1615,10 +1670,13 @@ public class AppCfgController extends BaseController {
logger.error("app主题网站删除失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else if (e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes, "error", "call_external_procedures_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
return "redirect:" + adminPath + "/app/topicDomainCfgList?functionId=" + functionId;
@@ -1685,8 +1743,10 @@ public class AppCfgController extends BaseController {
logger.error("appBuiltinFeatureFileSaveOrUpdate failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -1717,7 +1777,7 @@ public class AppCfgController extends BaseController {
@RequestMapping(value = { "/audit" })
@RequiresPermissions(value = { "app:built_in_file:confirm" })
public String audit(Integer isAudit, Integer isValid, String ids, Integer functionId,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
if (!StringUtil.isEmpty(ids)) {
String[] idArray = ids.split(",");
Date auditTime = new Date();
@@ -1730,8 +1790,10 @@ public class AppCfgController extends BaseController {
logger.error("appBuiltinFeature audit failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -1893,6 +1955,7 @@ public class AppCfgController extends BaseController {
} catch (Exception e) {
logger.error("ip addr export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -1965,6 +2028,7 @@ public class AppCfgController extends BaseController {
} catch (Exception e) {
logger.error("top export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -2031,6 +2095,7 @@ public class AppCfgController extends BaseController {
} catch (Exception e) {
logger.error("appIp export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -2105,6 +2170,7 @@ public class AppCfgController extends BaseController {
} catch (Exception e) {
logger.error("http export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -2177,6 +2243,7 @@ public class AppCfgController extends BaseController {
} catch (Exception e) {
logger.error("Domain export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -2250,6 +2317,7 @@ public class AppCfgController extends BaseController {
} catch (Exception e) {
logger.error("App ssl export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();