fix
This commit is contained in:
@@ -169,7 +169,6 @@ logx.AddWriter(logx.NewWriter(os.Stdout))
|
|||||||
listenOn := utils.GetConfigString("base.listenOn")
|
listenOn := utils.GetConfigString("base.listenOn")
|
||||||
mode := utils.GetConfigString("base.mode")
|
mode := utils.GetConfigString("base.mode")
|
||||||
serviceName := utils.GetConfigString("base.name")
|
serviceName := utils.GetConfigString("base.name")
|
||||||
registerIP := utils.GetConfigString("base.registerIP")
|
|
||||||
|
|
||||||
// 初始化服务发现
|
// 初始化服务发现
|
||||||
if err := discovery.Init(discovery.Config{
|
if err := discovery.Init(discovery.Config{
|
||||||
@@ -190,13 +189,14 @@ os.Exit(1)
|
|||||||
// 注册服务
|
// 注册服务
|
||||||
if err := discovery.Register(discovery.Instance{
|
if err := discovery.Register(discovery.Instance{
|
||||||
ServiceName: serviceName,
|
ServiceName: serviceName,
|
||||||
IP: registerIP,
|
IP: c.Nacos.RegisterIP,
|
||||||
Port: port,
|
Port: port,
|
||||||
Group: c.Nacos.Group,
|
Group: c.Nacos.Group,
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
logx.Errorf("nacos register: %v", err)
|
logx.Errorf("nacos register: %v", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
logx.Infof("服务注册成功: %s:%d", c.Nacos.RegisterIP, port)
|
||||||
|
|
||||||
defer func() {
|
defer func() {
|
||||||
if err := discovery.Deregister(); err != nil {
|
if err := discovery.Deregister(); err != nil {
|
||||||
@@ -238,15 +238,13 @@ os.Exit(1)
|
|||||||
debug := utils.GetConfigBool("mysql.debug")
|
debug := utils.GetConfigBool("mysql.debug")
|
||||||
modelbase.Init(db, modelbase.Config{Prefix: utils.GetConfigString("mysql.prefix"), Debug: debug})
|
modelbase.Init(db, modelbase.Config{Prefix: utils.GetConfigString("mysql.prefix"), Debug: debug})
|
||||||
|
|
||||||
// 修正语法错误,手动组装RPC配置
|
// 初始化服务信息
|
||||||
rpcConf := zrpc.RpcServerConf{
|
rpcConf := zrpc.RpcServerConf{
|
||||||
ListenOn: listenOn,
|
ListenOn: listenOn,
|
||||||
}
|
}
|
||||||
rpcConf.Mode = mode
|
rpcConf.Mode = mode
|
||||||
// 构建上下文
|
|
||||||
ctx := svc.NewServiceContext(c, db)
|
ctx := svc.NewServiceContext(c, db)
|
||||||
|
|
||||||
// 启动rpc服务,使用拼装好的rpcConf,不再使用本地空的c.RpcServerConf
|
|
||||||
s := zrpc.MustNewServer(rpcConf, func(grpcServer *grpc.Server) {
|
s := zrpc.MustNewServer(rpcConf, func(grpcServer *grpc.Server) {
|
||||||
admin.RegisterAdminServer(grpcServer, server.NewAdminServer(ctx))
|
admin.RegisterAdminServer(grpcServer, server.NewAdminServer(ctx))
|
||||||
if mode == service.DevMode || mode == service.TestMode {
|
if mode == service.DevMode || mode == service.TestMode {
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package main
|
|||||||
import (
|
import (
|
||||||
"admin/admin"
|
"admin/admin"
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
|
||||||
"net"
|
"net"
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
@@ -158,28 +157,3 @@ func listenPort(listenOn string) (uint64, error) {
|
|||||||
}
|
}
|
||||||
return strconv.ParseUint(portStr, 10, 64)
|
return strconv.ParseUint(portStr, 10, 64)
|
||||||
}
|
}
|
||||||
|
|
||||||
// getContainerIntranetIP 获取容器内网IPv4(排除回环地址)
|
|
||||||
func getContainerIntranetIP() (string, error) {
|
|
||||||
addrs, err := net.InterfaceAddrs()
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, addr := range addrs {
|
|
||||||
ipNet, ok := addr.(*net.IPNet)
|
|
||||||
if !ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
// 跳过127.0.0.1回环地址
|
|
||||||
if ipNet.IP.IsLoopback() {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
// 只取IPv4地址
|
|
||||||
ipv4 := ipNet.IP.To4()
|
|
||||||
if ipv4 != nil {
|
|
||||||
return ipv4.String(), nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return "", fmt.Errorf("未检测到可用内网IPv4地址")
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user