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:
zhanghongqing
2018-11-05 16:45:26 +08:00
parent 29b6ff8207
commit f1e19d4d00
7 changed files with 64 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/controller/configuration/CommonController.java
View File

@@ -129,7 +129,11 @@ public class CommonController extends BaseController {
addMessage(model,"success","save_success");
}catch(Exception e){
logger.error("保存失败",e);
addMessage(model,"error","save_failed");
if(e instanceof MaatConvertException) {
addMessage(model,"error", "request_service_failed");
}else {
addMessage(model,"error","save_failed");
}
}
}
public void _saveOrUpdateDomain(String cfgName,RedirectAttributes model, HttpUrlCfg cfg) {
@@ -332,7 +336,7 @@ public class CommonController extends BaseController {
}
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes,"error", "导出失败！" );
addMessage(redirectAttributes,"error", "export_failed" );
}
}
}

7
src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java
View File

@@ -83,9 +83,10 @@ public class DnsResStrategyController extends BaseController {
dnsResStrategyService.saveOrUpdate(cfg);
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
e.printStackTrace();
addMessage(redirectAttributes,"save_failed");
}catch (MaatConvertException e) {
addMessage(redirectAttributes,"error", "request_service_failed");
} catch (Exception e) {
addMessage(redirectAttributes,"error", "save_failed");
}
return "redirect:" + adminPath +"/maintenance/dnsResStrategy/list?functionId="+cfg.getFunctionId();

2
src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java
View File

@@ -67,7 +67,7 @@ public class DdosCfgController extends BaseController {
logger.error("信息保存失败",e);
e.printStackTrace();
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error",e.getMessage());
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}

40
src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
View File

@@ -373,7 +373,11 @@ public class AvContentController extends BaseController {
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(redirectAttributes,"error","save_failed");
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
}
return "redirect:" + adminPath +"/ntc/av/contIpList?functionId="+cfg.getFunctionId();
@@ -481,7 +485,11 @@ public class AvContentController extends BaseController {
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(redirectAttributes,"error","save_failed");
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
}
return "redirect:" + adminPath +"/ntc/av/picIpList?functionId="+cfg.getFunctionId();
@@ -511,11 +519,11 @@ public class AvContentController extends BaseController {
} catch (MaatConvertException e) {
e.printStackTrace();
logger.error("Pic Ip配置下发失败",e);
addMessage(redirectAttributes,"error","");
addMessage(redirectAttributes,"error","request_service_failed");
} catch (Exception e) {
e.printStackTrace();
logger.error("Pic Ip配置下发失败",e);
addMessage(redirectAttributes,"error", "audit_failed");
addMessage(redirectAttributes,"error","audit_failed");
}
}
@@ -639,10 +647,14 @@ public class AvContentController extends BaseController {
for(String id :idArray){
try {
avContentCfgService.auditContUrl(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) {
} catch ( Exception e) {
e.printStackTrace();
logger.info("Cont Url配置下发失败",e);
addMessage(redirectAttributes,"error", "audit_failed");
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error","audit_failed");
}
}
}
@@ -736,7 +748,11 @@ public class AvContentController extends BaseController {
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
addMessage(redirectAttributes,"error","save_failed");
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
}
return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+cfg.getFunctionId();
@@ -763,10 +779,14 @@ public class AvContentController extends BaseController {
for(String id :idArray){
try {
avContentCfgService.auditPicUrl(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) {
} catch ( Exception e) {
e.printStackTrace();
logger.info("Pic Url配置下发失败",e);
addMessage(redirectAttributes,"error", e.getMessage());
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error","audit_failed");
}
}
}
@@ -874,7 +894,7 @@ public class AvContentController extends BaseController {
return null;
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes,"error", "导出失败！失败信息："+e.getMessage());
addMessage(redirectAttributes,"error", "export_failed");
}
return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+entity.getFunctionId();

20
src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java
View File

@@ -72,7 +72,11 @@ public class ControlPolicyController extends BaseController{
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
addMessage(redirectAttributes,"save_failed");
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
}
return "redirect:" + adminPath +"/proxy/control/httpReqReplace/list?functionId="+cfg.getFunctionId();
@@ -144,7 +148,11 @@ public class ControlPolicyController extends BaseController{
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
addMessage(redirectAttributes,"save_failed");
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
}
return "redirect:" + adminPath +"/proxy/control/httpResReplace/list?functionId="+cfg.getFunctionId();
@@ -167,10 +175,14 @@ public class ControlPolicyController extends BaseController{
for(String id :idArray){
try {
controlPolicyService.audit(isAudit,isValid,functionId,id,auditTime,Constants.REPLACE_RES_KEY_VALUE);
} catch (MaatConvertException e) {
} catch ( Exception e) {
e.printStackTrace();
logger.error("配置下发失败",e);
addMessage(redirectAttributes, e.getMessage());
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error","audit_failed");
}
}
}

7
src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
View File

@@ -286,7 +286,12 @@ public class PxyObjKeyringController extends BaseController {
} catch (MaatConvertException e) {
addMessage(redirectAttributes,"error", "request_service_failed");
}catch (Exception e) {
addMessage(redirectAttributes,"error", "audit_failed");
logger.error("pxyObjkeyring error:"+e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error","audit_failed");
}
}
}

2
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
View File

@@ -263,7 +263,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">