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 15:43:12 +08:00
parent a11f637e6b
commit 97eb005a6d
41 changed files with 256 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,14 +55,14 @@ public class AsnPolicyCfgController extends BaseController {
,RedirectAttributes redirectAttributes){
try{
asnPolicyCfgService.saveOrUpdate(cfg);
addMessage(redirectAttributes,"save_success");
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage());
addMessage(redirectAttributes,"error", "request_service_failed");
}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);
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("dns fake ip配置下发失败："+e.getMessage());
logger.error("dns fake ip配置下发失败："+e.getMessage());
addMessage(redirectAttributes,"error","request_service_failed");
} catch (Exception e) {
e.printStackTrace();
logger.info("dns fake ip配置下发失败："+e.getMessage());
logger.error("dns fake ip配置下发失败："+e.getMessage());
addMessage(redirectAttributes,"error","audit_failed");
}

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

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

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

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

35
src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
View File

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

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

@@ -31,6 +31,7 @@ import com.nis.domain.configuration.FileDigestCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.maat.ToMaatResult;
import com.nis.exceptions.CallExternalProceduresException;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
@@ -70,7 +71,7 @@ public class MailCfgController extends BaseController{
}
@RequestMapping(value = {"saveMailCfg"})
@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) {
try {
@@ -97,8 +98,13 @@ public class MailCfgController extends BaseController{
logger.info("获取文件摘要响应信息："+result);
}
mailCfgService.saveMailCfg(entity,result);
} catch (IOException e) {
e.printStackTrace();
} catch ( Exception e) {
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();
@@ -168,10 +174,15 @@ public class MailCfgController extends BaseController{
entity.setFunctionId(functionId);
try {
mailCfgService.auditMailCfg(entity,isAudit);
} catch (MaatConvertException e) {
} catch ( Exception e) {
e.printStackTrace();
logger.info("mail配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
logger.error("mail配置下发失败："+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;

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

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

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

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

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

@@ -84,10 +84,14 @@ public class XmppController extends BaseController {
entity.setFunctionId(functionId);
try {
xmppCfgService.auditXmppCfg(entity,isAudit);
} catch (MaatConvertException e) {
} catch ( Exception e) {
e.printStackTrace();
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;