nacos config

2023-09-19 11:41:38 +08:00
parent d7f94f0da9
commit b4672bbed7
29 changed files with 208 additions and 124 deletions
--- a/utils/autoconfig/autoconfig.go
+++ b/utils/autoconfig/autoconfig.go
@@ -74,7 +74,7 @@ func AutoGetEtcYaml() *string {
 		dirs = dirs[0 : len(dirs)-1]

 		// 列出所有 curPath 下的文件夹
-		files, err := ioutil.ReadDir(curPath)
+		files, err := os.ReadDir(curPath)
 		if err != nil {
 			log.Println(err)
 			continue
--- a/utils/autoconfig/autoconfig_test.go
+++ b/utils/autoconfig/autoconfig_test.go
@@ -1,7 +1,10 @@
 package autoconfig

-import "testing"
+import (
+	"log"
+	"testing"
+)

 func TestAutoConfig(t *testing.T) {
-	AutoGetEtcYaml()
+	log.Println(*AutoGetEtcYaml())
 }
--- a/utils/collect/collect.go
+++ b/utils/collect/collect.go
@@ -119,7 +119,7 @@ func Array2MapByKey[KEY comparable, VALUE any](arrSrc []VALUE, fieldName string)
 		}
 		fv := srcv.FieldByName(fieldName)
 		k := fv.Interface().(KEY)
-		result[k] = srcv.Interface().(VALUE)
+		result[k] = arr.Index(i).Interface().(VALUE)
 	}

 	return result
@@ -166,7 +166,7 @@ func Array2MapByKeyTag[KEY comparable, VALUE any](arrSrc []VALUE, tag string) (r
 					fv = fv.Elem()
 				}
 				k := fv.Interface().(KEY)
-				result[k] = srcv.Interface().(VALUE)
+				result[k] = arr.Index(i).Interface().(VALUE)
 			}

 			return
--- a/utils/fsconfig/config.go
+++ b/utils/fsconfig/config.go
@@ -1,53 +1,142 @@
 package fsconfig

 import (
-	"fmt"
 	"log"
 	"os"
+	"path/filepath"
+	"strconv"
+	"strings"

+	"github.com/nacos-group/nacos-sdk-go/v2/clients"
+	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
+	"github.com/nacos-group/nacos-sdk-go/v2/vo"
 	"gopkg.in/yaml.v2"
 )

 type EnvConfig struct {
-	Host string `yaml:"host"`
-	Port uint64 `yaml:"port"`
-
-	UserName    string `yaml:"username"`
-	Password    string `yaml:"password"`
-	NamespaceId string `yaml:"namespace"`
-	DataId      string `yaml:"dataid"`
-	Group       string `yaml:"group"`
+	NacosServers []string `yaml:"nacos"`
+	UserName     string   `yaml:"username"`
+	Password     string   `yaml:"password"`
+	NamespaceId  string   `yaml:"namespace"`
+	DataId       string   `yaml:"dataid"`
+	Group        string   `yaml:"group"`
 }

-var OptPathDir = "/opt"
+var optPathDirs = []string{"/opt", "./", "../", "../../"}

 var nacosConfig *EnvConfig

 func GetEnvCofing() *EnvConfig {
-	return nacosConfig
+
+	if nacosConfig != nil {
+		return nacosConfig
+	}
+
+	for _, optDir := range optPathDirs {
+		if optDir[len(optDir)-1] != '/' {
+			optDir = optDir + "/"
+		}
+
+		for _, yname := range []string{"env.yaml", "env.yml"} {
+			f, err := os.Open(optDir + yname)
+			if err != nil {
+				// log.Println(err)
+				continue
+			}
+			cfg := &EnvConfig{}
+			err = yaml.NewDecoder(f).Decode(&cfg)
+			if err != nil {
+				// log.Println(err)
+				continue
+			}
+
+			nacosConfig = cfg
+			return nacosConfig
+		}
+	}
+
+	panic("Can't find env.yaml or env.yml in the specified directories")
+
 }

 func init() {
-	if OptPathDir[len(OptPathDir)-1] != '/' {
-		OptPathDir = OptPathDir + "/"
-	}

-	for _, yname := range []string{"env.yaml", "env.yml"} {
-		f, err := os.Open(OptPathDir + "/" + yname)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		cfg := &EnvConfig{}
-		err = yaml.NewDecoder(f).Decode(&cfg)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-
-		nacosConfig = cfg
-		return
-	}
-
-	panic(fmt.Sprintf("can't find %s(env.yaml|env.yml) ", OptPathDir))
+}
+
+func StartNacosConfig(configFile string, OnChange func(namespace, group, dataId, data string)) string {
+	env := GetEnvCofing()
+
+	// 创建serverConfig
+	// 支持多个;至少一个ServerConfig
+	var serverConfig []constant.ServerConfig
+
+	for _, s := range env.NacosServers {
+
+		sp := strings.Split(s, ":")
+		host := sp[0]
+		port, err := strconv.ParseUint(sp[1], 10, 64)
+		if err != nil {
+			panic(err)
+		}
+
+		serverConfig = append(serverConfig, constant.ServerConfig{
+			IpAddr: host,
+			Port:   port,
+		})
+	}
+
+	// 创建clientConfig
+	clientConfig := constant.ClientConfig{
+		NamespaceId:         env.NamespaceId, // 如果需要支持多namespace，我们可以场景多个client,它们有不同的NamespaceId。当namespace是public时，此处填空字符串。
+		TimeoutMs:           50000,
+		NotLoadCacheAtStart: true,
+		LogLevel:            "debug",
+		LogDir:              "/tmp/nacos/log",
+		CacheDir:            "/tmp/nacos/cache",
+		Username:            env.UserName,
+		Password:            env.Password,
+	}
+
+	// 创建服务发现客户端的另一种方式 (推荐)
+	// namingClient, err := clients.NewNamingClient(
+	// 	vo.NacosClientParam{
+	// 		ClientConfig:  &clientConfig,
+	// 		ServerConfigs: serverConfig,
+	// 	},
+	// )
+	// if err != nil {
+	// 	log.Fatalf("初始化nacos失败: %s", err.Error())
+	// }
+
+	// log.Println(namingClient)
+
+	// 创建 Nacos 配置客户端
+	configClient, err := clients.CreateConfigClient(map[string]interface{}{
+		"clientConfig":  clientConfig,
+		"serverConfigs": serverConfig,
+	})
+	if err != nil {
+		log.Fatalf("Failed to create Nacos config client: %v", err)
+	}
+
+	cfgYamls := strings.Split(configFile, "/")
+	cfgYaml := cfgYamls[len(cfgYamls)-1]
+	yamlExt := filepath.Ext(cfgYaml)
+	if !(yamlExt == ".yaml" || yamlExt == ".yml") {
+		log.Panic(configFile)
+	}
+
+	// 获取配置
+	content, err := configClient.GetConfig(vo.ConfigParam{
+		DataId:   cfgYaml,
+		Group:    env.Group,
+		OnChange: OnChange,
+	})
+	if err != nil {
+		log.Fatalf("Failed to get config from Nacos: %v", err)
+	}
+
+	return content
+
+	// log.Println(content)
 }
--- a/utils/fsconfig/config_test.go
+++ b/utils/fsconfig/config_test.go
@@ -2,69 +2,9 @@ package fsconfig_test

 import (
 	"fusenapi/utils/fsconfig"
-	"log"
 	"testing"
-
-	"github.com/nacos-group/nacos-sdk-go/v2/clients"
-	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
-	"github.com/nacos-group/nacos-sdk-go/v2/vo"
 )

 func TestCase1(t *testing.T) {
-
-	env := fsconfig.GetEnvCofing()
-
-	// 创建serverConfig
-	// 支持多个;至少一个ServerConfig
-	serverConfig := []constant.ServerConfig{
-		{
-			IpAddr: env.Host,
-			Port:   uint64(env.Port),
-		},
-	}
-
-	// 创建clientConfig
-	clientConfig := constant.ClientConfig{
-		NamespaceId:         env.NamespaceId, // 如果需要支持多namespace，我们可以场景多个client,它们有不同的NamespaceId。当namespace是public时，此处填空字符串。
-		TimeoutMs:           50000,
-		NotLoadCacheAtStart: true,
-		LogLevel:            "debug",
-		LogDir:              "/tmp/nacos",
-		CacheDir:            "/tmp/nacos",
-		Username:            env.UserName,
-		Password:            env.Password,
-	}
-
-	// 创建服务发现客户端的另一种方式 (推荐)
-	// namingClient, err := clients.NewNamingClient(
-	// 	vo.NacosClientParam{
-	// 		ClientConfig:  &clientConfig,
-	// 		ServerConfigs: serverConfig,
-	// 	},
-	// )
-	// if err != nil {
-	// 	log.Fatalf("初始化nacos失败: %s", err.Error())
-	// }
-
-	// log.Println(namingClient)
-
-	// 创建 Nacos 配置客户端
-	configClient, err := clients.CreateConfigClient(map[string]interface{}{
-		"clientConfig":  clientConfig,
-		"serverConfigs": serverConfig,
-	})
-	if err != nil {
-		log.Fatalf("Failed to create Nacos config client: %v", err)
-	}
-
-	// 获取配置
-	content, err := configClient.GetConfig(vo.ConfigParam{
-		DataId: "auth.yaml",
-		Group:  env.Group,
-	})
-	if err != nil {
-		log.Fatalf("Failed to get config from Nacos: %v", err)
-	}
-	log.Println(content)
-
+	fsconfig.StartNacosConfig("auth.yaml", nil)
 }