diff --git a/src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java b/src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java index d6e130889..cd1b3c563 100644 --- a/src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java @@ -18,6 +18,7 @@ import com.nis.domain.configuration.IpMultiplexPoolCfg; import com.nis.domain.maat.ToMaatResult; import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; +import com.nis.util.StringUtil; import com.nis.web.dao.basics.SysDictInfoDao; import com.nis.web.dao.configuration.IpMultiplexPoolCfgDao; import com.nis.web.security.UserUtils; @@ -191,6 +192,7 @@ public class IpMultiplexPoolCfgService extends BaseService{ public List getIsp(List ispList){ for (IpMultiplexPoolCfg snat : ispList) { + if(StringUtil.isEmpty(snat.getAreaEffectiveIds())){ if(snat.getAreaEffectiveIds().contains(":")){ int index=snat.getAreaEffectiveIds().indexOf(":"); String ispCode =snat.getAreaEffectiveIds().substring(index+1); @@ -198,6 +200,12 @@ public class IpMultiplexPoolCfgService extends BaseService{ if(dict !=null){ snat.setIspName(dict.getItemValue()); } + }else{ + SysDictInfo dict= sysDictInfoDao.getDictByItemCode(snat.getAreaEffectiveIds()); + if(dict !=null){ + snat.setIspName(dict.getItemValue()); + } + } } } return ispList; diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp index 0d38d7ad7..8c08f738a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp @@ -292,8 +292,9 @@ --%> - + + <%-- --%> @@ -408,11 +409,6 @@ ${fns:abbr(lableInfo,20)} --%> - - - - - @@ -421,6 +417,12 @@ + + + + + + <%--
--%> ${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp index 994c238da..9a4143833 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp @@ -294,8 +294,8 @@ --%> - + <%-- --%> @@ -416,11 +416,6 @@ ${fns:abbr(lableInfo,20)} --%> - - - - - @@ -429,6 +424,11 @@ + + + + + <%--
--%> ${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp index 38b2c911e..e477e4a14 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp @@ -298,8 +298,8 @@ --%> - + <%-- --%> @@ -406,11 +406,6 @@ ${fns:abbr(lableInfo,20)} --%> - - - - - @@ -419,6 +414,11 @@ + + + + + <%--
--%> ${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp index fe3f2a0ee..6258a8be6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp @@ -332,8 +332,8 @@ + - <%-- --%> @@ -354,11 +354,6 @@ ${cfg.cfgDesc } ${cfg.appName } - - - - - @@ -366,6 +361,11 @@ + + + + + <%--
--%> ${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index 9f4b44329..12d8e7459 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -357,19 +357,19 @@ - - <%-- --%> + + + + + - - - @@ -387,16 +387,34 @@ ${cfg.compileId } ${cfg.cfgDesc } - ${cfg.appCode } - ${cfg.behavCode } - <%-- ${cfg.ratelimit } --%> - + + ${cfg.appCode } + ${cfg.behavCode } + <%-- ${cfg.ratelimit } --%> + + + + + + + + + + + + + + + + + +
@@ -464,29 +482,12 @@ ${fns:abbr(lableInfo,20)} - - - - - - - + - - - - - - - - - - -
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp index b18afb2f9..a91737a04 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp @@ -293,8 +293,8 @@ --%> - + <%-- --%> @@ -415,11 +415,6 @@ ${fns:abbr(lableInfo,20)} --%> - - - - - @@ -428,6 +423,11 @@ + + + + + <%--
--%> ${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp index 86b07b4c3..dd73e49b3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp @@ -291,8 +291,8 @@ --%> - + <%-- --%> @@ -425,11 +425,6 @@ ${fns:abbr(lableInfo,20)} --%> - - - - - @@ -438,6 +433,11 @@ + + + + + <%--
--%> ${cfg.creatorName } 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 fc6113365..07dd033a1 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 @@ -364,15 +364,15 @@ + + - - @@ -397,6 +397,16 @@
+ + + + + + + + + + @@ -404,6 +414,7 @@ +
@@ -475,17 +486,6 @@ - - - - - - - - - - -
${indexCfg.creatorName } ${indexCfg.editorName } 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 21972f85c..21d054137 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -285,18 +285,18 @@ + <%-- --%> - + + - - @@ -312,6 +312,13 @@ ${cfg.compileId } ${cfg.cfgDesc } + + + + + + + @@ -324,15 +331,22 @@ ${fn:substring(cfg.sampleUrl,0,20) } - - - - - - - + ${cfg.level } + + + + + + + + + +
+ + ${cfg.requestName } + @@ -397,16 +411,6 @@ - - - - - - - - - -
${cfg.creatorName } ${cfg.editorName } 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 34c2d3156..f0630c828 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 @@ -364,15 +364,15 @@ + + - - @@ -397,6 +397,15 @@
+ + + + + + + + + @@ -404,6 +413,7 @@ +
@@ -475,16 +485,6 @@ - - - - - - - - - -
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp index 7983c81a2..ee93f5e1b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp @@ -362,19 +362,19 @@ - <%-- --%> <%-- --%> + + + - - @@ -392,16 +392,26 @@ ${cfg.compileId } ${cfg.cfgDesc } - ${cfg.appCode } - <%--${cfg.behavCode }--%> - <%-- ${cfg.ratelimit } --%> - + + ${cfg.appCode } + <%--${cfg.behavCode }--%> + <%-- ${cfg.ratelimit } --%> + + + + + + + + + + @@ -409,6 +419,7 @@ +
@@ -481,16 +492,6 @@ - - - - - - - - - -
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp index 0360ac543..cc48e619c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp @@ -297,6 +297,7 @@ <%-- --%> + <%-- --%> @@ -306,18 +307,19 @@ - - + + + + + - - @@ -333,6 +335,13 @@ ${cfg.compileId } ${cfg.cfgDesc } + + + + + + + @@ -362,13 +371,18 @@ + ${cfg.antiddosProtocol } + ${cfg.bpsThreadshold } + ${cfg.ppsThreadshold } - - - - - + + + + + + + @@ -377,9 +391,6 @@ - ${cfg.antiddosProtocol } - ${cfg.bpsThreadshold } - ${cfg.ppsThreadshold } ${cfg.requestName } @@ -444,14 +455,6 @@ - - - - - - - -
${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp index d555bf9c6..9aeb430bc 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp @@ -292,19 +292,19 @@ <%-- --%> + <%-- --%> <%-- --%> - + - <%-- --%> @@ -321,6 +321,13 @@ ${cfg.compileId } ${cfg.cfgDesc } + + + + + + + ${cfg.dnsStrategyName } @@ -344,11 +351,12 @@ --%> - - - - - + + + + + + ${cfg.requestName } @@ -414,14 +422,6 @@ - - - - - - - - <%--
--%> ${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp index 5b759fbe3..2b1ec9a5b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp @@ -359,19 +359,19 @@ + <%-- --%> - + + - - @@ -389,16 +389,24 @@ ${cfg.compileId } ${cfg.cfgDesc } - ${cfg.appCode } - ${cfg.behavCode } - <%-- ${cfg.ratelimit } --%> - + + ${cfg.appCode } + ${cfg.behavCode } + + + + + + + + + <%-- ${cfg.ratelimit } --%> @@ -406,6 +414,7 @@ +
@@ -478,15 +487,7 @@ - - - - - - - - -
+ ${cfg.creatorName } ${cfg.editorName } 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 93923c315..93e7ba11e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -323,11 +323,12 @@ + - + @@ -335,7 +336,7 @@ <%-- --%> - + <%-- --%> @@ -354,6 +355,13 @@ ${indexCfg.compileId } ${indexCfg.cfgDesc } + + + + + + + @@ -369,11 +377,12 @@ - - - - - + + + + + + @@ -454,14 +463,6 @@ - - - - - - - - <%--
--%> ${indexCfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp index 792015d23..30fd8c400 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp @@ -332,15 +332,15 @@ + + - - @@ -365,6 +365,14 @@
+ + + + + + + + @@ -372,6 +380,7 @@ +
@@ -444,15 +453,7 @@ - - - - - - - - -
+ ${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp index dbb3fea6d..812de1515 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp @@ -337,15 +337,15 @@ + + - - @@ -370,6 +370,14 @@
+ + + + + + + + @@ -377,6 +385,7 @@ +
@@ -449,15 +458,6 @@ - - - - - - - - -
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp index 3b2d4f4fe..aa0e094f7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -349,8 +349,8 @@ - - + + <%-- --%> @@ -363,7 +363,7 @@ - + <%-- --%> @@ -371,7 +371,6 @@ - <%-- --%> @@ -390,7 +389,15 @@ ${indexCfg.compileId } ${indexCfg.cfgDesc } - + + + + + + + + + @@ -437,12 +444,13 @@ - - - - - - + + + + + + + <%-- @@ -523,14 +531,6 @@ - - - - - - - - <%--
--%> ${indexCfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp index 9a52fa3fe..c359249e2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp @@ -341,15 +341,15 @@ + + - - @@ -381,6 +381,16 @@
+ + + + + + + + + + @@ -388,6 +398,7 @@ +
@@ -460,17 +471,6 @@ - - - - - - - - - - -
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp index 3fa2cb5b1..2ea07ff7a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp @@ -343,15 +343,15 @@ + + - - @@ -376,6 +376,15 @@
+ + + + + + + + + @@ -383,6 +392,7 @@ +
@@ -455,15 +465,6 @@ - - - - - - - - -
${indexCfg.creatorName } ${indexCfg.editorName } 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 9703d5a68..8d140d821 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 @@ -278,10 +278,11 @@ <%-- --%> + - + @@ -311,6 +312,13 @@ ${fns:abbr(cfg.cfgDesc,20)} + + + + + + + @@ -319,13 +327,7 @@ ${cfg.resGroup1Num } ${cfg.minTtl }-${cfg.maxTtl } - - - - - - - + diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp index 609d36043..cfb2d4737 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp @@ -276,6 +276,7 @@ <%-- --%> + @@ -283,13 +284,12 @@ <%-- --%> - + - @@ -310,6 +310,13 @@ ${fns:abbr(cfg.cfgDesc,20)} + + + + + + + @@ -339,11 +346,12 @@ --%> - - - - - + + + + + + ${cfg.requestName } @@ -409,14 +417,6 @@ - - - - - - - - ${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp index e37260519..ab8c78e51 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp @@ -278,6 +278,7 @@ <%-- --%> + @@ -286,7 +287,7 @@ --%> <%-- --%> - + @@ -313,6 +314,13 @@ ${fns:abbr(cfg.cfgDesc,20)} + + + + + + + @@ -352,13 +360,6 @@ --%> - - - - - - - diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp index 800572a58..015828481 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp @@ -279,6 +279,7 @@ + <%-- --%> <%-- --%> @@ -286,7 +287,6 @@ - <%-- --%> @@ -340,6 +340,14 @@
--%> + + + + + + + + ${indexCfg.requestName } @@ -404,14 +412,6 @@ - - - - - - - - <%--
--%> ${indexCfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp index d5108399a..51caf9951 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp @@ -277,6 +277,7 @@ + <%-- --%> <%-- --%> @@ -284,7 +285,7 @@ - + <%-- --%> @@ -334,6 +335,14 @@
--%> + + + + + + + + ${indexCfg.requestName } @@ -398,14 +407,6 @@ - - - - - - - - <%--
--%> ${indexCfg.creatorName } 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 55d1bb995..4085d4b0d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -344,15 +344,15 @@ + + - - @@ -377,6 +377,14 @@
+ + + + + + + + @@ -384,6 +392,7 @@ +
@@ -456,15 +465,7 @@ - - - - - - - - -
+ ${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp index f406e22da..86c6370cb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp @@ -531,19 +531,19 @@
+ + + + - - - - @@ -622,6 +622,15 @@ ${fns:abbr(indexCfg.userRegion2,20)} ${fns:abbr(indexCfg.userRegion3,20)}
+ + + + + + + + + @@ -631,6 +640,9 @@ + +
+
@@ -703,17 +715,6 @@ - - - - - - - - - -
-
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp index cfe76675b..f2509bc73 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp @@ -341,17 +341,17 @@ + - + + - - @@ -369,17 +369,25 @@ ${indexCfg.compileId } ${indexCfg.cfgDesc } + + + + + + + ${indexCfg.dnsStrategyName } - - - - - + + + + + + @@ -388,6 +396,7 @@
+
@@ -460,15 +469,6 @@ - - - - - - - - -
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp index fcbceee89..25294e0cb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp @@ -487,15 +487,15 @@ + + - - @@ -520,6 +520,14 @@
+ + + + + + + + @@ -527,6 +535,7 @@ +
@@ -599,15 +608,6 @@ - - - - - - - - -
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp index 7f9117281..d350083a2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp @@ -324,15 +324,15 @@ + + - - @@ -357,6 +357,14 @@
+ + + + + + + + @@ -364,6 +372,7 @@ +
@@ -436,15 +445,6 @@ - - - - - - - - -
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp index ae334ad1c..e3028fd77 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -328,6 +328,7 @@ + @@ -335,7 +336,6 @@ - <%-- --%> @@ -361,6 +361,14 @@
+ + + + + + + + @@ -440,14 +448,6 @@ - - - - - - - - <%--
--%> ${indexCfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp index b4f59f3a6..e238d34e5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp @@ -330,8 +330,9 @@ --%> - + + <%-- --%> @@ -431,11 +432,6 @@ ${fns:abbr(lableInfo,20)} --%> - - - - - @@ -444,6 +440,11 @@ + + + + + <%--
--%> ${indexCfg.creatorName } 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 963d21ce9..c354ce24a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp @@ -38,7 +38,7 @@
- +