From 0ed1cf4ce656c4a6de1c7c9e2dff89ce750269e8 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Tue, 27 Nov 2018 11:19:56 +0800
Subject: [PATCH] =?UTF-8?q?proxy=E4=B8=8B=E6=97=A5=E5=BF=97=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E9=BB=98=E8=AE=A4=E4=B8=BA1=EF=BC=8C=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=91=98=E8=A6=81=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BA1=EF=BC=8C=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=91=98=E8=A6=81=E5=88=97=E8=A1=A8=E8=AF=A6=E6=83=85=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/cfg/fileTransfer/fileDigestForm.jsp        |  8 ++++----
 .../views/cfg/fileTransfer/fileDigestList.jsp        |  2 +-
 .../WEB-INF/views/cfg/intercept/interceptForm.jsp    | 12 +++++-------
 .../webapp/WEB-INF/views/cfg/proxy/cache/form.jsp    | 12 ++++--------
 .../views/cfg/proxy/control/httpRedirectForm.jsp     |  9 ++++-----
 5 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
index 927c29225..e8c47ee3e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
@@ -176,8 +176,8 @@
 							<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
 							<input type="hidden" name="compileId" value="${_cfg.compileId}">
 							<input type="hidden" name="functionId" value="${_cfg.functionId}">
-							<input type="hidden" id="serviceId" name="serviceId"
-								value="${_cfg.serviceId}">
+							<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
+							<input type="hidden" id="doLog" name="doLog" value="1">
 							<!-- 配置域类型 -->
 							<c:forEach items="${regionList}" var="region">
 								<c:if test="${_cfg.functionId eq region.functionId}">
@@ -274,7 +274,7 @@
 								    </div>
 
 								</div>
-								<div class="row">
+								<%-- <div class="row">
 									<div class="col-md-6"  hidden="true" >
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
@@ -294,7 +294,7 @@
 											</c:forEach>
 										</div>
 									</div>
-								</div>
+								</div> --%>
 								<!-- subscribeId配置 -->
 								<c:set var="subscribeIdCfgIndex" value="0"></c:set>
 								<c:forEach items="${regionList}" var="region" varStatus="status">
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 39cc2fbc5..d36dc4b3e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
@@ -398,7 +398,7 @@
 								<c:forEach items="${page.list }" var="indexCfg" varStatus="status" step="1">
 								<tr>
 									<td>
-										<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
+<%-- 										<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span> --%>
 										<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
 									</td>
 									<td>${indexCfg.compileId }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
index 404bd90ad..896ed66e2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
@@ -13,9 +13,7 @@
 	$(document)
 			.ready(
 					function() {
-						if($("input[name='compileId']").val()==null||$("input[name='compileId']").val()==''){
-							$("input[name=doLog][value=1]").prop("checked",true);
-						}
+						
 						$(".action").on("change", function() {
 								 switchAction($("input[name=action]:checked").val());
 							   	//拦截根据action切换动作部分
@@ -420,8 +418,8 @@
 							<input type="hidden" name="compileId" value="${_cfg.compileId}">
 							<input type="hidden" name="functionId" value="${_cfg.functionId}">
 							<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
-							<input type="hidden" id="regionSize" name="regionSize"
-								value="${fn:length(regionList)}">
+							<input type="hidden" id="regionSize" name="regionSize" value="${fn:length(regionList)}">
+							<input type="hidden" id="doLog" name="doLog" value="1">
 
 							<div class="form-body">
 
@@ -470,7 +468,7 @@
 									</div>
 								</div>
 								<!-- dolog begin-->
-								<div class="row interceptDoLog">
+								<%-- <div class="row interceptDoLog">
 									<div class="col-md-6">
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
@@ -491,7 +489,7 @@
 											</c:forEach>
 										</div>
 									</div>
-								</div>
+								</div> --%>
 								<!-- dolog end-->
 								
 								<%--   action 为1 监测时 可以选择证书--%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/cache/form.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/cache/form.jsp
index eef891dd9..2a54d6fab 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/cache/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/cache/form.jsp
@@ -13,9 +13,6 @@
 	$(document)
 			.ready(
 					function() {
-						if($("input[name='compileId']").val()==null||$("input[name='compileId']").val()==''){
-							$("input[name=doLog][value=1]").prop("checked",true);
-						}
 						$(".switch").bootstrapSwitch({
 							/* onText:"<spring:message code='ON'/>",
 							offText:"<spring:message code='OFF'/>", */
@@ -341,9 +338,8 @@
 							<input type="hidden" name="cfgId" id="cfgId" value="${_cfg.cfgId}">
 							<input type="hidden" name="compileId" value="${_cfg.compileId}">
 							<input type="hidden" name="functionId" value="${_cfg.functionId}">
-							<input type="hidden" id="serviceId" name="serviceId"
-								value="${_cfg.serviceId}">
-
+							<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
+							<input type="hidden" id="doLog" name="doLog" value="1">
 							<div class="form-body">
 
 								<div class="row">
@@ -388,7 +384,7 @@
 									</div>
 								</div>
 								<!-- 记录日志begin -->
-								<div class="row">
+								<%-- <div class="row">
 									<div class="col-md-6">
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
@@ -408,7 +404,7 @@
 											</c:forEach>
 										</div>
 									</div>
-								</div>
+								</div> --%>
 								<!-- 记录日志end -->
 								<h4 class="form-section cacheAction">
 									<spring:message code="action_region" />
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
index 7150dee52..50e725142 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
@@ -147,9 +147,8 @@
 							<input type="hidden" name="cfgId" id="cfgId" value="${_cfg.cfgId}">
 							<input type="hidden" name="compileId" value="${_cfg.compileId}">
 							<input type="hidden" name="functionId" value="${_cfg.functionId}">
-							<input type="hidden" id="serviceId" name="serviceId"
-								value="${_cfg.serviceId}">
-
+							<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
+							<input type="hidden" id="doLog" name="doLog" value="1">
 							<div class="form-body">
 
 								<div class="row">
@@ -194,7 +193,7 @@
 								</div>
 								<c:if test="${action != 128 }">
 									<!-- 记录日志begin -->
-									<div class="row">
+									<%-- <div class="row">
 										<div class="col-md-6">
 											<div class="form-group">
 												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
@@ -214,7 +213,7 @@
 												</c:forEach>
 											</div>
 										</div>
-									</div>
+									</div> --%>
 									<!-- 记录日志end -->
 								</c:if>
 								<c:if test="${action eq 128}"><!-- 白名单不记录日志，默认为：0 -->