修改配置异常提示信息

This commit is contained in:
zhanghongqing
2018-11-05 15:43:12 +08:00
parent a11f637e6b
commit 97eb005a6d
41 changed files with 256 additions and 142 deletions

View File

@@ -199,14 +199,14 @@ public class AppCfgController extends BaseController {
entity.setAppCode(specificService.getSpecServiceCode()); entity.setAppCode(specificService.getSpecServiceCode());
} }
appCfgService.saveOrUpdateAppPolicyCfg(entity); appCfgService.saveOrUpdateAppPolicyCfg(entity);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) { } catch (Exception e) {
logger.error("saveAppPolicyCfg failed",e); logger.error("saveAppPolicyCfg failed",e);
e.printStackTrace(); e.printStackTrace();
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
} }
} }
@@ -240,7 +240,7 @@ public class AppCfgController extends BaseController {
e.printStackTrace(); e.printStackTrace();
logger.error("app策略配置下发失败",e); logger.error("app策略配置下发失败",e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error",""); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"error","audit_failed"); addMessage(redirectAttributes,"error","audit_failed");
} }
@@ -320,14 +320,14 @@ public class AppCfgController extends BaseController {
entity.setAppCode(specificService.getSpecServiceCode()); entity.setAppCode(specificService.getSpecServiceCode());
} }
appCfgService.saveOrUpdateAppIpCfg(entity); appCfgService.saveOrUpdateAppIpCfg(entity);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("saveAppIpCfg failed",e); logger.error("saveAppIpCfg failed",e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
} }
} }
@@ -372,7 +372,7 @@ public class AppCfgController extends BaseController {
e.printStackTrace(); e.printStackTrace();
logger.error("app协议IP配置下发失败",e); logger.error("app协议IP配置下发失败",e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error",e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"error","audit_failed"); addMessage(redirectAttributes,"error","audit_failed");
} }
@@ -453,14 +453,14 @@ public class AppCfgController extends BaseController {
entity.setAppCode(specificService.getSpecServiceCode()); entity.setAppCode(specificService.getSpecServiceCode());
} }
appCfgService.saveOrUpdateAppHttpCfg(entity); appCfgService.saveOrUpdateAppHttpCfg(entity);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("saveAppHttpCfg failed", e); logger.error("saveAppHttpCfg failed", e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
} }
} }
@@ -493,7 +493,7 @@ public class AppCfgController extends BaseController {
e.printStackTrace(); e.printStackTrace();
logger.error("app http配置下发失败",e); logger.error("app http配置下发失败",e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error",e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"error","audit_failed"); addMessage(redirectAttributes,"error","audit_failed");
} }
@@ -572,13 +572,13 @@ public class AppCfgController extends BaseController {
entity.setAppCode(specificService.getSpecServiceCode()); entity.setAppCode(specificService.getSpecServiceCode());
} }
appCfgService.saveOrUpdateAppDomainCfg(entity); appCfgService.saveOrUpdateAppDomainCfg(entity);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
} }
} }
@@ -611,7 +611,7 @@ public class AppCfgController extends BaseController {
e.printStackTrace(); e.printStackTrace();
logger.error("app协议domain配置下发失败",e); logger.error("app协议domain配置下发失败",e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error",e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"error","audit_failed"); addMessage(redirectAttributes,"error","audit_failed");
} }
@@ -690,14 +690,14 @@ public class AppCfgController extends BaseController {
entity.setAppCode(specificService.getSpecServiceCode()); entity.setAppCode(specificService.getSpecServiceCode());
} }
appCfgService.saveOrUpdateAppByteCfg(entity); appCfgService.saveOrUpdateAppByteCfg(entity);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("saveAppByteCfg failed",e); logger.error("saveAppByteCfg failed",e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
} }
} }
@@ -730,7 +730,7 @@ public class AppCfgController extends BaseController {
e.printStackTrace(); e.printStackTrace();
logger.error("app协议byte配置下发失败",e); logger.error("app协议byte配置下发失败",e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error",e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"error","audit_failed"); addMessage(redirectAttributes,"error","audit_failed");
} }
@@ -810,14 +810,14 @@ public class AppCfgController extends BaseController {
entity.setAppCode(specificService.getSpecServiceCode()); entity.setAppCode(specificService.getSpecServiceCode());
} }
appCfgService.saveOrUpdateAppSslCfg(entity); appCfgService.saveOrUpdateAppSslCfg(entity);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("saveAppSslCfg failed", e); logger.error("saveAppSslCfg failed", e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
} }
} }
@@ -932,12 +932,12 @@ public class AppCfgController extends BaseController {
entity.setAppCode(specificService.getSpecServiceCode()); entity.setAppCode(specificService.getSpecServiceCode());
} }
appCfgService.saveOrUpdateAppTcpeCfg(entity); appCfgService.saveOrUpdateAppTcpeCfg(entity);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("saveAppTcpCfg failed",e); logger.error("saveAppTcpCfg failed",e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"save_failed");
} }
@@ -1057,12 +1057,12 @@ public class AppCfgController extends BaseController {
entity.setAppCode(specificService.getSpecServiceCode()); entity.setAppCode(specificService.getSpecServiceCode());
} }
appCfgService.saveOrUpdateAppHeaderCfg(entity); appCfgService.saveOrUpdateAppHeaderCfg(entity);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("saveAppHeaderCfg failed",e); logger.error("saveAppHeaderCfg failed",e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"save_failed");
} }
@@ -1097,7 +1097,7 @@ public class AppCfgController extends BaseController {
e.printStackTrace(); e.printStackTrace();
logger.error("app Header配置下发失败",e); logger.error("app Header配置下发失败",e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error",e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"error","audit_failed"); addMessage(redirectAttributes,"error","audit_failed");
} }
@@ -1217,16 +1217,16 @@ public class AppCfgController extends BaseController {
entity.setDomain(entity.getDomain()); entity.setDomain(entity.getDomain());
} }
appCfgService.saveOrUpdateAppTopicDomainCfg(entity); appCfgService.saveOrUpdateAppTopicDomainCfg(entity);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) { } catch (Exception e) {
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
e.printStackTrace(); e.printStackTrace();
logger.info("app主题网站配置下发失败"+e.getMessage());; logger.info("app主题网站配置下发失败"+e.getMessage());;
addMessage(redirectAttributes,"request_service_failed"); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
e.printStackTrace(); e.printStackTrace();
logger.error("app主题网站配置下发失败",e); logger.error("app主题网站配置下发失败",e);
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
} }
} }
@@ -1353,12 +1353,12 @@ public class AppCfgController extends BaseController {
} }
appBuiltInFeatureService.saveOrUpdate(cfg); appBuiltInFeatureService.saveOrUpdate(cfg);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
logger.error("appBuiltinFeatureFileSaveOrUpdate failed",e); logger.error("appBuiltinFeatureFileSaveOrUpdate failed",e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"save_failed");
} }
@@ -1404,7 +1404,7 @@ public class AppCfgController extends BaseController {
e.printStackTrace(); e.printStackTrace();
logger.error("appBuiltinFeature audit failed", e); logger.error("appBuiltinFeature audit failed", e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error",e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"error","audit_failed"); addMessage(redirectAttributes,"error","audit_failed");
} }

View File

@@ -129,7 +129,11 @@ public class AppFeatureCfgController extends BaseController {
appMultiFeatureCfgService.saveOrUpdateAppFeatureCfg(entity); appMultiFeatureCfgService.saveOrUpdateAppFeatureCfg(entity);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
addMessage(redirectAttributes, e.getMessage()); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error", "save_failed");
}
} }
return "redirect:" + adminPath +"/app/feature/multiFeatureCfgList?functionId="+entity.getFunctionId(); return "redirect:" + adminPath +"/app/feature/multiFeatureCfgList?functionId="+entity.getFunctionId();
@@ -158,11 +162,11 @@ public class AppFeatureCfgController extends BaseController {
appMultiFeatureCfgService.auditAppFeatureCfg(entity,isAudit); appMultiFeatureCfgService.auditAppFeatureCfg(entity,isAudit);
} catch (MaatConvertException e) { } catch (MaatConvertException e) {
e.printStackTrace(); e.printStackTrace();
logger.info("app 特征配置下发失败:"+e.getMessage()); logger.error("app 特征配置下发失败:"+e.getMessage());
addMessage(redirectAttributes,"error", "request_service_failed"); addMessage(redirectAttributes,"error", "request_service_failed");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.info("app 特征配置下发失败:"+e.getMessage()); logger.error("app 特征配置下发失败:"+e.getMessage());
addMessage(redirectAttributes,"error", "audit_failed"); addMessage(redirectAttributes,"error", "audit_failed");
} }
} }

View File

@@ -135,15 +135,15 @@ public class BasicProtocolController extends BaseController {
entity.setAppCode(specificService.getSpecServiceCode()); entity.setAppCode(specificService.getSpecServiceCode());
} }
appCfgService.saveOrUpdateAppPolicyCfg(entity); appCfgService.saveOrUpdateAppPolicyCfg(entity);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("基础协议信息保存失败",e); logger.error("基础协议信息保存失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
// addMessage(redirectAttributes,e.getMessage()); // addMessage(redirectAttributes,e.getMessage());
addMessage(redirectAttributes,"request_service_failed"); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
} }
} }
@@ -206,10 +206,10 @@ public class BasicProtocolController extends BaseController {
logger.error("基础协议信息保存失败",e); logger.error("基础协议信息保存失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
e.printStackTrace(); e.printStackTrace();
addMessage(redirectAttributes,"request_service_failed"); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
e.printStackTrace(); e.printStackTrace();
addMessage(redirectAttributes,"delete_failed"); addMessage(redirectAttributes,"error","delete_failed");
} }
} }
return "redirect:" + adminPath +"/basicprotocol/list?functionId="+functionId; return "redirect:" + adminPath +"/basicprotocol/list?functionId="+functionId;

View File

@@ -152,7 +152,11 @@ public class CommonController extends BaseController {
addMessage(model,"success","save_success"); addMessage(model,"success","save_success");
}catch(Exception e){ }catch(Exception e){
logger.error("保存失败",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 _deleteIp(String cfgName,String ids,String compileIds,Integer functionId,RedirectAttributes model) { public void _deleteIp(String cfgName,String ids,String compileIds,Integer functionId,RedirectAttributes model) {
@@ -220,7 +224,7 @@ public class CommonController extends BaseController {
addMessage(redirectAttributes,"success","audit_success"); addMessage(redirectAttributes,"success","audit_success");
}catch(MaatConvertException e){ }catch(MaatConvertException e){
logger.error("审核失败", e); logger.error("审核失败", e);
addMessage(redirectAttributes,"error", e.getMessage()); addMessage(redirectAttributes,"error", "request_service_failed");
}catch(Exception e){ }catch(Exception e){
logger.error("审核失败", e); logger.error("审核失败", e);
addMessage(redirectAttributes,"error", "audit_failed"); addMessage(redirectAttributes,"error", "audit_failed");
@@ -328,7 +332,7 @@ public class CommonController extends BaseController {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
addMessage(redirectAttributes,"error", "导出失败!失败信息:"+e.getMessage()); addMessage(redirectAttributes,"error", "导出失败!" );
} }
} }
} }

View File

@@ -157,14 +157,14 @@ public class EncryptedTunnelBehaviorController extends BaseController {
entity.setAppCode(specificService.getSpecServiceCode()); entity.setAppCode(specificService.getSpecServiceCode());
} }
appCfgService.saveOrUpdateAppPolicyCfg(entity); appCfgService.saveOrUpdateAppPolicyCfg(entity);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("加密隧道信息保存失败",e); logger.error("加密隧道信息保存失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>"); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
} }
} }
@@ -224,11 +224,9 @@ public class EncryptedTunnelBehaviorController extends BaseController {
} catch (Exception e) { } catch (Exception e) {
logger.error("加密隧道协议保存失败",e); logger.error("加密隧道协议保存失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
e.printStackTrace(); addMessage(redirectAttributes,"error","request_service_failed");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}else { }else {
e.printStackTrace(); addMessage(redirectAttributes,"error","delete_failed");
addMessage(redirectAttributes,"delete_failed");
} }
} }
return "redirect:" + adminPath +"/encryptedtunnelbehav/list?functionId="+functionId; return "redirect:" + adminPath +"/encryptedtunnelbehav/list?functionId="+functionId;

View File

@@ -14,6 +14,8 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page; import com.nis.domain.Page;
import com.nis.domain.basics.PolicyGroupInfo; import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.configuration.GroupAreaInfo; import com.nis.domain.configuration.GroupAreaInfo;
import com.nis.exceptions.CallExternalProceduresException;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.StringUtil; import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController; import com.nis.web.controller.BaseController;
import com.nis.web.service.configuration.GroupAreaService; import com.nis.web.service.configuration.GroupAreaService;
@@ -66,10 +68,14 @@ public class GroupAreaController extends BaseController {
public String saveOrUpdate(GroupAreaInfo cfg,Model model,RedirectAttributes redirectAttributes) { public String saveOrUpdate(GroupAreaInfo cfg,Model model,RedirectAttributes redirectAttributes) {
try { try {
groupAreaService.saveOrUpdate(cfg); groupAreaService.saveOrUpdate(cfg);
addMessage(redirectAttributes, "save_success"); addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) { } catch (Exception e) {
logger.error("新增失败",e); logger.error("新增失败",e);
addMessage(redirectAttributes, "save_failed"); if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
} }
return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList"; return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList";
} }

View File

@@ -76,11 +76,15 @@ public class DnsIpCfgController extends BaseController {
,RedirectAttributes redirectAttributes){ ,RedirectAttributes redirectAttributes){
try{ try{
dnsIpCfgService.saveOrUpdate(cfg); dnsIpCfgService.saveOrUpdate(cfg);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){ }catch(Exception e){
logger.error("信息保存失败",e); logger.error("信息保存失败",e);
e.printStackTrace(); e.printStackTrace();
addMessage(redirectAttributes,"save_failed"); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
} }
return "redirect:" + adminPath +"/cfg/dnsIp/list?functionId="+cfg.getFunctionId(); return "redirect:" + adminPath +"/cfg/dnsIp/list?functionId="+cfg.getFunctionId();
@@ -167,7 +171,11 @@ public class DnsIpCfgController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("DnsIp export failed",e); logger.error("DnsIp export failed",e);
addMessage(redirectAttributes, "export_failed"); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error", "export_failed");
}
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }

View File

@@ -82,7 +82,7 @@ public class DnsResStrategyController extends BaseController {
dnsResStrategyService.saveOrUpdate(cfg); dnsResStrategyService.saveOrUpdate(cfg);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"save_failed");
@@ -188,7 +188,11 @@ public class DnsResStrategyController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("Dns export failed",e); logger.error("Dns export failed",e);
addMessage(redirectAttributes, "export_failed"); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error", "export_failed");
}
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }

View File

@@ -70,10 +70,14 @@ public class IpMultiplexPoolCfgController extends BaseController {
ipMultiplexPoolCfgService.saveOrUpdate(cfg); ipMultiplexPoolCfgService.saveOrUpdate(cfg);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
addMessage(redirectAttributes,"save_failed"); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error", "save_failed");
}
} }
return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/list?functionId="+cfg.getFunctionId(); return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/list?functionId="+cfg.getFunctionId();
@@ -98,7 +102,8 @@ public class IpMultiplexPoolCfgController extends BaseController {
} }
addMessage(redirectAttributes,"delete_success"); addMessage(redirectAttributes,"delete_success");
}catch(Exception e){ }catch(Exception e){
addMessage(redirectAttributes,"delete_failed"); logger.error(e);
addMessage(redirectAttributes,"error", "delete_failed");
} }
return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/list?functionId="+functionId; return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/list?functionId="+functionId;
} }
@@ -181,10 +186,14 @@ public class IpMultiplexPoolCfgController extends BaseController {
} }
ipMultiplexPoolCfgService.saveOrUpdate(cfg); ipMultiplexPoolCfgService.saveOrUpdate(cfg);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
addMessage(redirectAttributes,"save_failed"); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error", "save_failed");
}
} }
return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+cfg.getFunctionId(); return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+cfg.getFunctionId();
@@ -201,8 +210,12 @@ public class IpMultiplexPoolCfgController extends BaseController {
ipMultiplexPoolCfgService.audit(isAudit,isValid,functionId,id,auditTime); ipMultiplexPoolCfgService.audit(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) { } catch (MaatConvertException e) {
e.printStackTrace(); e.printStackTrace();
logger.info("SNAT地址池管理配置下发失败"+e.getMessage()); logger.error("SNAT地址池管理配置下发失败"+e.getMessage());
addMessage(redirectAttributes, e.getMessage()); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error", "audit_failed");
}
} }
} }
@@ -219,6 +232,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
} }
addMessage(redirectAttributes,"delete_success"); addMessage(redirectAttributes,"delete_success");
}catch(Exception e){ }catch(Exception e){
logger.error(e);
addMessage(redirectAttributes,"delete_failed"); addMessage(redirectAttributes,"delete_failed");
} }
return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId; return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId;

View File

@@ -62,11 +62,15 @@ public class DdosCfgController extends BaseController {
@ModelAttribute("cfg")DdosIpCfg cfg, RedirectAttributes redirectAttributes){ @ModelAttribute("cfg")DdosIpCfg cfg, RedirectAttributes redirectAttributes){
try{ try{
ddosCfgService.saveOrUpdate(cfg); ddosCfgService.saveOrUpdate(cfg);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){ }catch(Exception e){
logger.error("信息保存失败",e); logger.error("信息保存失败",e);
e.printStackTrace(); e.printStackTrace();
addMessage(redirectAttributes,"save_failed"); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error",e.getMessage());
}else {
addMessage(redirectAttributes,"error","save_failed");
}
} }
return "redirect:" + adminPath +"/manipulation/ddos/list?functionId="+cfg.getFunctionId(); return "redirect:" + adminPath +"/manipulation/ddos/list?functionId="+cfg.getFunctionId();

View File

@@ -55,14 +55,14 @@ public class AsnPolicyCfgController extends BaseController {
,RedirectAttributes redirectAttributes){ ,RedirectAttributes redirectAttributes){
try{ try{
asnPolicyCfgService.saveOrUpdate(cfg); asnPolicyCfgService.saveOrUpdate(cfg);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){ }catch(Exception e){
logger.error("信息保存失败",e); logger.error("信息保存失败",e);
e.printStackTrace(); e.printStackTrace();
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage()); addMessage(redirectAttributes,"error", "request_service_failed");
}else { }else {
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
} }
} }
@@ -88,11 +88,11 @@ public class AsnPolicyCfgController extends BaseController {
asnPolicyCfgService.audit(isAudit,isValid,functionId,id,auditTime); asnPolicyCfgService.audit(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) { } catch (MaatConvertException e) {
e.printStackTrace(); e.printStackTrace();
logger.info("dns fake ip配置下发失败"+e.getMessage()); logger.error("dns fake ip配置下发失败"+e.getMessage());
addMessage(redirectAttributes,"error","request_service_failed"); addMessage(redirectAttributes,"error","request_service_failed");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.info("dns fake ip配置下发失败"+e.getMessage()); logger.error("dns fake ip配置下发失败"+e.getMessage());
addMessage(redirectAttributes,"error","audit_failed"); addMessage(redirectAttributes,"error","audit_failed");
} }

View File

@@ -603,7 +603,7 @@ public class AvContentController extends BaseController {
CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){ CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){
try{ try{
avContentCfgService.saveOrUpdateContUrl(cfg); avContentCfgService.saveOrUpdateContUrl(cfg);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){ }catch(Exception e){
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
e.printStackTrace(); e.printStackTrace();

View File

@@ -238,16 +238,17 @@ public class AvController extends BaseController {
avCfgService.saveOrUpdateAvFileSample(entity, srcFile); avCfgService.saveOrUpdateAvFileSample(entity, srcFile);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){ }catch(Exception e){
logger.error("文件上传失败",e); logger.error("文件上传失败",e);
e.printStackTrace(); e.printStackTrace();
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,e.getMessage()); addMessage(redirectAttributes,"error","save_failed");
} }
} }
@@ -258,14 +259,14 @@ public class AvController extends BaseController {
public String saveAudioSignSample(Model model,HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes,String ids,AvSignSampleCfg entity){ public String saveAudioSignSample(Model model,HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes,String ids,AvSignSampleCfg entity){
try{ try{
avCfgService.saveOrUpdateAvSignSample(entity); avCfgService.saveOrUpdateAvSignSample(entity);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){ }catch(Exception e){
logger.error("saveAudioSignSample failed",e); logger.error("saveAudioSignSample failed",e);
e.printStackTrace(); e.printStackTrace();
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
} }
} }
return "redirect:" + adminPath +"/ntc/av/sample/audioSignSampleList?functionId="+entity.getFunctionId(); return "redirect:" + adminPath +"/ntc/av/sample/audioSignSampleList?functionId="+entity.getFunctionId();
@@ -396,11 +397,11 @@ public class AvController extends BaseController {
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
logger.info("音视频标识样例配置下发失败:"+e.getMessage()); logger.error("音视频标识样例配置下发失败:"+e.getMessage());
addMessage(redirectAttributes,"error","request_service_failed"); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
logger.error("auditAvAudioSignSample failed",e); logger.error("auditAvAudioSignSample failed",e);
addMessage(redirectAttributes,"success","audit_failed"); addMessage(redirectAttributes,"error","audit_failed");
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.configuration.P2pHashCfg; import com.nis.domain.configuration.P2pHashCfg;
import com.nis.domain.configuration.P2pKeywordCfg; import com.nis.domain.configuration.P2pKeywordCfg;
import com.nis.domain.maat.ToMaatResult; import com.nis.domain.maat.ToMaatResult;
import com.nis.exceptions.CallExternalProceduresException;
import com.nis.exceptions.MaatConvertException; import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil; import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants; import com.nis.util.Constants;
@@ -79,7 +80,7 @@ public class FileTransferCfgController extends BaseController{
CfgIndexInfo entity,RedirectAttributes redirectAttributes) { CfgIndexInfo entity,RedirectAttributes redirectAttributes) {
try { try {
fileTransferCfgService.saveFtpCfg(entity); fileTransferCfgService.saveFtpCfg(entity);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) { } catch (Exception e) {
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
e.printStackTrace(); e.printStackTrace();
@@ -174,7 +175,7 @@ public class FileTransferCfgController extends BaseController{
} catch (MaatConvertException e) { } catch (MaatConvertException e) {
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
e.printStackTrace(); e.printStackTrace();
logger.info("ftp配置下发失败"+e.getMessage());; logger.error("ftp配置下发失败"+e.getMessage());;
addMessage(redirectAttributes,"request_service_failed"); addMessage(redirectAttributes,"request_service_failed");
}else { }else {
e.printStackTrace(); e.printStackTrace();
@@ -254,11 +255,16 @@ public class FileTransferCfgController extends BaseController{
logger.info("获取文件摘要响应信息:"+result); logger.info("获取文件摘要响应信息:"+result);
} }
fileTransferCfgService.saveOrUpdateFileDigestCfg(entity,result,areaCfgIds); fileTransferCfgService.saveOrUpdateFileDigestCfg(entity,result,areaCfgIds);
addMessage(redirectAttributes, "save_success"); addMessage(redirectAttributes,"success","save_success");
} catch (MaatConvertException e) { } catch (MaatConvertException e) {
addMessage(redirectAttributes, "request_service_failed"); addMessage(redirectAttributes, "request_service_failed");
} catch (IOException e) { } catch ( Exception e) {
addMessage(redirectAttributes, "save_failed"); if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","audit_failed");
}
} }
return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+entity.getFunctionId(); return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+entity.getFunctionId();
} }
@@ -280,9 +286,15 @@ public class FileTransferCfgController extends BaseController{
for(String id :idArray){ for(String id :idArray){
try { try {
fileTransferCfgService.auditFileDigestCfg(isAudit,isValid,functionId,id,auditTime); fileTransferCfgService.auditFileDigestCfg(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) { } catch ( Exception e) {
logger.error("File Digest配置下发失败",e); logger.error("File Digest配置下发失败",e);
addMessage(redirectAttributes, e.getMessage()); if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","audit_failed");
}
} }
} }
@@ -450,10 +462,15 @@ public class FileTransferCfgController extends BaseController{
entity.setFunctionId(functionId); entity.setFunctionId(functionId);
try { try {
fileTransferCfgService.auditP2pCfg(entity,isAudit); fileTransferCfgService.auditP2pCfg(entity,isAudit);
} catch (MaatConvertException e) { } catch ( Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.info("p2p配置下发失败"+e.getMessage()); logger.info("p2p配置下发失败"+e.getMessage());
addMessage(redirectAttributes, e.getMessage()); if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","audit_failed");
}
} }
} }
return "redirect:" + adminPath +"/ntc/fileTransfer/p2pList?functionId="+functionId; return "redirect:" + adminPath +"/ntc/fileTransfer/p2pList?functionId="+functionId;

View File

@@ -31,6 +31,7 @@ import com.nis.domain.configuration.FileDigestCfg;
import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.maat.ToMaatResult; import com.nis.domain.maat.ToMaatResult;
import com.nis.exceptions.CallExternalProceduresException;
import com.nis.exceptions.MaatConvertException; import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil; import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants; import com.nis.util.Constants;
@@ -70,7 +71,7 @@ public class MailCfgController extends BaseController{
} }
@RequestMapping(value = {"saveMailCfg"}) @RequestMapping(value = {"saveMailCfg"})
@RequiresPermissions(value={"mail:config"}) @RequiresPermissions(value={"mail:config"})
public String saveMailCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids, public String saveMailCfg( RedirectAttributes redirectAttributes, Model model,HttpServletRequest request,HttpServletResponse response,String ids,
CfgIndexInfo entity,MultipartFile file) { CfgIndexInfo entity,MultipartFile file) {
try { try {
@@ -97,8 +98,13 @@ public class MailCfgController extends BaseController{
logger.info("获取文件摘要响应信息:"+result); logger.info("获取文件摘要响应信息:"+result);
} }
mailCfgService.saveMailCfg(entity,result); mailCfgService.saveMailCfg(entity,result);
} catch (IOException e) { } catch ( Exception e) {
e.printStackTrace(); if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
} }
return "redirect:" + adminPath +"/ntc/mail/mailList?functionId="+entity.getFunctionId(); return "redirect:" + adminPath +"/ntc/mail/mailList?functionId="+entity.getFunctionId();
@@ -168,10 +174,15 @@ public class MailCfgController extends BaseController{
entity.setFunctionId(functionId); entity.setFunctionId(functionId);
try { try {
mailCfgService.auditMailCfg(entity,isAudit); mailCfgService.auditMailCfg(entity,isAudit);
} catch (MaatConvertException e) { } catch ( Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.info("mail配置下发失败"+e.getMessage()); logger.error("mail配置下发失败"+e.getMessage());
addMessage(redirectAttributes, e.getMessage()); if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
} }
} }
return "redirect:" + adminPath +"/ntc/mail/mailList?functionId="+functionId; return "redirect:" + adminPath +"/ntc/mail/mailList?functionId="+functionId;

View File

@@ -39,6 +39,7 @@ import com.nis.domain.configuration.HttpResHeadCfg;
import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.exceptions.CallExternalProceduresException;
import com.nis.exceptions.MaatConvertException; import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants; import com.nis.util.Constants;
import com.nis.util.DictUtils; import com.nis.util.DictUtils;
@@ -314,10 +315,15 @@ public class WebsiteController extends BaseController{
entity.setFunctionId(functionId); entity.setFunctionId(functionId);
try { try {
websiteCfgService.auditSslCfg(entity,isAudit); websiteCfgService.auditSslCfg(entity,isAudit);
} catch (MaatConvertException e) { } catch ( Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.info("ssl配置下发失败"+e.getMessage()); logger.error("ssl配置下发失败"+e.getMessage());
addMessage(redirectAttributes,"error", e.getMessage()); if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
} }
} }
return "redirect:" + adminPath +"/ntc/website/sslList?functionId="+functionId; return "redirect:" + adminPath +"/ntc/website/sslList?functionId="+functionId;
@@ -407,7 +413,7 @@ public class WebsiteController extends BaseController{
}catch (Exception e) { }catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.info("dns配置下发失败"+e.getMessage()); logger.info("dns配置下发失败"+e.getMessage());
addMessage(redirectAttributes,"error", e.getMessage()); addMessage(redirectAttributes,"error", "audit_failed");
} }
} }
return "redirect:" + adminPath +"/ntc/website/dnsList?functionId="+functionId; return "redirect:" + adminPath +"/ntc/website/dnsList?functionId="+functionId;

View File

@@ -246,11 +246,11 @@ public class WhiteListController extends CommonController{
domainService.auditDomainCfg(entity,isAudit); domainService.auditDomainCfg(entity,isAudit);
} catch (MaatConvertException e) { } catch (MaatConvertException e) {
e.printStackTrace(); e.printStackTrace();
logger.info("domain配置下发失败"+e.getMessage()); logger.error("domain配置下发失败"+e.getMessage());
addMessage(redirectAttributes,"error","request_service_failed"); addMessage(redirectAttributes,"error","request_service_failed");
}catch (Exception e) { }catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.info("domain配置下发失败"+e.getMessage()); logger.error("domain配置下发失败"+e.getMessage());
addMessage(redirectAttributes,"error","audit_failed"); addMessage(redirectAttributes,"error","audit_failed");
} }
} }

View File

@@ -84,10 +84,14 @@ public class XmppController extends BaseController {
entity.setFunctionId(functionId); entity.setFunctionId(functionId);
try { try {
xmppCfgService.auditXmppCfg(entity,isAudit); xmppCfgService.auditXmppCfg(entity,isAudit);
} catch (MaatConvertException e) { } catch ( Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.info("http配置下发失败"+e.getMessage()); logger.info("http配置下发失败"+e.getMessage());
addMessage(redirectAttributes, e.getMessage()); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","audit_failed");
}
} }
} }
return "redirect:" + adminPath +"/ntc/other/xmppList?functionId="+functionId; return "redirect:" + adminPath +"/ntc/other/xmppList?functionId="+functionId;

View File

@@ -69,7 +69,7 @@ public class ControlPolicyController extends BaseController{
,RedirectAttributes redirectAttributes){ ,RedirectAttributes redirectAttributes){
try{ try{
controlPolicyService.saveOrUpdate(cfg,areaCfgIds); controlPolicyService.saveOrUpdate(cfg,areaCfgIds);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){ }catch(Exception e){
logger.error("信息保存失败",e); logger.error("信息保存失败",e);
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"save_failed");
@@ -95,9 +95,13 @@ public class ControlPolicyController extends BaseController{
for(String id :idArray){ for(String id :idArray){
try { try {
controlPolicyService.audit(isAudit,isValid,functionId,id,auditTime,Constants.REPLACE_REQ_KEY_VALUE); controlPolicyService.audit(isAudit,isValid,functionId,id,auditTime,Constants.REPLACE_REQ_KEY_VALUE);
} catch (MaatConvertException e) { } catch ( Exception e) {
logger.error("配置下发失败",e); logger.error("配置下发失败",e);
addMessage(redirectAttributes, e.getMessage()); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","audit_failed");
}
} }
} }
@@ -137,7 +141,7 @@ public class ControlPolicyController extends BaseController{
,RedirectAttributes redirectAttributes){ ,RedirectAttributes redirectAttributes){
try{ try{
controlPolicyService.saveOrUpdate(cfg,areaCfgIds); controlPolicyService.saveOrUpdate(cfg,areaCfgIds);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){ }catch(Exception e){
logger.error("信息保存失败",e); logger.error("信息保存失败",e);
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"save_failed");

View File

@@ -28,6 +28,7 @@ import com.nis.domain.Page;
import com.nis.domain.callback.ProxyFileStrategyCfg; import com.nis.domain.callback.ProxyFileStrategyCfg;
import com.nis.domain.maat.ToMaatResult; import com.nis.domain.maat.ToMaatResult;
import com.nis.domain.maat.ToMaatResult.ResponseData; import com.nis.domain.maat.ToMaatResult.ResponseData;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil; import com.nis.util.ConfigServiceUtil;
import com.nis.util.FileUtils; import com.nis.util.FileUtils;
import com.nis.util.JsonMapper; import com.nis.util.JsonMapper;
@@ -116,10 +117,14 @@ public class FileStrategyController extends CommonController {
cfg.setContentLength(file.length());//文件长度 cfg.setContentLength(file.length());//文件长度
} }
proxyFileStrategyService.saveOrUpdate(cfg); proxyFileStrategyService.saveOrUpdate(cfg);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){ }catch(Exception e){
logger.error("信息保存失败",e); logger.error("信息保存失败",e);
addMessage(redirectAttributes,"save_failed"); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
}finally { }finally {
if(file != null) { if(file != null) {
file.delete();//删除临时文件 file.delete();//删除临时文件

View File

@@ -185,11 +185,15 @@ public class HttpRedirectPolicyController extends BaseController{
@ModelAttribute("cfg")CfgIndexInfo cfg,RedirectAttributes redirectAttributes){ @ModelAttribute("cfg")CfgIndexInfo cfg,RedirectAttributes redirectAttributes){
try{ try{
httpRedirectCfgService.saveHttpCfg(cfg); httpRedirectCfgService.saveHttpCfg(cfg);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){ }catch(Exception e){
logger.error("信息保存失败",e); logger.error("信息保存失败",e);
e.printStackTrace(); e.printStackTrace();
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/httpRedirect/httpRedirectList?functionId="+cfg.getFunctionId(); return "redirect:" + adminPath +"/proxy/control/httpRedirect/httpRedirectList?functionId="+cfg.getFunctionId();
@@ -231,10 +235,14 @@ public class HttpRedirectPolicyController extends BaseController{
entity.setFunctionId(functionId); entity.setFunctionId(functionId);
try { try {
httpRedirectCfgService.auditHttpCfg(entity,isAudit); httpRedirectCfgService.auditHttpCfg(entity,isAudit);
} catch (MaatConvertException e) { } catch ( Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.info("http重定向配置下发失败"+e.getMessage()); logger.info("http重定向配置下发失败"+e.getMessage());
addMessage(redirectAttributes,"error", e.getMessage()); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","audit_failed");
}
} }
} }
return "redirect:" + adminPath +"/proxy/control/httpRedirect/httpRedirectList?functionId="+functionId; return "redirect:" + adminPath +"/proxy/control/httpRedirect/httpRedirectList?functionId="+functionId;

View File

@@ -85,10 +85,14 @@ public class InterceptController extends CommonController{
public String saveInterceptIpCfg(RedirectAttributes redirectAttributes,Model model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) { public String saveInterceptIpCfg(RedirectAttributes redirectAttributes,Model model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
try { try {
interceptCfgService.saveInterceptCfg(entity); interceptCfgService.saveInterceptCfg(entity);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) { } catch (Exception e) {
logger.error("save_failed", e); logger.error("save_failed", 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/intercept/ip/list?functionId="+entity.getFunctionId(); return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+entity.getFunctionId();
} }
@@ -144,9 +148,13 @@ public class InterceptController extends CommonController{
try { try {
interceptCfgService.auditInterceptIpCfg(entity,isAudit); interceptCfgService.auditInterceptIpCfg(entity,isAudit);
addMessage(redirectAttributes,"audit_success"); addMessage(redirectAttributes,"audit_success");
} catch (MaatConvertException e) { } catch ( Exception e) {
logger.error("intercept ip audit failed",e); logger.error("intercept ip audit failed",e);
addMessage(redirectAttributes,"audit_failed"); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error", "audit_failed");
}
} }
} }
return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+functionId; return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+functionId;

View File

@@ -110,7 +110,11 @@ public class PxyObjKeyringController extends BaseController {
} catch (Exception e) { } catch (Exception e) {
validFlag=false; validFlag=false;
logger.error("证书文件校验失败",e); logger.error("证书文件校验失败",e);
addMessage(redirectAttributes,e.getMessage()); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error", "save_failed");
}
} }
if(validFlag){ if(validFlag){
@@ -131,7 +135,11 @@ public class PxyObjKeyringController extends BaseController {
} }
}catch (Exception e) { }catch (Exception e) {
logger.error("证书信息获取失败",e); logger.error("证书信息获取失败",e);
addMessage(redirectAttributes,e.getMessage()); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error", "save_failed");
}
} }
} }
if(validFlag){ if(validFlag){
@@ -184,13 +192,13 @@ public class PxyObjKeyringController extends BaseController {
} }
pxyObjKeyringService.saveOrUpdate(cfg); pxyObjKeyringService.saveOrUpdate(cfg);
addMessage(redirectAttributes,"save_success"); addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){ }catch(Exception e){
logger.error("证书上传失败",e); logger.error("证书上传失败",e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage()); addMessage(redirectAttributes,"error", "request_service_failed");
}else { }else {
addMessage(redirectAttributes,e.getMessage()); addMessage(redirectAttributes,"error", "save_failed");
} }
} }
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -60,7 +60,7 @@
<div class="portlet"> <div class="portlet">
<div class="portlet-body"> <div class="portlet-body">
<div class="row" > <div class="row" >
<sys:message content="${message}"/> <sys:message content="${message}" type="${messageType }"/>
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/manipulation/ipmulitiplex/dnatPolicyList?functionId=${cfg.functionId}" method="post" class="form-search"> <form:form id="searchForm" modelAttribute="cfg" action="${ctx}/manipulation/ipmulitiplex/dnatPolicyList?functionId=${cfg.functionId}" method="post" class="form-search">
<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/> <input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
<input id="audit" name="audit" type="hidden" value="${audit}"/> <input id="audit" name="audit" type="hidden" value="${audit}"/>

View File

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

View File

@@ -60,7 +60,7 @@
<div class="portlet"> <div class="portlet">
<div class="portlet-body"> <div class="portlet-body">
<div class="row" > <div class="row" >
<sys:message content="${message}"/> <sys:message content="${message}" type="${messageTypes }"/>
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/manipulation/ipmulitiplex/snatPolicyList?functionId=${cfg.functionId}" method="post" class="form-search"> <form:form id="searchForm" modelAttribute="cfg" action="${ctx}/manipulation/ipmulitiplex/snatPolicyList?functionId=${cfg.functionId}" method="post" class="form-search">
<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/> <input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
<input id="audit" name="audit" type="hidden" value="${audit}"/> <input id="audit" name="audit" type="hidden" value="${audit}"/>

View File

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

View File

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

View File

@@ -153,7 +153,7 @@ $(document).ready(function(){
<!-- /筛选搜索内容栏 结束--> <!-- /筛选搜索内容栏 结束-->
</form:form> </form:form>
</div> </div>
<sys:message content="${message}"/> <sys:message content="${message}" type="${messageTypes }"/>
<div class="table-responsive"> <div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb"> <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">