[dubbo-go-samples] branch master updated: 修改:修复registry/nacos示例无法正常使用的问题,调整client.yml和server.yml方便阅读

[ironcity]

This is an automated email from the ASF dual-hosted git repository.

ironcity pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git


The following commit(s) were added to refs/heads/master by this push:
     new 76f2b1c  修改:修复registry/nacos示例无法正常使用的问题,调整client.yml和server.yml方便阅读
     new 02a9c8c  Merge pull request #70 from milerL/nacos
76f2b1c is described below

commit 76f2b1c2ebdac253bdc0788e7144feda64ae5103
Author: songsq <song9...@sina.com>
AuthorDate: Thu Mar 18 15:07:44 2021 +0800

    修改:修复registry/nacos示例无法正常使用的问题,调整client.yml和server.yml方便阅读
---
 registry/nacos/go-client/cmd/client.go   | 1 -
 registry/nacos/go-client/conf/client.yml | 4 ++--
 registry/nacos/go-server/cmd/server.go   | 5 +----
 registry/nacos/go-server/conf/server.yml | 4 ++--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/registry/nacos/go-client/cmd/client.go 
b/registry/nacos/go-client/cmd/client.go
index 6550414..72037c3 100644
--- a/registry/nacos/go-client/cmd/client.go
+++ b/registry/nacos/go-client/cmd/client.go
@@ -49,7 +49,6 @@ func init() {
 
 // need to setup environment variable "CONF_CONSUMER_FILE_PATH" to 
"conf/client.yml" before run
 func main() {
-       hessian.RegisterPOJO(&pkg.User{})
        config.Load()
        time.Sleep(3 * time.Second)
 
diff --git a/registry/nacos/go-client/conf/client.yml 
b/registry/nacos/go-client/conf/client.yml
index d1b5e3d..5936848 100644
--- a/registry/nacos/go-client/conf/client.yml
+++ b/registry/nacos/go-client/conf/client.yml
@@ -16,7 +16,7 @@ application:
 
 # registry config
 registries:
-  "nacos":
+  "demoNacos":
     protocol: "nacos"
     timeout: "3s"
     address: "127.0.0.1:8848"
@@ -24,7 +24,7 @@ registries:
 # reference config
 references:
   "UserProvider":
-    registry: "nacos"
+    registry: "demoNacos"
     protocol: "dubbo"
     interface: "org.apache.dubbo.UserProvider"
     cluster: "failover"
diff --git a/registry/nacos/go-server/cmd/server.go 
b/registry/nacos/go-server/cmd/server.go
index 9446960..5e58fb3 100644
--- a/registry/nacos/go-server/cmd/server.go
+++ b/registry/nacos/go-server/cmd/server.go
@@ -26,8 +26,6 @@ import (
 )
 
 import (
-       hessian "github.com/apache/dubbo-go-hessian2"
-
        _ "github.com/apache/dubbo-go/cluster/cluster_impl"
        _ "github.com/apache/dubbo-go/cluster/loadbalance"
        "github.com/apache/dubbo-go/common/logger"
@@ -40,7 +38,7 @@ import (
 )
 
 import (
-       "github.com/apache/dubbo-go-samples/registry/nacos/go-server/pkg"
+       _ "github.com/apache/dubbo-go-samples/registry/nacos/go-server/pkg"
 )
 
 var (
@@ -49,7 +47,6 @@ var (
 
 // need to setup environment variable "CONF_PROVIDER_FILE_PATH" to 
"conf/server.yml" before run
 func main() {
-       hessian.RegisterPOJO(&pkg.User{})
        config.Load()
 
        initSignal()
diff --git a/registry/nacos/go-server/conf/server.yml 
b/registry/nacos/go-server/conf/server.yml
index 6fa7d55..441c344 100644
--- a/registry/nacos/go-server/conf/server.yml
+++ b/registry/nacos/go-server/conf/server.yml
@@ -10,7 +10,7 @@ application:
 
 # registry config
 registries:
-  "nacos":
+  "demoNacos":
     protocol: "nacos"
     timeout    : "3s"
     address: "127.0.0.1:8848"
@@ -18,7 +18,7 @@ registries:
 # service config
 services:
   "UserProvider":
-    registry: "nacos"
+    registry: "demoNacos"
     protocol: "dubbo"
     interface: "org.apache.dubbo.UserProvider"
     loadbalance: "random"