将版本修改为v0.5.3.1

internal/const/const.go

@@ -1,7 +1,7 @@
 package teaconst
 
 const (
-	Version = "0.5.3"
+	Version = "0.5.3.1"
 
 	ProductName   = "Edge API"
 	ProcessName   = "edge-api"

internal/db/models/ns_cluster_model_ext.go

@@ -3,7 +3,6 @@ package models
 import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAPI/internal/remotelogs"
-	"github.com/TeaOSLab/EdgeCommon/pkg/dnsconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/ddosconfigs"
 )
 
@@ -29,47 +28,3 @@ func (this *NSCluster) HasDDoSProtection() bool {
 	}
 	return false
 }
-
-// DecodeHosts 解析主机地址
-func (this *NSCluster) DecodeHosts() []string {
-	if IsNull(this.Hosts) {
-		return nil
-	}
-
-	var hosts = []string{}
-	err := json.Unmarshal(this.Hosts, &hosts)
-	if err != nil {
-		remotelogs.Error("NSCluster.DecodeHosts", "decode failed: "+err.Error())
-	}
-
-	return hosts
-}
-
-// DecodeSOAConfig 解析SOA设置
-func (this *NSCluster) DecodeSOAConfig() *dnsconfigs.NSSOAConfig {
-	var config = dnsconfigs.DefaultNSSOAConfig()
-	if IsNull(this.Soa) {
-		return config
-	}
-	err := json.Unmarshal(this.Soa, config)
-	if err != nil {
-		remotelogs.Error("NSCluster.DecodeSOAConfig", "decode failed: "+err.Error())
-	}
-	return config
-}
-
-// DecodeAnswerConfig 解析应答设置
-func (this *NSCluster) DecodeAnswerConfig() *dnsconfigs.NSAnswerConfig {
-	var config = dnsconfigs.DefaultNSAnswerConfig()
-
-	if IsNull(this.Answer) {
-		return config
-	}
-
-	err := json.Unmarshal(this.Answer, config)
-	if err != nil {
-		remotelogs.Error("NSCluster.DecodeAnswerConfig", "decode failed: "+err.Error())
-	}
-
-	return config
-}

internal/dnsclients/edgeapi/response_base.go

@@ -0,0 +1,21 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package edgeapi
+
+import (
+	"errors"
+	"github.com/iwind/TeaGo/types"
+)
+
+type BaseResponse struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+func (this *BaseResponse) IsValid() bool {
+	return this.Code == 200
+}
+
+func (this *BaseResponse) Error() error {
+	return errors.New("code: " + types.String(this.Code) + ", message: " + this.Message)
+}

internal/dnsclients/edgeapi/response_create_ns_record.go

@@ -0,0 +1,11 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package edgeapi
+
+type CreateNSRecordResponse struct {
+	BaseResponse
+
+	Data struct {
+		NSRecordId int64 `json:"nsRecordId"`
+	} `json:"data"`
+}

internal/dnsclients/edgeapi/response_find_all_ns_routes.go

@@ -0,0 +1,14 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package edgeapi
+
+type FindAllNSRoutesResponse struct {
+	BaseResponse
+
+	Data struct {
+		NSRoutes []struct {
+			Name string `json:"name"`
+			Code string `json:"code"`
+		} `json:"nsRoutes"`
+	} `json:"data"`
+}

internal/dnsclients/edgeapi/response_find_ns_domain_with_name.go

@@ -0,0 +1,14 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package edgeapi
+
+type FindDomainWithNameResponse struct {
+	BaseResponse
+
+	Data struct {
+		NSDomain struct {
+			Id   int64  `json:"id"`
+			Name string `json:"name"`
+		}
+	} `json:"data"`
+}

internal/dnsclients/edgeapi/response_find_ns_record_with_name_and_type.go

@@ -0,0 +1,21 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package edgeapi
+
+type FindNSRecordWithNameAndTypeResponse struct {
+	BaseResponse
+
+	Data struct {
+		NSRecord struct {
+			Id       int64  `json:"id"`
+			Name     string `json:"name"`
+			Type     string `json:"type"`
+			Value    string `json:"value"`
+			TTL      int32  `json:"ttl"`
+			NSRoutes []struct {
+				Name string `json:"name"`
+				Code string `json:"code"`
+			} `json:"nsRoutes"`
+		} `json:"nsRecord"`
+	}
+}

internal/dnsclients/edgeapi/response_get_api_access_token.go

@@ -0,0 +1,12 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package edgeapi
+
+type GetAPIAccessToken struct {
+	BaseResponse
+
+	Data struct {
+		Token     string `json:"token"`
+		ExpiresAt int64  `json:"expiresAt"`
+	} `json:"data"`
+}

internal/dnsclients/edgeapi/response_interface.go

@@ -0,0 +1,8 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package edgeapi
+
+type ResponseInterface interface {
+	IsValid() bool
+	Error() error
+}

internal/dnsclients/edgeapi/response_list_ns_domains.go

@@ -0,0 +1,16 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package edgeapi
+
+type ListNSDomainsResponse struct {
+	BaseResponse
+
+	Data struct {
+		NSDomains []struct {
+			Id        int64  `json:"id"`
+			Name      string `json:"name"`
+			IsOn      bool   `json:"isOn"`
+			IsDeleted bool   `json:"isDeleted"`
+		} `json:"nsDomains"`
+	} `json:"data"`
+}

internal/dnsclients/edgeapi/response_list_ns_records.go

@@ -0,0 +1,21 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package edgeapi
+
+type ListNSRecordsResponse struct {
+	BaseResponse
+
+	Data struct {
+		NSRecords []struct {
+			Id       int64  `json:"id"`
+			Name     string `json:"name"`
+			Value    string `json:"value"`
+			TTL      int32  `json:"ttl"`
+			Type     string `json:"type"`
+			NSRoutes []struct {
+				Name string `json:"name"`
+				Code string `json:"code"`
+			} `json:"nsRoutes"`
+		} `json:"nsRecords"`
+	} `json:"data"`
+}

internal/dnsclients/edgeapi/response_success.go

@@ -0,0 +1,7 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package edgeapi
+
+type SuccessResponse struct {
+	BaseResponse
+}

internal/dnsclients/edgeapi/response_update_ns_record.go

@@ -0,0 +1,7 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package edgeapi
+
+type UpdateNSRecordResponse struct {
+	BaseResponse
+}

internal/nodes/api_node.go

@@ -130,14 +130,16 @@ func (this *APINode) Start() {
 	}
 
 	// 数据库通知启动
+	this.setProgress("DATABASE", "正在建立数据库模型")
 	logs.Println("[API_NODE]notify ready ...")
 	dbs.NotifyReady()
 
 	// 设置时区
+	this.setProgress("TIMEZONE", "正在设置时区")
 	this.setupTimeZone()
 
 	// 读取配置
-	this.setProgress("DATABASE", "加载API配置")
+	this.setProgress("DATABASE", "正在加载API配置")
 	logs.Println("[API_NODE]reading api config ...")
 	config, err := configs.SharedAPIConfig()
 	if err != nil {
@@ -384,6 +386,19 @@ func (this *APINode) setupDB() error {
 		return err
 	}
 
+	// 检查是否为root用户
+	config, _ := db.Config()
+	if config == nil {
+		return nil
+	}
+	dsnConfig, err := mysql.ParseDSN(config.Dsn)
+	if err != nil || dsnConfig == nil {
+		return err
+	}
+	if dsnConfig.User != "root" {
+		return nil
+	}
+
 	// 设置Innodb事务提交模式
 	{
 		result, err := db.FindOne("SHOW VARIABLES WHERE variable_name='innodb_flush_log_at_trx_commit'")

internal/setup/sql_dump.go

@@ -3,6 +3,7 @@ package setup
 import (
 	"errors"
 	"fmt"
+	"github.com/go-sql-driver/mysql"
 	"github.com/iwind/TeaGo/dbs"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/types"
@@ -137,12 +138,22 @@ func (this *SQLDump) Dump(db *dbs.DB) (result *SQLDumpResult, err error) {
 func (this *SQLDump) Apply(db *dbs.DB, newResult *SQLDumpResult, showLog bool) (ops []string, err error) {
 	// 设置Innodb事务提交模式
 	{
-
+		// 检查是否为root用户
-		result, err := db.FindOne("SHOW VARIABLES WHERE variable_name='innodb_flush_log_at_trx_commit'")
+		config, _ := db.Config()
-		if err == nil && result != nil {
+		if config == nil {
-			var oldValue = result.GetInt("Value")
+			return nil, nil
-			if oldValue == 1 {
+		}
-				_, _ = db.Exec("SET GLOBAL innodb_flush_log_at_trx_commit=2")
+		dsnConfig, err := mysql.ParseDSN(config.Dsn)
+		if err != nil || dsnConfig == nil {
+			return nil, err
+		}
+		if dsnConfig.User == "root" {
+			result, err := db.FindOne("SHOW VARIABLES WHERE variable_name='innodb_flush_log_at_trx_commit'")
+			if err == nil && result != nil {
+				var oldValue = result.GetInt("Value")
+				if oldValue == 1 {
+					_, _ = db.Exec("SET GLOBAL innodb_flush_log_at_trx_commit=2")
+				}
 			}
 		}
 	}

internal/setup/sql_dump_test.go

@@ -76,7 +76,7 @@ func TestSQLDump_Apply(t *testing.T) {
 
 	db2, err := dbs.NewInstanceFromConfig(&dbs.DBConfig{
 		Driver: "mysql",
-		Dsn:    "root:123456@tcp(192.168.2.60:3306)/db_edge_new?charset=utf8mb4&timeout=30s",
+		Dsn:    "edge:123456@tcp(192.168.2.60:3306)/db_edge_new?charset=utf8mb4&timeout=30s",
 		Prefix: "edge",
 	})
 	if err != nil {