更新 'go.mod'

readme update

.gitignore

@@ -0,0 +1,19 @@
+### Go template
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# Test binary, built with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Dependency directories (remove the comment below to include it)
+.idea
+vendor/
+logs
+go.sum

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/nacos-viper-remote.iml" filepath="$PROJECT_DIR$/.idea/nacos-viper-remote.iml" />
+    </modules>
+  </component>
+</project>

.idea/nacos-viper-remote.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 yoyofx
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,9 +1,9 @@
-# nacos-viper-remote
+# Viper remote for Nacos
 
 Golang configuration,use to Viper reading from remote Nacos config systems. Viper remote for Naocs.
 
 ```go
-runtime_viper := viper.New()
+config_viper := viper.New()
 
 remote.SetOptions(&remote.Option{
    Url:         "localhost",
@@ -14,13 +14,30 @@ remote.SetOptions(&remote.Option{
    Auth:        nil,
 })
 
+remote_viper := viper.New()
 err := remote_viper.AddRemoteProvider("nacos", "localhost", "")
 remote_viper.SetConfigType("yaml")
+err = remote_viper.ReadRemoteConfig()    //sync get remote configs to remote_viper instance memory . for example , remote_viper.GetString(key)
 
-_ = remote_viper.ReadRemoteConfig()             //sync get remote configs to remote_viper instance memory . for example , remote_viper.GetString(key)
-_ = remote_viper.WatchRemoteConfigOnChannel()   //async watch , auto refresh configs.
+if err == nil {
+    config_viper = remote_viper
+    fmt.Println("used remote viper")
+    provider := remote.NewRemoteProvider("yaml")
+    respChan := provider.WatchRemoteConfigOnChannel(config_viper)
 
-appName := remote_viper.GetString("key")   // sync get config by key
+    go func(rc <-chan bool) {
+        for {
+            <-rc
+            fmt.Printf("remote async: %s", config_viper.GetString("yoyogo.application.name"))
+        }
+    }(respChan)
+}
 
-fmt.Println(appName)
+go func() {
+    for {
+        time.Sleep(time.Second * 30) // delay after each request
+        appName = config_viper.GetString("yoyogo.application.name")
+        fmt.Println("sync:" + appName)
+    }
+}()
 ```

config_remote_provider.go

@@ -0,0 +1,62 @@
+package nacos_viper_remote
+
+import (
+	"bytes"
+	"fmt"
+	"github.com/spf13/viper"
+)
+
+type ViperRemoteProvider struct {
+	configType string
+	configSet  string
+}
+
+func NewRemoteProvider(configType string) *ViperRemoteProvider {
+	return &ViperRemoteProvider{
+		configType: configType,
+		configSet:  "yoyogo.cloud.discovery.metadata"}
+}
+
+func (provider *ViperRemoteProvider) GetProvider(runtimeViper *viper.Viper) *viper.Viper {
+	var option *Option
+	err := runtimeViper.Sub(provider.configSet).Unmarshal(&option)
+	if err != nil {
+		panic(err)
+		return nil
+	}
+	SetOptions(option)
+	remote_viper := viper.New()
+	err = remote_viper.AddRemoteProvider("nacos", "localhost", "")
+	if provider.configType == "" {
+		provider.configType = "yaml"
+	}
+	remote_viper.SetConfigType(provider.configType)
+	err = remote_viper.ReadRemoteConfig()
+	if err == nil {
+		//err = remote_viper.WatchRemoteConfigOnChannel()
+		if err == nil {
+			fmt.Println("used remote viper")
+			return remote_viper
+		}
+	} else {
+		panic(err)
+	}
+	return runtimeViper
+}
+
+func (provider *ViperRemoteProvider) WatchRemoteConfigOnChannel(remoteViper *viper.Viper) <-chan bool {
+	updater := make(chan bool)
+
+	respChan, _ := viper.RemoteConfig.WatchChannel(DefaultRemoteProvider())
+	go func(rc <-chan *viper.RemoteResponse) {
+		for {
+			b := <-rc
+			reader := bytes.NewReader(b.Value)
+			_ = remoteViper.ReadConfig(reader)
+			// configuration on changed
+			updater <- true
+		}
+	}(respChan)
+
+	return updater
+}

example/main.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
+	remote "github.com/Echo7659/nacos-viper-remote"
 	"github.com/spf13/viper"
-	remote "github.com/yoyofxteam/nacos-viper-remote"
 	"os"
 	"os/signal"
 	"syscall"
@@ -32,14 +32,21 @@ func main() {
 	remote_viper := viper.New()
 	err := remote_viper.AddRemoteProvider("nacos", "localhost", "")
 	remote_viper.SetConfigType("yaml")
-
 	err = remote_viper.ReadRemoteConfig()
-	if err == nil {
-		err = remote_viper.WatchRemoteConfigOnChannel()
+
 	if err == nil {
 		config_viper = remote_viper
 		fmt.Println("used remote viper")
+		provider := remote.NewRemoteProvider("yaml")
+		respChan := provider.WatchRemoteConfigOnChannel(config_viper)
+
+		go func(rc <-chan bool) {
+			for {
+				<-rc
+				fmt.Printf("remote async: %s", config_viper.GetString("yoyogo.application.name"))
 			}
+		}(respChan)
+
 	}
 
 	appName := config_viper.GetString("yoyogo.application.name")
@@ -50,7 +57,7 @@ func main() {
 		for {
 			time.Sleep(time.Second * 30) // delay after each request
 			appName = config_viper.GetString("yoyogo.application.name")
-			fmt.Println(appName)
+			fmt.Println("sync:" + appName)
 		}
 	}()
 

example_config.yaml

@@ -8,7 +8,7 @@ yoyogo:
       strategy: "round-robin"    # round-robin  , weight-time ,  random
       type: "nacos"
       metadata:
-        url: "120.53.133.30"
+        url: "localhost"
         port: 80
         namespace: "public"
         group: "DEFAULT_GROUP"
@@ -18,3 +18,8 @@ yoyogo:
           enable: true
           username: "root"
           password: "1234"
+          endpoint: ""
+          regionId: ""
+          accessKey: ""
+          secretKey: ""
+          openKMS: false

go.mod

@@ -1,8 +1,8 @@
-module github.com/yoyofxteam/nacos-viper-remote
+module git.echol.cn/loser/nacos-viper-remote
 
 go 1.14
 
 require (
-	github.com/spf13/viper v1.7.1
-	github.com/nacos-group/nacos-sdk-go v1.0.7
+	github.com/nacos-group/nacos-sdk-go/v2 v2.0.0
+	github.com/spf13/viper v1.10.1
 )

nacos_manager.go

@@ -2,11 +2,11 @@ package nacos_viper_remote
 
 import (
 	"fmt"
-	"github.com/nacos-group/nacos-sdk-go/clients"
-	"github.com/nacos-group/nacos-sdk-go/clients/config_client"
-	"github.com/nacos-group/nacos-sdk-go/common/constant"
-	"github.com/nacos-group/nacos-sdk-go/common/logger"
-	"github.com/nacos-group/nacos-sdk-go/vo"
+	"github.com/nacos-group/nacos-sdk-go/v2/clients"
+	"github.com/nacos-group/nacos-sdk-go/v2/clients/config_client"
+	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
+	"github.com/nacos-group/nacos-sdk-go/v2/common/logger"
+	"github.com/nacos-group/nacos-sdk-go/v2/vo"
 	"github.com/spf13/viper"
 	"strings"
 )
@@ -30,18 +30,21 @@ func NewNacosConfigManager(option *Option) (*nacosConfigManager, error) {
 		NamespaceId:         option.NamespaceId,
 		TimeoutMs:           5000,
 		NotLoadCacheAtStart: true,
-		RotateTime:          "1h",
-		MaxAge:              3,
+		LogDir:              "logs/nacos/log",
+		CacheDir:            "logs/nacos/cache",
 		LogLevel:            "info",
 	}
+
 	if option.Auth != nil && option.Auth.Enable {
 		clientConfig.Username = option.Auth.User
 		clientConfig.Password = option.Auth.Password
+		clientConfig.Endpoint = option.Auth.Endpoint
+		clientConfig.RegionId = option.Auth.RegionId
+		clientConfig.AccessKey = option.Auth.AccessKey
+		clientConfig.SecretKey = option.Auth.SecretKey
+		clientConfig.OpenKMS = option.Auth.OpenKMS
 	}
-	client, err := clients.CreateConfigClient(map[string]interface{}{
-		"serverConfigs": serverConfigs,
-		"clientConfig":  clientConfig,
-	})
+	client, err := clients.NewConfigClient(vo.NacosClientParam{ClientConfig: &clientConfig, ServerConfigs: serverConfigs})
 	if err != nil {
 		logger.Error(err.Error())
 		return nil, err

nacos_options.go

@@ -17,4 +17,15 @@ type Auth struct {
 	Enable   bool   `mapstructure:"enable"`
 	User     string `mapstructure:"username"`
 	Password string `mapstructure:"password"`
+
+	// ACM Endpoint
+	Endpoint string `mapstructure:"endpoint"`
+	// ACM RegionId
+	RegionId string `mapstructure:"regionId"`
+	// ACM AccessKey
+	AccessKey string `mapstructure:"accessKey"`
+	// ACM SecretKey
+	SecretKey string `mapstructure:"secretKey"`
+	// ACM OpenKMS
+	OpenKMS bool `mapstructure:"openKMS"`
 }

nacosprovider.go

@@ -0,0 +1,28 @@
+package nacos_viper_remote
+
+type nacosRemoteProvider struct {
+	provider      string
+	endpoint      string
+	path          string
+	secretKeyring string
+}
+
+func DefaultRemoteProvider() *nacosRemoteProvider {
+	return &nacosRemoteProvider{provider: "nacos", endpoint: "localhost", path: "", secretKeyring: ""}
+}
+
+func (rp nacosRemoteProvider) Provider() string {
+	return rp.provider
+}
+
+func (rp nacosRemoteProvider) Endpoint() string {
+	return rp.endpoint
+}
+
+func (rp nacosRemoteProvider) Path() string {
+	return rp.path
+}
+
+func (rp nacosRemoteProvider) SecretKeyring() string {
+	return rp.secretKeyring
+}

viper_remote.go

@@ -7,17 +7,20 @@ import (
 	"io"
 )
 
-var nacosOptions = &Option{}
+//var nacosOptions = &Option{}
 
 func SetOptions(option *Option) {
-	nacosOptions = option
+	manager, _ := NewNacosConfigManager(option)
+	viper.SupportedRemoteProviders = []string{"nacos"}
+	viper.RemoteConfig = &remoteConfigProvider{ConfigManager: manager}
 }
 
 type remoteConfigProvider struct {
+	ConfigManager *nacosConfigManager
 }
 
 func (rc *remoteConfigProvider) Get(rp viper.RemoteProvider) (io.Reader, error) {
-	cmt, err := getConfigManager(rp)
+	cmt, err := rc.getConfigManager(rp)
 	if err != nil {
 		return nil, err
 	}
@@ -37,7 +40,7 @@ func (rc *remoteConfigProvider) Watch(rp viper.RemoteProvider) (io.Reader, error
 }
 
 func (rc *remoteConfigProvider) WatchChannel(rp viper.RemoteProvider) (<-chan *viper.RemoteResponse, chan bool) {
-	cmt, err := getConfigManager(rp)
+	cmt, err := rc.getConfigManager(rp)
 	if err != nil {
 		return nil, nil
 	}
@@ -52,15 +55,10 @@ func (rc *remoteConfigProvider) WatchChannel(rp viper.RemoteProvider) (<-chan *v
 	return nil, nil
 }
 
-func getConfigManager(rp viper.RemoteProvider) (interface{}, error) {
+func (rc *remoteConfigProvider) getConfigManager(rp viper.RemoteProvider) (interface{}, error) {
 	if rp.Provider() == "nacos" {
-		return NewNacosConfigManager(nacosOptions)
+		return rc.ConfigManager, nil
 	} else {
 		return nil, errors.New("The Nacos configuration manager is not supported!")
 	}
 }
-
-func init() {
-	viper.SupportedRemoteProviders = []string{"nacos"}
-	viper.RemoteConfig = &remoteConfigProvider{}
-}