fix
This commit is contained in:
@@ -169,7 +169,6 @@ logx.AddWriter(logx.NewWriter(os.Stdout))
|
||||
listenOn := utils.GetConfigString("base.listenOn")
|
||||
mode := utils.GetConfigString("base.mode")
|
||||
serviceName := utils.GetConfigString("base.name")
|
||||
registerIP := utils.GetConfigString("base.registerIP")
|
||||
|
||||
// 初始化服务发现
|
||||
if err := discovery.Init(discovery.Config{
|
||||
@@ -190,13 +189,14 @@ os.Exit(1)
|
||||
// 注册服务
|
||||
if err := discovery.Register(discovery.Instance{
|
||||
ServiceName: serviceName,
|
||||
IP: registerIP,
|
||||
IP: c.Nacos.RegisterIP,
|
||||
Port: port,
|
||||
Group: c.Nacos.Group,
|
||||
}); err != nil {
|
||||
logx.Errorf("nacos register: %v", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
logx.Infof("服务注册成功: %s:%d", c.Nacos.RegisterIP, port)
|
||||
|
||||
defer func() {
|
||||
if err := discovery.Deregister(); err != nil {
|
||||
@@ -238,15 +238,13 @@ os.Exit(1)
|
||||
debug := utils.GetConfigBool("mysql.debug")
|
||||
modelbase.Init(db, modelbase.Config{Prefix: utils.GetConfigString("mysql.prefix"), Debug: debug})
|
||||
|
||||
// 修正语法错误,手动组装RPC配置
|
||||
// 初始化服务信息
|
||||
rpcConf := zrpc.RpcServerConf{
|
||||
ListenOn: listenOn,
|
||||
}
|
||||
rpcConf.Mode = mode
|
||||
// 构建上下文
|
||||
ctx := svc.NewServiceContext(c, db)
|
||||
|
||||
// 启动rpc服务,使用拼装好的rpcConf,不再使用本地空的c.RpcServerConf
|
||||
s := zrpc.MustNewServer(rpcConf, func(grpcServer *grpc.Server) {
|
||||
admin.RegisterAdminServer(grpcServer, server.NewAdminServer(ctx))
|
||||
if mode == service.DevMode || mode == service.TestMode {
|
||||
|
||||
Reference in New Issue
Block a user