diff --git a/.github/workflows/logic_CI.yml b/.github/workflows/logic_CI.yml index 654d5ab02..8b3103fbf 100644 --- a/.github/workflows/logic_CI.yml +++ b/.github/workflows/logic_CI.yml @@ -58,8 +58,8 @@ jobs: uses: easingthemes/ssh-deploy@main env: SSH_PRIVATE_KEY: ${{ secrets.BLAZING }} - REMOTE_HOST: "122.10.117.123" - REMOTE_PORT: 41967 + REMOTE_HOST: "125.208.20.223" + REMOTE_PORT: 22916 REMOTE_USER: "root" SOURCE: "logic_${{ needs.prepare-version.outputs.build_version }}" # 只指定可执行文件作为源 TARGET: "/home/" diff --git a/common/rpc/rpc.go b/common/rpc/rpc.go index 8271d6633..7dd48b833 100644 --- a/common/rpc/rpc.go +++ b/common/rpc/rpc.go @@ -68,12 +68,12 @@ func StartServer() { rpcServer := jsonrpc.NewServer(jsonrpc.WithReverseClient[ClientHandler]("")) rpcServer.Register("", &ServerHandler{}) - cool.Loger.Debug(context.Background(), "jsonrpc server start") + cool.Loger.Debug(context.Background(), "jsonrpc server start", rpcport) // go time.AfterFunc(3000, func() { // testjsonrpc() // }) - err := http.ListenAndServe("0.0.0.0"+rpcport, rpcServer) + err := http.ListenAndServe("0.0.0.0:"+rpcport, rpcServer) cool.Loger.Debug(context.Background(), "jsonrpc server fail", err) } @@ -88,7 +88,7 @@ func StartClient(id, port uint16, callback any) *struct { var rpcaddr, _ = service.NewBaseSysParamService().DataByKey(context.Background(), "server_ip") closer1, err := jsonrpc.NewMergeClient(context.Background(), - "ws://"+rpcaddr+rpcport, "", []interface{}{ + "ws://"+rpcaddr+":"+rpcport, "", []interface{}{ &RPCClient, }, nil, jsonrpc.WithClientHandler("", callback), jsonrpc.WithReconnFun(func() { RPCClient.RegisterLogic(id, port) }), diff --git a/common/socket/ServerEvent.go b/common/socket/ServerEvent.go index 50288073e..247747156 100644 --- a/common/socket/ServerEvent.go +++ b/common/socket/ServerEvent.go @@ -59,7 +59,7 @@ func (s *Server) OnTick() (delay time.Duration, action gnet.Action) { func (s *Server) OnBoot(eng gnet.Engine) gnet.Action { s.eng = eng - cool.Loger.Infof(context.Background(), " server is listening on %s\n", s.addr) + // cool.Loger.Infof(context.Background(), " server is listening on %s\n", s.addr) return gnet.None } diff --git a/logic/server.go b/logic/server.go index f6d150a62..13a4686c2 100644 --- a/logic/server.go +++ b/logic/server.go @@ -24,7 +24,7 @@ const ( ) var defaultPort = gconv.Int(cool.Config.Port) //读入默认的端口 -var candidatePorts = []int{defaultPort} +var candidatePorts = cool.Config.GamePort // determinePort 确定服务器使用的端口 func determinePort(serverid uint16) (int, error) { @@ -38,7 +38,7 @@ func determinePort(serverid uint16) (int, error) { // 遍历指定的端口列表 for _, port := range candidatePorts { if isPortAvailable(port) { - return port, nil + return int(port), nil } log.Printf("Port %d is not available, checking next...", port) } @@ -49,7 +49,7 @@ func determinePort(serverid uint16) (int, error) { } // isPortAvailable 检查端口是否可用 -func isPortAvailable(port int) bool { +func isPortAvailable(port uint64) bool { address := fmt.Sprintf(":%d", port) listener, err := net.Listen("tcp", address) if err != nil { diff --git a/logic/service/fight/node/fight.go b/logic/service/fight/node/fight.go index 4f16faf13..559733c0c 100644 --- a/logic/service/fight/node/fight.go +++ b/logic/service/fight/node/fight.go @@ -7,6 +7,7 @@ import "blazing/logic/service/fight/input" func (e *EffectNode) Fight_Start(ctx input.Ctx) bool { //战斗开始应该注入魂印 //panic("not implemented") // TODO: Implement + return true } func (e *EffectNode) PreBattleEnd(ctx input.Ctx) bool { panic("not implemented") // TODO: Implement