对服务增加基础的数据统计

README.md

@@ -14,3 +14,6 @@
 
 ## 联系我们
 有什么问题和建议都可以加入QQ群 `659832182`。
+
+## 感谢
+* 感谢[JetBrains公司](https://www.jetbrains.com/)提供免费的IDE开发Licence。

internal/rpc/rpc_client.go

@@ -91,6 +91,30 @@ func (this *RPCClient) ServerRPC() pb.ServerServiceClient {
 	return pb.NewServerServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) ServerClientSystemMonthlyStatRPC() pb.ServerClientSystemMonthlyStatServiceClient {
+	return pb.NewServerClientSystemMonthlyStatServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ServerClientBrowserMonthlyStatRPC() pb.ServerClientBrowserMonthlyStatServiceClient {
+	return pb.NewServerClientBrowserMonthlyStatServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ServerRegionCountryMonthlyStatRPC() pb.ServerRegionCountryMonthlyStatServiceClient {
+	return pb.NewServerRegionCountryMonthlyStatServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ServerRegionProvinceMonthlyStatRPC() pb.ServerRegionProvinceMonthlyStatServiceClient {
+	return pb.NewServerRegionProvinceMonthlyStatServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ServerRegionCityMonthlyStatRPC() pb.ServerRegionCityMonthlyStatServiceClient {
+	return pb.NewServerRegionCityMonthlyStatServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ServerRegionProviderMonthlyStatRPC() pb.ServerRegionProviderMonthlyStatServiceClient {
+	return pb.NewServerRegionProviderMonthlyStatServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) ServerGroupRPC() pb.ServerGroupServiceClient {
 	return pb.NewServerGroupServiceClient(this.pickConn())
 }

internal/web/actions/default/servers/server/settings/reverseProxy/updateSchedulingPopup.go

@@ -70,10 +70,10 @@ func (this *UpdateSchedulingPopupAction) RunGet(params struct {
 		if !types.IsSlice(networks) {
 			continue
 		}
-		if (serverConfig.IsHTTP() && lists.Contains(networks, "http")) ||
+		if (serverConfig.IsHTTPFamily() && lists.Contains(networks, "http")) ||
-			(serverConfig.IsTCP() && lists.Contains(networks, "tcp")) ||
+			(serverConfig.IsTCPFamily() && lists.Contains(networks, "tcp")) ||
-			(serverConfig.IsUDP() && lists.Contains(networks, "udp")) ||
+			(serverConfig.IsUDPFamily() && lists.Contains(networks, "udp")) ||
-			(serverConfig.IsUnix() && lists.Contains(networks, "unix")) {
+			(serverConfig.IsUnixFamily() && lists.Contains(networks, "unix")) {
 			schedulingTypes = append(schedulingTypes, m)
 		}
 	}

internal/web/actions/default/servers/server/stat/clients.go

@@ -0,0 +1,110 @@
+package stat
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+)
+
+type ClientsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *ClientsAction) Init() {
+	this.Nav("", "stat", "")
+	this.SecondMenu("client")
+}
+
+func (this *ClientsAction) RunGet(params struct {
+	ServerId int64
+	Month    string
+}) {
+	month := params.Month
+	if len(month) != 6 {
+		month = timeutil.Format("Ym")
+	}
+	this.Data["month"] = month
+
+	serverTypeResp, err := this.RPC().ServerRPC().FindEnabledServerType(this.AdminContext(), &pb.FindEnabledServerTypeRequest{ServerId: params.ServerId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	serverType := serverTypeResp.Type
+
+	statIsOn := false
+
+	// 是否已开启
+	if serverconfigs.IsHTTPServerType(serverType) {
+		webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if webConfig != nil && webConfig.StatRef != nil {
+			statIsOn = webConfig.StatRef.IsOn
+		}
+	} else {
+		this.WriteString("此类型服务暂不支持统计")
+		return
+	}
+
+	this.Data["statIsOn"] = statIsOn
+
+	// 统计数据
+	systemMaps := []maps.Map{}
+	browserMaps := []maps.Map{}
+
+	if statIsOn {
+		{
+			resp, err := this.RPC().ServerClientSystemMonthlyStatRPC().FindTopServerClientSystemMonthlyStats(this.AdminContext(), &pb.FindTopServerClientSystemMonthlyStatsRequest{
+				ServerId: params.ServerId,
+				Month:    month,
+				Offset:   0,
+				Size:     10,
+			})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			for _, stat := range resp.Stats {
+				systemMaps = append(systemMaps, maps.Map{
+					"count": stat.Count,
+					"system": maps.Map{
+						"id":   stat.ClientSystem.Id,
+						"name": stat.ClientSystem.Name,
+					},
+				})
+			}
+		}
+
+		{
+			resp, err := this.RPC().ServerClientBrowserMonthlyStatRPC().FindTopServerClientBrowserMonthlyStats(this.AdminContext(), &pb.FindTopServerClientBrowserMonthlyStatsRequest{
+				ServerId: params.ServerId,
+				Month:    month,
+				Offset:   0,
+				Size:     10,
+			})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			for _, stat := range resp.Stats {
+				browserMaps = append(browserMaps, maps.Map{
+					"count": stat.Count,
+					"browser": maps.Map{
+						"id":   stat.ClientBrowser.Id,
+						"name": stat.ClientBrowser.Name,
+					},
+				})
+			}
+		}
+	}
+	this.Data["systemStats"] = systemMaps
+	this.Data["browserStats"] = browserMaps
+
+	this.Show()
+}

internal/web/actions/default/servers/server/stat/index.go

@@ -1,6 +1,13 @@
 package stat
 
-import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+)
 
 type IndexAction struct {
 	actionutils.ParentAction
@@ -11,6 +18,133 @@ func (this *IndexAction) Init() {
 	this.SecondMenu("index")
 }
 
-func (this *IndexAction) RunGet(params struct{}) {
+func (this *IndexAction) RunGet(params struct {
+	ServerId int64
+	Month    string
+}) {
+	month := params.Month
+	if len(month) != 6 {
+		month = timeutil.Format("Ym")
+	}
+	this.Data["month"] = month
+
+	serverTypeResp, err := this.RPC().ServerRPC().FindEnabledServerType(this.AdminContext(), &pb.FindEnabledServerTypeRequest{ServerId: params.ServerId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	serverType := serverTypeResp.Type
+
+	statIsOn := false
+
+	// 是否已开启
+	if serverconfigs.IsHTTPServerType(serverType) {
+		webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if webConfig != nil && webConfig.StatRef != nil {
+			statIsOn = webConfig.StatRef.IsOn
+		}
+	} else {
+		this.WriteString("此类型服务暂不支持统计")
+		return
+	}
+
+	this.Data["statIsOn"] = statIsOn
+
+	// 统计数据
+	countryStatMaps := []maps.Map{}
+	provinceStatMaps := []maps.Map{}
+	cityStatMaps := []maps.Map{}
+
+	if statIsOn {
+		// 地区
+		{
+			resp, err := this.RPC().ServerRegionCountryMonthlyStatRPC().FindTopServerRegionCountryMonthlyStats(this.AdminContext(), &pb.FindTopServerRegionCountryMonthlyStatsRequest{
+				Month:    month,
+				ServerId: params.ServerId,
+				Offset:   0,
+				Size:     10,
+			})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			for _, stat := range resp.Stats {
+				countryStatMaps = append(countryStatMaps, maps.Map{
+					"count": stat.Count,
+					"country": maps.Map{
+						"id":   stat.RegionCountry.Id,
+						"name": stat.RegionCountry.Name,
+					},
+				})
+			}
+		}
+
+		// 省份
+		{
+			resp, err := this.RPC().ServerRegionProvinceMonthlyStatRPC().FindTopServerRegionProvinceMonthlyStats(this.AdminContext(), &pb.FindTopServerRegionProvinceMonthlyStatsRequest{
+				Month:    month,
+				ServerId: params.ServerId,
+				Offset:   0,
+				Size:     10,
+			})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			for _, stat := range resp.Stats {
+				provinceStatMaps = append(provinceStatMaps, maps.Map{
+					"count": stat.Count,
+					"country": maps.Map{
+						"id":   stat.RegionCountry.Id,
+						"name": stat.RegionCountry.Name,
+					},
+					"province": maps.Map{
+						"id":   stat.RegionProvince.Id,
+						"name": stat.RegionProvince.Name,
+					},
+				})
+			}
+		}
+
+		// 城市
+		{
+			resp, err := this.RPC().ServerRegionCityMonthlyStatRPC().FindTopServerRegionCityMonthlyStats(this.AdminContext(), &pb.FindTopServerRegionCityMonthlyStatsRequest{
+				Month:    month,
+				ServerId: params.ServerId,
+				Offset:   0,
+				Size:     10,
+			})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			for _, stat := range resp.Stats {
+				cityStatMaps = append(cityStatMaps, maps.Map{
+					"count": stat.Count,
+					"country": maps.Map{
+						"id":   stat.RegionCountry.Id,
+						"name": stat.RegionCountry.Name,
+					},
+					"province": maps.Map{
+						"id":   stat.RegionProvince.Id,
+						"name": stat.RegionProvince.Name,
+					},
+					"city": maps.Map{
+						"id":   stat.RegionCity.Id,
+						"name": stat.RegionCity.Name,
+					},
+				})
+			}
+		}
+	}
+
+	this.Data["countryStats"] = countryStatMaps
+	this.Data["provinceStats"] = provinceStatMaps
+	this.Data["cityStats"] = cityStatMaps
+
 	this.Show()
 }

internal/web/actions/default/servers/server/stat/init.go

@@ -14,6 +14,8 @@ func init() {
 			Helper(serverutils.NewServerHelper()).
 			Prefix("/servers/server/stat").
 			Get("", new(IndexAction)).
+			Get("/providers", new(ProvidersAction)).
+			Get("/clients", new(ClientsAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/servers/server/stat/providers.go

@@ -0,0 +1,86 @@
+package stat
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+)
+
+type ProvidersAction struct {
+	actionutils.ParentAction
+}
+
+func (this *ProvidersAction) Init() {
+	this.Nav("", "stat", "")
+	this.SecondMenu("provider")
+}
+
+func (this *ProvidersAction) RunGet(params struct {
+	ServerId int64
+	Month    string
+}) {
+	month := params.Month
+	if len(month) != 6 {
+		month = timeutil.Format("Ym")
+	}
+	this.Data["month"] = month
+
+	serverTypeResp, err := this.RPC().ServerRPC().FindEnabledServerType(this.AdminContext(), &pb.FindEnabledServerTypeRequest{ServerId: params.ServerId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	serverType := serverTypeResp.Type
+
+	statIsOn := false
+
+	// 是否已开启
+	if serverconfigs.IsHTTPServerType(serverType) {
+		webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if webConfig != nil && webConfig.StatRef != nil {
+			statIsOn = webConfig.StatRef.IsOn
+		}
+	} else {
+		this.WriteString("此类型服务暂不支持统计")
+		return
+	}
+
+	this.Data["statIsOn"] = statIsOn
+
+	// 统计数据
+	providerMaps := []maps.Map{}
+
+	if statIsOn {
+		{
+			resp, err := this.RPC().ServerRegionProviderMonthlyStatRPC().FindTopServerRegionProviderMonthlyStats(this.AdminContext(), &pb.FindTopServerRegionProviderMonthlyStatsRequest{
+				Month:    month,
+				ServerId: params.ServerId,
+				Offset:   0,
+				Size:     10,
+			})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			for _, stat := range resp.Stats {
+				providerMaps = append(providerMaps, maps.Map{
+					"count": stat.Count,
+					"provider": maps.Map{
+						"id":   stat.RegionProvider.Id,
+						"name": stat.RegionProvider.Name,
+					},
+				})
+			}
+		}
+	}
+	this.Data["providerStats"] = providerMaps
+
+	this.Show()
+}

internal/web/actions/default/servers/serverutils/server_helper.go

@@ -77,13 +77,13 @@ func (this *ServerHelper) createLeftMenu(action *actions.ActionObject) {
 
 	// 协议簇
 	family := ""
-	if serverConfig.IsHTTP() {
+	if serverConfig.IsHTTPFamily() {
 		family = "http"
-	} else if serverConfig.IsTCP() {
+	} else if serverConfig.IsTCPFamily() {
 		family = "tcp"
-	} else if serverConfig.IsUnix() {
+	} else if serverConfig.IsUnixFamily() {
 		family = "unix"
-	} else if serverConfig.IsUDP() {
+	} else if serverConfig.IsUDPFamily() {
 		family = "udp"
 	}
 	action.Data["serverFamily"] = family
@@ -94,7 +94,9 @@ func (this *ServerHelper) createLeftMenu(action *actions.ActionObject) {
 	tabbar.Add("服务列表", "", "/servers", "", false)
 	//tabbar.Add("看板", "", "/servers/server/board?serverId="+serverIdString, "dashboard", selectedTabbar == "board")
 	tabbar.Add("日志", "", "/servers/server/log?serverId="+serverIdString, "history", selectedTabbar == "log")
-	//tabbar.Add("统计", "", "/servers/server/stat?serverId="+serverIdString, "chart area", selectedTabbar == "stat")
+	if family == "http" {
+		tabbar.Add("统计", "", "/servers/server/stat?serverId="+serverIdString, "chart area", selectedTabbar == "stat")
+	}
 	tabbar.Add("设置", "", "/servers/server/settings?serverId="+serverIdString, "setting", selectedTabbar == "setting")
 	tabbar.Add("删除", "", "/servers/server/delete?serverId="+serverIdString, "trash", selectedTabbar == "delete")
 	{
@@ -155,10 +157,20 @@ func (this *ServerHelper) createLogMenu(secondMenuItem string, serverIdString st
 func (this *ServerHelper) createStatMenu(secondMenuItem string, serverIdString string, serverConfig *serverconfigs.ServerConfig) []maps.Map {
 	menuItems := []maps.Map{}
 	menuItems = append(menuItems, maps.Map{
-		"name":     "统计",
+		"name":     "地域分布",
 		"url":      "/servers/server/stat?serverId=" + serverIdString,
 		"isActive": secondMenuItem == "index",
 	})
+	menuItems = append(menuItems, maps.Map{
+		"name":     "运营商",
+		"url":      "/servers/server/stat/providers?serverId=" + serverIdString,
+		"isActive": secondMenuItem == "provider",
+	})
+	menuItems = append(menuItems, maps.Map{
+		"name":     "终端",
+		"url":      "/servers/server/stat/clients?serverId=" + serverIdString,
+		"isActive": secondMenuItem == "client",
+	})
 	return menuItems
 }
 
@@ -179,7 +191,7 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri
 	}
 
 	// HTTP
-	if serverConfig.IsHTTP() {
+	if serverConfig.IsHTTPFamily() {
 		menuItems = append(menuItems, maps.Map{
 			"name":     "域名",
 			"url":      "/servers/server/settings/serverNames?serverId=" + serverIdString,
@@ -294,7 +306,7 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri
 			"isActive": secondMenuItem == "websocket",
 			"isOn":     serverConfig.Web != nil && serverConfig.Web.WebsocketRef != nil && serverConfig.Web.WebsocketRef.IsOn,
 		})
-	} else if serverConfig.IsTCP() {
+	} else if serverConfig.IsTCPFamily() {
 		menuItems = append(menuItems, maps.Map{
 			"name":     "TCP",
 			"url":      "/servers/server/settings/tcp?serverId=" + serverIdString,
@@ -313,14 +325,14 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri
 			"isActive": secondMenuItem == "reverseProxy",
 			"isOn":     serverConfig.ReverseProxyRef != nil && serverConfig.ReverseProxyRef.IsOn,
 		})
-	} else if serverConfig.IsUnix() {
+	} else if serverConfig.IsUnixFamily() {
 		menuItems = append(menuItems, maps.Map{
 			"name":     "Unix",
 			"url":      "/servers/server/settings/unix?serverId=" + serverIdString,
 			"isActive": secondMenuItem == "unix",
 			"isOn":     serverConfig.Unix != nil && serverConfig.Unix.IsOn && len(serverConfig.Unix.Listen) > 0,
 		})
-	} else if serverConfig.IsUDP() {
+	} else if serverConfig.IsUDPFamily() {
 		menuItems = append(menuItems, maps.Map{
 			"name":     "UDP",
 			"url":      "/servers/server/settings/udp?serverId=" + serverIdString,

web/public/js/components/server/http-stat-config-box.js

@@ -5,7 +5,7 @@ Vue.component("http-stat-config-box", {
 		if (stat == null) {
 			stat = {
 				isPrior: false,
-				isOn: true
+				isOn: false
 			}
 		}
 		return {

web/public/js/components/server/http-websocket-box.js

@@ -14,7 +14,7 @@ Vue.component("http-websocket-box", {
 		if (websocketConfig == null) {
 			websocketConfig = {
 				id: 0,
-				isOn: true,
+				isOn: false,
 				handshakeTimeout: {
 					count: 30,
 					unit: "second"

web/public/js/utils.js

@@ -1,261 +1,263 @@
 window.teaweb = {
-	set: function (key, value) {
+    set: function (key, value) {
-		localStorage.setItem(key, JSON.stringify(value));
+        localStorage.setItem(key, JSON.stringify(value));
-	},
+    },
-	get: function (key) {
+    get: function (key) {
-		var item = localStorage.getItem(key);
+        var item = localStorage.getItem(key);
-		if (item == null || item.length == 0) {
+        if (item == null || item.length == 0) {
-			return null;
+            return null;
-		}
+        }
 
-		return JSON.parse(item);
+        return JSON.parse(item);
-	},
+    },
-	getString: function (key) {
+    getString: function (key) {
-		var value = this.get(key);
+        var value = this.get(key);
-		if (typeof (value) == "string") {
+        if (typeof (value) == "string") {
-			return value;
+            return value;
-		}
+        }
-		return "";
+        return "";
-	},
+    },
-	getBool: function (key) {
+    getBool: function (key) {
-		return Boolean(this.get(key));
+        return Boolean(this.get(key));
-	},
+    },
-	remove: function (key) {
+    remove: function (key) {
-		localStorage.removeItem(key)
+        localStorage.removeItem(key)
-	},
+    },
-	match: function (source, keyword) {
+    match: function (source, keyword) {
-		if (source == null) {
+        if (source == null) {
-			return false;
+            return false;
-		}
+        }
-		if (keyword == null) {
+        if (keyword == null) {
-			return true;
+            return true;
-		}
+        }
-		source = source.trim();
+        source = source.trim();
-		keyword = keyword.trim();
+        keyword = keyword.trim();
-		if (keyword.length == 0) {
+        if (keyword.length == 0) {
-			return true;
+            return true;
-		}
+        }
-		if (source.length == 0) {
+        if (source.length == 0) {
-			return false;
+            return false;
-		}
+        }
-		var pieces = keyword.split(/\s+/);
+        var pieces = keyword.split(/\s+/);
-		for (var i = 0; i < pieces.length; i++) {
+        for (var i = 0; i < pieces.length; i++) {
-			var pattern = pieces[i];
+            var pattern = pieces[i];
-			pattern = pattern.replace(/(\+|\*|\?|[|]|{|}|\||\\|\(|\)|\.)/g, "\\$1");
+            pattern = pattern.replace(/(\+|\*|\?|[|]|{|}|\||\\|\(|\)|\.)/g, "\\$1");
-			var reg = new RegExp(pattern, "i");
+            var reg = new RegExp(pattern, "i");
-			if (!reg.test(source)) {
+            if (!reg.test(source)) {
-				return false;
+                return false;
-			}
+            }
-		}
+        }
-		return true;
+        return true;
-	},
+    },
 
-	datepicker: function (element, callback) {
+    datepicker: function (element, callback) {
-		if (typeof (element) == "string") {
+        if (typeof (element) == "string") {
-			element = document.getElementById(element);
+            element = document.getElementById(element);
-		}
+        }
-		var year = new Date().getFullYear();
+        var year = new Date().getFullYear();
-		var picker = new Pikaday({
+        var picker = new Pikaday({
-			field: element,
+            field: element,
-			firstDay: 1,
+            firstDay: 1,
-			minDate: new Date(year - 1, 0, 1),
+            minDate: new Date(year - 1, 0, 1),
-			maxDate: new Date(year + 10, 11, 31),
+            maxDate: new Date(year + 10, 11, 31),
-			yearRange: [year - 1, year + 10],
+            yearRange: [year - 1, year + 10],
-			format: "YYYY-MM-DD",
+            format: "YYYY-MM-DD",
-			i18n: {
+            i18n: {
-				previousMonth: '上月',
+                previousMonth: '上月',
-				nextMonth: '下月',
+                nextMonth: '下月',
-				months: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+                months: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
-				weekdays: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+                weekdays: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
-				weekdaysShort: ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
+                weekdaysShort: ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
-			},
+            },
-			theme: 'triangle-theme',
+            theme: 'triangle-theme',
-			onSelect: function () {
+            onSelect: function () {
-				if (typeof (callback) == "function") {
+                if (typeof (callback) == "function") {
-					callback.call(Tea.Vue, picker.toString());
+                    callback.call(Tea.Vue, picker.toString());
-				}
+                }
-			}
+            }
-		});
+        });
-	},
+    },
 
-	formatBytes: function (bytes) {
+    formatBytes: function (bytes) {
-		bytes = Math.ceil(bytes);
+        bytes = Math.ceil(bytes);
-		if (bytes < 1024) {
+        if (bytes < 1024) {
-			return bytes + " bytes";
+            return bytes + " bytes";
-		}
+        }
-		if (bytes < 1024 * 1024) {
+        if (bytes < 1024 * 1024) {
-			return (Math.ceil(bytes * 100 / 1024) / 100) + " k";
+            return (Math.ceil(bytes * 100 / 1024) / 100) + " k";
-		}
+        }
-		return (Math.ceil(bytes * 100 / 1024 / 1024) / 100) + " m";
+        return (Math.ceil(bytes * 100 / 1024 / 1024) / 100) + " m";
-	},
+    },
+    formatNumber: function (x) {
+        return x.toString().replace(/\B(?<!\.\d*)(?=(\d{3})+(?!\d))/g, ", ");
+    },
+    popup: function (url, options) {
+        if (options == null) {
+            options = {};
+        }
+        var width = "40em";
+        var height = "20em";
+        window.POPUP_CALLBACK = function () {
+            Swal.close();
+        };
 
-	popup: function (url, options) {
+        if (options["width"] != null) {
-		if (options == null) {
+            width = options["width"];
-			options = {};
+        }
-		}
+        if (options["height"] != null) {
-		var width = "40em";
+            height = options["height"];
-		var height = "20em";
+        }
-		window.POPUP_CALLBACK = function () {
+        if (typeof (options["callback"]) == "function") {
-			Swal.close();
+            window.POPUP_CALLBACK = function () {
-		};
+                Swal.close();
+                options["callback"].apply(Tea.Vue, arguments);
+            };
+        }
 
-		if (options["width"] != null) {
+        Swal.fire({
-			width = options["width"];
+            html: '<iframe src="' + url + '#popup-' + width + '" style="border:0; width: 100%; height:' + height + '"></iframe>',
-		}
+            width: width,
-		if (options["height"] != null) {
+            padding: "0.5em",
-			height = options["height"];
+            showConfirmButton: false,
-		}
+            showCloseButton: true,
-		if (typeof (options["callback"]) == "function") {
+            focusConfirm: false,
-			window.POPUP_CALLBACK = function () {
+            onClose: function (popup) {
-				Swal.close();
+                if (typeof (options["onClose"]) == "function") {
-				options["callback"].apply(Tea.Vue, arguments);
+                    options["onClose"].apply(Tea.Vue, arguments)
-			};
+                }
-		}
+            }
+        });
+    },
+    popupFinish: function () {
+        if (window.POPUP_CALLBACK != null) {
+            window.POPUP_CALLBACK.apply(window, arguments);
+        }
+    },
+    popupTip: function (html) {
+        Swal.fire({
+            html: '<i class="icon question circle"></i><span style="line-height: 1.7">' + html + "</span>",
+            width: "30em",
+            padding: "5em",
+            showConfirmButton: false,
+            showCloseButton: true,
+            focusConfirm: false
+        });
+    },
+    isPopup: function () {
+        var hash = window.location.hash;
+        return hash != null && hash.startsWith("#popup");
+    },
+    Swal: function () {
+        return this.isPopup() ? window.parent.Swal : window.Swal;
+    },
+    success: function (message, callback) {
+        var width = "20em";
+        if (message.length > 30) {
+            width = "30em";
+        }
 
-		Swal.fire({
+        let config = {
-			html: '<iframe src="' + url + '#popup-' + width + '" style="border:0; width: 100%; height:' + height + '"></iframe>',
+            confirmButtonText: "确定",
-			width: width,
+            buttonsStyling: false,
-			padding: "0.5em",
+            icon: "success",
-			showConfirmButton: false,
+            customClass: {
-			showCloseButton: true,
+                closeButton: "ui button",
-			focusConfirm: false,
+                cancelButton: "ui button",
-			onClose: function (popup) {
+                confirmButton: "ui button primary"
-				if (typeof (options["onClose"]) == "function") {
+            },
-					options["onClose"].apply(Tea.Vue, arguments)
+            width: width,
-				}
+            onAfterClose: function () {
-			}
+                if (typeof (callback) == "function") {
-		});
+                    setTimeout(function () {
-	},
+                        callback();
-	popupFinish: function () {
+                    });
-		if (window.POPUP_CALLBACK != null) {
+                } else if (typeof (callback) == "string") {
-			window.POPUP_CALLBACK.apply(window, arguments);
+                    window.location = callback
-		}
+                }
-	},
+            }
-	popupTip: function (html) {
+        }
-		Swal.fire({
-			html: '<i class="icon question circle"></i><span style="line-height: 1.7">' + html + "</span>",
-			width: "30em",
-			padding: "5em",
-			showConfirmButton: false,
-			showCloseButton: true,
-			focusConfirm: false
-		});
-	},
-	isPopup: function () {
-		var hash = window.location.hash;
-		return hash != null && hash.startsWith("#popup");
-	},
-	Swal: function () {
-		return this.isPopup() ? window.parent.Swal : window.Swal;
-	},
-	success: function (message, callback) {
-		var width = "20em";
-		if (message.length > 30) {
-			width = "30em";
-		}
 
-		let config = {
+        if (message.startsWith("html:")) {
-			confirmButtonText: "确定",
+            config.html = message.substring(5)
-			buttonsStyling: false,
+        } else {
-			icon: "success",
+            config.text = message
-			customClass: {
+        }
-				closeButton: "ui button",
-				cancelButton: "ui button",
-				confirmButton: "ui button primary"
-			},
-			width: width,
-			onAfterClose: function () {
-				if (typeof (callback) == "function") {
-					setTimeout(function () {
-						callback();
-					});
-				} else if (typeof (callback) == "string") {
-					window.location = callback
-				}
-			}
-		}
 
-		if (message.startsWith("html:")) {
+        Swal.fire(config);
-			config.html = message.substring(5)
+    },
-		} else {
+    successToast: function (message, timeout) {
-			config.text = message
+        if (timeout == null) {
-		}
+            timeout = 2000
-
+        }
-		Swal.fire(config);
+        var width = "20em";
-	},
+        if (message.length > 30) {
-	successToast: function (message, timeout) {
+            width = "30em";
-		if (timeout == null) {
+        }
-			timeout = 2000
+        Swal.fire({
-		}
+            text: message,
-		var width = "20em";
+            icon: "success",
-		if (message.length > 30) {
+            width: width,
-			width = "30em";
+            timer: timeout,
-		}
+            showConfirmButton: false
-		Swal.fire({
+        });
-			text: message,
+    },
-			icon: "success",
+    warn: function (message, callback) {
-			width: width,
+        var width = "20em";
-			timer: timeout,
+        if (message.length > 30) {
-			showConfirmButton: false
+            width = "30em";
-		});
+        }
-	},
+        Swal.fire({
-	warn: function (message, callback) {
+            text: message,
-		var width = "20em";
+            confirmButtonText: "确定",
-		if (message.length > 30) {
+            buttonsStyling: false,
-			width = "30em";
+            customClass: {
-		}
+                closeButton: "ui button",
-		Swal.fire({
+                cancelButton: "ui button",
-			text: message,
+                confirmButton: "ui button primary"
-			confirmButtonText: "确定",
+            },
-			buttonsStyling: false,
+            icon: "warning",
-			customClass: {
+            width: width,
-				closeButton: "ui button",
+            onAfterClose: function () {
-				cancelButton: "ui button",
+                if (typeof (callback) == "function") {
-				confirmButton: "ui button primary"
+                    setTimeout(function () {
-			},
+                        callback();
-			icon: "warning",
+                    });
-			width: width,
+                }
-			onAfterClose: function () {
+            }
-				if (typeof (callback) == "function") {
+        });
-					setTimeout(function () {
+    },
-						callback();
+    confirm: function (message, callback) {
-					});
+        let width = "20em";
-				}
+        if (message.length > 30) {
-			}
+            width = "30em";
-		});
+        }
-	},
+        let config = {
-	confirm: function (message, callback) {
+            confirmButtonText: "确定",
-		let width = "20em";
+            cancelButtonText: "取消",
-		if (message.length > 30) {
+            showCancelButton: true,
-			width = "30em";
+            showCloseButton: false,
-		}
+            buttonsStyling: false,
-		let config = {
+            customClass: {
-			confirmButtonText: "确定",
+                closeButton: "ui button",
-			cancelButtonText: "取消",
+                cancelButton: "ui button",
-			showCancelButton: true,
+                confirmButton: "ui button primary"
-			showCloseButton: false,
+            },
-			buttonsStyling: false,
+            icon: "warning",
-			customClass: {
+            width: width,
-				closeButton: "ui button",
+            preConfirm: function () {
-				cancelButton: "ui button",
+                if (typeof (callback) == "function") {
-				confirmButton: "ui button primary"
+                    callback.call(Tea.Vue);
-			},
+                }
-			icon: "warning",
+            }
-			width: width,
+        }
-			preConfirm: function () {
+        if (message.startsWith("html:")) {
-				if (typeof (callback) == "function") {
+            config.html = message.substring(5)
-					callback.call(Tea.Vue);
+        } else {
-				}
+            config.text = message
-			}
+        }
-		}
+        Swal.fire(config);
-		if (message.startsWith("html:")) {
+    },
-			config.html = message.substring(5)
+    reload: function () {
-		} else {
+        window.location.reload()
-			config.text = message
+    }
-		}
-		Swal.fire(config);
-	},
-	reload: function () {
-		window.location.reload()
-	}
 };

web/views/@default/dashboard/index.html

@@ -1,6 +1,5 @@
 {$layout}
 
-
 {$var "header"}
 <!-- echart -->
 <script type="text/javascript" src="/js/echarts/echarts.min.js"></script>

web/views/@default/servers/server/stat/clients.css

@@ -0,0 +1,4 @@
+.chart-box {
+  height: 20em;
+}
+/*# sourceMappingURL=clients.css.map */

web/views/@default/servers/server/stat/clients.css.map

@@ -0,0 +1 @@
+{"version":3,"sources":["clients.less"],"names":[],"mappings":"AAAA;EACC,YAAA","file":"clients.css"}

web/views/@default/servers/server/stat/clients.html

@@ -0,0 +1,21 @@
+{$layout}
+
+{$var "header"}
+<!-- echart -->
+<script type="text/javascript" src="/js/echarts/echarts.min.js"></script>
+{$end}
+
+{$template "/left_menu"}
+<div class="right-box">
+    {$ if eq .statIsOn false}
+	<p class="ui message">
+        要想查看统计数据，需要先开启统计功能，<a :href="'/servers/server/settings/stat?serverId=' + serverId">[点击这里]</a>修改配置。
+    </p>
+    {$else}
+    <h4>操作系统排行</h4>
+    <div class="chart-box" id="system-chart"></div>
+
+    <h4>浏览器排行</h4>
+    <div class="chart-box" id="browser-chart"></div>
+    {$end}
+</div>

web/views/@default/servers/server/stat/clients.js

@@ -0,0 +1,108 @@
+Tea.context(function () {
+    this.$delay(function () {
+        let that = this
+
+        let systemUnit = this.processMaxUnit(this.systemStats)
+        this.reloadChart("system-chart", "操作系统", this.systemStats, function (v) {
+            return v.system.name
+        }, function (args) {
+            return that.systemStats[args.dataIndex].system.name + ": " + teaweb.formatNumber(that.systemStats[args.dataIndex].rawCount)
+        }, systemUnit)
+        window.addEventListener("resize", function () {
+            that.resizeChart("system-chart")
+        })
+
+        let browserUnit = this.processMaxUnit(this.browserStats)
+        this.reloadChart("browser-chart", "浏览器", this.browserStats, function (v) {
+            return v.browser.name
+        }, function (args) {
+            return that.browserStats[args.dataIndex].browser.name + ": " + teaweb.formatNumber(that.browserStats[args.dataIndex].rawCount)
+        }, browserUnit)
+
+        window.addEventListener("resize", function () {
+            that.resizeChart("system-chart")
+            that.resizeChart("browser-chart")
+        })
+    })
+
+    this.reloadChart = function (chartId, name, stats, xFunc, tooltipFunc, unit) {
+        let chartBox = document.getElementById(chartId)
+        if (chartBox == null) {
+            return
+        }
+        let chart = echarts.init(chartBox)
+        let option = {
+            xAxis: {
+                data: stats.map(xFunc)
+            },
+            yAxis: {
+                axisLabel: {
+                    formatter: function (value) {
+                        return value + unit
+                    }
+                }
+            },
+            tooltip: {
+                show: true,
+                trigger: "item",
+                formatter: tooltipFunc
+            },
+            grid: {
+                left: 40,
+                top: 10,
+                right: 20,
+                bottom: 20
+            },
+            series: [
+                {
+                    name: name,
+                    type: "bar",
+                    data: stats.map(function (v) {
+                        return v.count;
+                    }),
+                    itemStyle: {
+                        color: "#9DD3E8"
+                    },
+                    barWidth: "20em"
+                }
+            ],
+            animation: true
+        }
+        chart.setOption(option)
+        chart.resize()
+    }
+
+    this.resizeChart = function (chartId) {
+        let chartBox = document.getElementById(chartId)
+        if (chartBox == null) {
+            return
+        }
+        let chart = echarts.init(chartBox)
+        chart.resize()
+    }
+
+    this.processMaxUnit = function (stats) {
+        let max = stats.$map(function (k, v) {
+            return v.count
+        }).$max()
+        let divider = 0
+        let unit = ""
+        if (max >= 1000 * 1000 * 1000) {
+            unit = "B"
+            divider = 1000 * 1000 * 1000
+        } else if (max >= 1000 * 1000) {
+            unit = "M"
+            divider = 1000 * 1000
+        } else if (max >= 1000) {
+            unit = "K"
+            divider = 1000
+        }
+        stats.forEach(function (v) {
+            v.rawCount = v.count
+            if (divider > 0) {
+                v.count /= divider
+            }
+        })
+        return unit
+    }
+})

web/views/@default/servers/server/stat/clients.less

@@ -0,0 +1,3 @@
+.chart-box {
+	height: 20em;
+}

web/views/@default/servers/server/stat/index.css

@@ -0,0 +1,4 @@
+.chart-box {
+  height: 20em;
+}
+/*# sourceMappingURL=index.css.map */

web/views/@default/servers/server/stat/index.css.map

@@ -1 +1 @@
-undefined
+{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA;EACC,YAAA","file":"index.css"}

web/views/@default/servers/server/stat/index.html

@@ -1,6 +1,30 @@
 {$layout}
 
+{$var "header"}
+<!-- echart -->
+<script type="text/javascript" src="/js/echarts/echarts.min.js"></script>
+{$end}
+
 {$template "/left_menu"}
 <div class="right-box">
-	<div class="ui message">此功能暂未开放，敬请期待。</div>
+    {$ if eq .statIsOn false}
+	<p class="ui message">
+        要想查看统计数据，需要先开启统计功能，<a :href="'/servers/server/settings/stat?serverId=' + serverId">[点击这里]</a>修改配置。
+    </p>
+    {$else}
+        <h4>地区排行</h4>
+        <div class="chart-box" id="country-chart">
+
+        </div>
+
+        <h4>省市排行</h4>
+        <div class="chart-box" id="province-chart">
+
+        </div>
+
+        <h4>城市排行</h4>
+        <div class="chart-box" id="city-chart">
+
+        </div>
+    {$end}
 </div>

web/views/@default/servers/server/stat/index.js

@@ -0,0 +1,113 @@
+Tea.context(function () {
+    this.$delay(function () {
+        let that = this
+
+        let countryUnit = this.processMaxUnit(this.countryStats)
+        this.reloadChart("country-chart", "地区", this.countryStats, function (v) {
+            return v.country.name
+        }, function (args) {
+            return that.countryStats[args.dataIndex].country.name + ": " + teaweb.formatNumber(that.countryStats[args.dataIndex].rawCount)
+        }, countryUnit)
+
+        let provinceUnit = this.processMaxUnit(this.provinceStats)
+        this.reloadChart("province-chart", "省市", this.provinceStats, function (v) {
+            return v.province.name
+        }, function (args) {
+            return that.provinceStats[args.dataIndex].country.name + ": " + that.provinceStats[args.dataIndex].province.name + " " + teaweb.formatNumber(that.provinceStats[args.dataIndex].rawCount)
+        }, provinceUnit)
+
+        let cityUnit = this.processMaxUnit(this.cityStats)
+        this.reloadChart("city-chart", "城市", this.cityStats, function (v) {
+            return v.city.name
+        }, function (args) {
+            return that.cityStats[args.dataIndex].country.name + ": " + that.cityStats[args.dataIndex].province.name + " " + that.cityStats[args.dataIndex].city.name + " " + teaweb.formatNumber(that.cityStats[args.dataIndex].rawCount)
+        }, cityUnit)
+
+        window.addEventListener("resize", function () {
+            that.resizeChart("country-chart")
+            that.resizeChart("province-chart")
+            that.resizeChart("city-chart")
+        })
+    })
+
+    this.reloadChart = function (chartId, name, stats, xFunc, tooltipFunc, unit) {
+        let chartBox = document.getElementById(chartId)
+        if (chartBox == null) {
+            return
+        }
+        let chart = echarts.init(chartBox)
+        let option = {
+            xAxis: {
+                data: stats.map(xFunc)
+            },
+            yAxis: {
+                axisLabel: {
+                    formatter: function (value) {
+                        return value + unit
+                    }
+                }
+            },
+            tooltip: {
+                show: true,
+                trigger: "item",
+                formatter: tooltipFunc
+            },
+            grid: {
+                left: 40,
+                top: 10,
+                right: 20,
+                bottom: 20
+            },
+            series: [
+                {
+                    name: name,
+                    type: "bar",
+                    data: stats.map(function (v) {
+                        return v.count;
+                    }),
+                    itemStyle: {
+                        color: "#9DD3E8"
+                    },
+                    barWidth: "20em"
+                }
+            ],
+            animation: true
+        }
+        chart.setOption(option)
+        chart.resize()
+    }
+
+    this.resizeChart = function (chartId) {
+        let chartBox = document.getElementById(chartId)
+        if (chartBox == null) {
+            return
+        }
+        let chart = echarts.init(chartBox)
+        chart.resize()
+    }
+
+    this.processMaxUnit = function (stats) {
+        let max = stats.$map(function (k, v) {
+            return v.count
+        }).$max()
+        let divider = 0
+        let unit = ""
+        if (max >= 1000 * 1000 * 1000) {
+            unit = "B"
+            divider = 1000 * 1000 * 1000
+        } else if (max >= 1000 * 1000) {
+            unit = "M"
+            divider = 1000 * 1000
+        } else if (max >= 1000) {
+            unit = "K"
+            divider = 1000
+        }
+        stats.forEach(function (v) {
+            v.rawCount = v.count
+            if (divider > 0) {
+                v.count /= divider
+            }
+        })
+        return unit
+    }
+})

web/views/@default/servers/server/stat/index.less

@@ -0,0 +1,3 @@
+.chart-box {
+	height: 20em;
+}

web/views/@default/servers/server/stat/providers.css

@@ -0,0 +1,4 @@
+.chart-box {
+  height: 20em;
+}
+/*# sourceMappingURL=providers.css.map */

web/views/@default/servers/server/stat/providers.css.map

@@ -0,0 +1 @@
+{"version":3,"sources":["providers.less"],"names":[],"mappings":"AAAA;EACC,YAAA","file":"providers.css"}

web/views/@default/servers/server/stat/providers.html

@@ -0,0 +1,18 @@
+{$layout}
+
+{$var "header"}
+<!-- echart -->
+<script type="text/javascript" src="/js/echarts/echarts.min.js"></script>
+{$end}
+
+{$template "/left_menu"}
+<div class="right-box">
+    {$ if eq .statIsOn false}
+    <p class="ui message">
+        要想查看统计数据，需要先开启统计功能，<a :href="'/servers/server/settings/stat?serverId=' + serverId">[点击这里]</a>修改配置。
+    </p>
+    {$else}
+    <h4>运营商排行</h4>
+    <div class="chart-box" id="provider-chart"></div>
+    {$end}
+</div>

web/views/@default/servers/server/stat/providers.js

@@ -0,0 +1,96 @@
+Tea.context(function () {
+    this.$delay(function () {
+        let that = this
+
+        let providerUnit = this.processMaxUnit(this.providerStats)
+        this.reloadChart("provider-chart", "运营商", this.providerStats, function (v) {
+            return v.provider.name
+        }, function (args) {
+            return that.providerStats[args.dataIndex].provider.name + ": " + teaweb.formatNumber(that.providerStats[args.dataIndex].rawCount)
+        }, providerUnit)
+        window.addEventListener("resize", function () {
+            that.resizeChart("provider-chart")
+        })
+    })
+
+    this.reloadChart = function (chartId, name, stats, xFunc, tooltipFunc, unit) {
+        let chartBox = document.getElementById(chartId)
+        if (chartBox == null) {
+            return
+        }
+        let chart = echarts.init(chartBox)
+        let option = {
+            xAxis: {
+                data: stats.map(xFunc)
+            },
+            yAxis: {
+                axisLabel: {
+                    formatter: function (value) {
+                        return value + unit
+                    }
+                }
+            },
+            tooltip: {
+                show: true,
+                trigger: "item",
+                formatter: tooltipFunc
+            },
+            grid: {
+                left: 40,
+                top: 10,
+                right: 20,
+                bottom: 20
+            },
+            series: [
+                {
+                    name: name,
+                    type: "bar",
+                    data: stats.map(function (v) {
+                        return v.count;
+                    }),
+                    itemStyle: {
+                        color: "#9DD3E8"
+                    },
+                    barWidth: "20em"
+                }
+            ],
+            animation: true
+        }
+        chart.setOption(option)
+        chart.resize()
+    }
+
+    this.resizeChart = function (chartId) {
+        let chartBox = document.getElementById(chartId)
+        if (chartBox == null) {
+            return
+        }
+        let chart = echarts.init(chartBox)
+        chart.resize()
+    }
+
+    this.processMaxUnit = function (stats) {
+        let max = stats.$map(function (k, v) {
+            return v.count
+        }).$max()
+        let divider = 0
+        let unit = ""
+        if (max >= 1000 * 1000 * 1000) {
+            unit = "B"
+            divider = 1000 * 1000 * 1000
+        } else if (max >= 1000 * 1000) {
+            unit = "M"
+            divider = 1000 * 1000
+        } else if (max >= 1000) {
+            unit = "K"
+            divider = 1000
+        }
+        stats.forEach(function (v) {
+            v.rawCount = v.count
+            if (divider > 0) {
+                v.count /= divider
+            }
+        })
+        return unit
+    }
+})

web/views/@default/servers/server/stat/providers.less

@@ -0,0 +1,3 @@
+.chart-box {
+	height: 20em;
+}