From 3504ec12cc9175136c2bb161af696fe4938729f3 Mon Sep 17 00:00:00 2001 From: "DESKTOP-V763RJ7\\Administrator" <835606593@qq.com> Date: Wed, 7 Jan 2026 15:15:29 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E4=BF=AE=E6=94=B9model=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/app.go | 6 +++--- app/base.go | 6 +++--- app/db.go | 4 ++-- app/grpc.go | 6 +++--- config/config.go | 2 +- go.mod | 4 +--- go.sum | 2 ++ internal/dao/model/users.gen.go | 2 +- internal/dao/query/users.gen.go | 2 +- internal/dao/repository/users.go | 8 ++++---- internal/grpc_server/server/server.go | 12 ++++++------ internal/grpc_server/server/server_init.go | 6 +++--- main.go | 2 +- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/app/app.go b/app/app.go index 8b99abf..938c9a3 100644 --- a/app/app.go +++ b/app/app.go @@ -1,11 +1,11 @@ package app import ( - "common/discover" - "common/log" "fmt" + "git.hlsq.asia/mmorpg/service-common/discover" + "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/mmorpg/service-user/config" "github.com/judwhite/go-svc" - "user/config" ) type Program struct { diff --git a/app/base.go b/app/base.go index ffb7184..5a1c61f 100644 --- a/app/base.go +++ b/app/base.go @@ -1,10 +1,10 @@ package app import ( - "common/log" - "common/utils" + "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/mmorpg/service-common/utils" + "git.hlsq.asia/mmorpg/service-user/config" "math/rand" - "user/config" ) // ModuleBase 基础模块，或者一些零散的模块 diff --git a/app/db.go b/app/db.go index d387068..c51d7ae 100644 --- a/app/db.go +++ b/app/db.go @@ -1,8 +1,8 @@ package app import ( - "common/db" - "user/config" + "git.hlsq.asia/mmorpg/service-common/db" + "git.hlsq.asia/mmorpg/service-user/config" ) // ModuleDB 数据库模块 diff --git a/app/grpc.go b/app/grpc.go index a544d76..1a30961 100644 --- a/app/grpc.go +++ b/app/grpc.go @@ -1,9 +1,9 @@ package app import ( - "common/net/grpc/service" - "user/config" - "user/internal/grpc_server/server" + "git.hlsq.asia/mmorpg/service-common/net/grpc/service" + "git.hlsq.asia/mmorpg/service-user/config" + "git.hlsq.asia/mmorpg/service-user/internal/grpc_server/server" ) // ModuleGrpcServer Grpc服务模块 diff --git a/config/config.go b/config/config.go index 0abe5cd..17e398b 100644 --- a/config/config.go +++ b/config/config.go @@ -1,6 +1,6 @@ package config -import "common/config" +import "git.hlsq.asia/mmorpg/service-common/config" const path = "./config" diff --git a/go.mod b/go.mod index 0ff6642..0ed8db3 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module git.hlsq.asia/mmorpg/service-user go 1.23.1 require ( - common v0.0.0-00010101000000-000000000000 + git.hlsq.asia/mmorpg/service-common v0.0.0-20260107061047-e02e56781e78 github.com/judwhite/go-svc v1.2.1 google.golang.org/grpc v1.71.1 google.golang.org/protobuf v1.36.9 @@ -87,5 +87,3 @@ require ( gorm.io/driver/mysql v1.6.0 // indirect gorm.io/hints v1.1.0 // indirect ) - -replace common => ../common diff --git a/go.sum b/go.sum index e289616..c6ca392 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ 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-20260107061047-e02e56781e78 h1:4CP8w5jHDOdN7hym8YrtioxNDd7PS2WcZDrO6dtY344= +git.hlsq.asia/mmorpg/service-common v0.0.0-20260107061047-e02e56781e78/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/dao/model/users.gen.go b/internal/dao/model/users.gen.go index e5007d6..b2f7841 100644 --- a/internal/dao/model/users.gen.go +++ b/internal/dao/model/users.gen.go @@ -5,7 +5,7 @@ package model import ( - "common/utils" + "git.hlsq.asia/mmorpg/service-common/utils" "gorm.io/gorm" "time" ) diff --git a/internal/dao/query/users.gen.go b/internal/dao/query/users.gen.go index 5d757ed..fb76e6c 100644 --- a/internal/dao/query/users.gen.go +++ b/internal/dao/query/users.gen.go @@ -6,7 +6,7 @@ package query import ( "context" - "user/internal/dao/model" + "git.hlsq.asia/mmorpg/service-user/internal/dao/model" "gorm.io/gorm" "gorm.io/gorm/clause" diff --git a/internal/dao/repository/users.go b/internal/dao/repository/users.go index a3571d5..20d9e1c 100644 --- a/internal/dao/repository/users.go +++ b/internal/dao/repository/users.go @@ -1,13 +1,13 @@ package repository import ( - "common/db/mysql" - "common/db/redis" "context" "fmt" + "git.hlsq.asia/mmorpg/service-common/db/mysql" + "git.hlsq.asia/mmorpg/service-common/db/redis" + "git.hlsq.asia/mmorpg/service-user/internal/dao/model" + "git.hlsq.asia/mmorpg/service-user/internal/dao/query" "time" - "user/internal/dao/model" - "user/internal/dao/query" ) var ( diff --git a/internal/grpc_server/server/server.go b/internal/grpc_server/server/server.go index c62f913..c221f93 100644 --- a/internal/grpc_server/server/server.go +++ b/internal/grpc_server/server/server.go @@ -1,16 +1,16 @@ package server import ( - "common/db/redis" - "common/net/http/http_resp" - "common/proto/ss/grpc_pb" - "common/utils" "context" "errors" "fmt" + "git.hlsq.asia/mmorpg/service-common/db/redis" + "git.hlsq.asia/mmorpg/service-common/net/http/http_resp" + "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb" + "git.hlsq.asia/mmorpg/service-common/utils" + "git.hlsq.asia/mmorpg/service-user/internal/dao/model" + "git.hlsq.asia/mmorpg/service-user/internal/dao/repository" "gorm.io/gorm" - "user/internal/dao/model" - "user/internal/dao/repository" ) func (s *Server) Login(ctx context.Context, req *grpc_pb.LoginReq) (*grpc_pb.LoginResp, error) { diff --git a/internal/grpc_server/server/server_init.go b/internal/grpc_server/server/server_init.go index 2cea096..0e0d036 100644 --- a/internal/grpc_server/server/server_init.go +++ b/internal/grpc_server/server/server_init.go @@ -1,9 +1,9 @@ package server import ( - "common/discover/common" - "common/net/grpc/service" - "common/proto/ss/grpc_pb" + "git.hlsq.asia/mmorpg/service-common/discover/common" + "git.hlsq.asia/mmorpg/service-common/net/grpc/service" + "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb" "google.golang.org/grpc" ) diff --git a/main.go b/main.go index 57c43fa..f88f351 100644 --- a/main.go +++ b/main.go @@ -2,9 +2,9 @@ package main import ( "fmt" + "git.hlsq.asia/mmorpg/service-user/app" "github.com/judwhite/go-svc" "syscall" - "user/app" ) func main() {