提交 0ecf723d authored 作者: mooncake9527's avatar mooncake9527

upd

上级 bb06df59
...@@ -76,19 +76,21 @@ func nacosRegisterInstance() (err error) { ...@@ -76,19 +76,21 @@ func nacosRegisterInstance() (err error) {
}) })
logger.Debug("[rd][nacos]", logger.Any("conf", conf.Rd.Nacos)) logger.Debug("[rd][nacos]", logger.Any("conf", conf.Rd.Nacos))
var nacosCli *nacos.NacosServiceClient var nacosCli *nacos.NacosServiceClient
if conf.ConfType == "nacos" { // if conf.ConfType == "nacos" {
cc := conf.NacosConfClient.GetCC() // logger.Info("conf type is nacos, use nacos conf client sc & cc")
sc := conf.NacosConfClient.GetSC() // cc := conf.NacosConfClient.GetCC()
nacosCli, err = nacos.New(&conf.Rd.Nacos, cc, sc) // sc := conf.NacosConfClient.GetSC()
if err != nil { // nacosCli, err = nacos.New(&conf.Rd.Nacos, cc, sc)
return xerror.Wrap(err, "nacos new client failed") // if err != nil {
} // return xerror.Wrap(err, "nacos new client failed")
} else { // }
nacosCli, err = nacos.NewWithConfig(&conf.Rd.Nacos) // } else {
if err != nil { // logger.Info("conf type is not nacos, use nacos conf to new a conf client")
return xerror.Wrap(err, "nacos new client failed") nacosCli, err = nacos.NewWithConfig(&conf.Rd.Nacos)
} if err != nil {
return xerror.Wrap(err, "nacos new client failed")
} }
// }
if err := nacosCli.Register(); err != nil { if err := nacosCli.Register(); err != nil {
return xerror.Wrap(err, "nacos register instance failed") return xerror.Wrap(err, "nacos register instance failed")
} }
......
...@@ -7,6 +7,7 @@ import ( ...@@ -7,6 +7,7 @@ import (
"github.com/nacos-group/nacos-sdk-go/model" "github.com/nacos-group/nacos-sdk-go/model"
"github.com/nacos-group/nacos-sdk-go/vo" "github.com/nacos-group/nacos-sdk-go/vo"
"gitlab.wanzhuangkj.com/tush/xpkg/config" "gitlab.wanzhuangkj.com/tush/xpkg/config"
"gitlab.wanzhuangkj.com/tush/xpkg/logger"
) )
type NacosServiceClient struct { type NacosServiceClient struct {
...@@ -30,7 +31,7 @@ func NewWithConfig(cfg *config.NacosSvcConfig) (*NacosServiceClient, error) { ...@@ -30,7 +31,7 @@ func NewWithConfig(cfg *config.NacosSvcConfig) (*NacosServiceClient, error) {
serverConfigs = append(serverConfigs, *serverConfig) serverConfigs = append(serverConfigs, *serverConfig)
} }
nnc.sc = serverConfigs nnc.sc = serverConfigs
logger.Debug("[rd][nacos]", logger.Any("nnc.cfg", nnc.cfg))
nnc.cc = constant.NewClientConfig( nnc.cc = constant.NewClientConfig(
constant.WithNamespaceId(nnc.cfg.Namespace), // 命名空间ID constant.WithNamespaceId(nnc.cfg.Namespace), // 命名空间ID
constant.WithTimeoutMs(5000), // 请求超时时间 constant.WithTimeoutMs(5000), // 请求超时时间
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论