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:
DuanDongmei
2018-11-20 13:04:37 +08:00
parent bec11857d0
commit ffd9c2ec44
12 changed files with 58 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/nis/util/ConfigServiceUtil.java
View File

@@ -206,7 +206,7 @@ public class ConfigServiceUtil {
* @return
* @throws Exception
*/
public static ToMaatResult postFileCfg(String params,File file,String fileDesc) throws MaatConvertException{
public static ToMaatResult postFileCfg(String params,File file,String fileDesc) throws Exception{
String result = null;
ToMaatResult bean = null;
String url = Constants.SERVICE_URL+Constants.FILE_UPLOAD_CFG;
@@ -217,13 +217,18 @@ public class ConfigServiceUtil {
FileDataBodyPart bodyPart=new FileDataBodyPart("file",file);
formDataMultiPart.bodyPart(bodyPart);
Builder header = wt.request(MediaType.APPLICATION_JSON).header("File-Desc",fileDesc);
Response response= header.post(Entity.entity(formDataMultiPart, formDataMultiPart.getMediaType()));
if( response.getStatus() == 200){
Response response=null;
try {
response= header.post(Entity.entity(formDataMultiPart, formDataMultiPart.getMediaType()));
} catch (Exception e) {
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
if(response != null && response.getStatus() == 200){
result= response.readEntity(String.class);
JSONObject resObject = JSONObject.fromObject(result);
bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class);
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+response.readEntity(String.class));
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
return bean;

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

@@ -1282,9 +1282,11 @@ public class AppCfgController extends BaseController {
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
logger.error("app主题网站删除失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
if(e instanceof MaatConvertException) {
e.printStackTrace();
addMessage(redirectAttributes,"error","request_service_failed");
}else if(e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","call_external_procedures_failed");
}else {
e.printStackTrace();
addMessage(redirectAttributes,"error","delete_failed");

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

@@ -139,9 +139,11 @@ public class BasicProtocolController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
logger.error("基础协议信息保存失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
if(e instanceof MaatConvertException) {
// addMessage(redirectAttributes,e.getMessage());
addMessage(redirectAttributes,"error","request_service_failed");
}else if(e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","call_external_procedures_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
@@ -204,9 +206,11 @@ public class BasicProtocolController extends BaseController {
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
logger.error("基础协议信息保存失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
if(e instanceof MaatConvertException) {
e.printStackTrace();
addMessage(redirectAttributes,"error","request_service_failed");
}else if(e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","call_external_procedures_failed");
}else {
e.printStackTrace();
addMessage(redirectAttributes,"error","delete_failed");

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

@@ -161,8 +161,10 @@ public class EncryptedTunnelBehaviorController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
logger.error("加密隧道信息保存失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else if(e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","call_external_procedures_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
@@ -223,8 +225,10 @@ public class EncryptedTunnelBehaviorController extends BaseController {
appCfgService.updateAppPolicyCfgValid(isValid,ids,functionId);
} catch (Exception e) {
logger.error("加密隧道协议保存失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else if(e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","call_external_procedures_failed");
}else {
addMessage(redirectAttributes,"error","delete_failed");
}

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

@@ -71,8 +71,10 @@ public class GroupAreaController extends BaseController {
addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) {
logger.error("新增失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else if(e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","call_external_procedures_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}

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

@@ -239,15 +239,14 @@ public class AvController extends BaseController {
avCfgService.saveOrUpdateAvFileSample(entity, srcFile);
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
logger.error("文件上传失败",e);
e.printStackTrace();
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
}else if(e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","call_external_procedures_failed");
}else{
addMessage(redirectAttributes,"error","save_failed");
}
}
@@ -263,8 +262,10 @@ public class AvController extends BaseController {
}catch(Exception e){
logger.error("saveAudioSignSample failed",e);
e.printStackTrace();
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else if(e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","call_external_procedures_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}

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

@@ -286,9 +286,11 @@ public class FileTransferCfgController extends BaseController{
fileTransferCfgService.auditFileDigestCfg(isAudit,isValid,functionId,id,auditTime);
} catch ( Exception e) {
logger.error("File Digest配置下发失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else if(e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","call_external_procedures_failed");
}else {
addMessage(redirectAttributes,"error","audit_failed");
}
@@ -463,9 +465,11 @@ public class FileTransferCfgController extends BaseController{
} catch ( Exception e) {
e.printStackTrace();
logger.info("p2p配置下发失败："+e.getMessage());
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else if(e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","call_external_procedures_failed");
}else {
addMessage(redirectAttributes,"error","audit_failed");
}

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

@@ -99,9 +99,11 @@ public class MailCfgController extends BaseController{
}
mailCfgService.saveMailCfg(entity,result);
} catch ( Exception e) {
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else if(e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","call_external_procedures_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
@@ -177,9 +179,11 @@ public class MailCfgController extends BaseController{
} catch ( Exception e) {
e.printStackTrace();
logger.error("mail配置下发失败："+e.getMessage());
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else if(e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","call_external_procedures_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}

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

@@ -318,9 +318,11 @@ public class WebsiteController extends BaseController{
} catch ( Exception e) {
e.printStackTrace();
logger.error("ssl配置下发失败："+e.getMessage());
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else if(e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","call_external_procedures_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}

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

@@ -668,8 +668,9 @@ public class PxyObjKeyringController extends BaseController {
String cmdarray[] = new String[] {cmd1, cmd2 ,sb.toString() };
BufferedReader br = null;
BufferedReader bre = null;
Process exec=null;
try {
Process exec = Runtime.getRuntime().exec(cmdarray);
exec = Runtime.getRuntime().exec(cmdarray);
exec.getInputStream();
br = new BufferedReader(
new InputStreamReader(exec.getInputStream()));
@@ -744,6 +745,9 @@ public class PxyObjKeyringController extends BaseController {
} catch (IOException e) {
e.printStackTrace();
}
if (exec != null)
exec.destroy();
}
return result;
}

7
src/main/java/com/nis/web/service/configuration/AvCfgService.java
View File

@@ -274,11 +274,10 @@ public class AvCfgService extends BaseService{
throw new CallExternalProceduresException();
}
}catch (Exception e) {
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
throw e;
if(e instanceof MaatConvertException ) {
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}else {
e.printStackTrace();
throw new CallExternalProceduresException();
throw new CallExternalProceduresException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
}
return entity;

2
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1255,7 +1255,7 @@ not_valid_domain=%s\u4E0D\u662F\u4E00\u4E2A\u5408\u6CD5\u57DF\u540D
cert_not_match_domain=\u57DF\u540D\u4E0E\u6240\u9009\u8BC1\u4E66\u4FE1\u606F\u4E0D\u7B26\u5408\uFF01
crl_file_error=CRL\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF
PXY_OBJ_TRUSTED_CA_CERT=\u53EF\u4FE1\u8BC1\u4E66
crl_issuer_error=crl\u6587\u4EF6\u7684issuer\u4E0E\u8BC1\u4E66\u6587\u4EF6\u7684issuer\u4E0D\u5339\u914D \u7FFB\u8BD1
crl_issuer_error=crl\u6587\u4EF6\u7684issuer\u4E0E\u8BC1\u4E66\u6587\u4EF6\u7684issuer\u4E0D\u5339\u914D
cert_name=\u8BC1\u4E66\u540D\u79F0
add_crl_file=Add CRL File
import_crl=\u5BFC\u5165\u5185\u7F6ECRL\u6587\u4EF6