diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java index 09480a13f..491dff836 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java @@ -248,6 +248,8 @@ public class FileTransferCfgController extends BaseController{ logger.info("获取文件摘要响应信息:"+result); } fileTransferCfgService.saveOrUpdateFileDigestCfg(entity,result,areaCfgIds); + } catch (MaatConvertException e) { + addMessage(redirectAttributes, e.getMessage()); } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml index 145b590cd..e22ed5d00 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml @@ -300,7 +300,7 @@ r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY, r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID, r.CFG_TYPE,r.CFG_REGION_CODE,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN,r.USER_REGION1,r.USER_REGION2, - r.USER_REGION3,r.USER_REGION4,r.USER_REGION5,r.do_log + r.USER_REGION3,r.USER_REGION4,r.USER_REGION5,r.DO_LOG diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml index 4b7770a43..9140f8307 100644 --- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml @@ -121,6 +121,7 @@ + @@ -187,7 +188,7 @@ a.CFG_ID,a.CFG_DESC,a.raw_len,a.digest,a.cfds_level,a.file_url,a.ACTION,a.IS_VALID,a.IS_AUDIT, a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME, - a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY, + a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,a.DO_LOG, a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,cfg_type,cfg_region_code - - - - - - - - - - -
-
-
-
- -
- -
-
-
-
-
- -
- - - -
-
-
-
-
-
-
-
- -
- +
+ +
+ + + + + + + + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ + + +
+
+
+
+
+
+
+
+ +
+
- " class="required form-control" style=" background-color:transparent" - aria-required="true" type="text" value="${_cfg.digest }"> - + " + class="required form-control" + style="background-color: transparent" aria-required="true" + type="text" value="${_cfg.digest }"> +
- +
-
- +
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+ +
+
+
+
+ + + + + + + + + + +
-
-
-
- -
- -
-
-
-
- + <%@include file="/WEB-INF/include/form/areaInfo.jsp"%> + <%@include file="/WEB-INF/include/form/basicInfo.jsp"%>
- <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> - <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+ - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp index 11593a8b3..e2c89c8ae 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -12,6 +12,8 @@ $("#intype").val("${cfg.cfgDesc}"); }else if("${cfg.cfdsLevel}"){ $("#intype").val("${cfg.cfdsLevel}"); + }else if("${cfg.compileId}"){ + $("#intype").val("${cfg.compileId}"); }else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } @@ -59,7 +61,6 @@
- @@ -89,6 +90,7 @@ + @@ -271,6 +273,7 @@ + @@ -377,6 +380,13 @@ ${fns:abbr(lableInfo,20)} + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp index d6bfc4719..e5a0e0d68 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp @@ -9,6 +9,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); + }else if("${cfg.compileId}"){ + $("#intype").val("${cfg.compileId}"); }else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } @@ -131,10 +133,7 @@ - <%-- - - - --%> +