diff --git a/src/main/java/com/nis/domain/specific/ConfigGroupInfo.java b/src/main/java/com/nis/domain/specific/ConfigGroupInfo.java index e51dc5bd9..72f75145b 100644 --- a/src/main/java/com/nis/domain/specific/ConfigGroupInfo.java +++ b/src/main/java/com/nis/domain/specific/ConfigGroupInfo.java @@ -10,6 +10,14 @@ public class ConfigGroupInfo { private Date insertTime; private Date updateTime; private Integer groupType; + private Integer compileId; + + public Integer getCompileId() { + return compileId; + } + public void setCompileId(Integer compileId) { + this.compileId = compileId; + } public Integer getId() { return id; } diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java index 7fe6cc4ed..afd5dbe8c 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -177,9 +177,15 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppPolicyCfg(entity); + addMessage(redirectAttributes,"save_success"); } catch (Exception e) { + logger.error("saveAppPolicyCfg failed",e); e.printStackTrace(); - addMessage(redirectAttributes, e.getMessage()); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"save_failed"); + } } return "redirect:" + adminPath +"/app/policyCfgList?functionId="+entity.getFunctionId(); @@ -208,10 +214,14 @@ public class AppCfgController extends BaseController { entity.setConfigType(Constants.SPECIFIC_SERVICE_CFG_TYPE_APP); try { appCfgService.auditAppPolicyCfg(entity,isAudit); - } catch (MaatConvertException e) { + } catch (Exception e) { e.printStackTrace(); - logger.info("app策略配置下发失败："+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + logger.error("app策略配置下发失败",e); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"audit_failed"); + } } } return "redirect:" + adminPath +"/app/policyCfgList?functionId="+functionId; @@ -288,9 +298,15 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppIpCfg(entity); + addMessage(redirectAttributes,"save_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, e.getMessage()); + logger.error("saveAppIpCfg failed",e); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"save_failed"); + } } return "redirect:" + adminPath +"/app/ipCfgList?functionId="+entity.getFunctionId(); @@ -330,10 +346,14 @@ public class AppCfgController extends BaseController { for(List entitys:dataMap.values()) { try { appCfgService.auditAppIpCfg(entitys,isAudit); - } catch (MaatConvertException e) { + } catch (Exception e) { e.printStackTrace(); - logger.info("app协议IP配置下发失败："+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + logger.error("app协议IP配置下发失败",e); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"audit_failed"); + } } } @@ -411,9 +431,15 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppHttpCfg(entity); + addMessage(redirectAttributes,"save_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, e.getMessage()); + logger.error("saveAppHttpCfg failed", e); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"save_failed"); + } } return "redirect:" + adminPath +"/app/httpCfgList?functionId="+entity.getFunctionId(); @@ -441,10 +467,14 @@ public class AppCfgController extends BaseController { entity.setFunctionId(functionId); try { appCfgService.auditAppHttpCfg(entity,isAudit); - } catch (MaatConvertException e) { + } catch (Exception e) { e.printStackTrace(); - logger.info("app http配置下发失败："+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + logger.error("app http配置下发失败",e); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"audit_failed"); + } } } return "redirect:" + adminPath +"/app/httpCfgList?functionId="+functionId; @@ -520,9 +550,14 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppDomainCfg(entity); + addMessage(redirectAttributes,"save_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, e.getMessage()); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"save_failed"); + } } return "redirect:" + adminPath +"/app/domainCfgList?functionId="+entity.getFunctionId(); @@ -550,10 +585,14 @@ public class AppCfgController extends BaseController { entity.setFunctionId(functionId); try { appCfgService.auditAppDomainCfg(entity,isAudit); - } catch (MaatConvertException e) { + } catch (Exception e) { e.printStackTrace(); - logger.info("app协议domain配置下发失败："+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + logger.error("app协议domain配置下发失败",e); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"audit_failed"); + } } } return "redirect:" + adminPath +"/app/domainCfgList?functionId="+functionId; @@ -629,9 +668,15 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppByteCfg(entity); + addMessage(redirectAttributes,"save_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, e.getMessage()); + logger.error("saveAppByteCfg failed",e); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"save_failed"); + } } return "redirect:" + adminPath +"/app/byteCfgList?functionId="+entity.getFunctionId(); @@ -659,10 +704,14 @@ public class AppCfgController extends BaseController { entity.setFunctionId(functionId); try { appCfgService.auditAppByteCfg(entity,isAudit); - } catch (MaatConvertException e) { + } catch (Exception e) { e.printStackTrace(); - logger.info("app协议byte配置下发失败："+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + logger.error("app协议byte配置下发失败",e); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"audit_failed"); + } } } return "redirect:" + adminPath +"/app/byteCfgList?functionId="+functionId; @@ -739,9 +788,15 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppSslCfg(entity); + addMessage(redirectAttributes,"save_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, e.getMessage()); + logger.error("saveAppSslCfg failed", e); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"save_failed"); + } } return "redirect:" + adminPath +"/app/sslCfgList?functionId="+entity.getFunctionId(); @@ -769,10 +824,14 @@ public class AppCfgController extends BaseController { entity.setFunctionId(functionId); try { appCfgService.auditAppSslCfg(entity,isAudit); - } catch (MaatConvertException e) { + } catch (Exception e) { e.printStackTrace(); - logger.info("app SSL配置下发失败："+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + logger.error("app SSL配置下发失败",e); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"audit_failed"); + } } } return "redirect:" + adminPath +"/app/sslCfgList?functionId="+functionId; @@ -852,9 +911,15 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppTcpeCfg(entity); + addMessage(redirectAttributes,"save_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, e.getMessage()); + logger.error("saveAppTcpCfg failed",e); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"save_failed"); + } } return "redirect:" + adminPath +"/app/tcpCfgList?functionId="+entity.getFunctionId(); @@ -898,10 +963,14 @@ public class AppCfgController extends BaseController { entity.setFunctionId(functionId); try { appCfgService.auditAppTcpCfg(entity,isAudit); - } catch (MaatConvertException e) { + } catch (Exception e) { e.printStackTrace(); - logger.info("app SSL配置下发失败："+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + logger.error("app SSL配置下发失败",e); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"audit_failed"); + } } } return "redirect:" + adminPath +"/app/tcpCfgList?functionId="+functionId; @@ -968,9 +1037,15 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppHeaderCfg(entity); + addMessage(redirectAttributes,"save_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, e.getMessage()); + logger.error("saveAppHeaderCfg failed",e); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"save_failed"); + } } return "redirect:" + adminPath +"/app/headerCfgList?functionId="+entity.getFunctionId(); @@ -998,10 +1073,14 @@ public class AppCfgController extends BaseController { entity.setFunctionId(functionId); try { appCfgService.auditAppHeaderCfg(entity,isAudit); - } catch (MaatConvertException e) { + } catch (Exception e) { e.printStackTrace(); - logger.info("app Header配置下发失败："+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + logger.error("app Header配置下发失败",e); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"audit_failed"); + } } } return "redirect:" + adminPath +"/app/headerCfgList?functionId="+functionId; @@ -1157,14 +1236,12 @@ public class AppCfgController extends BaseController { try { appCfgService.auditAppTopicDomainCfg(entity,isAudit); addMessage(redirectAttributes,"audit_success"); - } catch (MaatConvertException e) { + } catch (Exception e) { + e.printStackTrace(); + logger.error("app主题网站配置下发失败",e); if(e instanceof MaatConvertException) { - e.printStackTrace(); - logger.info("app主题网站配置下发失败："+e.getMessage());; addMessage(redirectAttributes,"request_service_failed"); }else { - e.printStackTrace(); - logger.error("app主题网站配置下发失败",e); addMessage(redirectAttributes,"audit_failed"); } } @@ -1260,7 +1337,12 @@ public class AppCfgController extends BaseController { addMessage(redirectAttributes,"save_success"); }catch(Exception e){ e.printStackTrace(); - addMessage(redirectAttributes,"save_failed"); + logger.error("appBuiltinFeatureFileSaveOrUpdate failed",e); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"save_failed"); + } } return "redirect:" + adminPath +"/app/appBuiltinFeatureFileList?functionId="+cfg.getFunctionId(); @@ -1299,8 +1381,14 @@ public class AppCfgController extends BaseController { for(String id :idArray){ try { appBuiltInFeatureService.audit(isAudit,isValid,functionId,id,auditTime); - } catch (MaatConvertException e) { - addMessage(redirectAttributes, e.getMessage()); + } catch (Exception e) { + e.printStackTrace(); + logger.error("appBuiltinFeature audit failed", e); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,e.getMessage()); + }else { + addMessage(redirectAttributes,"audit_failed"); + } } } diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java index de7f9deed..73bc636eb 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java @@ -57,7 +57,8 @@ public class DnsResStrategyController extends BaseController { } //查询policyGroup列表，供响应策略选择 - List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1); +// List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1); + List policyGroups=policyGroupInfoService.findHasIpPolicyGroupInfosByType(1); model.addAttribute("policyGroups", policyGroups); model.addAttribute("_cfg", cfg); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java index acc8c2236..50ab696a6 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java @@ -323,7 +323,7 @@ public class WebsiteController extends BaseController{ initFormCondition(model,entity); } //获取所有响应策略信息 - List resStrategys=dnsResStrategyService.findhasValidIpResStrategys(null, 1,1); + List resStrategys=dnsResStrategyService.findDnsResStrategys(null, 1,1); model.addAttribute("dnsResStrategys", resStrategys); model.addAttribute("_cfg", entity); return "/cfg/website/dnsForm"; diff --git a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java index f7a2c81cf..93144d780 100644 --- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java +++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java @@ -12,6 +12,7 @@ public interface PolicyGroupInfoDao extends CrudDao { List findPolicyGroupInfoList(PolicyGroupInfo policyGroupInfo); List findPolicyGroupInfos(); List findPolicyGroupInfosByType(int groupType); + List findHasIPPolicyGroupInfosByType(int groupType); List findPolicyGroupInfosHasIpRegionByType(int groupType); PolicyGroupInfo getById(int id); diff --git a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml index 39fcc5589..dae3b765b 100644 --- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml @@ -73,6 +73,15 @@ FROM policy_group_info r where r.is_valid=1 and r.group_type=#{groupType,jdbcType=INTEGER} + insert into policy_group_info( IS_VALID, diff --git a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml index 63918e545..9d00b2bd1 100644 --- a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml +++ b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml @@ -212,7 +212,7 @@ + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp index 575b173f6..dc86168ad 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp @@ -135,7 +135,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSubFeatureList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSubFeatureList.jsp index 351db7d1c..da07fdd77 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSubFeatureList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSubFeatureList.jsp @@ -141,7 +141,7 @@ -
+
@@ -248,7 +248,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp index 72e848770..b5b76a6df 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp @@ -330,8 +330,8 @@
-
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp index c53c0f49a..615fea62e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp @@ -327,8 +327,8 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp index f5d4331b4..4a64476e5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -276,8 +276,8 @@ +
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp index d4e7345b0..cbcbc4f17 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp @@ -330,8 +330,9 @@ -
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp index 16e36acbf..aae8fd482 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp @@ -328,8 +328,8 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp index 358be311e..b249af92a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp @@ -285,8 +285,9 @@ +
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/subList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/subList.jsp index 2c4eee0d5..11191396b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/subList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/subList.jsp @@ -117,7 +117,7 @@ -
+
@@ -222,7 +222,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp index 65dbd85dd..16564cdaa 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp @@ -107,7 +107,7 @@ if(data.subscribe.length > 0){ html+="
"; $.each(data.subscribe,function(index,item){ - console.log(item.cfgKeywords); + //console.log(item.cfgKeywords); html+="
"; html+="
"; html+="
"; @@ -637,8 +637,8 @@
-
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp index bd48b17b4..477eb2d81 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp @@ -651,8 +651,8 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp index 3662682ef..4adbf8a99 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp @@ -134,7 +134,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp index f647123b2..a309e3b42 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp @@ -94,10 +94,10 @@ $(function(){ $(".disabled").each(function(){ $(this).remove(); }); - $("input[name$='exprType']").attr("disabled",false); - if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){ - $("input[name$='exprType']").val(1); - } + $("input[name='exprType']").attr("disabled",false); + //if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){ + // $("input[name='exprType']").val(1); + //} if($("input[name='ratelimit']").is(":hidden")){ $("input[name='ratelimit']").val(""); } diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp index 3ff8f0a93..60ceab4e7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp @@ -267,8 +267,9 @@
+
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp index c0e44d8a4..25c067939 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp @@ -282,8 +282,8 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp index 575b173f6..dc86168ad 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp @@ -135,7 +135,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp index 7c4dc8642..e79176b1c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp @@ -85,9 +85,9 @@ $(function(){ }, errorContainer: "#messageBox", }); - if('${_cfg.behavCode}'){ + //if('${_cfg.behavCode}'){ ajaxBehaviour($("#specServiceIdId").val()); - } + //} $("#specServiceIdId").on("change",function(){ ajaxBehaviour($(this).val()); }); diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp index 953cba8c7..f7ffadb40 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -313,8 +313,9 @@
-
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp index 2bb448e94..f7df1f9bc 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp @@ -36,7 +36,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp index 4befce696..eed75b246 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp @@ -115,7 +115,7 @@ -
+
@@ -230,7 +230,7 @@ -
+
@@ -338,7 +338,7 @@ <%-- -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pSubList.jsp index 2eba15834..495f37d02 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pSubList.jsp @@ -125,7 +125,7 @@ -
+
@@ -242,7 +242,7 @@ -
+
@@ -348,7 +348,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp index 25bc627a8..ef82a938e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp @@ -115,7 +115,7 @@ -
+
@@ -221,7 +221,7 @@ -
+
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 2643e5f51..9ed82cca6 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 @@ -262,8 +262,9 @@
-
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp index fa2b18727..453374b01 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp @@ -115,7 +115,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp index aaaabcf72..0815c1318 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp @@ -116,7 +116,7 @@ -
+
@@ -231,7 +231,7 @@ -
+
@@ -278,7 +278,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp index 56b41ce35..7f4cda696 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp @@ -267,8 +267,9 @@
-
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp index fd101b48e..2bab1a0d0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -318,7 +318,6 @@
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpSubList.jsp index 8789fefe3..2a0f84755 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpSubList.jsp @@ -115,7 +115,7 @@ -
+
@@ -222,7 +222,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp index 8cb372623..481ce526d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp @@ -116,7 +116,7 @@ -
+
@@ -223,7 +223,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp index f1e2b18b8..f9d6a733c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp @@ -151,7 +151,7 @@
-
+
@@ -254,7 +254,7 @@ -
+
@@ -363,7 +363,7 @@
-
+
@@ -466,7 +466,7 @@ -
+
@@ -576,7 +576,7 @@ -
+
@@ -679,7 +679,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp index 9e18bc014..c9c2c3a06 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp @@ -262,8 +262,9 @@
-
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp index be99d6b39..52a1e9644 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp @@ -263,8 +263,9 @@ -
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp index 54965a6b7..108bc6828 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp @@ -165,13 +165,9 @@ - - - - - +
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp index f3c21e868..45d25edca 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp @@ -117,7 +117,7 @@ -
+
@@ -232,7 +232,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp index 5f597fc5f..840e0528d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp @@ -72,8 +72,8 @@ var flag = true; //代表所有业务都隐藏了，提示必须增加一种业务数据 if(!$(".httpReqCfg").hasClass("hidden")){ - console.log($(".httpReqCfg").find(".boxSolid").length); - console.log($(".httpReqCfg").find(".boxSolid.hidden").length); + //console.log($(".httpReqCfg").find(".boxSolid").length); + //console.log($(".httpReqCfg").find(".boxSolid.hidden").length); if($(".httpReqCfg").find(".boxSolid").length==$(".httpReqCfg").find(".boxSolid.hidden").length){ top.$.jBox.tip("", ""); return; diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp index f17ff9564..d0e5c9a21 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp @@ -150,7 +150,7 @@
-
+
@@ -254,7 +254,7 @@ -
+
@@ -363,7 +363,7 @@
-
+
@@ -466,7 +466,7 @@ -
+
@@ -577,7 +577,7 @@ -
+
@@ -680,7 +680,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp index 9d1bc7aaf..54ec45d69 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp @@ -35,14 +35,14 @@ //loading('onloading...'); var flag = true; var subscribeId=0; - console.log("boxSolid:"+$(".boxSolid.hidden").length); - console.log("hidden subscribeId:"+$(".boxSolid,.hidden").hasClass("subscribeId")); + //console.log("boxSolid:"+$(".boxSolid.hidden").length); + //console.log("hidden subscribeId:"+$(".boxSolid,.hidden").hasClass("subscribeId")); //存在隐藏的subscribeId，不算进域配置 if($(".boxSolid.hidden").hasClass("subscribeId")){ subscribeId=1; } - console.log("boxSolid not sub:"+($(".boxSolid").length-1)); - console.log("hidden not sub:"+($(".boxSolid.hidden").length-subscribeId)); + //console.log("boxSolid not sub:"+($(".boxSolid").length-1)); + //console.log("hidden not sub:"+($(".boxSolid.hidden").length-subscribeId)); //代表所有业务都隐藏了，提示必须增加一种业务数据 if(($(".boxSolid").length-1) ==($(".boxSolid.hidden").length-subscribeId)){ top.$.jBox.tip("", ""); diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp index ffe339e79..a38dd34d1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp @@ -115,7 +115,7 @@ -
+
@@ -221,7 +221,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp index 2ef7fb1ac..0304cae99 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp @@ -115,7 +115,7 @@ -
+
@@ -167,7 +167,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp index 33a31e923..f8bfe7d8a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp @@ -2,7 +2,7 @@ <%@ include file="/WEB-INF/include/taglib.jsp"%> -<spring:message code="${cfgName}"></spring:message> +<spring:message code="ip_whitelist"></spring:message>