From 9e6e2fbd37a25ae00c323d5da093b3abee3da70d Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Fri, 18 Jan 2019 20:21:04 +0600
Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E4=BB=A3=E7=90=86=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E7=9A=84=E8=AF=81=E4=B9=A6=E6=98=AF=E5=90=A6=E8=A2=AB?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA=E7=AD=96=E7=95=A5=E5=BC=95=E7=94=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E8=A2=AB=E5=BC=95=E7=94=A8=EF=BC=8C=E5=88=99=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6=E9=85=8D=E7=BD=AE=E4=B8=8D=E8=83=BD=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/PxyObjKeyringController.java        | 28 +++++++++++++++++++
 .../web/dao/configuration/WebsiteCfgDao.xml   | 11 ++++++++
 .../configuration/HttpRedirectCfgService.java |  4 +++
 src/main/webapp/WEB-INF/tags/sys/delRow.tag   | 25 ++++++++++++++++-
 .../views/cfg/intercept/strateagy/list.jsp    |  2 +-
 5 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
index 29829d2d1..894f18edb 100644
--- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
@@ -41,6 +41,7 @@ import com.google.common.collect.Maps;
 import com.nis.domain.Page;
 import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.configuration.DnsIpCfg;
 import com.nis.domain.configuration.DnsResStrategy;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.PxyObjKeyring;
@@ -911,4 +912,31 @@ public class PxyObjKeyringController extends BaseController {
 		}
 		return "redirect:" + adminPath + "/proxy/intercept/strateagy/trustedCertList?functionId=" + functionId;
 	}
+	
+	/**
+	 * 验证Keyring是否有被使用
+	 * 
+	 * @param entity
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = { "/ajaxKeyinfIsUsed" })
+	public boolean ajaxKeyinfIsUsed(String[] compileIds, HttpServletRequest request, HttpServletResponse response) {
+		for(String compileId:compileIds){
+			CfgIndexInfo cfg = new CfgIndexInfo();
+			cfg.setIsAudit(1);
+			cfg.setIsValid(1);
+			cfg.setFunctionId(200);//代理拦截策略
+			cfg.setServiceId(512);
+			cfg.setUserRegion1(compileId);
+			List<CfgIndexInfo> list = httpRedirectCfgService.getCfgIndexInfos(cfg);
+			if (list.size() > 0) {
+				return false;
+			}
+		}
+		
+		return true;
+	}
 }
diff --git a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
index ae5586621..ec33f8ff0 100644
--- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
@@ -371,6 +371,17 @@
 	    	<if test="sourceCompileId != null">
 	    		and source_compile_id=#{sourceCompileId}
 	    	</if>
+	    	<if test="isValid != null">
+	    		and is_valid=#{isValid}
+	    	</if>
+	    	<if test="isAudit != null">
+	    		and is_audit=#{isAudit}
+	    	</if>
+	    	<!-- 代理拦截策略 -->
+	    	<if test="functionId != null and functionId=200">
+	    		and a.user_region1=#{userRegion1}
+	    	</if>
+	    	
 	    </where>
   </select>
   <select id="getIpPortList" resultMap="ipPortMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
diff --git a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
index b6ec4448e..f6d9d6971 100644
--- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
@@ -54,6 +54,10 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 	@Autowired
 	protected StringCfgDao stringCfgDao;
 	
+	public List<CfgIndexInfo> getCfgIndexInfos(CfgIndexInfo entity){
+		return websiteCfgDao.getCfgIndexInfos(entity);
+	}
+	
 	public CfgIndexInfo getHttpCfg(Long cfgId,Integer compileId){
 		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId,compileId);
 		List<HttpUrlCfg> httpUrlList = websiteCfgDao.getHttpUrlList(entity);
diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index e7d8d79f2..690e37e40 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -182,13 +182,19 @@ function cancelPassOpt(url){
 		if(validateAllPass(checkboxes)){
 			
 			var addrPoolIds = [],canCancel = true;
+			var compileIds = [];
 			$(checkboxes).filter(":checked").each(function(){
 				var addrPoolId = $(this).attr("addressPoolId");
+				var serviceId = $(this).attr("serviceId");
+				var compileId = $(this).attr("compileId");
 				if(typeof addrPoolId != "undefined"){
 					addrPoolIds.push(addrPoolId);
 				}
+				//记录代理证书的配置
+				if(typeof serviceId != "undefined" && serviceId==520 && typeof compileId != "undefined"){
+					compileIds.push(compileId);
+				}
 			});
-			
 			// 地址池管理 （被策略引用的地址池不可取消）
 			if(addrPoolIds.length > 0){
 				$.ajax({
@@ -204,6 +210,23 @@ function cancelPassOpt(url){
 	 				}
 	 			});
 			}
+			if(canCancel){
+				//查询证书是否被拦截策略引用
+				if(compileIds.length > 0){
+					$.ajax({
+		 				type:'post',
+		 				url:'${ctx}/proxy/intercept/strateagy/ajaxKeyinfIsUsed',
+		 				data:{"compileIds":compileIds.join(',')},
+		 				async:false,
+		 				success:function(data){//处理返回结果
+		 					if(data == false){
+		 						top.$.jBox.tip('<spring:message code="keyring_is_used"/>');
+		 						canCancel=data;
+		 					}
+		 				}
+		 			});
+				}
+			}
 			
 			if(canCancel){
 				doAll(checkboxes,url);
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 c08b5a5df..99be631ce 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
@@ -321,7 +321,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
 									<td>
-										<input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}">
+										<input type="checkbox" class="i-checks" serviceId="${cfg.serviceId }" compileId="${cfg.compileId }" id="${cfg.cfgId}" value="${cfg.isAudit}">
 									</td>
 									<td>${cfg.compileId }</td>
 									<td>${cfg.cfgDesc }</td>