实现公用的IP名单

2025-11-27 05:00:25 +08:00 · 2021-06-23 13:12:33 +08:00
parent c99547d9e3
commit 8e4ee54f03
88 changed files with 2060 additions and 69 deletions
--- a/web/views/@default/servers/server/settings/waf/ipadmin/allowList.html
+++ b/web/views/@default/servers/server/settings/waf/ipadmin/allowList.html
@@ -11,6 +11,8 @@
        <menu-item @click.prevent="createIP('white')">添加IP</menu-item>
        <span class="item">|</span>
        <span class="item">ID: {{listId}} &nbsp; <tip-icon content="ID可以用于使用API操作此IP名单"></tip-icon></span>
+        <span class="item">|</span>
+        <div class="item"><ip-list-bind-box :v-http-firewall-policy-id="firewallPolicyId" :v-type="'white'"></ip-list-bind-box></div>
    </second-menu>

    <p class="ui message warning" v-if="!wafIsOn">当前WAF未启用，设置将在<a :href="'/servers/server/settings/waf?serverId=' + serverId">[启用]</a>后生效。</p>
--- a/web/views/@default/servers/server/settings/waf/ipadmin/allowList.js
+++ b/web/views/@default/servers/server/settings/waf/ipadmin/allowList.js
@@ -29,7 +29,9 @@ Tea.context(function () {
 		teaweb.popup("/servers/server/settings/waf/ipadmin/createIPPopup?listId=" + this.listId + '&type=' + type, {
 			height: "26em",
 			callback: function () {
-				window.location.reload()
+				teaweb.success("保存成功", function () {
+					teaweb.reload()
+				})
 			}
 		})
 	}
--- a/web/views/@default/servers/server/settings/waf/ipadmin/countries.js
+++ b/web/views/@default/servers/server/settings/waf/ipadmin/countries.js
@@ -56,10 +56,13 @@ Tea.context(function () {
 	 * 添加IP名单菜单
 	 */
 	this.createIP = function (type) {
+		let that = this
 		teaweb.popup("/servers/components/waf/ipadmin/createIPPopup?firewallPolicyId=" + this.firewallPolicyId + '&type=' + type, {
 			height: "30em",
 			callback: function () {
-				window.location = "/servers/components/waf/ipadmin/lists?firewallPolicyId=" + this.firewallPolicyId + "&type=" + type
+				teaweb.success("保存成功", function () {
+					window.location = "/servers/components/waf/ipadmin/lists?firewallPolicyId=" + that.firewallPolicyId + "&type=" + type
+				})
 			}
 		})
 	}
--- a/web/views/@default/servers/server/settings/waf/ipadmin/denyList.html
+++ b/web/views/@default/servers/server/settings/waf/ipadmin/denyList.html
@@ -11,6 +11,8 @@
        <menu-item @click.prevent="createIP('black')">添加IP</menu-item>
        <span class="item">|</span>
        <span class="item">ID: {{listId}} &nbsp; <tip-icon content="ID可以用于使用API操作此IP名单"></tip-icon></span>
+        <span class="item">|</span>
+        <div class="item"><ip-list-bind-box :v-http-firewall-policy-id="firewallPolicyId" :v-type="'black'"></ip-list-bind-box></div>
    </second-menu>

    <p class="ui message warning" v-if="!wafIsOn">当前WAF未启用，设置将在<a :href="'/servers/server/settings/waf?serverId=' + serverId">[启用]</a>后生效。</p>
--- a/web/views/@default/servers/server/settings/waf/ipadmin/denyList.js
+++ b/web/views/@default/servers/server/settings/waf/ipadmin/denyList.js
@@ -29,7 +29,9 @@ Tea.context(function () {
 		teaweb.popup("/servers/server/settings/waf/ipadmin/createIPPopup?listId=" + this.listId + '&type=' + type, {
 			height: "26em",
 			callback: function () {
-				window.location.reload()
+				teaweb.success("保存成功", function () {
+					teaweb.reload()
+				})
 			}
 		})
 	}
--- a/web/views/@default/servers/server/settings/waf/ipadmin/provinces.js
+++ b/web/views/@default/servers/server/settings/waf/ipadmin/provinces.js
@@ -42,10 +42,13 @@ Tea.context(function () {
 	 * 添加IP名单菜单
 	 */
 	this.createIP = function (type) {
+		let that = this
 		teaweb.popup("/servers/components/waf/ipadmin/createIPPopup?firewallPolicyId=" + this.firewallPolicyId + '&type=' + type, {
 			height: "30em",
 			callback: function () {
-				window.location = "/servers/components/waf/ipadmin/lists?firewallPolicyId=" + this.firewallPolicyId + "&type=" + type
+				teaweb.success("保存成功", function () {
+					window.location = "/servers/components/waf/ipadmin/lists?firewallPolicyId=" + that.firewallPolicyId + "&type=" + type
+				})
 			}
 		})
 	}
--- a/web/views/@default/servers/server/stat/clients.css
+++ b/web/views/@default/servers/server/stat/clients.css
@@ -1,4 +1,7 @@
 .chart-box {
  height: 20em;
 }
+h4 span.small {
+  font-size: 0.8em;
+}
 /*# sourceMappingURL=clients.css.map */
--- a/web/views/@default/servers/server/stat/clients.css.map
+++ b/web/views/@default/servers/server/stat/clients.css.map
@@ -1 +1 @@
-{"version":3,"sources":["clients.less"],"names":[],"mappings":"AAAA;EACC,YAAA","file":"clients.css"}
+{"version":3,"sources":["clients.less"],"names":[],"mappings":"AAAA;EACC,YAAA;;AAGD,EAAG,KAAI;EACN,gBAAA","file":"clients.css"}
--- a/web/views/@default/servers/server/stat/clients.html
+++ b/web/views/@default/servers/server/stat/clients.html
@@ -12,10 +12,10 @@
        要想查看统计数据，需要先开启统计功能，<a :href="'/servers/server/settings/stat?serverId=' + serverId">[点击这里]</a>修改配置。
    </p>
    {$else}
-    <h4>操作系统排行</h4>
+    <h4>操作系统排行<span class="small grey">（按月）</span></h4>
    <div class="chart-box" id="system-chart"></div>

-    <h4>浏览器排行</h4>
+    <h4>浏览器排行<span class="small grey">（按月）</span></h4>
    <div class="chart-box" id="browser-chart"></div>
    {$end}
 </div>
--- a/web/views/@default/servers/server/stat/clients.less
+++ b/web/views/@default/servers/server/stat/clients.less
@@ -1,3 +1,7 @@
 .chart-box {
 	height: 20em;
+}
+
+h4 span.small {
+	font-size: 0.8em;
 }
--- a/web/views/@default/servers/server/stat/dailyRequests.css
+++ b/web/views/@default/servers/server/stat/dailyRequests.css
@@ -1,4 +1,7 @@
 .chart-box {
  height: 21em;
 }
+h4 span.small {
+  font-size: 0.8em;
+}
 /*# sourceMappingURL=dailyRequests.css.map */
--- a/web/views/@default/servers/server/stat/dailyRequests.css.map
+++ b/web/views/@default/servers/server/stat/dailyRequests.css.map
@@ -1 +1 @@
-{"version":3,"sources":["dailyRequests.less"],"names":[],"mappings":"AAAA;EACC,YAAA","file":"dailyRequests.css"}
+{"version":3,"sources":["dailyRequests.less"],"names":[],"mappings":"AAAA;EACC,YAAA;;AAGD,EAAG,KAAI;EACN,gBAAA","file":"dailyRequests.css"}
--- a/web/views/@default/servers/server/stat/dailyRequests.less
+++ b/web/views/@default/servers/server/stat/dailyRequests.less
@@ -1,3 +1,7 @@
 .chart-box {
 	height: 21em;
+}
+
+h4 span.small {
+	font-size: 0.8em;
 }
--- a/web/views/@default/servers/server/stat/hourlyRequests.css
+++ b/web/views/@default/servers/server/stat/hourlyRequests.css
@@ -1,4 +1,7 @@
 .chart-box {
  height: 21em;
 }
+h4 span.small {
+  font-size: 0.8em;
+}
 /*# sourceMappingURL=hourlyRequests.css.map */
--- a/web/views/@default/servers/server/stat/hourlyRequests.css.map
+++ b/web/views/@default/servers/server/stat/hourlyRequests.css.map
@@ -1 +1 @@
-{"version":3,"sources":["hourlyRequests.less"],"names":[],"mappings":"AAAA;EACC,YAAA","file":"hourlyRequests.css"}
+{"version":3,"sources":["hourlyRequests.less"],"names":[],"mappings":"AAAA;EACC,YAAA;;AAGD,EAAG,KAAI;EACN,gBAAA","file":"hourlyRequests.css"}
--- a/web/views/@default/servers/server/stat/hourlyRequests.less
+++ b/web/views/@default/servers/server/stat/hourlyRequests.less
@@ -1,3 +1,7 @@
 .chart-box {
 	height: 21em;
+}
+
+h4 span.small {
+	font-size: 0.8em;
 }
--- a/web/views/@default/servers/server/stat/index.css
+++ b/web/views/@default/servers/server/stat/index.css
@@ -1,4 +1,7 @@
 .chart-box {
  height: 21em;
 }
+h4 span.small {
+  font-size: 0.8em;
+}
 /*# sourceMappingURL=index.css.map */
--- a/web/views/@default/servers/server/stat/index.css.map
+++ b/web/views/@default/servers/server/stat/index.css.map
@@ -1 +1 @@
-{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA;EACC,YAAA","file":"index.css"}
+{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA;EACC,YAAA;;AAGD,EAAG,KAAI;EACN,gBAAA","file":"index.css"}
--- a/web/views/@default/servers/server/stat/index.less
+++ b/web/views/@default/servers/server/stat/index.less
@@ -1,3 +1,7 @@
 .chart-box {
 	height: 21em;
+}
+
+h4 span.small {
+	font-size: 0.8em;
 }
--- a/web/views/@default/servers/server/stat/providers.css
+++ b/web/views/@default/servers/server/stat/providers.css
@@ -1,4 +1,7 @@
 .chart-box {
  height: 20em;
 }
+h4 span.small {
+  font-size: 0.8em;
+}
 /*# sourceMappingURL=providers.css.map */
--- a/web/views/@default/servers/server/stat/providers.css.map
+++ b/web/views/@default/servers/server/stat/providers.css.map
@@ -1 +1 @@
-{"version":3,"sources":["providers.less"],"names":[],"mappings":"AAAA;EACC,YAAA","file":"providers.css"}
+{"version":3,"sources":["providers.less"],"names":[],"mappings":"AAAA;EACC,YAAA;;AAGD,EAAG,KAAI;EACN,gBAAA","file":"providers.css"}
--- a/web/views/@default/servers/server/stat/providers.html
+++ b/web/views/@default/servers/server/stat/providers.html
@@ -12,7 +12,7 @@
        要想查看统计数据，需要先开启统计功能，<a :href="'/servers/server/settings/stat?serverId=' + serverId">[点击这里]</a>修改配置。
    </p>
    {$else}
-    <h4>运营商排行</h4>
+    <h4>运营商排行<span class="small grey">（按月）</span></h4>
    <div class="chart-box" id="provider-chart"></div>
    {$end}
 </div>
--- a/web/views/@default/servers/server/stat/providers.less
+++ b/web/views/@default/servers/server/stat/providers.less
@@ -1,3 +1,7 @@
 .chart-box {
 	height: 20em;
+}
+
+h4 span.small {
+	font-size: 0.8em;
 }
--- a/web/views/@default/servers/server/stat/regions.css
+++ b/web/views/@default/servers/server/stat/regions.css
@@ -1,4 +1,7 @@
 .chart-box {
  height: 20em;
 }
-/*# sourceMappingURL=index.css.map */
+h4 span.small {
+  font-size: 0.8em;
+}
+/*# sourceMappingURL=regions.css.map */
--- a/web/views/@default/servers/server/stat/regions.css.map
+++ b/web/views/@default/servers/server/stat/regions.css.map
@@ -1 +1 @@
-{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA;EACC,YAAA","file":"index.css"}
+{"version":3,"sources":["regions.less"],"names":[],"mappings":"AAAA;EACC,YAAA;;AAGD,EAAG,KAAI;EACN,gBAAA","file":"regions.css"}
--- a/web/views/@default/servers/server/stat/regions.html
+++ b/web/views/@default/servers/server/stat/regions.html
@@ -12,17 +12,17 @@
        要想查看统计数据，需要先开启统计功能，<a :href="'/servers/server/settings/stat?serverId=' + serverId">[点击这里]</a>修改配置。
    </p>
    {$else}
-        <h4>地区排行</h4>
+        <h4>地区排行<span class="small grey">（按月）</span></h4>
        <div class="chart-box" id="country-chart">

        </div>

-        <h4>省市排行</h4>
+        <h4>省市排行<span class="small grey">（按月）</span></h4>
        <div class="chart-box" id="province-chart">

        </div>

-        <h4>城市排行</h4>
+        <h4>城市排行<span class="small grey">（按月）</span></h4>
        <div class="chart-box" id="city-chart">

        </div>
--- a/web/views/@default/servers/server/stat/regions.less
+++ b/web/views/@default/servers/server/stat/regions.less
@@ -1,3 +1,7 @@
 .chart-box {
 	height: 20em;
+}
+
+h4 span.small {
+	font-size: 0.8em;
 }