From 1cfe52d56594aa96653245864d136acca2c8bbd9 Mon Sep 17 00:00:00 2001
From: zhouyonggao <1971162852@qq.com>
Date: Sat, 20 Dec 2025 14:26:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(grpc):=20=E6=9B=B4=E6=96=B0=20gRPC=20?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=A2=E6=88=B7=E7=AB=AF=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E4=B8=BA=20GitHub=20=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 user_client.go 中的 gRPC 用户客户端路径引用，使用 GitHub 路径以避免对 grpc 目录的修改。
- 更新 go.mod 文件中的 gRPC 用户客户端依赖，简化依赖管理。
---
 go.work                             | 6 ++++++
 go.work.sum                         | 1 +
 grpc                                | 2 +-
 server/go.mod                       | 5 +----
 server/internal/grpc/user_client.go | 4 ++--
 5 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 go.work
 create mode 100644 go.work.sum

diff --git a/go.work b/go.work
new file mode 100644
index 0000000..8c10223
--- /dev/null
+++ b/go.work
@@ -0,0 +1,6 @@
+go 1.25.4
+
+use (
+	./grpc/user/userv1
+	./server
+)
diff --git a/go.work.sum b/go.work.sum
new file mode 100644
index 0000000..9fd6adc
--- /dev/null
+++ b/go.work.sum
@@ -0,0 +1 @@
+google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 h1:SeZZZx0cP0fqUyA+oRzP9k7cSwJlvDFiROO72uwD6i0=
diff --git a/grpc b/grpc
index 00ebce5..040d4db 160000
--- a/grpc
+++ b/grpc
@@ -1 +1 @@
-Subproject commit 00ebce5a327bfb43bd3cd8543639671efa99c8cd
+Subproject commit 040d4dbacab2cf48ed17d44adcc286d3535d80f1
diff --git a/server/go.mod b/server/go.mod
index b3f3a4b..14632b8 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/xuri/excelize/v2 v2.8.1
 	google.golang.org/grpc v1.60.1
 	gopkg.in/yaml.v3 v3.0.1
-	grpc/user/userv1 v0.0.0
+	github.com/grpc/user/userv1 v0.0.0
 )
 
 require (
@@ -25,6 +25,3 @@ require (
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
 	google.golang.org/protobuf v1.32.0 // indirect
 )
-
-// 使用本地 grpc 生成的代码（不修改 grpc 目录）
-replace grpc/user/userv1 => ../grpc/user/userv1
diff --git a/server/internal/grpc/user_client.go b/server/internal/grpc/user_client.go
index c05fbff..e54937b 100644
--- a/server/internal/grpc/user_client.go
+++ b/server/internal/grpc/user_client.go
@@ -11,8 +11,8 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/keepalive"
 
-	// 使用生成的 proto 代码（通过 go.mod replace 指向本地目录，不修改 grpc 目录）
-	userv1 "grpc/user/userv1"
+	// 使用生成的 proto 代码（通过 go.work，不修改 grpc 目录的代码文件）
+	userv1 "github.com/grpc/user/userv1"
 )
 
 var (