管理端全部功能跑通

2026-02-27 10:35:22 +08:00
parent 4d275c921d
commit 150799f41d
263 changed files with 22664 additions and 4053 deletions
--- a/EdgeAPI/internal/setup/sql_upgrade.go
+++ b/EdgeAPI/internal/setup/sql_upgrade.go
@@ -110,6 +110,9 @@ var upgradeFuncs = []*upgradeVersion{
 	{
 		"1.4.4", upgradeV1_4_4,
 	},
+	{
+		"1.4.8", upgradeV1_4_8,
+	},
 }

 // UpgradeSQLData 升级SQL数据
@@ -269,14 +272,14 @@ func upgradeV0_0_10(db *dbs.DB) error {

 // v0.2.5
 func upgradeV0_2_5(db *dbs.DB) error {
-	// 更新用户
+	// 鏇存柊鐢ㄦ埛
 	_, err := db.Exec("UPDATE edgeUsers SET day=FROM_UNIXTIME(createdAt,'%Y%m%d') WHERE day IS NULL OR LENGTH(day)=0")
 	if err != nil {
 		return err
 	}

-	// 更新防火墙规则
-	ones, _, err := db.FindOnes("SELECT id, actions, action, actionOptions FROM edgeHTTPFirewallRuleSets WHERE actions IS NULL OR LENGTH(actions)=0")
+		// 更新防火墙规则
+		ones, _, err := db.FindOnes("SELECT id, actions, action, actionOptions FROM edgeHTTPFirewallRuleSets WHERE actions IS NULL OR LENGTH(actions)=0")
 	if err != nil {
 		return err
 	}
@@ -309,8 +312,8 @@ func upgradeV0_2_5(db *dbs.DB) error {

 // v0.3.0
 func upgradeV0_3_0(db *dbs.DB) error {
-	// 升级健康检查
-	ones, _, err := db.FindOnes("SELECT id,healthCheck FROM edgeNodeClusters WHERE state=1")
+		// 升级健康检查
+		ones, _, err := db.FindOnes("SELECT id,healthCheck FROM edgeNodeClusters WHERE state=1")
 	if err != nil {
 		return err
 	}
@@ -342,11 +345,10 @@ func upgradeV0_3_0(db *dbs.DB) error {

 // v0.3.1
 func upgradeV0_3_1(db *dbs.DB) error {
-	// 清空域名统计，已使用分表代替
-	// 因为可能有权限问题，所以我们忽略错误
-	_, _ = db.Exec("TRUNCATE table edgeServerDomainHourlyStats")
+	// 娓呯┖鍩熷悕缁熻锛屽凡浣跨敤鍒嗚〃浠ｆ浛
+	// 鍥犱负鍙兘鏈夋潈闄愰棶棰橈紝鎵€浠ユ垜浠拷鐣ラ敊璇?	_, _ = db.Exec("TRUNCATE table edgeServerDomainHourlyStats")

-	// 升级APIToken
+	// 鍗囩骇APIToken
 	ones, _, err := db.FindOnes("SELECT uniqueId,secret FROM edgeNodeClusters")
 	if err != nil {
 		return err
@@ -374,9 +376,9 @@ func upgradeV0_3_2(db *dbs.DB) error {
 	// gzip => compression

 	type HTTPGzipRef struct {
-		IsPrior bool  `yaml:"isPrior" json:"isPrior"` // 是否覆盖
-		IsOn    bool  `yaml:"isOn" json:"isOn"`       // 是否开启
-		GzipId  int64 `yaml:"gzipId" json:"gzipId"`   // 使用的配置ID
+		IsPrior bool  `yaml:"isPrior" json:"isPrior"` // 鏄惁瑕嗙洊
+			IsOn    bool  `yaml:"isOn" json:"isOn"`       // 是否开启
+			GzipId  int64 `yaml:"gzipId" json:"gzipId"`   // 使用的配置ID
 	}

 	webOnes, _, err := db.FindOnes("SELECT id, gzip FROM edgeHTTPWebs WHERE gzip IS NOT NULL AND compression IS NULL")
@@ -458,7 +460,7 @@ func upgradeV0_3_2(db *dbs.DB) error {
 		}
 	}

-	// 更新服务端口
+	// 鏇存柊鏈嶅姟绔彛
 	var serverDAO = models.NewServerDAO()
 	ones, err := serverDAO.Query(nil).
 		ResultPk().
@@ -479,14 +481,14 @@ func upgradeV0_3_2(db *dbs.DB) error {

 // v0.3.3
 func upgradeV0_3_3(db *dbs.DB) error {
-	// 升级CC请求数Code
-	_, err := db.Exec("UPDATE edgeHTTPFirewallRuleSets SET code='8002' WHERE name='CC请求数' AND code='8001'")
+	// 鍗囩骇CC璇锋眰鏁癈ode
+	_, err := db.Exec("UPDATE edgeHTTPFirewallRuleSets SET code='8002' WHERE name='CC璇锋眰鏁? AND code='8001'")
 	if err != nil {
 		return err
 	}

-	// 清除节点
-	// 删除7天以前的info日志
+	// 娓呴櫎鑺傜偣
+	// 鍒犻櫎7澶╀互鍓嶇殑info鏃ュ織
 	err = models.NewNodeLogDAO().DeleteExpiredLogsWithLevel(nil, "info", 7)
 	if err != nil {
 		return err
@@ -497,13 +499,13 @@ func upgradeV0_3_3(db *dbs.DB) error {

 // v0.3.7
 func upgradeV0_3_7(db *dbs.DB) error {
-	// 修改所有edgeNodeGrants中的su为0
+	// 淇敼鎵€鏈塭dgeNodeGrants涓殑su涓?
 	_, err := db.Exec("UPDATE edgeNodeGrants SET su=0 WHERE su=1")
 	if err != nil {
 		return err
 	}

-	// WAF预置分组
+	// WAF棰勭疆鍒嗙粍
 	_, err = db.Exec("UPDATE edgeHTTPFirewallRuleGroups SET isTemplate=1 WHERE LENGTH(code)>0")
 	if err != nil {
 		return err
@@ -514,7 +516,7 @@ func upgradeV0_3_7(db *dbs.DB) error {

 // v0.4.0
 func upgradeV0_4_0(db *dbs.DB) error {
-	// 升级SYN Flood配置
+	// 鍗囩骇SYN Flood閰嶇疆
 	synFloodJSON, err := json.Marshal(firewallconfigs.NewSYNFloodConfig())
 	if err == nil {
 		_, err := db.Exec("UPDATE edgeHTTPFirewallPolicies SET synFlood=? WHERE synFlood IS NULL AND state=1", string(synFloodJSON))
@@ -528,13 +530,13 @@ func upgradeV0_4_0(db *dbs.DB) error {

 // v0.4.1
 func upgradeV0_4_1(db *dbs.DB) error {
-	// 升级 servers.lastUserPlanId
+	// 鍗囩骇 servers.lastUserPlanId
 	_, err := db.Exec("UPDATE edgeServers SET lastUserPlanId=userPlanId WHERE userPlanId>0")
 	if err != nil {
 		return err
 	}

-	// 执行域名统计清理
+	// 鎵ц鍩熷悕缁熻娓呯悊
 	err = stats.NewServerDomainHourlyStatDAO().CleanDays(nil, 7)
 	if err != nil {
 		return err
@@ -545,7 +547,7 @@ func upgradeV0_4_1(db *dbs.DB) error {

 // v0.4.5
 func upgradeV0_4_5(db *dbs.DB) error {
-	// 升级访问日志自动分表
+	// 鍗囩骇璁块棶鏃ュ織鑷姩鍒嗚〃
 	{
 		var dao = models.NewSysSettingDAO()
 		valueJSON, err := dao.ReadSetting(nil, systemconfigs.SettingCodeAccessLogQueue)
@@ -569,7 +571,7 @@ func upgradeV0_4_5(db *dbs.DB) error {
 		}
 	}

-	// 升级一个防SQL注入规则
+	// 鍗囩骇涓€涓槻SQL娉ㄥ叆瑙勫垯
 	{
 		ones, _, err := db.FindOnes(`SELECT id FROM edgeHTTPFirewallRules WHERE value=?`, "(updatexml|extractvalue|ascii|ord|char|chr|count|concat|rand|floor|substr|length|len|user|database|benchmark|analyse)\\s*\\(")
 		if err != nil {
@@ -589,7 +591,7 @@ func upgradeV0_4_5(db *dbs.DB) error {

 // v0.4.7
 func upgradeV0_4_7(db *dbs.DB) error {
-	// 升级 edgeServers 中的 plainServerNames
+	// 鍗囩骇 edgeServers 涓殑 plainServerNames
 	{
 		ones, _, err := db.FindOnes("SELECT id,serverNames FROM edgeServers WHERE state=1")
 		if err != nil {
@@ -621,7 +623,7 @@ func upgradeV0_4_7(db *dbs.DB) error {

 // v0.4.8
 func upgradeV0_4_8(db *dbs.DB) error {
-	// 设置edgeIPLists中的serverId
+	// 璁剧疆edgeIPLists涓殑serverId
 	{
 		firewallPolicyOnes, _, err := db.FindOnes("SELECT inbound,serverId FROM edgeHTTPFirewallPolicies WHERE serverId>0")
 		if err != nil {
@@ -673,7 +675,7 @@ func upgradeV0_4_8(db *dbs.DB) error {

 // v0.4.11
 func upgradeV0_4_11(db *dbs.DB) error {
-	// 升级ns端口
+	// 鍗囩骇ns绔彛
 	{
 		// TCP
 		{
@@ -751,19 +753,19 @@ func upgradeV1_2_1(db *dbs.DB) error {
 // 1.2.10
 func upgradeV1_2_10(db *dbs.DB) error {
 	{
-		type OldGlobalConfig struct {
-			// HTTP & HTTPS相关配置
-			HTTPAll struct {
-				DomainAuditingIsOn   bool   `yaml:"domainAuditingIsOn" json:"domainAuditingIsOn"`     // 域名是否需要审核
-				DomainAuditingPrompt string `yaml:"domainAuditingPrompt" json:"domainAuditingPrompt"` // 域名审核的提示
-			} `yaml:"httpAll" json:"httpAll"`
+			type OldGlobalConfig struct {
+				// HTTP & HTTPS鐩稿叧閰嶇疆
+				HTTPAll struct {
+					DomainAuditingIsOn   bool   `yaml:"domainAuditingIsOn" json:"domainAuditingIsOn"`     // 域名是否需要审核
+					DomainAuditingPrompt string `yaml:"domainAuditingPrompt" json:"domainAuditingPrompt"` // 域名审核提示
+				} `yaml:"httpAll" json:"httpAll"`

-			TCPAll struct {
-				PortRangeMin int   `yaml:"portRangeMin" json:"portRangeMin"` // 最小端口
-				PortRangeMax int   `yaml:"portRangeMax" json:"portRangeMax"` // 最大端口
-				DenyPorts    []int `yaml:"denyPorts" json:"denyPorts"`       // 禁止使用的端口
-			} `yaml:"tcpAll" json:"tcpAll"`
-		}
+				TCPAll struct {
+					PortRangeMin int   `yaml:"portRangeMin" json:"portRangeMin"` // 最小端口
+					PortRangeMax int   `yaml:"portRangeMax" json:"portRangeMax"` // 最大端口
+					DenyPorts    []int `yaml:"denyPorts" json:"denyPorts"`       // 禁止端口
+				} `yaml:"tcpAll" json:"tcpAll"`
+			}

 		globalConfigValue, err := db.FindCol(0, "SELECT value FROM edgeSysSettings WHERE code='serverGlobalConfig'")
 		if err != nil {
@@ -1023,7 +1025,7 @@ func upgradeV1_3_2(db *dbs.DB) error {
 					}
 				}

-				err = addRuleToGroup(ruleGroup.GetInt64("id"), "7010", "SQL注入检测", []*firewallconfigs.HTTPFirewallActionConfig{
+					err = addRuleToGroup(ruleGroup.GetInt64("id"), "7010", "SQL注入检测", []*firewallconfigs.HTTPFirewallActionConfig{
 					{
 						Code:    firewallconfigs.HTTPFirewallActionPage,
 						Options: maps.Map{"status": 403, "body": ""},
@@ -1131,7 +1133,7 @@ func upgradeV1_3_2(db *dbs.DB) error {
 					}
 				}

-				err = addRuleToGroup(ruleGroup.GetInt64("id"), "1010", "XSS攻击检测", []*firewallconfigs.HTTPFirewallActionConfig{
+					err = addRuleToGroup(ruleGroup.GetInt64("id"), "1010", "XSS攻击检测", []*firewallconfigs.HTTPFirewallActionConfig{
 					{
 						Code:    firewallconfigs.HTTPFirewallActionPage,
 						Options: maps.Map{"status": 403, "body": ""},
@@ -1233,8 +1235,8 @@ func upgradeV1_3_4(db *dbs.DB) error {

 // 1.4.4
 func upgradeV1_4_4(db *dbs.DB) error {
-	// 检查 encryption 字段是否已存在
-	col, err := db.FindCol(0, "SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='edgeHTTPWebs' AND COLUMN_NAME='encryption'")
+		// 检查 encryption 字段是否已存在
+		col, err := db.FindCol(0, "SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='edgeHTTPWebs' AND COLUMN_NAME='encryption'")
 	if err != nil {
 		return err
 	}
@@ -1253,3 +1255,30 @@ func upgradeV1_4_4(db *dbs.DB) error {

 	return nil
 }
+
+// 1.4.8
+func upgradeV1_4_8(db *dbs.DB) error {
+	return createHTTPDNSTables(db)
+}
+
+func createHTTPDNSTables(db *dbs.DB) error {
+	sqls := []string{
+		"CREATE TABLE IF NOT EXISTS `edgeHTTPDNSClusters` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`name` varchar(255) DEFAULT NULL,`isOn` tinyint unsigned DEFAULT '1',`isDefault` tinyint unsigned DEFAULT '0',`serviceDomain` varchar(255) DEFAULT NULL,`defaultTTL` int unsigned DEFAULT '30',`fallbackTimeoutMs` int unsigned DEFAULT '300',`installDir` varchar(255) DEFAULT '/opt/edge-httpdns',`tlsPolicy` json DEFAULT NULL,`createdAt` bigint unsigned DEFAULT '0',`updatedAt` bigint unsigned DEFAULT '0',`state` tinyint unsigned DEFAULT '1',PRIMARY KEY (`id`),KEY `name` (`name`),KEY `isDefault` (`isDefault`),KEY `state` (`state`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS集群配置表（默认TTL、回退超时、服务域名等）'",
+		"CREATE TABLE IF NOT EXISTS `edgeHTTPDNSNodes` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`clusterId` bigint unsigned DEFAULT '0',`name` varchar(255) DEFAULT NULL,`isOn` tinyint unsigned DEFAULT '1',`isUp` tinyint unsigned DEFAULT '0',`isInstalled` tinyint unsigned DEFAULT '0',`isActive` tinyint unsigned DEFAULT '0',`uniqueId` varchar(64) DEFAULT NULL,`secret` varchar(64) DEFAULT NULL,`installDir` varchar(255) DEFAULT '/opt/edge-httpdns',`status` json DEFAULT NULL,`installStatus` json DEFAULT NULL,`createdAt` bigint unsigned DEFAULT '0',`updatedAt` bigint unsigned DEFAULT '0',`state` tinyint unsigned DEFAULT '1',PRIMARY KEY (`id`),UNIQUE KEY `uniqueId` (`uniqueId`),KEY `clusterId` (`clusterId`),KEY `state` (`state`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS节点表（节点基础信息与运行状态）'",
+		"CREATE TABLE IF NOT EXISTS `edgeHTTPDNSApps` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`name` varchar(255) DEFAULT NULL,`appId` varchar(64) DEFAULT NULL,`isOn` tinyint unsigned DEFAULT '1',`primaryClusterId` bigint unsigned DEFAULT '0',`backupClusterId` bigint unsigned DEFAULT '0',`sniMode` varchar(64) DEFAULT 'fixed_hide',`userId` bigint unsigned DEFAULT '0',`createdAt` bigint unsigned DEFAULT '0',`updatedAt` bigint unsigned DEFAULT '0',`state` tinyint unsigned DEFAULT '1',PRIMARY KEY (`id`),UNIQUE KEY `appId` (`appId`),KEY `name` (`name`),KEY `state` (`state`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS应用表（应用与主备集群绑定关系）'",
+		"CREATE TABLE IF NOT EXISTS `edgeHTTPDNSAppSecrets` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`appId` bigint unsigned DEFAULT '0',`signEnabled` tinyint unsigned DEFAULT '0',`signSecret` varchar(255) DEFAULT NULL,`signUpdatedAt` bigint unsigned DEFAULT '0',`updatedAt` bigint unsigned DEFAULT '0',`state` tinyint unsigned DEFAULT '1',PRIMARY KEY (`id`),UNIQUE KEY `appId` (`appId`),KEY `state` (`state`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS应用密钥表（请求验签开关与加签Secret）'",
+		"CREATE TABLE IF NOT EXISTS `edgeHTTPDNSDomains` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`appId` bigint unsigned DEFAULT '0',`domain` varchar(255) DEFAULT NULL,`isOn` tinyint unsigned DEFAULT '1',`createdAt` bigint unsigned DEFAULT '0',`updatedAt` bigint unsigned DEFAULT '0',`state` tinyint unsigned DEFAULT '1',PRIMARY KEY (`id`),UNIQUE KEY `appId_domain` (`appId`,`domain`),KEY `domain` (`domain`),KEY `state` (`state`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS应用域名表（应用绑定的业务域名）'",
+		"CREATE TABLE IF NOT EXISTS `edgeHTTPDNSCustomRules` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`appId` bigint unsigned DEFAULT '0',`domainId` bigint unsigned DEFAULT '0',`ruleName` varchar(255) DEFAULT NULL,`lineScope` varchar(64) DEFAULT NULL,`lineCarrier` varchar(64) DEFAULT NULL,`lineRegion` varchar(64) DEFAULT NULL,`lineProvince` varchar(64) DEFAULT NULL,`lineContinent` varchar(64) DEFAULT NULL,`lineCountry` varchar(128) DEFAULT NULL,`ttl` int unsigned DEFAULT '30',`isOn` tinyint unsigned DEFAULT '1',`priority` int unsigned DEFAULT '0',`updatedAt` bigint unsigned DEFAULT '0',`state` tinyint unsigned DEFAULT '1',PRIMARY KEY (`id`),KEY `domainId_isOn_priority` (`domainId`,`isOn`,`priority`),KEY `state` (`state`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS自定义解析规则表（按线路/地域匹配）'",
+		"CREATE TABLE IF NOT EXISTS `edgeHTTPDNSCustomRuleRecords` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`ruleId` bigint unsigned DEFAULT '0',`recordType` varchar(32) DEFAULT NULL,`recordValue` varchar(255) DEFAULT NULL,`weight` int unsigned DEFAULT '0',`sort` int unsigned DEFAULT '0',`state` tinyint unsigned DEFAULT '1',PRIMARY KEY (`id`),KEY `ruleId` (`ruleId`),KEY `state` (`state`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS自定义规则记录值表（A/AAAA及权重）'",
+		"CREATE TABLE IF NOT EXISTS `edgeHTTPDNSAccessLogs` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`requestId` varchar(128) DEFAULT NULL,`clusterId` bigint unsigned DEFAULT '0',`nodeId` bigint unsigned DEFAULT '0',`appId` varchar(64) DEFAULT NULL,`appName` varchar(255) DEFAULT NULL,`domain` varchar(255) DEFAULT NULL,`qtype` varchar(16) DEFAULT NULL,`clientIP` varchar(64) DEFAULT NULL,`clientRegion` varchar(255) DEFAULT NULL,`carrier` varchar(128) DEFAULT NULL,`sdkVersion` varchar(64) DEFAULT NULL,`os` varchar(64) DEFAULT NULL,`resultIPs` text,`status` varchar(32) DEFAULT NULL,`errorCode` varchar(64) DEFAULT NULL,`costMs` int unsigned DEFAULT '0',`createdAt` bigint unsigned DEFAULT '0',`day` varchar(8) DEFAULT NULL,`summary` text,PRIMARY KEY (`id`),UNIQUE KEY `requestId_nodeId` (`requestId`,`nodeId`),KEY `day_cluster_node_domain_status_createdAt` (`day`,`clusterId`,`nodeId`,`domain`,`status`,`createdAt`),KEY `appId` (`appId`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS访问日志表（解析请求与结果）'",
+		"CREATE TABLE IF NOT EXISTS `edgeHTTPDNSRuntimeLogs` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`clusterId` bigint unsigned DEFAULT '0',`nodeId` bigint unsigned DEFAULT '0',`level` varchar(32) DEFAULT NULL,`type` varchar(64) DEFAULT NULL,`module` varchar(64) DEFAULT NULL,`description` text,`count` bigint unsigned DEFAULT '1',`requestId` varchar(128) DEFAULT NULL,`createdAt` bigint unsigned DEFAULT '0',`day` varchar(8) DEFAULT NULL,PRIMARY KEY (`id`),KEY `day_cluster_node_level_createdAt` (`day`,`clusterId`,`nodeId`,`level`,`createdAt`),KEY `requestId` (`requestId`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS运行日志表（节点运行与异常日志）'",
+	}
+	for _, sql := range sqls {
+		if _, err := db.Exec(sql); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+