diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java index e6088fd43..4ae7ed5a5 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java @@ -138,9 +138,12 @@ public class WhiteListController extends CommonController{ @RequestMapping(value = {"saveHttpUrlCfgs"}) public String saveHttpUrlCfgs(RedirectAttributes model,HttpServletRequest request,HttpServletResponse response,CfgIndexInfo entity) { if(!StringUtil.isEmpty(entity) && !StringUtil.isEmpty(entity.getHttpUrlList())){ + + CfgIndexInfo sourceCfg=websiteCfgService.getCfgIndexInfo(entity.getHttpUrlList().get(0).getSourceCompileId()); for (HttpUrlCfg httpUrlCfg : entity.getHttpUrlList()) { CfgIndexInfo cfg=new CfgIndexInfo(); List httpList=new ArrayList<>(); + httpUrlCfg.setRequestId(sourceCfg.getRequestId()); BeanUtils.copyProperties(httpUrlCfg, cfg); httpList.add(httpUrlCfg); cfg.setHttpUrlList(httpList); 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 ecc3901cc..28badf0aa 100644 --- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml @@ -353,7 +353,7 @@ and cfg_id=#{cfgId} - and compileId=#{compileId} + and compile_id=#{compileId} and function_id=#{functionId} diff --git a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java index 1d54598ae..bdfcd3bf9 100644 --- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java @@ -62,6 +62,15 @@ public class WebsiteCfgService extends CrudService { @Autowired private ServiceDictInfoDao serviceDictInfoDao; + public CfgIndexInfo getCfgIndexInfo(Integer compileId){ + CfgIndexInfo entity=new CfgIndexInfo(); + entity.setCompileId(compileId); + List cfgs=websiteCfgDao.getCfgIndexInfos(entity); + if(!StringUtil.isEmpty(cfgs)){ + entity=cfgs.get(0); + } + return entity; + } public CfgIndexInfo getHttpCfg(Long cfgId){ CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId); List ipPortList = websiteCfgDao.getIpPortList(entity); diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 2795282dc..9f6f04d16 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1283,7 +1283,7 @@ not_multiple=%s\u4e0d\u652f\u6301\u591a\u4e2a\u5173\u952e\u5b57 template_error=\u5bfc\u5165\u6a21\u677f\u9519\u8bef.\u8bf7\u9009\u62e9\u4e0e\u7cfb\u7edf\u8bed\u8a00\u4e00\u81f4\uff0c\u5e76\u4e14\u914d\u7f6e\u7c7b\u578b\u4e00\u81f4\u7684\u6a21\u677f\u5bfc\u5165. asn_no=ASN query=Query -cfg_operation_log=\u914d\u7f6e\u64e6\u6b27\u6d32\u54e6\u65e5\u5fd7 +cfg_operation_log=\u914D\u7F6E\u64CD\u4F5C\u65E5\u5FD7 function_name=\u64cd\u4f5c\u6a21\u5757 config_service_statistics=\u914d\u7f6e\u7edf\u8ba1 ruleLimitTip=\u6709\u6548\u89c4\u5219\u91cf\u5df2\u8fbe\u5230\u9650\u5236(%s). @@ -1320,6 +1320,7 @@ ip_behavior_data=\u7528\u6237IP\u7edf\u8ba1 not_valid_domain=%s\u4e0d\u662f\u4e00\u4e2a\u5408\u6cd5\u57df\u540d cert_not_match_domain=\u57df\u540d\u4e0e\u6240\u9009\u8bc1\u4e66\u4fe1\u606f\u4e0d\u7b26\u5408\uff01 crl_file_error=CRL\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF +PXY_OBJ_TRUSTED_CA_CERT=\u53EF\u4FE1\u8BC1\u4E66 crl_issuer_error=crl\u6587\u4EF6\u7684issuer\u4E0E\u8BC1\u4E66\u6587\u4EF6\u7684issuer\u4E0D\u5339\u914D \u7FFB\u8BD1 cert_name=\u8BC1\u4E66\u540D\u79F0 add_crl_file=Add CRL File diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/crlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/crlForm.jsp index 6a1aa2235..2e4b70137 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/crlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/crlForm.jsp @@ -107,7 +107,7 @@ var submitCrlFrom=function(){ * + color="red">* diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp index 9c95760f4..3aaaa9ad5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp @@ -200,7 +200,7 @@ - + @@ -239,6 +239,7 @@ + ${log.cfgId }