1.5.0

2026-03-13 14:25:13 +08:00
parent a25a474d6a
commit afbaaa869c
95 changed files with 4591 additions and 2578 deletions
--- a/EdgeAdmin/web/views/@default/dashboard/boards/@menu.html
+++ b/EdgeAdmin/web/views/@default/dashboard/boards/@menu.html
@@ -6,6 +6,7 @@
        <span v-if="countTodayAttacks > 0" :class="{red: countTodayAttacks != countTodayAttacksRead}">({{countTodayAttacksFormat}})</span>
    </menu-item>
    <menu-item href="/dashboard/boards/dns" code="dns">{{LANG('admin_dashboard@ui_dns')}}</menu-item>
+    <menu-item href="/dashboard/boards/httpdns" code="httpdns">HTTPDNS</menu-item>
    <menu-item href="/dashboard/boards/user" code="user">{{LANG('admin_dashboard@ui_user')}}</menu-item>
    <menu-item href="/dashboard/boards/events" code="event">{{LANG('admin_dashboard@ui_events')}}<span :class="{red: countEvents > 0}">({{countEvents}})</span></menu-item>
-</first-menu>
+</first-menu>
--- a/EdgeAdmin/web/views/@default/dashboard/boards/httpdns.css
+++ b/EdgeAdmin/web/views/@default/dashboard/boards/httpdns.css
@@ -0,0 +1,8 @@
+.ui.message .icon {
+  position: absolute;
+  right: 1em;
+  top: 1.8em;
+}
+.chart-box {
+  height: 14em;
+}
--- a/EdgeAdmin/web/views/@default/dashboard/boards/httpdns.html
+++ b/EdgeAdmin/web/views/@default/dashboard/boards/httpdns.html
@@ -0,0 +1,67 @@
+{$layout}
+{$template "menu"}
+{$template "/echarts"}
+
+<div style="margin-top: 0.8em" v-if="isLoading">
+    <div class="ui message loading">
+        <div class="ui active inline loader small"></div>  &nbsp; 数据加载中...
+    </div>
+</div>
+
+<div v-show="!isLoading">
+    <columns-grid>
+        <div class="ui column">
+            <h4>应用<link-icon href="/httpdns/apps"></link-icon></h4>
+            <div class="value"><span>{{board.countApps}}</span>个</div>
+        </div>
+        <div class="ui column">
+            <h4>域名<link-icon href="/httpdns/apps"></link-icon></h4>
+            <div class="value"><span>{{board.countDomains}}</span>个</div>
+        </div>
+        <div class="ui column">
+            <h4>集群<link-icon href="/httpdns/clusters"></link-icon></h4>
+            <div class="value"><span>{{board.countClusters}}</span>个</div>
+        </div>
+        <div class="ui column">
+            <h4>节点<link-icon href="/httpdns/clusters"></link-icon></h4>
+            <div class="value"><span>{{board.countNodes}}</span>
+                <span v-if="board.countOfflineNodes > 0" style="font-size: 1em">
+                    / <a href="/httpdns/clusters"><span class="red" style="font-size: 1em">{{board.countOfflineNodes}}离线</span></a>
+                </span>
+                <span v-else style="font-size: 1em">个</span>
+            </div>
+        </div>
+    </columns-grid>
+
+    <chart-columns-grid>
+        <div class="ui column">
+            <div class="ui menu text blue">
+                <a href="" class="item" :class="{active: trafficTab == 'hourly'}" @click.prevent="selectTrafficTab('hourly')">24小时请求趋势</a>
+                <a href="" class="item" :class="{active: trafficTab == 'daily'}" @click.prevent="selectTrafficTab('daily')">15天请求趋势</a>
+            </div>
+            <div class="ui divider"></div>
+
+            <div class="chart-box" id="hourly-traffic-chart" v-show="trafficTab == 'hourly'"></div>
+            <div class="chart-box" id="daily-traffic-chart" v-show="trafficTab == 'daily'"></div>
+        </div>
+
+        <div class="ui column">
+            <h4>应用请求排行 <span>（24小时）</span></h4>
+            <div class="ui divider"></div>
+            <div class="chart-box" id="top-apps-chart"></div>
+        </div>
+
+        <div class="ui column">
+            <h4>域名请求排行 <span>（24小时）</span></h4>
+            <div class="ui divider"></div>
+            <div class="chart-box" id="top-domains-chart"></div>
+        </div>
+
+        <div class="ui column">
+            <h4>节点访问排行 <span>（24小时）</span></h4>
+            <div class="ui divider"></div>
+            <div class="chart-box" id="top-nodes-chart"></div>
+        </div>
+
+    </chart-columns-grid>
+</div>
--- a/EdgeAdmin/web/views/@default/dashboard/boards/httpdns.js
+++ b/EdgeAdmin/web/views/@default/dashboard/boards/httpdns.js
@@ -0,0 +1,192 @@
+Tea.context(function () {
+	this.isLoading = true
+
+	this.$delay(function () {
+		this.$post("$")
+			.success(function (resp) {
+				for (let k in resp.data) {
+					this[k] = resp.data[k]
+				}
+
+				this.$delay(function () {
+					this.reloadHourlyTrafficChart()
+					this.reloadTopAppsChart()
+					this.reloadTopDomainsChart()
+					this.reloadTopNodesChart()
+				})
+
+				this.isLoading = false
+			})
+	})
+
+	this.trafficTab = "hourly"
+
+	this.selectTrafficTab = function (tab) {
+		this.trafficTab = tab
+		if (tab == "hourly") {
+			this.$delay(function () {
+				this.reloadHourlyTrafficChart()
+			})
+		} else if (tab == "daily") {
+			this.$delay(function () {
+				this.reloadDailyTrafficChart()
+			})
+		}
+	}
+
+	this.reloadHourlyTrafficChart = function () {
+		let stats = this.hourlyStats
+		if (stats == null || stats.length == 0) {
+			return
+		}
+		this.reloadTrafficChart("hourly-traffic-chart", stats, function (args) {
+			return stats[args.dataIndex].day + " " + stats[args.dataIndex].hour + "时<br/>请求数：" + teaweb.formatNumber(stats[args.dataIndex].countRequests)
+		})
+	}
+
+	this.reloadDailyTrafficChart = function () {
+		let stats = this.dailyStats
+		if (stats == null || stats.length == 0) {
+			return
+		}
+		this.reloadTrafficChart("daily-traffic-chart", stats, function (args) {
+			return stats[args.dataIndex].day + "<br/>请求数：" + teaweb.formatNumber(stats[args.dataIndex].countRequests)
+		})
+	}
+
+	this.reloadTrafficChart = function (chartId, stats, tooltipFunc) {
+		let chartBox = document.getElementById(chartId)
+		if (chartBox == null) {
+			return
+		}
+
+		let axis = teaweb.countAxis(stats, function (v) {
+			return v.countRequests
+		})
+
+		let chart = teaweb.initChart(chartBox)
+		let option = {
+			xAxis: {
+				data: stats.map(function (v) {
+					if (v.hour != null) {
+						return v.hour
+					}
+					return v.day
+				})
+			},
+			yAxis: {
+				axisLabel: {
+					formatter: function (value) {
+						return value + axis.unit
+					}
+				}
+			},
+			tooltip: {
+				show: true,
+				trigger: "item",
+				formatter: tooltipFunc
+			},
+			grid: {
+				left: 50,
+				top: 10,
+				right: 20,
+				bottom: 20
+			},
+			series: [
+				{
+					name: "请求数",
+					type: "line",
+					data: stats.map(function (v) {
+						return v.countRequests / axis.divider
+					}),
+					itemStyle: {
+						color: teaweb.DefaultChartColor
+					},
+					areaStyle: {
+						color: teaweb.DefaultChartColor
+					},
+					smooth: true
+				}
+			],
+			animation: true
+		}
+		chart.setOption(option)
+		chart.resize()
+	}
+
+	this.reloadTopAppsChart = function () {
+		if (this.topAppStats == null || this.topAppStats.length == 0) {
+			return
+		}
+		let axis = teaweb.countAxis(this.topAppStats, function (v) {
+			return v.countRequests
+		})
+		teaweb.renderBarChart({
+			id: "top-apps-chart",
+			name: "应用",
+			values: this.topAppStats,
+			x: function (v) {
+				return v.appName
+			},
+			tooltip: function (args, stats) {
+				return stats[args.dataIndex].appName + "<br/>请求数：" + teaweb.formatNumber(stats[args.dataIndex].countRequests)
+			},
+			value: function (v) {
+				return v.countRequests / axis.divider
+			},
+			axis: axis
+		})
+	}
+
+	this.reloadTopDomainsChart = function () {
+		if (this.topDomainStats == null || this.topDomainStats.length == 0) {
+			return
+		}
+		let axis = teaweb.countAxis(this.topDomainStats, function (v) {
+			return v.countRequests
+		})
+		teaweb.renderBarChart({
+			id: "top-domains-chart",
+			name: "域名",
+			values: this.topDomainStats,
+			x: function (v) {
+				return v.domainName
+			},
+			tooltip: function (args, stats) {
+				return stats[args.dataIndex].domainName + "<br/>请求数：" + teaweb.formatNumber(stats[args.dataIndex].countRequests)
+			},
+			value: function (v) {
+				return v.countRequests / axis.divider
+			},
+			axis: axis
+		})
+	}
+
+	this.reloadTopNodesChart = function () {
+		if (this.topNodeStats == null || this.topNodeStats.length == 0) {
+			return
+		}
+		let axis = teaweb.countAxis(this.topNodeStats, function (v) {
+			return v.countRequests
+		})
+		teaweb.renderBarChart({
+			id: "top-nodes-chart",
+			name: "节点",
+			values: this.topNodeStats,
+			x: function (v) {
+				return v.nodeName
+			},
+			tooltip: function (args, stats) {
+				return stats[args.dataIndex].nodeName + "<br/>请求数：" + teaweb.formatNumber(stats[args.dataIndex].countRequests)
+			},
+			value: function (v) {
+				return v.countRequests / axis.divider
+			},
+			axis: axis,
+			click: function (args, stats) {
+				window.location = "/httpdns/clusters/cluster/node?nodeId=" + stats[args.dataIndex].nodeId + "&clusterId=" + stats[args.dataIndex].clusterId
+			}
+		})
+	}
+
+})
--- a/EdgeAdmin/web/views/@default/dashboard/boards/index.html
+++ b/EdgeAdmin/web/views/@default/dashboard/boards/index.html
@@ -53,8 +53,9 @@
 <!-- 升级提醒 -->
 <div class="ui icon message error" v-if="!isLoading && nodeUpgradeInfo.count > 0">
    <i class="icon warning circle"></i>
-    <a href="/clusters">
-    升级提醒：有 {{nodeUpgradeInfo.count}} 个边缘节点需要升级到 v{{nodeUpgradeInfo.version}} 版本，系统正在尝试自动升级，请耐心等待...</a><a href="" title="关闭" @click.prevent="closeMessage"><i class="ui icon remove small"></i></a>
+    <a href="/clusters" v-if="autoUpgrade">升级提醒：有 {{nodeUpgradeInfo.count}} 个边缘节点需要升级到 v{{nodeUpgradeInfo.version}} 版本，系统正在尝试自动升级，请耐心等待...</a>
+    <a href="/settings/upgrade" v-else>升级提醒：有 {{nodeUpgradeInfo.count}} 个边缘节点需要升级到 v{{nodeUpgradeInfo.version}} 版本，请到系统设置-升级设置页面自行升级...</a>
+    <a href="" title="关闭" @click.prevent="closeMessage"><i class="ui icon remove small"></i></a>
 </div>
 <div class="ui icon message error" v-if="!isLoading && userNodeUpgradeInfo.count > 0 && teaIsPlus">
    <i class="icon warning circle"></i>
@@ -73,7 +74,15 @@

 <div class="ui icon message error" v-if="!isLoading && nsNodeUpgradeInfo.count > 0 && teaIsPlus">
    <i class="icon warning circle"></i>
-    <a href="/ns/clusters">升级提醒：有 {{nsNodeUpgradeInfo.count}} 个DNS节点需要升级到 v{{nsNodeUpgradeInfo.version}} 版本，系统正在尝试自动升级，请耐心等待...</a><a href="" title="关闭" @click.prevent="closeMessage"><i class="ui icon remove small"></i></a>
+    <a href="/ns/clusters" v-if="autoUpgrade">升级提醒：有 {{nsNodeUpgradeInfo.count}} 个DNS节点需要升级到 v{{nsNodeUpgradeInfo.version}} 版本，系统正在尝试自动升级，请耐心等待...</a>
+    <a href="/settings/upgrade" v-else>升级提醒：有 {{nsNodeUpgradeInfo.count}} 个DNS节点需要升级到 v{{nsNodeUpgradeInfo.version}} 版本，请到系统设置-升级设置页面自行升级...</a>
+    <a href="" title="关闭" @click.prevent="closeMessage"><i class="ui icon remove small"></i></a>
+</div>
+<div class="ui icon message error" v-if="!isLoading && httpdnsNodeUpgradeInfo.count > 0 && teaIsPlus">
+    <i class="icon warning circle"></i>
+    <a href="/httpdns/clusters" v-if="autoUpgrade">升级提醒：有 {{httpdnsNodeUpgradeInfo.count}} 个HTTPDNS节点需要升级到 v{{httpdnsNodeUpgradeInfo.version}} 版本，系统正在尝试自动升级，请耐心等待...</a>
+    <a href="/settings/upgrade" v-else>升级提醒：有 {{httpdnsNodeUpgradeInfo.count}} 个HTTPDNS节点需要升级到 v{{httpdnsNodeUpgradeInfo.version}} 版本，请到系统设置-升级设置页面自行升级...</a>
+    <a href="" title="关闭" @click.prevent="closeMessage"><i class="ui icon remove small"></i></a>
 </div>
 <div class="ui icon message error" v-if="!isLoading && reportNodeUpgradeInfo.count > 0 && teaIsPlus">
    <i class="icon warning circle"></i>