diff --git a/app/app.go b/app/app.go index ffe7c54..ffc609e 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-scene/config" "github.com/judwhite/go-svc" - "scene/config" ) type Program struct { diff --git a/app/base.go b/app/base.go index 3614b3d..1045c84 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-scene/config" "math/rand" - "scene/config" ) // ModuleBase 基础模块,或者一些零散的模块 diff --git a/app/db.go b/app/db.go index a457f05..ee3d659 100644 --- a/app/db.go +++ b/app/db.go @@ -1,8 +1,8 @@ package app import ( - "common/db" - "scene/config" + "git.hlsq.asia/mmorpg/service-common/db" + "git.hlsq.asia/mmorpg/service-scene/config" ) // ModuleDB 数据库模块 diff --git a/app/grpc.go b/app/grpc.go index 0438b5c..621187d 100644 --- a/app/grpc.go +++ b/app/grpc.go @@ -1,9 +1,9 @@ package app import ( - "common/net/grpc/service" - "scene/config" - "scene/internal/grpc_server/server" + "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" ) // 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 4d1e3ac..954a8ff 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module git.hlsq.asia/mmorpg/service-scene 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 go.uber.org/zap v1.27.0 google.golang.org/grpc v1.71.1 @@ -82,5 +82,3 @@ require ( gorm.io/driver/mysql v1.6.0 // indirect gorm.io/gorm v1.31.1 // indirect ) - -replace common => ../common diff --git a/go.sum b/go.sum index f437fa0..308680f 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/grpc_server/server/server.go b/internal/grpc_server/server/server.go index 5aa3173..1f81c08 100644 --- a/internal/grpc_server/server/server.go +++ b/internal/grpc_server/server/server.go @@ -1,12 +1,12 @@ package server import ( - "common/log" - "common/proto/sc/sc_pb" - "common/proto/ss/grpc_pb" "context" + "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb" + "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb" + instance2 "git.hlsq.asia/mmorpg/service-scene/internal/instance" "google.golang.org/protobuf/proto" - instance2 "scene/internal/instance" "sync" ) diff --git a/internal/grpc_server/server/server_init.go b/internal/grpc_server/server/server_init.go index b3c239b..52b2a4a 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/internal/grpc_server/stream_client/gateway.go b/internal/grpc_server/stream_client/gateway.go index a47cf81..2fc85ed 100644 --- a/internal/grpc_server/stream_client/gateway.go +++ b/internal/grpc_server/stream_client/gateway.go @@ -1,9 +1,9 @@ package stream_client import ( - "common/log" - "common/net/grpc/service" "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" diff --git a/internal/instance/instance.go b/internal/instance/instance.go index edcc8ad..9b14e4d 100644 --- a/internal/instance/instance.go +++ b/internal/instance/instance.go @@ -1,18 +1,18 @@ package instance import ( - "common/discover" - "common/log" - "common/proto/sc/sc_pb" - "common/proto/ss/grpc_pb" - "common/utils" "context" "fmt" + "git.hlsq.asia/mmorpg/service-common/discover" + "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb" + "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb" + "git.hlsq.asia/mmorpg/service-common/utils" + "git.hlsq.asia/mmorpg/service-scene/internal/grpc_server/stream_client" + "git.hlsq.asia/mmorpg/service-scene/internal/npc" "go.uber.org/zap" "google.golang.org/protobuf/proto" "runtime/debug" - "scene/internal/grpc_server/stream_client" - "scene/internal/npc" "sync" "time" ) diff --git a/internal/npc/npc.go b/internal/npc/npc.go index e07b3f6..5a043ed 100644 --- a/internal/npc/npc.go +++ b/internal/npc/npc.go @@ -1,7 +1,7 @@ package npc import ( - "common/proto/ss/grpc_pb" + "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb" ) // NPCNode 定义NPC节点 diff --git a/internal/npc/player.go b/internal/npc/player.go index 945d5a4..637c8ca 100644 --- a/internal/npc/player.go +++ b/internal/npc/player.go @@ -1,8 +1,8 @@ package npc import ( - "common/proto/sc/sc_pb" - "common/proto/ss/grpc_pb" + "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb" + "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb" ) // PlayerNode 定义玩家节点结构体 diff --git a/main.go b/main.go index 394c871..7ab6da5 100644 --- a/main.go +++ b/main.go @@ -2,8 +2,8 @@ package main import ( "fmt" + "git.hlsq.asia/mmorpg/service-scene/app" "github.com/judwhite/go-svc" - "scene/app" "syscall" )