自建DNS增加全局配置

internal/const/const.go

@@ -22,5 +22,5 @@ const (
 	UserNodeVersion      = "0.0.10"
 	AuthorityNodeVersion = "0.0.2"
 	MonitorNodeVersion   = "0.0.2"
-	DNSNodeVersion       = "0.0.3"
+	DNSNodeVersion       = "0.1.0"
 )

internal/db/models/nameservers/ns_node_dao.go

@@ -8,6 +8,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/dnsconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/dbs"
@@ -387,15 +388,35 @@ func (this *NSNodeDAO) ComposeNodeConfig(tx *dbs.Tx, nodeId int64) (*dnsconfigs.
 		ClusterId: int64(node.ClusterId),
 	}
 
-	if len(cluster.AccessLog) > 0 {
-		ref := &dnsconfigs.AccessLogRef{}
-		err = json.Unmarshal([]byte(cluster.AccessLog), ref)
+	// 访问日志
+	// 全局配置
+	{
+		globalValue, err := models.SharedSysSettingDAO.ReadSetting(tx, systemconfigs.SettingCodeNSAccessLogSetting)
+		if err != nil {
+			return nil, err
+		}
+		if len(globalValue) > 0 {
+			var ref = &dnsconfigs.NSAccessLogRef{}
+			err = json.Unmarshal(globalValue, ref)
 			if err != nil {
 				return nil, err
 			}
 			config.AccessLogRef = ref
 		}
 
+		// 集群配置
+		if len(cluster.AccessLog) > 0 {
+			ref := &dnsconfigs.NSAccessLogRef{}
+			err = json.Unmarshal([]byte(cluster.AccessLog), ref)
+			if err != nil {
+				return nil, err
+			}
+			if ref.IsPrior {
+				config.AccessLogRef = ref
+			}
+		}
+	}
+
 	return config, nil
 }
 

internal/setup/sql_executor.go

@@ -4,7 +4,9 @@ import (
 	"encoding/json"
 	teaconst "github.com/TeaOSLab/EdgeAPI/internal/const"
 	"github.com/TeaOSLab/EdgeAPI/internal/errors"
+	"github.com/TeaOSLab/EdgeCommon/pkg/dnsconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/go-yaml/yaml"
 	"github.com/iwind/TeaGo/Tea"
@@ -104,6 +106,12 @@ func (this *SQLExecutor) checkData(db *dbs.DB) error {
 		return err
 	}
 
+	// 检查自建DNS全局设置
+	err = this.checkNS(db)
+	if err != nil {
+		return err
+	}
+
 	// 更新版本号
 	err = this.updateVersion(db, teaconst.Version)
 	if err != nil {
@@ -396,6 +404,33 @@ func (this *SQLExecutor) checkMetricItems(db *dbs.DB) error {
 	return nil
 }
 
+// 检查自建DNS全局设置
+func (this *SQLExecutor) checkNS(db *dbs.DB) error {
+	// 访问日志
+	{
+		one, err := db.FindOne("SELECT id FROM edgeSysSettings WHERE code=? LIMIT 1", systemconfigs.SettingCodeNSAccessLogSetting)
+		if err != nil {
+			return err
+		}
+		if len(one) == 0 {
+			ref := &dnsconfigs.NSAccessLogRef{
+				IsPrior:           false,
+				IsOn:              true,
+				LogMissingDomains: false,
+			}
+			refJSON, err := json.Marshal(ref)
+			if err != nil {
+				return err
+			}
+			_, err = db.Exec("INSERT edgeSysSettings (code, value) VALUES (?, ?)", systemconfigs.SettingCodeNSAccessLogSetting, refJSON)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 // 更新版本号
 func (this *SQLExecutor) updateVersion(db *dbs.DB, version string) error {
 	stmt, err := db.Prepare("SELECT COUNT(*) FROM edgeVersions")

internal/setup/sql_executor_test.go

@@ -35,3 +35,21 @@ func TestSQLExecutor_checkMetricItems(t *testing.T) {
 	}
 	t.Log("ok")
 }
+
+func TestSQLExecutor_checkNS(t *testing.T) {
+	executor := NewSQLExecutor(&dbs.DBConfig{
+		Driver: "mysql",
+		Prefix: "edge",
+		Dsn:    "root:123456@tcp(127.0.0.1:3306)/db_edge_new?charset=utf8mb4&multiStatements=true",
+	})
+	db, err := dbs.NewInstanceFromConfig(executor.dbConfig)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = executor.checkNS(db)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}