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

调整app ip的协议位置

Browse Source 
addMessage方法增加messageType，用于界面提示框颜色显示
统一部分错误提示信息增加messageType
This commit is contained in:
duandongmei
2018-11-02 16:08:08 +08:00
parent 43c6a35547
commit 5b4c0c8af4
24 changed files with 172 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/controller/configuration/ntc/AsnPolicyCfgController.java
View File

@@ -89,7 +89,11 @@ public class AsnPolicyCfgController extends BaseController {
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("dns fake ip配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
addMessage(redirectAttributes,"error","request_service_failed");
} catch (Exception e) {
e.printStackTrace();
logger.info("dns fake ip配置下发失败："+e.getMessage());
addMessage(redirectAttributes,"error","audit_failed");
}
}

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

@@ -88,16 +88,16 @@ public class AvContentController extends BaseController {
CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){
try{
avContentCfgService.saveOrUpdateAvVoip(cfg);
addMessage(redirectAttributes,"save_success");
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("voip 信息保存失败",e);
addMessage(redirectAttributes,"request_service_failed");
addMessage(redirectAttributes,"error","request_service_failed");
}else {
e.printStackTrace();
logger.error("voip 信息保存失败",e);
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
}
return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+cfg.getFunctionId();
@@ -169,11 +169,11 @@ public class AvContentController extends BaseController {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("voip 信息审核失败",e);
addMessage(redirectAttributes,"request_service_failed");
addMessage(redirectAttributes,"error","request_service_failed");
}else {
e.printStackTrace();
logger.error("voip 信息审核失败",e);
addMessage(redirectAttributes,"delete_failed");
addMessage(redirectAttributes,"error","delete_failed");
}
}
return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+functionId;
@@ -213,11 +213,11 @@ public class AvContentController extends BaseController {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("VOIP配置下发失败："+e.getMessage());;
addMessage(redirectAttributes,"request_service_failed");
addMessage(redirectAttributes,"error","request_service_failed");
}else {
e.printStackTrace();
logger.error("VOIP配置下发失败",e);
addMessage(redirectAttributes,"audit_failed");
addMessage(redirectAttributes,"error","audit_failed");
}
}
@@ -369,11 +369,11 @@ public class AvContentController extends BaseController {
,RedirectAttributes redirectAttributes){
try{
avContentCfgService.saveOrUpdateContIp(cfg,areaCfgIds);
addMessage(redirectAttributes,"save_success");
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
return "redirect:" + adminPath +"/ntc/av/contIpList?functionId="+cfg.getFunctionId();
@@ -402,7 +402,10 @@ public class AvContentController extends BaseController {
avContentCfgService.auditContIp(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) {
logger.error("Cont Ip配置下发失败",e);
addMessage(redirectAttributes, e.getMessage());
addMessage(redirectAttributes,"error","request_service_failed");
}catch (Exception e) {
logger.error("Cont Ip配置下发失败",e);
addMessage(redirectAttributes,"error","audit_failed");
}
}
@@ -474,11 +477,11 @@ public class AvContentController extends BaseController {
,RedirectAttributes redirectAttributes){
try{
avContentCfgService.saveOrUpdatePicIp(cfg,areaCfgIds);
addMessage(redirectAttributes,"save_success");
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
return "redirect:" + adminPath +"/ntc/av/picIpList?functionId="+cfg.getFunctionId();
@@ -508,7 +511,11 @@ public class AvContentController extends BaseController {
} catch (MaatConvertException e) {
e.printStackTrace();
logger.error("Pic Ip配置下发失败",e);
addMessage(redirectAttributes, e.getMessage());
addMessage(redirectAttributes,"error","");
} catch (Exception e) {
e.printStackTrace();
logger.error("Pic Ip配置下发失败",e);
addMessage(redirectAttributes,"error", "audit_failed");
}
}
@@ -635,7 +642,7 @@ public class AvContentController extends BaseController {
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("Cont Url配置下发失败",e);
addMessage(redirectAttributes, e.getMessage());
addMessage(redirectAttributes,"error", "audit_failed");
}
}
@@ -726,10 +733,10 @@ public class AvContentController extends BaseController {
,RedirectAttributes redirectAttributes){
try{
avContentCfgService.saveOrUpdatePicUrl(cfg,areaCfgIds);
addMessage(redirectAttributes,"save_success");
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+cfg.getFunctionId();
@@ -759,7 +766,7 @@ public class AvContentController extends BaseController {
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("Pic Url配置下发失败",e);
addMessage(redirectAttributes, e.getMessage());
addMessage(redirectAttributes,"error", e.getMessage());
}
}
@@ -867,7 +874,7 @@ public class AvContentController extends BaseController {
return null;
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "导出失败！失败信息："+e.getMessage());
addMessage(redirectAttributes,"error", "导出失败！失败信息："+e.getMessage());
}
return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+entity.getFunctionId();
@@ -958,7 +965,7 @@ public class AvContentController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("stream export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error", "export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
@@ -1048,7 +1055,7 @@ public class AvContentController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("voip export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error", "export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

23
src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
View File

@@ -355,10 +355,10 @@ public class AvController extends BaseController {
e.printStackTrace();
if(e instanceof MaatConvertException) {
logger.info("音视频文件样例配置下发失败："+e.getMessage());
addMessage(redirectAttributes,e.getMessage());
addMessage(redirectAttributes,"error","request_service_failed");
}else {
logger.error("auditAvFileSample failed",e);
addMessage(redirectAttributes,"audit_failed");
addMessage(redirectAttributes,"error","audit_failed");
}
}
}
@@ -397,10 +397,10 @@ public class AvController extends BaseController {
e.printStackTrace();
if(e instanceof MaatConvertException) {
logger.info("音视频标识样例配置下发失败："+e.getMessage());
addMessage(redirectAttributes,e.getMessage());
addMessage(redirectAttributes,"error","request_service_failed");
}else {
logger.error("auditAvAudioSignSample failed",e);
addMessage(redirectAttributes,"audit_failed");
addMessage(redirectAttributes,"success","audit_failed");
}
}
}
@@ -423,17 +423,16 @@ public class AvController extends BaseController {
for (AvSignSampleCfg avSignSampleCfg : cfg.getCfgs()) {
avCfgService.saveOrUpdateAvSignSample(avSignSampleCfg);
}
addMessage(redirectAttributes,"save_success");
addMessage(redirectAttributes,"success","save_success");
return "redirect:" + adminPath +"/ntc/av/sample/signSampleList?functionId="+functionId;
}
} catch (Exception e1) {
e1.printStackTrace();
if(e1 instanceof MaatConvertException) {
logger.error("预置失败",e1);
addMessage(redirectAttributes,"request_service_failed");
addMessage(redirectAttributes,"error","request_service_failed");
}else {
logger.error("auditAvSignSample failed",e1);
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
}
//修改下发配置
@@ -449,15 +448,15 @@ public class AvController extends BaseController {
// if(!avSignSampleCfg.getAction().equals(avSignSampleCfg.getActionOld())||!avSignSampleCfg.getIsValid().equals(avSignSampleCfg.getIsValidOld())){
try {
avCfgService.auditAvSignSample(avSignSampleCfg);
addMessage(redirectAttributes,"save_success");
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
e.printStackTrace();
if(e instanceof MaatConvertException) {
logger.error("下发失败",e);
addMessage(redirectAttributes,"request_service_failed");
addMessage(redirectAttributes,"error","request_service_failed");
}else {
logger.error("auditAvSignSample failed",e);
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
}
}
@@ -506,7 +505,7 @@ public class AvController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("ysp export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

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

@@ -145,7 +145,11 @@ public class BgpCfgController extends BaseController{
} catch (MaatConvertException e) {
e.printStackTrace();
logger.error("bgp配置下发失败",e);
addMessage(redirectAttributes, e.getMessage());
addMessage(redirectAttributes,"error","request_service_failed");
}catch (Exception e) {
e.printStackTrace();
logger.error("bgp配置下发失败",e);
addMessage(redirectAttributes,"error","audit_failed");
}
}
return "redirect:" + adminPath +"/ntc/other/bgpList?functionId="+functionId;
@@ -226,7 +230,7 @@ public class BgpCfgController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("dns export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

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

@@ -146,12 +146,11 @@ public class IpController extends BaseController{
}
} catch (Exception e) {
e.printStackTrace();
logger.info("ip配置下发失败："+e.getMessage());
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes, e.getMessage());
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes, "audit_failed");
addMessage(redirectAttributes,"error", "audit_failed");
}
}
@@ -232,6 +231,7 @@ public class IpController extends BaseController{
exportTemplate(request,response,redirectAttributes,regionDict,serviceDict,requestId);
} catch (Exception e) {
logger.error("export_failed", e);
addMessage(redirectAttributes,"error", "export_failed");
}
}
@@ -417,7 +417,7 @@ public class IpController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("ip addr export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error", "export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

18
src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
View File

@@ -221,10 +221,10 @@ public class WebsiteController extends BaseController{
websiteCfgService.auditHttpCfg(entity,isAudit);
} catch (MaatConvertException e) {
logger.error("http配置下发失败："+e.getMessage());
addMessage(redirectAttributes, "request_service_failed");
addMessage(redirectAttributes,"error", "request_service_failed");
}catch (Exception e) {
logger.error("http配置下发失败："+e.getMessage());
addMessage(redirectAttributes, "audit_failed");
addMessage(redirectAttributes,"error", "audit_failed");
}
}
return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+functionId;
@@ -317,7 +317,7 @@ public class WebsiteController extends BaseController{
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("ssl配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
addMessage(redirectAttributes,"error", e.getMessage());
}
}
return "redirect:" + adminPath +"/ntc/website/sslList?functionId="+functionId;
@@ -403,7 +403,11 @@ public class WebsiteController extends BaseController{
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("dns配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
addMessage(redirectAttributes,"error", "request_service_failed");
}catch (Exception e) {
e.printStackTrace();
logger.info("dns配置下发失败："+e.getMessage());
addMessage(redirectAttributes,"error", e.getMessage());
}
}
return "redirect:" + adminPath +"/ntc/website/dnsList?functionId="+functionId;
@@ -648,7 +652,7 @@ public class WebsiteController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("http export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error", "export_failed");
}
return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();
}
@@ -746,7 +750,7 @@ public class WebsiteController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("dns export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error", "export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
@@ -840,7 +844,7 @@ public class WebsiteController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("http export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error", "export_failed");
}
return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();
}

21
src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
View File

@@ -113,10 +113,13 @@ public class WhiteListController extends CommonController{
entity.setFunctionId(functionId);
try {
ipCfgService.auditIpCfg(entity,isAudit);
addMessage(redirectAttributes,"success", "audit_success");
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("ip配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
addMessage(redirectAttributes,"error", "request_service_failed");
}catch (Exception e) {
logger.info("ip配置下发失败："+e.getMessage());
addMessage(redirectAttributes,"error", "audit_failed");
}
}
return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+entity.getFunctionId();
@@ -219,10 +222,10 @@ public class WhiteListController extends CommonController{
public String deleteDomain(String ids,Integer functionId,RedirectAttributes model) {
try{
domainService.deleteWhiteDomain(ids);
addMessage(model,"delete_success");
addMessage(model,"success","delete_success");
}catch(Exception e){
logger.error("删除失败", e);
addMessage(model,"delete_failed");
addMessage(model,"error","delete_failed");
}
return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+functionId;
}
@@ -244,7 +247,11 @@ public class WhiteListController extends CommonController{
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("domain配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
addMessage(redirectAttributes,"error","request_service_failed");
}catch (Exception e) {
e.printStackTrace();
logger.info("domain配置下发失败："+e.getMessage());
addMessage(redirectAttributes,"error","audit_failed");
}
}
return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+functionId;
@@ -321,7 +328,7 @@ public class WhiteListController extends CommonController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("ip white export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error", "export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
@@ -378,7 +385,7 @@ public class WhiteListController extends CommonController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("ip white export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error", "export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}