diff --git a/src/main/java/com/nis/util/ConfigConvertUtil.java b/src/main/java/com/nis/util/ConfigConvertUtil.java index 0a8616cc7..78924e88f 100644 --- a/src/main/java/com/nis/util/ConfigConvertUtil.java +++ b/src/main/java/com/nis/util/ConfigConvertUtil.java @@ -850,9 +850,9 @@ public class ConfigConvertUtil { //ssl_ver map=new HashMap<>(); map.put("mirror_client", 0); - map.put("allow_http2", 0); - map.put("min", "ssl3"); - map.put("max", "tls13"); + map.put("allow_http2", 1); + map.put("min", "SSLv3"); + map.put("max", "TLSv1.3"); userRegionMap.put("ssl_ver", map); //decrypt_mirror map=new HashMap<>(); diff --git a/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java b/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java index 72d34e581..12f8fdf7b 100644 --- a/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java +++ b/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java @@ -602,4 +602,13 @@ public class ObjectGroupController extends BaseController { logger.warn("配置批量生效/失效耗时:"+(end-start)); return tip.toString(); } + @RequestMapping(value = { "ajaxSubList"}) + public String ajaxSubList(Model model, Long cfgId, Integer index, Integer compileId) { + CfgIndexInfo cfg = objectGroupService.getObjectGroupCfg(cfgId, null); + List tabList = new ArrayList(); + model.addAttribute("_cfg", cfg); + model.addAttribute("index", index); + model.addAttribute("tabList", tabList); + return "/cfg/objgroup/subList"; + } } diff --git a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp index 193f369fc..c61cb8b72 100644 --- a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp @@ -10,7 +10,7 @@ @@ -431,7 +470,7 @@ - <%----%> + ${cfg.compileId } diff --git a/src/main/webapp/WEB-INF/views/cfg/objgroup/subList.jsp b/src/main/webapp/WEB-INF/views/cfg/objgroup/subList.jsp new file mode 100644 index 000000000..80a327e9b --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/subList.jsp @@ -0,0 +1,42 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + +
+ + +
+ +
+
+
+
+ +
+
+
+
+
+ + +
+ + +
+ +
+ <%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%> +
+
+ \ No newline at end of file diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 2e877b542..03ecbd9d4 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -61,7 +61,7 @@ $(function(){ $("form input[class~='domainCheck']").attr("maxlength","1024"); $("form input[class~='domainCheck']").attr("minlength","4"); //截取过长的文字 使用id选择器;例如:tab对象->tr->td对象. 排除日志table .logTb - $("#contentTable").find("td").not(":has(a)").not(".SysException").each(function(i,element){ + $("#contentTable").find("td").not(":has(a)").not(".SysException,.commonGroup").each(function(i,element){ //获取td当前对象的文本,如果长度大于25; if(!$(element).find(".tooltips").length>0){ var tdclass= $(this).attr("class");//no_substr 不进行截取