From e87febaeaa71597dfaac2e2d5afe1afa88ab6282 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Tue, 11 Sep 2018 11:03:08 +0800
Subject: [PATCH] =?UTF-8?q?(1)=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4=E6=98=AF=E5=90=A6=E5=8F=B6?=
 =?UTF-8?q?=E5=AD=90=E8=8A=82=E7=82=B9=E8=87=AA=E5=8A=A8=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=20(2)=E5=9F=BA=E7=A1=80=E5=8D=8F=E8=AE=AE=EF=BC=8C=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=86=E9=9A=A7=E9=81=93=E8=A1=8C=E4=B8=BA=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?ID=E4=BF=AE=E6=94=B9=E4=B8=8EAPP=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../update_basic_encrypted_protocol_id.sql        |  3 +++
 .../views/specific/specificServiceCfgForm.jsp     | 15 +++++++++++++--
 .../views/specific/specificServiceCfgList.jsp     |  4 ++--
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 src/main/resources/sql/20180911/update_basic_encrypted_protocol_id.sql

diff --git a/src/main/resources/sql/20180911/update_basic_encrypted_protocol_id.sql b/src/main/resources/sql/20180911/update_basic_encrypted_protocol_id.sql
new file mode 100644
index 000000000..6e1ebc926
--- /dev/null
+++ b/src/main/resources/sql/20180911/update_basic_encrypted_protocol_id.sql
@@ -0,0 +1,3 @@
+#基础协议，加密隧道行为 protocol_id修改与app一致
+UPDATE function_service_dict SET protocol_id=21 WHERE function_id=407
+UPDATE function_service_dict SET protocol_id=21 WHERE function_id=408
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
index 850809450..5f6fddeaa 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
@@ -186,6 +186,11 @@
 					$("#businessType"+cfgType).selectpicker("val","");
 					$("#businessType"+cfgType).parents(".businessType").addClass("hidden");
 				}
+				if(!$(this).val()||$(this).val()==0){
+					$("#isLeaf").val(0);
+				}else{
+					$("#isLeaf").val(1);
+				}
 			});
 		});
 	</script>
@@ -341,7 +346,7 @@
 														<div for="groupId"></div>
 													</div> 
 													
-													 <div class="form-group hidden">
+													 <%-- <div class="form-group hidden">
 														<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
 														<div class="col-md-4">
 															<form:select path="isLeaf"  class="form-control leafChange">
@@ -350,7 +355,13 @@
 																		</c:forEach>				                    
 															</form:select>
 														</div>
-													</div>  
+													</div>  --%> 
+													<c:if test="${not empty specificServiceCfg and specificServiceCfg.isLeaf ne null}">
+														<input type="hidden" name="isLeaf" id="isLeaf" value="${specificServiceCfg.isLeaf}">
+													</c:if>
+													<c:if test="${empty specificServiceCfg or specificServiceCfg.isLeaf eq null}">
+														<input type="hidden" name="isLeaf" id="isLeaf" value="0">
+													</c:if>
 													 <%-- <div class="form-group">
 														<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="cfg_type"/>:</label>
 														<div class="col-md-4">
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
index b7bc2a358..502d42ba5 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
@@ -313,7 +313,7 @@
 									</c:if>
 								  </th>
 								   <%-- <th><spring:message code="group_id"/></th> --%>
-								   <th><spring:message code="is_leaf"/></th>
+								  <%--  <th><spring:message code="is_leaf"/></th> --%>
 								   <th><spring:message code="cfg_type"/></th>
 								   <th class="sort-column op_time"><spring:message code="operate_time"/></th>
   							    </tr>
@@ -350,7 +350,7 @@
 												<td title="${specificServiceCfg.specServiceName}">${specificServiceCfg.specServiceName}</td>
 												<td title="${specificServiceCfg.specServiceDesc}">${fns:abbr(specificServiceCfg.specServiceDesc,15)}</td>
 												<%-- <td>${specificServiceCfg.groupId }</td> --%>
-												<td><spring:message code="${fns:getDictLabel('INT_YES_NO',specificServiceCfg.isLeaf,'0')}"></spring:message></td>
+												<%-- <td><spring:message code="${fns:getDictLabel('INT_YES_NO',specificServiceCfg.isLeaf,'0')}"></spring:message></td> --%>
 												<td><c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
 													<c:if test="${dict.itemCode==specificServiceCfg.cfgType}"><spring:message code="${dict.itemValue}"/></c:if>
 													</c:forEach>