添加了节点服务器，各个服务器之间支持多对多

gs/app/app.go

@@ -9,57 +9,75 @@ import (
 	"time"
 
 	"hk4e/common/config"
+	"hk4e/common/constant"
 	"hk4e/common/mq"
+	"hk4e/common/rpc"
 	"hk4e/gdconf"
 	gdc "hk4e/gs/config"
-	"hk4e/gs/constant"
 	"hk4e/gs/dao"
 	"hk4e/gs/game"
 	"hk4e/gs/service"
+	"hk4e/node/api"
 	"hk4e/pkg/logger"
 
 	"github.com/nats-io/nats.go"
 )
 
+var APPID string
+
 func Run(ctx context.Context, configFile string) error {
 	config.InitConfig(configFile)
 
-	logger.InitLogger("gs")
-	logger.Warn("gs start")
+	// natsrpc client
+	client, err := rpc.NewClient()
+	if err != nil {
+		return err
+	}
+
+	// 注册到节点服务器
+	rsp, err := client.Discovery.RegisterServer(context.TODO(), &api.RegisterServerReq{
+		ServerType: api.GS,
+	})
+	if err != nil {
+		return err
+	}
+	APPID = rsp.GetAppId()
+
+	logger.InitLogger("gs_" + APPID)
+	logger.Warn("gs start, appid: %v", APPID)
 
 	constant.InitConstant()
 
 	gdc.InitGameDataConfig()
 	gdconf.InitGameDataConfig()
 
-	conn, err := nats.Connect(config.CONF.MQ.NatsUrl)
-	if err != nil {
-		logger.Error("connect nats error: %v", err)
-		return err
-	}
-	defer conn.Close()
-
 	db, err := dao.NewDao()
 	if err != nil {
 		panic(err)
 	}
 	defer db.CloseDao()
 
-	messageQueue := mq.NewMessageQueue(mq.GS, "1")
+	messageQueue := mq.NewMessageQueue(api.GS, APPID)
 	defer messageQueue.Close()
 
 	gameManager := game.NewGameManager(db, messageQueue)
 	defer gameManager.Stop()
 
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
-
+	// natsrpc server
+	conn, err := nats.Connect(config.CONF.MQ.NatsUrl)
+	if err != nil {
+		logger.Error("connect nats error: %v", err)
+		return err
+	}
+	defer conn.Close()
 	s, err := service.NewService(conn)
 	if err != nil {
 		return err
 	}
 	defer s.Close()
 
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
 	for {
 		select {
 		case <-ctx.Done():
@@ -68,7 +86,7 @@ func Run(ctx context.Context, configFile string) error {
 			logger.Warn("get a signal %s", s.String())
 			switch s {
 			case syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT:
-				logger.Warn("gs exit")
+				logger.Warn("gs exit, appid: %v", APPID)
 				time.Sleep(time.Second)
 				return nil
 			case syscall.SIGHUP: