From 1766fd80bd7d99cb1536c8e71fc278ccfb7457c6 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Sun, 13 Jan 2019 20:09:38 +0800
Subject: [PATCH] =?UTF-8?q?dns=E7=AD=96=E7=95=A5=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E3=80=81proxy=E7=AD=96=E7=95=A5=E5=AF=B9=E8=B1=A1=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0do=5Flog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/dao/configuration/DnsIpCfgDao.xml | 12 +++--
 .../dao/configuration/PxyObjKeyringDao.xml    | 24 +++++++---
 .../function_service_dict_add_do_log.sql      | 13 +++++-
 .../WEB-INF/views/cfg/av/fileSampleForm.jsp   | 44 ++++++++++++++++---
 .../webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp | 26 ++++++++++-
 .../views/cfg/intercept/strateagy/form.jsp    | 26 ++++++++++-
 .../intercept/strateagy/trustedCertForm.jsp   | 27 +++++++++++-
 7 files changed, 152 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
index a536c558c..2146cf3f7 100644
--- a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
@@ -36,6 +36,7 @@
 	    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
 	    <result column="dns_strategy_id" property="dnsStrategyId" jdbcType="INTEGER" />
 	    <result column="dns_strategy_name" property="dnsStrategyName" jdbcType="VARCHAR" />
+	     <result column="do_log" property="doLog" jdbcType="INTEGER" />
     </resultMap>
   
     <sql id="columns">
@@ -44,7 +45,7 @@
 		,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
 		,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id,
 		r.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable
-		,r.area_effective_ids,r.function_id,r.cfg_region_code,r.dns_strategy_id
+		,r.area_effective_ids,r.function_id,r.cfg_region_code,r.dns_strategy_id,r.do_log
     </sql>
     
     <select id="findPage" resultMap="dnsIpCfgMap">
@@ -239,7 +240,8 @@
     dest_ip_address,
     cfg_type,
     cfg_region_code,
-    dns_strategy_id
+    dns_strategy_id,
+    do_log
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -272,7 +274,8 @@
     	#{destIpAddress,jdbcType=VARCHAR},
     	#{cfgType,jdbcType=VARCHAR},
     	#{cfgRegionCode,jdbcType=INTEGER},
-    	#{dnsStrategyId,jdbcType=INTEGER}
+    	#{dnsStrategyId,jdbcType=INTEGER},
+    	#{doLog,jdbcType=INTEGER}
     )
   </insert>
     
@@ -369,6 +372,9 @@
       </if>
        <if test="dnsStrategyId != null " >
         dns_strategy_id = #{dnsStrategyId,jdbcType=INTEGER},
+      </if>
+       <if test="doLog != null" >
+        do_log =  #{doLog,jdbcType=INTEGER},
       </if>
       </trim>
     </set>
diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
index 8e4ea49a9..4fc39163f 100644
--- a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
@@ -37,6 +37,7 @@
 	    <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
 	    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
 	    <result column="compile_id" property="compileId" jdbcType="INTEGER" />
+	     <result column="do_log" property="doLog" jdbcType="INTEGER" />
 	  </resultMap>
 	  <resultMap id="PxyObjTrustedCaCertMap" type="com.nis.domain.configuration.PxyObjTrustedCaCert" >
 	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -64,6 +65,7 @@
 	    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
 	    <result column="compile_id" property="compileId" jdbcType="INTEGER" />
 	    <result column="cancel_request_id" property="cancelRequestId" jdbcType="INTEGER" />
+	      <result column="do_log" property="doLog" jdbcType="INTEGER" />
 	  </resultMap>
 	  <resultMap id="PxyObjTrustedCaCrlMap" type="com.nis.domain.configuration.PxyObjTrustedCaCrl" >
 	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -100,7 +102,7 @@
 		,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
 		,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id
 		,r.is_area_effective,r.classify,r.attribute,r.lable
-		,r.area_effective_ids,r.function_id,r.cfg_region_code,r.compile_id,r.cancel_request_id
+		,r.area_effective_ids,r.function_id,r.cfg_region_code,r.compile_id,r.cancel_request_id,r.do_log
 	</sql>
     <sql id="PxyObjTrustedCaCrlColumns">
 		 r.cfg_id,r.cfg_desc
@@ -131,7 +133,7 @@
 		,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
 		,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id
 		,r.is_area_effective,r.classify,r.attribute,r.lable
-		,r.area_effective_ids,r.function_id,r.cfg_region_code,r.compile_id
+		,r.area_effective_ids,r.function_id,r.cfg_region_code,r.compile_id,r.do_log
 	</sql>
   
    <!-- 查出所有 有效数据-->
@@ -391,7 +393,8 @@
   	alt_name, 
 	cfg_type,
 	compile_Id,
-    cfg_region_code
+    cfg_region_code,
+    do_log
     )values (
    		#{cfgId,jdbcType=VARCHAR},
    		#{cfgDesc,jdbcType=VARCHAR},
@@ -426,7 +429,8 @@
   		#{altName,jdbcType=VARCHAR}, 
     	#{cfgType,jdbcType=VARCHAR},
     	#{compileId,jdbcType=INTEGER},
-    	#{cfgRegionCode,jdbcType=INTEGER}
+    	#{cfgRegionCode,jdbcType=INTEGER},
+    	#{doLog,jdbcType=INTEGER}
     )
   </insert>
 	<insert id="insertPxyObjTrustedCaCert" parameterType="com.nis.domain.configuration.PxyObjTrustedCaCert" >
@@ -454,7 +458,8 @@
 	issuer, 
 	cfg_type,
 	compile_Id,
-    cfg_region_code
+    cfg_region_code,
+    do_log
     )values (
    		#{cfgId,jdbcType=VARCHAR},
    		#{cfgDesc,jdbcType=VARCHAR},
@@ -479,7 +484,8 @@
  		#{issuer, jdbcType=VARCHAR},
     	#{cfgType,jdbcType=VARCHAR},
     	#{compileId,jdbcType=INTEGER},
-    	#{cfgRegionCode,jdbcType=INTEGER}
+    	#{cfgRegionCode,jdbcType=INTEGER},
+    	#{doLog,jdbcType=INTEGER}
     )
   </insert>
 	
@@ -546,6 +552,9 @@
       </if>
        <if test="issuer != null  and issuer !=''"  >
         issuer =  #{issuer,jdbcType=VARCHAR},
+      </if>
+       <if test="doLog != null" >
+        do_log =  #{doLog,jdbcType=INTEGER},
       </if>
       </trim>
     </set>
@@ -787,6 +796,9 @@
        <if test="altName != null and altName !=''" >
         alt_name =  #{altName,jdbcType=VARCHAR},
       </if>
+      <if test="doLog != null" >
+        do_log =  #{doLog,jdbcType=INTEGER},
+      </if>
       </trim>
     </set>
     <where>
diff --git a/src/main/resources/sql/20190113/function_service_dict_add_do_log.sql b/src/main/resources/sql/20190113/function_service_dict_add_do_log.sql
index 3ff395954..ce51e1472 100644
--- a/src/main/resources/sql/20190113/function_service_dict_add_do_log.sql
+++ b/src/main/resources/sql/20190113/function_service_dict_add_do_log.sql
@@ -4,8 +4,17 @@ UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=834 AND
 UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=835 AND function_id=300;
 #dnat ip
 UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=836 AND function_id=304;
-
 #dns strategy
 UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=65 AND function_id=400;
+ALTER TABLE  dns_res_strategy ADD COLUMN `do_log` int(11) DEFAULT NULL;
+#dns ip
+UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=64 AND function_id=401;
+ALTER TABLE  dns_ip_cfg ADD COLUMN `do_log` int(11) DEFAULT NULL;
 
-ALTER TABLE  dns_res_strategy ADD COLUMN `do_log` int(11) DEFAULT NULL;
\ No newline at end of file
+#����֤�����
+UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=520 AND function_id=570;
+ALTER TABLE  pxy_obj_keyring ADD COLUMN `do_log` int(11) DEFAULT NULL;
+
+#����֤��
+UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=640 AND function_id=571;
+ALTER TABLE  pxy_obj_trusted_ca_cert ADD COLUMN `do_log` int(11) DEFAULT NULL;
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
index 8d7ff244e..d1e23bdc7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
@@ -363,9 +363,10 @@ function sampleFileValidate(fileType,fileName){
 																		varStatus="satus">
 																		<label class="radio-inline"> <c:if
 																				test="${_cfg.functionId eq service.functionId}">
-																				<input type="radio" name="action"
+																				<input type="radio" name="action" class="action"
 																					serviceId="${service.serviceId }"
 																					protocolId="${service.protocolId }"
+																					configDolog="${service.configDoLog }"
 																					value="${service.action }" class="required action"
 																					<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -382,6 +383,7 @@ function sampleFileValidate(fileType,fileName){
 							    </div>
 							    
 							</div>
+							
 							<div class="row">
 								<div class="col-md-6">
 							        <div class="form-group ">
@@ -453,11 +455,6 @@ function sampleFileValidate(fileType,fileName){
 							            <div id="fileErrorNote"></div>
 							            
 							        </div>
-							        <c:if test="${_cfg.functionId eq 28 or _cfg.functionId eq 29 }">
-								        <div style="margin-bottom:5px">
-								            <span style="color: red;font-size: 16px;letter-spacing: 0px;"> <spring:message code="av_tips"></spring:message></span>
-								        </div>
-							        </c:if>
 							    </div>
 							    <%-- <div class="col-md-6">
 							        <div class="form-group">
@@ -496,7 +493,38 @@ function sampleFileValidate(fileType,fileName){
 							            <div for="level"></div>
 							        </div>
 							    </div>
+							    
+							    
 							</div>
+							
+								<div class="row doLog">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+													<c:choose>
+														<c:when test="${dict.itemCode eq _cfg.doLog}">
+															<label class="radio-inline">
+														<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:when>
+														<c:otherwise>
+															<label class="radio-inline">
+																<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:otherwise>
+													</c:choose>
+											</c:forEach>
+										</div>
+									</div>
+								</div>
+								<div class="row">
+								<c:if test="${_cfg.functionId eq 28 or _cfg.functionId eq 29 }">
+								        <div style="margin-bottom:5px">
+								            <span style="color: red;font-size: 16px;letter-spacing: 0px;"> <spring:message code="av_tips"></spring:message></span>
+								        </div>
+							        </c:if>
+								</div>
 							<%-- <div class="row">
 							    <div class="col-md-6">
 							        <div class="form-group">
@@ -521,6 +549,10 @@ function sampleFileValidate(fileType,fileName){
 							    </div>
 							</div> --%>
                            <%--  <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%>
+                           	<!-- dolog begin-->
+								
+								
+								<!-- dolog end-->
                            <input type="hidden" name="isAreaEffective" value="0">
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
index 64569672d..16add00e9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
@@ -104,10 +104,11 @@ $(function(){
 																		varStatus="satus">
 																		<label class="radio-inline"> <c:if
 																				test="${_cfg.functionId eq service.functionId}">
-																				<input type="radio" name="action"
+																				<input type="radio" name="action"  class="action"
 																					serviceId="${service.serviceId }"
 																					protocolId="${service.protocolId }"
 																					regionCode="${service.regionCode }"
+																					configDolog="${service.configDoLog }"
 																					value="${service.action }" class="required action"
 																					<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -124,6 +125,29 @@ $(function(){
 								   </div>
 								</div>
 							<!-- desc and action -->
+							 <!-- dolog begin-->
+									<!-- <div class="row doLog"> -->
+										<div class="col-md-6 hidden">
+											<div class="form-group ">
+												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+													<c:choose>
+														<c:when test="${dict.itemCode eq _cfg.doLog}">
+															<label class="radio-inline">
+																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:when>
+														<c:otherwise>
+															<label class="radio-inline">
+																<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:otherwise>
+													</c:choose>
+												</c:forEach>
+											</div>
+										</div>
+									<!-- </div> -->
+									<!-- dolog end-->
                            <%-- <%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %> --%>
                            <div class="row ipInfo">
 								<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
index 44eace250..9e24157b2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
@@ -210,9 +210,10 @@ function privateFileValidate(){
 																		varStatus="satus">
 																		<label class="radio-inline"> <c:if
 																				test="${_cfg.functionId eq service.functionId}">
-																				<input type="radio" name="action"
+																				<input type="radio" name="action"  class="action"
 																					serviceId="${service.serviceId }"
 																					protocolId="${service.protocolId }"
+																					configDolog="${service.configDoLog }"
 																					value="${service.action }" class="required action"
 																					<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -228,6 +229,29 @@ function privateFileValidate(){
 								       </div>
 								   </div>
 								</div>
+								 <!-- dolog begin-->
+									<!-- <div class="row doLog"> -->
+										<div class="col-md-6 hidden">
+											<div class="form-group ">
+												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+													<c:choose>
+														<c:when test="${dict.itemCode eq _cfg.doLog}">
+															<label class="radio-inline">
+																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:when>
+														<c:otherwise>
+															<label class="radio-inline">
+																<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:otherwise>
+													</c:choose>
+												</c:forEach>
+											</div>
+										</div>
+									<!-- </div> -->
+									<!-- dolog end-->
 								<div class="row">
 								 <div class="col-md-6">
 								        <div class="form-group">
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertForm.jsp
index ef5666540..3cebfb2ff 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertForm.jsp
@@ -118,9 +118,10 @@ function certFileValidate(){
 																		varStatus="satus">
 																		<label class="radio-inline"> <c:if
 																				test="${_cfg.functionId eq service.functionId}">
-																				<input type="radio" name="action"
+																				<input type="radio" name="action"  class="action"
 																					serviceId="${service.serviceId }"
 																					protocolId="${service.protocolId }"
+																					configDolog="${service.configDoLog }"
 																					value="${service.action }" class="required action"
 																					<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -136,6 +137,30 @@ function certFileValidate(){
 								       </div>
 								   </div>
 								</div>
+								
+								<!-- dolog begin-->
+									<!-- <div class="row doLog"> -->
+										<div class="col-md-6 hidden">
+											<div class="form-group ">
+												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+													<c:choose>
+														<c:when test="${dict.itemCode eq _cfg.doLog}">
+															<label class="radio-inline">
+																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:when>
+														<c:otherwise>
+															<label class="radio-inline">
+																<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:otherwise>
+													</c:choose>
+												</c:forEach>
+											</div>
+										</div>
+									<!-- </div> -->
+									<!-- dolog end-->
 								<div class="row">
 								 <div class="col-md-6">
 								        <div class="form-group">