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

1、修改用户统计界面，2.修改流量统计加载问题，3、配置异常增加error提示

Browse Source
This commit is contained in:
zhanghongqing
2018-11-08 14:52:58 +08:00
parent b7fc16e681
commit 22d1228097
19 changed files with 172 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
View File

@@ -403,7 +403,7 @@ public class HttpRedirectPolicyController 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();*/
}

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

@@ -147,7 +147,7 @@ public class InterceptController extends CommonController{
entity.setFunctionId(functionId);
try {
interceptCfgService.auditInterceptIpCfg(entity,isAudit);
addMessage(redirectAttributes,"audit_success");
addMessage(redirectAttributes,"success","audit_success");
} catch ( Exception e) {
logger.error("intercept ip audit failed",e);
if(e instanceof MaatConvertException) {
@@ -164,10 +164,10 @@ public class InterceptController extends CommonController{
public String updateInterceptIpValid(Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
try {
interceptCfgService.updatInterceptValid(isValid,ids,functionId);
addMessage(redirectAttributes,"delete_success");
addMessage(redirectAttributes,"error","delete_success");
} catch (Exception e) {
logger.error("intercept ip delete failed",e);
addMessage(redirectAttributes,"delete_failed");
addMessage(redirectAttributes,"error","delete_failed");
}
return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+functionId;
}
@@ -311,7 +311,7 @@ public class InterceptController extends CommonController{
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();
}

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

@@ -101,24 +101,28 @@ public class PxyObjKeyringController extends BaseController {
boolean publicKeyFileflag=validCertFileContent(publicKeyFileI,"-incert");
boolean privateKeyFileflag=validCertFileContent(privateKeyFileI,"-inkey");
if(!publicKeyFileflag && !privateKeyFileflag){
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
logger.error(publicKeyFileI.getOriginalFilename()+" and "+privateKeyFileI.getOriginalFilename()+" file non certificate file format ");
throw new MultiPartNewException(
this.getMsgProp().getProperty("certificate_error")
);
}else if(!publicKeyFileflag){
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
logger.error(publicKeyFileI.getOriginalFilename()+" file non public key file format ");
throw new MultiPartNewException(this.getMsgProp().getProperty("public_file_error"));
}else if(!privateKeyFileflag){
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
logger.error(privateKeyFileI.getOriginalFilename()+" file non private key file format ");
throw new MultiPartNewException(this.getMsgProp().getProperty("private_file_error"));
}
} catch (Exception e) {
validFlag=false;
logger.error("证书文件校验失败",e);
addMessage(redirectAttributes,"error",e.getMessage());
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
}
try{
@@ -160,7 +164,11 @@ public class PxyObjKeyringController extends BaseController {
}
}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");
}
}
try{
if(validFlag){
@@ -217,9 +225,9 @@ public class PxyObjKeyringController extends BaseController {
}catch(Exception e){
logger.error("证书上传失败",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error",e.getMessage());
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error",e.getMessage());
addMessage(redirectAttributes,"error","save_failed");
}
}
@@ -383,7 +391,7 @@ public class PxyObjKeyringController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("pxyObjKeyring export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes, "error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}