From 9518f3da5f99079931a03ba7e93f244342a1ca13 Mon Sep 17 00:00:00 2001
From: "DESKTOP-V763RJ7\\Administrator" <835606593@qq.com>
Date: Wed, 14 Jan 2026 14:44:49 +0800
Subject: [PATCH] =?UTF-8?q?feat=20grpc=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=95=B4?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 net/grpc/{service => grpc_client}/client_gateway.go          | 2 +-
 net/grpc/{service => grpc_client}/client_qgdzs.go            | 2 +-
 net/grpc/{service => grpc_client}/client_scene.go            | 2 +-
 net/grpc/{service => grpc_client}/client_user.go             | 2 +-
 .../gateway.go => grpc_client/stream_gateway.go}             | 5 ++---
 .../{stream_client/scene.go => grpc_client/stream_scene.go}  | 5 ++---
 6 files changed, 8 insertions(+), 10 deletions(-)
 rename net/grpc/{service => grpc_client}/client_gateway.go (97%)
 rename net/grpc/{service => grpc_client}/client_qgdzs.go (97%)
 rename net/grpc/{service => grpc_client}/client_scene.go (97%)
 rename net/grpc/{service => grpc_client}/client_user.go (97%)
 rename net/grpc/{stream_client/gateway.go => grpc_client/stream_gateway.go} (93%)
 rename net/grpc/{stream_client/scene.go => grpc_client/stream_scene.go} (93%)

diff --git a/net/grpc/service/client_gateway.go b/net/grpc/grpc_client/client_gateway.go
similarity index 97%
rename from net/grpc/service/client_gateway.go
rename to net/grpc/grpc_client/client_gateway.go
index 85c699c..7c42c82 100644
--- a/net/grpc/service/client_gateway.go
+++ b/net/grpc/grpc_client/client_gateway.go
@@ -1,4 +1,4 @@
-package service
+package grpc_client
 
 import (
 	"git.hlsq.asia/mmorpg/service-common/discover"
diff --git a/net/grpc/service/client_qgdzs.go b/net/grpc/grpc_client/client_qgdzs.go
similarity index 97%
rename from net/grpc/service/client_qgdzs.go
rename to net/grpc/grpc_client/client_qgdzs.go
index c99ad78..f1364d4 100644
--- a/net/grpc/service/client_qgdzs.go
+++ b/net/grpc/grpc_client/client_qgdzs.go
@@ -1,4 +1,4 @@
-package service
+package grpc_client
 
 import (
 	"git.hlsq.asia/mmorpg/service-common/discover"
diff --git a/net/grpc/service/client_scene.go b/net/grpc/grpc_client/client_scene.go
similarity index 97%
rename from net/grpc/service/client_scene.go
rename to net/grpc/grpc_client/client_scene.go
index 2988720..5a6102d 100644
--- a/net/grpc/service/client_scene.go
+++ b/net/grpc/grpc_client/client_scene.go
@@ -1,4 +1,4 @@
-package service
+package grpc_client
 
 import (
 	"git.hlsq.asia/mmorpg/service-common/discover"
diff --git a/net/grpc/service/client_user.go b/net/grpc/grpc_client/client_user.go
similarity index 97%
rename from net/grpc/service/client_user.go
rename to net/grpc/grpc_client/client_user.go
index 69593be..679520b 100644
--- a/net/grpc/service/client_user.go
+++ b/net/grpc/grpc_client/client_user.go
@@ -1,4 +1,4 @@
-package service
+package grpc_client
 
 import (
 	"git.hlsq.asia/mmorpg/service-common/discover"
diff --git a/net/grpc/stream_client/gateway.go b/net/grpc/grpc_client/stream_gateway.go
similarity index 93%
rename from net/grpc/stream_client/gateway.go
rename to net/grpc/grpc_client/stream_gateway.go
index c43e22b..c7ed3af 100644
--- a/net/grpc/stream_client/gateway.go
+++ b/net/grpc/grpc_client/stream_gateway.go
@@ -1,9 +1,8 @@
-package stream_client
+package grpc_client
 
 import (
 	"context"
 	"git.hlsq.asia/mmorpg/service-common/log"
-	"git.hlsq.asia/mmorpg/service-common/net/grpc/service"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/proto"
 	"strconv"
@@ -30,7 +29,7 @@ func findGatewayBySID(sid string, fun GatewayFun) (*gatewayStream, error) {
 		return v.(*gatewayStream), nil
 	}
 
-	client, err := service.GatewayNewClient(sid)
+	client, err := GatewayNewClient(sid)
 	if err != nil {
 		log.Errorf("findGatewayBySID cannot find client: %v", err)
 		return nil, err
diff --git a/net/grpc/stream_client/scene.go b/net/grpc/grpc_client/stream_scene.go
similarity index 93%
rename from net/grpc/stream_client/scene.go
rename to net/grpc/grpc_client/stream_scene.go
index 85ff472..63df7bc 100644
--- a/net/grpc/stream_client/scene.go
+++ b/net/grpc/grpc_client/stream_scene.go
@@ -1,9 +1,8 @@
-package stream_client
+package grpc_client
 
 import (
 	"context"
 	"git.hlsq.asia/mmorpg/service-common/log"
-	"git.hlsq.asia/mmorpg/service-common/net/grpc/service"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/proto"
 	"strconv"
@@ -30,7 +29,7 @@ func findSceneBySID(sid string, fun SceneFun) (*sceneStream, error) {
 		return v.(*sceneStream), nil
 	}
 
-	client, err := service.SceneNewClient(sid)
+	client, err := SceneNewClient(sid)
 	if err != nil {
 		log.Errorf("findSceneBySID cannot find client: %v", err)
 		return nil, err