From 30d2c589bf56049112801b5f25113c9d00ceace5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-V763RJ7\\Administrator" <835606593@qq.com>
Date: Wed, 14 Jan 2026 18:15:38 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/grpc.go                                      | 4 ++--
 go.mod                                           | 2 +-
 go.sum                                           | 2 --
 internal/grpc_server/{server => }/server.go      | 2 +-
 internal/grpc_server/{server => }/server_init.go | 2 +-
 internal/instance/instance.go                    | 4 ++--
 6 files changed, 7 insertions(+), 9 deletions(-)
 rename internal/grpc_server/{server => }/server.go (98%)
 rename internal/grpc_server/{server => }/server_init.go (96%)

diff --git a/app/grpc.go b/app/grpc.go
index 621187d..26ab296 100644
--- a/app/grpc.go
+++ b/app/grpc.go
@@ -3,7 +3,7 @@ package app
 import (
 	"git.hlsq.asia/mmorpg/service-common/net/grpc/service"
 	"git.hlsq.asia/mmorpg/service-scene/config"
-	"git.hlsq.asia/mmorpg/service-scene/internal/grpc_server/server"
+	"git.hlsq.asia/mmorpg/service-scene/internal/grpc_server"
 )
 
 // ModuleGrpcServer Grpc服务模块
@@ -16,7 +16,7 @@ func (m *ModuleGrpcServer) init() error {
 }
 
 func (m *ModuleGrpcServer) start() error {
-	m.server = server.NewServer(config.Get().Serve.Grpc.TTL)
+	m.server = grpc_server.NewServer(config.Get().Serve.Grpc.TTL)
 	m.server.Init(config.Get().Serve.Grpc.Address, config.Get().Serve.Grpc.Port)
 	return nil
 }
diff --git a/go.mod b/go.mod
index 8ac9a51..6b29314 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module git.hlsq.asia/mmorpg/service-scene
 go 1.23.1
 
 require (
-	git.hlsq.asia/mmorpg/service-common v0.0.0-20260113095415-34b2e45e3d50
+	git.hlsq.asia/mmorpg/service-common v0.0.0-20260114100922-695f5e7b0497
 	github.com/judwhite/go-svc v1.2.1
 	go.uber.org/zap v1.27.0
 	google.golang.org/grpc v1.71.1
diff --git a/go.sum b/go.sum
index b6b2b74..f437fa0 100644
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,5 @@
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
-git.hlsq.asia/mmorpg/service-common v0.0.0-20260113095415-34b2e45e3d50 h1:T0JZl2N+HMYRgyifEGFXD2y1MZOuoAS1xjnIg/JLGwM=
-git.hlsq.asia/mmorpg/service-common v0.0.0-20260113095415-34b2e45e3d50/go.mod h1:xv6m1I2jUA6mudKVznygpnzMoshBQarthHD1QnkW4qc=
 github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
 github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
diff --git a/internal/grpc_server/server/server.go b/internal/grpc_server/server.go
similarity index 98%
rename from internal/grpc_server/server/server.go
rename to internal/grpc_server/server.go
index 8a441c2..e821c6a 100644
--- a/internal/grpc_server/server/server.go
+++ b/internal/grpc_server/server.go
@@ -1,4 +1,4 @@
-package server
+package grpc_server
 
 import (
 	"context"
diff --git a/internal/grpc_server/server/server_init.go b/internal/grpc_server/server_init.go
similarity index 96%
rename from internal/grpc_server/server/server_init.go
rename to internal/grpc_server/server_init.go
index 523a436..efbc146 100644
--- a/internal/grpc_server/server/server_init.go
+++ b/internal/grpc_server/server_init.go
@@ -1,4 +1,4 @@
-package server
+package grpc_server
 
 import (
 	"git.hlsq.asia/mmorpg/service-common/discover/common"
diff --git a/internal/instance/instance.go b/internal/instance/instance.go
index 7e8f7a9..9497273 100644
--- a/internal/instance/instance.go
+++ b/internal/instance/instance.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"git.hlsq.asia/mmorpg/service-common/discover"
 	"git.hlsq.asia/mmorpg/service-common/log"
-	"git.hlsq.asia/mmorpg/service-common/net/grpc/stream_client"
+	"git.hlsq.asia/mmorpg/service-common/net/grpc/grpc_client"
 	"git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb"
 	"git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb"
 	"git.hlsq.asia/mmorpg/service-common/utils"
@@ -120,7 +120,7 @@ func (i *Instance) onLogic(delta int64) {
 		payload, _ := proto.Marshal(&ss_pb.S2C_Position{
 			Info: positionUpdate,
 		})
-		if err := stream_client.SendMessageToGateway(sid, stream_client.FunToClient, &grpc_pb.ToClientReq{
+		if err := grpc_client.SendMessageToGateway(sid, grpc_client.FunToClient, &grpc_pb.ToClientReq{
 			USN:       "",
 			MessageID: int32(ss_pb.MessageID_MESSAGE_ID_POSITION),
 			Payload:   payload,