From e62228823487241aa85db8e1637ccd0a2a962dcc Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@zdjizhi.com>
Date: Mon, 17 Jun 2019 19:00:51 +0800
Subject: [PATCH] =?UTF-8?q?(1)Obj-list-group=20sub=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=20(2)=E4=BF=AE=E5=A4=8Dform=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=BD=93=E9=BB=98=E8=AE=A4monitor=E5=8A=A8=E4=BD=9C=E6=97=B6In?=
 =?UTF-8?q?tercept=E6=97=A0=E6=B3=95=E5=B1=95=E7=A4=BA=E7=9A=84bug=20(3)?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8B=A6=E6=88=AA=E5=8A=A8=E4=BD=9C=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91userregion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/util/ConfigConvertUtil.java  |  6 +--
 .../configuration/ObjectGroupController.java  |  9 ++++
 .../WEB-INF/views/cfg/objgroup/form.jsp       |  2 +-
 .../WEB-INF/views/cfg/objgroup/list.jsp       | 41 +++++++++++++++++-
 .../WEB-INF/views/cfg/objgroup/subList.jsp    | 42 +++++++++++++++++++
 .../webapp/static/global/scripts/common.js    |  2 +-
 6 files changed, 96 insertions(+), 6 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/views/cfg/objgroup/subList.jsp

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<String[]> 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 @@
 </style>
 <script type="text/javascript">
 $(function(){
-	if('${_cfg.action}'!=1){
+	if('${_cfg.action}'!=1 && '${_cfg.action}'!=""){
 		$("[name='userRegion1'] option[value=intercept]").addClass("hidden").addClass("disabled");
         $(".domainGroup").addClass("hidden").addClass("disabled");
 		//处理do_log
diff --git a/src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp b/src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp
index b52a01a91..5222607ac 100644
--- a/src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp
@@ -124,6 +124,45 @@
 			}
 
 		}
+         //异步获取相关信息
+         $("span[id^=open]").click(function(){
+             var openId=$(this).attr("id");
+             var closeId=$(this).attr("id").replace("open","close");
+             var index=$(this).attr("id").replace("open","");
+             $("#"+openId).hide();
+             $("#"+closeId).show();
+             //var compileId=$(this).attr("compileId");
+             var cfgId=$(this).attr("cfgId");
+             if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+                 $("#"+openId).parent().parent().next("tr").show();
+             }else{
+                 $.ajax({
+                     type:'post',
+                     async:false,
+                     url:'${ctx}/objgroup/ajaxSubList',
+                     data:{"cfgId":cfgId,"index":index},
+                     dataType:"html",
+                     success:function(data){
+                         //console.log(data);
+                         var subTab="<tr class='child'>"+
+                             "<td style='border-right: 1px solid #FFFFFF;'>"+
+                             "<input type='checkbox' hidden='hidden'/>"+
+                             "</td>"+
+                             "<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"' class='commonGroup'>";
+                         var html="";
+                         html+="<div class='row'>";
+                         html = html+data;
+                         subTab=subTab+html;
+                         subTab+="</td>";
+                         subTab+="</tr>";
+                         //console.log(subTab);
+                         $("#"+openId).parent().parent().after(subTab);
+                         //$("div[name='scheduleTitle"+index+"']").get(0).click();
+                     }
+                 });
+             }
+
+         });
 	});
 </script>
 
@@ -431,7 +470,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 								<tr>
 									<td>
-									<%--<span id="open${status.index}" class="" compileId="${cfg.compileId}" cfgId="${cfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>--%>
+									<span id="open${status.index}" class="" compileId="${cfg.compileId}" cfgId="${cfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 									<input type="checkbox" class="i-checks child-checks" id="${cfg.cfgId}" value="${cfg.isAudit}">
 									</td>
 								    <td>${cfg.compileId }</td>
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"%>
+<html>
+<head>
+	<script>
+		$(document).ready(function() {
+			//$("div[name='tabTitle"+index+"']").get(0).click();
+		})
+	</script>
+	<style type="text/css">
+	</style>
+</head>
+<c:if test="${fn:length(tabList)==0 and empty _cfg.schedule}">
+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"
+		 class="col-md-1 tabInfo" name="tabTitle${index }">
+		<spring:message code='schedule' />
+		<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>
+	</div>
+	</div>
+	<div id="scheduleTitle${index}" class="content" name="subCfg${index}">
+		<div class="row">
+			<div class="col-md-8">
+				<div class="form-group">
+					<spring:message code='no_data' />
+				</div>
+			</div>
+		</div>
+	</div>
+</c:if>
+<!-- 显示 定时任务信息 -->
+<c:if test="${not empty _cfg.schedule }">
+		<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"
+			 class="col-md-1 tabInfo" name="tabTitle${index }">
+			<spring:message code='schedule' />
+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>
+		</div>
+	</div>
+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">
+		<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>
+	</div>
+</c:if>
+</html>
\ 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 不进行截取