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 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 @@ and source_compile_id=#{sourceCompileId} + + and is_valid=#{isValid} + + + and is_audit=#{isAudit} + + + + and a.user_region1=#{userRegion1} + + + ${cfg.compileId } ${cfg.cfgDesc }