From d6bf1e9ccbe8fb57127b79ea1c7cf9329778fe49 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Thu, 30 Aug 2018 19:47:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=AD=96=E7=95=A5=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=EF=BC=8Cdomain=E6=8B=A6=E6=88=AA=E4=BF=AE=E6=94=B9domian?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9F=9Fbug=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/dao/configuration/PxyObjKeyringDao.xml |  4 ++--
 .../service/configuration/InterceptCfgService.java | 10 +++++++++-
 src/main/resources/messages/message_en.properties  |  2 +-
 .../WEB-INF/views/cfg/intercept/strateagy/form.jsp | 14 --------------
 .../WEB-INF/views/cfg/intercept/strateagy/list.jsp |  5 -----
 5 files changed, 12 insertions(+), 23 deletions(-)

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 fa9e45fa3..312f27afa 100644
--- a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
@@ -162,8 +162,8 @@
 	   	 <if test="isAudit == 1">
    			AND r.is_audit =1
    		</if>
-	   	 <if test="cfgType != null">
-   			AND r.cfg_type =#{cfgType,jdbcType=VARCHAR}
+	   	 <if test="cfgType == 'ip' ">
+   			<![CDATA[AND r.keyring_type <> 'end-entity']]>
    		</if>
 	   	 <if test="cfgId != null">
    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
diff --git a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
index 7ad1a07ed..6d80151b2 100644
--- a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 
 import com.nis.domain.Page;
 import com.nis.domain.configuration.AreaIpCfg;
+import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.HttpUrlCfg;
 import com.nis.domain.configuration.InterceptPktBin;
@@ -283,7 +284,14 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
 		if(entity.getHttpUrlList()!=null && entity.getHttpUrlList().size()>0){
 			doaminFlag=true;
 			domainUserRegion=Constants.USERREGION_DOMAIN_ID+"="+entity.getCompileId();
-			domainUserRegion=domainUserRegion+";"+Constants.USERREGION_DOMAIN_STR+"="+entity.getHttpUrlList().get(0).getCfgKeywords();
+			String domainStr="";
+			if(entity != null && entity.getHttpUrlList() != null && entity.getHttpUrlList().size() > 0){
+				BaseStringCfg httpUrl= entity.getHttpUrlList().get(0);
+				domainStr=httpUrl.getCfgKeywords();
+			}
+			//entity.getHttpUrlList().get(0).getCfgKeywords();
+			
+			domainUserRegion=domainUserRegion+";"+Constants.USERREGION_DOMAIN_STR+"="+domainStr;
 			HttpUrlCfg cfg = new HttpUrlCfg();
 			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
 			cfg.setTableName(HttpUrlCfg.getTablename());
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 6e6063b83..d891e5131 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1047,7 +1047,7 @@ tunnel_desc=Tunnel Behavior Description
 call_external_procedures_failed=Call external procedures failed
 is_hex=Is HEX
 is_case_insenstive=Is Case-sensitive
-case_senstive=Case-senstive
+case_senstive=Case-sensitive
 case_insenstive=Case-insensitive
 hex=Hex
 not_hex=Not HEX
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 eb8e83681..f4de1daa8 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
@@ -17,10 +17,6 @@ $(function(){
 	$("#privateKeyFileI").on('change', function() {
 		$("#privateKeyFileInfo").val($("#privateKeyFileI").val());
 	});
-	switchCfgType();
-	$("input[name=cfgType]").on('change', function() {
-		switchCfgType();
-	});
 	switchKeyringType();
 	$("select[name=keyringType]").on('change', function() {
 		switchKeyringType();
@@ -143,16 +139,6 @@ var switchKeyringType=function(){
 								            <div for="action"></div>
 								       </div>
 								   </div>
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><spring:message code="cfgType"/></label>
-								            <div class="col-md-6">
-								            <input type="radio" name="cfgType" value="ip" <c:if test="${_cfg.cfgType == 'ip' || empty _cfg.cfgType}">checked="checked"</c:if>> <spring:message code="ip"/> <spring:message code="monitor"/>
-								            <input type="radio" name="cfgType" value="domain" <c:if test="${_cfg.cfgType == 'domain' }">checked="checked"</c:if>><spring:message code="domain"/> <spring:message code="monitor"/>
-								               </div>
-								            <div for="action"></div>
-								       </div>
-								   </div>
 								</div>
 								<div class="row">
 								 <div class="col-md-6">
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
index 060bfe08d..f9427c543 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
@@ -255,7 +255,6 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
-									<th><spring:message code="cfg_type"/></th>
 									<th><spring:message code="keyring_name"/></th>
 									<th><spring:message code="keyring_type"/></th>
 									<th><spring:message code="private_key_file"/></th>
@@ -287,10 +286,6 @@
 									<td>
 										<input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}">
 									</td>
-									<td>
-									<c:if test="${cfg.cfgType eq 'ip'}"><spring:message code="ip"/> <spring:message code="monitor"/> </c:if>
-									<c:if test="${cfg.cfgType eq 'domain'}"><spring:message code="domain"/> <spring:message code="monitor"/></c:if>
-									</td>
 									<td>${cfg.cfgDesc }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('INTERCEPT_CERTIFICATE_TYPE') }" var="dict">