diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java index 931ee40f2..fab4495c2 100644 --- a/src/main/java/com/nis/util/ConfigServiceUtil.java +++ b/src/main/java/com/nis/util/ConfigServiceUtil.java @@ -14,6 +14,7 @@ import net.sf.json.JSONObject; import org.glassfish.jersey.media.multipart.FormDataMultiPart; import org.glassfish.jersey.media.multipart.file.FileDataBodyPart; +import com.nis.exceptions.MaatConvertException; import com.nis.util.httpclient.ClientUtil; public class ConfigServiceUtil { @@ -39,13 +40,10 @@ public class ConfigServiceUtil { Response response= header.get(); if( response.getStatus() == 200){ result= response.readEntity(String.class); - } - if(result == null){ - return "0"; }else{ - return result; + throw new MaatConvertException(":"+response.readEntity(String.class)); } - + return result; } /** * MAAT配置提交 @@ -64,7 +62,7 @@ public class ConfigServiceUtil { if( response.getStatus() == 200){ result= response.readEntity(String.class); }else{ - + throw new MaatConvertException(":"+response.readEntity(String.class)); } return result; @@ -86,7 +84,7 @@ public class ConfigServiceUtil { if( response.getStatus() == 200){ result= response.readEntity(String.class); }else{ - + throw new MaatConvertException(":"+response.readEntity(String.class)); } return result; @@ -110,7 +108,7 @@ public class ConfigServiceUtil { if( response.getStatus() == 200){ result= response.readEntity(String.class); }else{ - + throw new MaatConvertException(":"+response.readEntity(String.class)); } return result; @@ -137,7 +135,7 @@ public class ConfigServiceUtil { if( response.getStatus() == 200){ result= response.readEntity(String.class); }else{ - + throw new MaatConvertException(":"+response.readEntity(String.class)); } return result; @@ -164,7 +162,7 @@ public class ConfigServiceUtil { if( response.getStatus() == 200){ result= response.readEntity(String.class); }else{ - + throw new MaatConvertException(":"+response.readEntity(String.class)); } return result; } @@ -187,7 +185,7 @@ public class ConfigServiceUtil { if( response.getStatus() == 200){ result= response.readEntity(String.class); }else{ - + throw new MaatConvertException(":"+response.readEntity(String.class)); } return result; } @@ -201,7 +199,7 @@ public class ConfigServiceUtil { if( response.getStatus() == 200){ String result= response.readEntity(String.class); }else{ - + throw new MaatConvertException(":"+response.readEntity(String.class)); } } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java index 1eb1ae0ab..b9689da7e 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java @@ -72,9 +72,7 @@ public class AvController extends BaseController { public String saveFileSample(Model model,HttpServletRequest request,HttpServletResponse response, String ids,AvFileSampleCfg entity,MultipartFile srcFile,MultipartFile sampleFile){ try{ - if(StringUtil.isEmpty(entity.getSrcUrl()) && - StringUtil.isEmpty(entity.getSampleUrl()) && - srcFile!=null && sampleFile!=null && + if(srcFile!=null && sampleFile!=null && srcFile.getSize()>0 && sampleFile.getSize()>0){ String sep = System.getProperty("file.separator"); diff --git a/src/main/java/com/nis/web/service/configuration/AvCfgService.java b/src/main/java/com/nis/web/service/configuration/AvCfgService.java index dbb9ac63b..cd096d8ca 100644 --- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java @@ -72,14 +72,14 @@ public class AvCfgService extends BaseService{ } catch (Exception e) { e.printStackTrace(); logger.info("获取编译ID出错"); - throw new MaatConvertException("获取编译ID出错"); + throw new MaatConvertException(":"+e.getMessage()); } Integer compileId = Integer.parseInt(result); if(compileId!=0){ entity.setCompileId(compileId); avCfgDao.insertAvFileSample(entity); }else{ - throw new MaatConvertException("获取编译ID出错"); + throw new MaatConvertException(""); } }else{ entity.setEditorId(UserUtils.getUser().getId()); @@ -100,14 +100,14 @@ public class AvCfgService extends BaseService{ } catch (Exception e) { e.printStackTrace(); logger.info("获取编译ID出错"); - throw new MaatConvertException("获取编译ID出错"); + throw new MaatConvertException(":"+e.getMessage()); } Integer compileId = Integer.parseInt(result); if(compileId!=0){ entity.setCompileId(compileId); avCfgDao.insertAvSignSample(entity); }else{ - throw new MaatConvertException("获取编译ID出错"); + throw new MaatConvertException(""); } }else{ @@ -171,7 +171,7 @@ public class AvCfgService extends BaseService{ } catch (Exception e) { e.printStackTrace(); logger.info("音视频文件样例配置下发失败"); - throw new MaatConvertException("音视频文件样例配置下发失败："+e.getMessage()); + throw new MaatConvertException(":"+e.getMessage()); } } @@ -190,7 +190,7 @@ public class AvCfgService extends BaseService{ } catch (Exception e) { e.printStackTrace(); logger.info("音视频文件样例配置下发失败"); - throw new MaatConvertException("音视频文件样例配置下发失败："+e.getMessage()); + throw new MaatConvertException(":"+e.getMessage()); } }else if(isAudit==3){ //调用服务接口取消配置 @@ -203,7 +203,7 @@ public class AvCfgService extends BaseService{ } catch (Exception e) { e.printStackTrace(); logger.info("音视频文件样取消配置失败"); - throw new MaatConvertException("音视频文件样例取消配置失败："+e.getMessage()); + throw new MaatConvertException(":"+e.getMessage()); } } } @@ -246,7 +246,7 @@ public class AvCfgService extends BaseService{ } catch (Exception e) { e.printStackTrace(); logger.info("音视频标志样例配置下发失败"); - throw new MaatConvertException("音视频标识样例配置下发失败："+e.getMessage()); + throw new MaatConvertException(":"+e.getMessage()); } }else if(isAudit==3){ //调用服务接口取消配置 @@ -259,7 +259,7 @@ public class AvCfgService extends BaseService{ } catch (Exception e) { e.printStackTrace(); logger.info("音视频标志样例取消配置失败"); - throw new MaatConvertException("音视频标识样例取消失败："+e.getMessage()); + throw new MaatConvertException(":"+e.getMessage()); } } diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 739d24ec1..a14423ae1 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -543,6 +543,15 @@ av_sample_audio_porn_control=\u97F3\u9891\u8272\u60C5\u6837\u4F8B\u7BA1\u63A7 av_sample_vedio_porn_control=\u89C6\u9891\u8272\u60C5\u6837\u4F8B\u7BA1\u63A7 av_sample_control=\u6837\u4F8B\u7BA1\u63A7 harm_level=\u5371\u5BB3\u7A0B\u5EA6 -src_url=\u6E90\u6587\u4EF6 -sample_url=\u6837\u4F8B\u6587\u4EF6 +src_file=\u6E90\u6587\u4EF6 +select_file=\u8BF7\u9009\u62E9\u4E0A\u4F20\u6587\u4EF6 +sample_file=\u6837\u4F8B\u6587\u4EF6 sample_sign=\u6837\u4F8B\u6807\u5FD7 +click_detail=\u8BF7\u70B9\u51FB\u201C\u67E5\u770B\u8BE6\u7EC6\u4FE1\u606F\u201D\u6309\u94AE\uFF0C\u5C06\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F\u53D1\u9001\u7ED9\u7CFB\u7EDF\u7BA1\u7406\u5458\uFF0C\u8C22\u8C22\uFF01 +return_lastpage=\u8FD4\u56DE\u4E0A\u4E00\u9875 +show_detail=\u67E5\u770B\u8BE6\u7EC6\u4FE1\u606F +hidden_detail=\u9690\u85CF\u4FE1\u606F\u4FE1\u606F +notfound_page=\u9875\u9762\u4E0D\u5B58\u5728 +no_permission=\u6743\u9650\u4E0D\u8DB3 +param_error=\u53C2\u6570\u6709\u8BEF\uFF0C\u670D\u52A1\u5668\u65E0\u6CD5\u89E3\u6790\u3002 +request_error=\u8BF7\u6C42\u9519\u8BEF diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp index a3439eafd..ef31acbad 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp @@ -25,6 +25,18 @@ $(function(){ $("select[name$='ipType']").on("change",function(){ switchIpType($(this)); }); + $("#uploadSrc,#srcFileInfo").on('click',function(){ + $("#srcFile").trigger("click"); + }); + $("#srcFile").on('change',function(){ + $("#srcFileInfo").val($("#srcFile").val()); + }); + $("#uploadSample,#sampleFileInfo").on('click',function(){ + $("#sampleFile").trigger("click"); + }); + $("#sampleFile").on('change',function(){ + $("#sampleFileInfo").val($("#sampleFile").val()); + }); $("input[name='areaType']").on('change',function(){ var val=$(this).val(); if($(this).is(":visible")){ @@ -128,10 +140,20 @@ $(function(){
- +
<%-- --%> - + +
+ " class="required form-control" style=" background-color:transparent" + aria-required="true" type="text" value="${_cfg.srcUrl }"> + +
+ +
+ <%-- ${_cfg.srcUrl } --%> +
@@ -139,10 +161,22 @@ $(function(){
- +
<%-- --%> - + +
+ " class="required form-control" style=" background-color:transparent" + aria-required="true" type="text" value="${_cfg.sampleUrl }"> + +
+ +
+ <%-- ${_cfg.srcUrl } --%> +
+ <%-- + ${_cfg.sampleUrl } --%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp index 389935500..531a1baf6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -267,8 +267,8 @@ <%-- --%> - - + + diff --git a/src/main/webapp/WEB-INF/views/error/400.jsp b/src/main/webapp/WEB-INF/views/error/400.jsp index a3329197a..f35ccbab9 100644 --- a/src/main/webapp/WEB-INF/views/error/400.jsp +++ b/src/main/webapp/WEB-INF/views/error/400.jsp @@ -5,7 +5,7 @@ response.setStatus(400); Throwable ex = Exceptions.getThrowable(request); // 编译错误信息 -StringBuilder sb = new StringBuilder("(400)错误信息：\n"); +StringBuilder sb = new StringBuilder("(400)：\n"); if (ex != null) { if (ex instanceof BindException) { for (ObjectError e : ((BindException)ex).getGlobalErrors()){ @@ -24,7 +24,7 @@ if (ex != null) { sb.append("☆" + ex.getMessage()); } } else { - sb.append("未知错误.\n\n"); + sb.append(".\n\n"); } // 如果是异步请求或是手机端，则直接返回信息 @@ -47,16 +47,16 @@ else { - 400 - 请求出错 + 400 - <spring:message code="request_error"/> <%@include file="/WEB-INF/include/header.jsp" %>
-

参数有误,服务器无法解析.

+

<%=StringUtils.toHtml(sb.toString())%>
- 返回上一页   +  

diff --git a/src/main/webapp/WEB-INF/views/error/403.jsp b/src/main/webapp/WEB-INF/views/error/403.jsp index 0a2d30451..4d35d6a29 100644 --- a/src/main/webapp/WEB-INF/views/error/403.jsp +++ b/src/main/webapp/WEB-INF/views/error/403.jsp @@ -24,18 +24,18 @@ else { - 403 - 操作权限不足 + 403 - <spring:message code="no_permission"/> <%@include file="/WEB-INF/include/header.jsp" %>
-

操作权限不足-403.

+

-403.

<% if (ex!=null && StringUtils.startsWith(ex.getMessage(), "msg:")){ out.print("
"+StringUtils.replace(ex.getMessage(), "msg:", "")+"

"); } %> - +
diff --git a/src/main/webapp/WEB-INF/views/error/404.jsp b/src/main/webapp/WEB-INF/views/error/404.jsp index 25327665f..148c8cae9 100644 --- a/src/main/webapp/WEB-INF/views/error/404.jsp +++ b/src/main/webapp/WEB-INF/views/error/404.jsp @@ -3,7 +3,7 @@ response.setStatus(404); // 如果是异步请求或是手机端，则直接返回信息 if (Servlets.isAjaxRequest(request)) { - out.print("页面不存在."); + out.print("."); } //输出异常信息页面 @@ -15,13 +15,13 @@ else { - 404 - 页面不存在 + 404 - <spring:message code="notfound_page"/> <%@include file="/WEB-INF/include/header.jsp" %>
-

404-页面不存在.

- +

404-.

+
diff --git a/src/main/webapp/WEB-INF/views/error/500.jsp b/src/main/webapp/WEB-INF/views/error/500.jsp index 1835134c9..0c85d629a 100644 --- a/src/main/webapp/WEB-INF/views/error/500.jsp +++ b/src/main/webapp/WEB-INF/views/error/500.jsp @@ -8,11 +8,11 @@ if (ex != null){ } // 编译错误信息 -StringBuilder sb = new StringBuilder("错误信息：\n"); +StringBuilder sb = new StringBuilder("：\n"); if (ex != null) { sb.append(Exceptions.getStackTraceAsString(ex)); } else { - sb.append("未知错误.\n\n"); + sb.append(".\n\n"); } // 如果是异步请求或是手机端，则直接返回信息 @@ -32,22 +32,23 @@ else { - 500 - 系统内部错误 + 500 - <spring:message code="system_error"/> <%@include file="/WEB-INF/include/header.jsp" %>
-

500-系统内部错误.

+

500-.

- 错误信息：<%=ex==null?"未知错误.":StringUtils.toHtml(ex.getMessage())%>

- 请点击“查看详细信息”按钮，将详细错误信息发送给系统管理员，谢谢！

- 返回上一页   - 查看详细信息 + ：<%=ex==null?".":StringUtils.toHtml(ex.getMessage())%>

+ +

+   +
<%=StringUtils.toHtml(sb.toString())%>
- 返回上一页   - 隐藏详细信息 +   +