diff --git a/db/db.go b/db/db.go index 5cdbbab..0e9dfed 100644 --- a/db/db.go +++ b/db/db.go @@ -1,11 +1,11 @@ package db import ( - "common/config" - "common/db/etcd" - "common/db/mysql" - "common/db/redis" - "common/log" + "git.hlsq.asia/mmorpg/service-common/config" + "git.hlsq.asia/mmorpg/service-common/db/etcd" + "git.hlsq.asia/mmorpg/service-common/db/mysql" + "git.hlsq.asia/mmorpg/service-common/db/redis" + "git.hlsq.asia/mmorpg/service-common/log" ) // ModuleDB 数据库模块 diff --git a/db/etcd/client.go b/db/etcd/client.go index ce79301..e6c4ca1 100644 --- a/db/etcd/client.go +++ b/db/etcd/client.go @@ -1,8 +1,8 @@ package etcd import ( - "common/config" "context" + "git.hlsq.asia/mmorpg/service-common/config" "go.etcd.io/etcd/client/v3" "time" ) diff --git a/db/mongo/client.go b/db/mongo/client.go index db3b729..f6de04a 100644 --- a/db/mongo/client.go +++ b/db/mongo/client.go @@ -1,9 +1,9 @@ package mongo import ( - "common/config" - "common/log" "context" + "git.hlsq.asia/mmorpg/service-common/config" + "git.hlsq.asia/mmorpg/service-common/log" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" ) diff --git a/db/mysql/client.go b/db/mysql/client.go index aad686d..cdd2ca0 100644 --- a/db/mysql/client.go +++ b/db/mysql/client.go @@ -1,8 +1,8 @@ package mysql import ( - "common/config" - "common/log" + "git.hlsq.asia/mmorpg/service-common/config" + "git.hlsq.asia/mmorpg/service-common/log" "gorm.io/driver/mysql" "gorm.io/gorm" "gorm.io/gorm/logger" diff --git a/db/redis/client.go b/db/redis/client.go index b7f7950..559890a 100644 --- a/db/redis/client.go +++ b/db/redis/client.go @@ -1,9 +1,9 @@ package redis import ( - "common/config" - "common/log" "context" + "git.hlsq.asia/mmorpg/service-common/config" + "git.hlsq.asia/mmorpg/service-common/log" "github.com/redis/go-redis/v9" "time" ) diff --git a/discover/common/tool.go b/discover/common/tool.go index 3a1bbc1..6b7dfd4 100644 --- a/discover/common/tool.go +++ b/discover/common/tool.go @@ -1,8 +1,8 @@ package common import ( - "common/db/etcd" - "common/log" + "git.hlsq.asia/mmorpg/service-common/db/etcd" + "git.hlsq.asia/mmorpg/service-common/log" clientv3 "go.etcd.io/etcd/client/v3" ) diff --git a/discover/instance.go b/discover/instance.go index bf2a639..6af42a3 100644 --- a/discover/instance.go +++ b/discover/instance.go @@ -1,10 +1,10 @@ package discover import ( - "common/db/etcd" - "common/discover/common" - "common/log" "fmt" + "git.hlsq.asia/mmorpg/service-common/db/etcd" + "git.hlsq.asia/mmorpg/service-common/discover/common" + "git.hlsq.asia/mmorpg/service-common/log" clientv3 "go.etcd.io/etcd/client/v3" "strconv" "sync" diff --git a/discover/listener.go b/discover/listener.go index 38fde40..c7d6e68 100644 --- a/discover/listener.go +++ b/discover/listener.go @@ -1,12 +1,12 @@ package discover import ( - "common/db/etcd" - "common/discover/common" - "common/log" - "common/utils" "context" "fmt" + "git.hlsq.asia/mmorpg/service-common/db/etcd" + "git.hlsq.asia/mmorpg/service-common/discover/common" + "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/mmorpg/service-common/utils" "go.etcd.io/etcd/api/v3/mvccpb" clientv3 "go.etcd.io/etcd/client/v3" "strconv" diff --git a/discover/server.go b/discover/server.go index 903a370..d8b1bde 100644 --- a/discover/server.go +++ b/discover/server.go @@ -1,11 +1,11 @@ package discover import ( - "common/db/etcd" - "common/discover/common" - "common/log" - "common/net/grpc/grpc_conn" "fmt" + "git.hlsq.asia/mmorpg/service-common/db/etcd" + "git.hlsq.asia/mmorpg/service-common/discover/common" + "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/mmorpg/service-common/net/grpc/grpc_conn" clientv3 "go.etcd.io/etcd/client/v3" "google.golang.org/grpc" "sync" diff --git a/go.mod b/go.mod index 28cc671..917d63c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module common +module git.hlsq.asia/mmorpg/service-common go 1.23.1 diff --git a/net/grpc/grpc_conn/conn.go b/net/grpc/grpc_conn/conn.go index f68a88f..7b0da0f 100644 --- a/net/grpc/grpc_conn/conn.go +++ b/net/grpc/grpc_conn/conn.go @@ -1,7 +1,7 @@ package grpc_conn import ( - "common/log" + "git.hlsq.asia/mmorpg/service-common/log" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/keepalive" diff --git a/net/grpc/grpc_conn/conn_mgr.go b/net/grpc/grpc_conn/conn_mgr.go index 2a154e4..6743b8e 100644 --- a/net/grpc/grpc_conn/conn_mgr.go +++ b/net/grpc/grpc_conn/conn_mgr.go @@ -1,8 +1,8 @@ package grpc_conn import ( - "common/log" "fmt" + "git.hlsq.asia/mmorpg/service-common/log" "google.golang.org/grpc" "math/rand" ) diff --git a/net/grpc/resolver/conn.go b/net/grpc/resolver/conn.go index b9a97a9..8954899 100644 --- a/net/grpc/resolver/conn.go +++ b/net/grpc/resolver/conn.go @@ -1,7 +1,7 @@ package resolver import ( - "common/log" + "git.hlsq.asia/mmorpg/service-common/log" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/keepalive" diff --git a/net/grpc/resolver/etcd_resolver.go b/net/grpc/resolver/etcd_resolver.go index 40bdcec..e9d68ed 100644 --- a/net/grpc/resolver/etcd_resolver.go +++ b/net/grpc/resolver/etcd_resolver.go @@ -1,10 +1,10 @@ package resolver import ( - "common/db/etcd" - "common/discover/common" - "common/log" "context" + "git.hlsq.asia/mmorpg/service-common/db/etcd" + "git.hlsq.asia/mmorpg/service-common/discover/common" + "git.hlsq.asia/mmorpg/service-common/log" "go.etcd.io/etcd/client/v3" "google.golang.org/grpc/resolver" "strings" diff --git a/net/grpc/service/client_gateway.go b/net/grpc/service/client_gateway.go index 8bed0a6..1dea5af 100644 --- a/net/grpc/service/client_gateway.go +++ b/net/grpc/service/client_gateway.go @@ -1,9 +1,9 @@ package service import ( - "common/discover" - "common/discover/common" - "common/proto/ss/grpc_pb" + "git.hlsq.asia/mmorpg/service-common/discover" + "git.hlsq.asia/mmorpg/service-common/discover/common" + "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb" ) func GatewayNewClient(sid ...int64) (grpc_pb.GatewayClient, error) { diff --git a/net/grpc/service/client_scene.go b/net/grpc/service/client_scene.go index b7df99c..906f5d5 100644 --- a/net/grpc/service/client_scene.go +++ b/net/grpc/service/client_scene.go @@ -1,10 +1,10 @@ package service import ( - "common/discover" - "common/discover/common" - "common/net/grpc/resolver" - "common/proto/ss/grpc_pb" + "git.hlsq.asia/mmorpg/service-common/discover" + "git.hlsq.asia/mmorpg/service-common/discover/common" + "git.hlsq.asia/mmorpg/service-common/net/grpc/resolver" + "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb" ) func SceneNewClient(sid ...int64) (grpc_pb.SceneClient, error) { diff --git a/net/grpc/service/client_user.go b/net/grpc/service/client_user.go index fd470bb..ad6e65f 100644 --- a/net/grpc/service/client_user.go +++ b/net/grpc/service/client_user.go @@ -1,10 +1,10 @@ package service import ( - "common/discover" - "common/discover/common" - "common/net/grpc/resolver" - "common/proto/ss/grpc_pb" + "git.hlsq.asia/mmorpg/service-common/discover" + "git.hlsq.asia/mmorpg/service-common/discover/common" + "git.hlsq.asia/mmorpg/service-common/net/grpc/resolver" + "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb" ) func UserNewClient(sid ...int64) (grpc_pb.UserClient, error) { diff --git a/net/grpc/service/service.go b/net/grpc/service/service.go index 8c9e4d8..c3b8dd9 100644 --- a/net/grpc/service/service.go +++ b/net/grpc/service/service.go @@ -1,11 +1,11 @@ package service import ( - "common/discover" - "common/log" - "common/utils" "context" "fmt" + "git.hlsq.asia/mmorpg/service-common/discover" + "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/mmorpg/service-common/utils" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/keepalive" diff --git a/net/http/http_resp/code.go b/net/http/http_resp/code.go index 6bec18e..db662a9 100644 --- a/net/http/http_resp/code.go +++ b/net/http/http_resp/code.go @@ -1,7 +1,7 @@ package http_resp import ( - "common/proto/ss/ss_common" + "git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/net/socket/websocket/websocket.go b/net/socket/websocket/websocket.go index 15b19f8..3421c6e 100644 --- a/net/socket/websocket/websocket.go +++ b/net/socket/websocket/websocket.go @@ -2,8 +2,8 @@ package websocket import ( "bytes" - "common/net/socket" "context" + "git.hlsq.asia/mmorpg/service-common/net/socket" "github.com/panjf2000/gnet/v2" "github.com/panjf2000/gnet/v2/pkg/logging" "sync" diff --git a/proto/sc/sc_pb/action.pb.go b/proto/sc/sc_pb/action.pb.go index 08ed345..bba2e3e 100644 --- a/proto/sc/sc_pb/action.pb.go +++ b/proto/sc/sc_pb/action.pb.go @@ -7,7 +7,7 @@ package sc_pb import ( - _ "common/proto/sc/sc_common" + _ "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/proto/sc/sc_pb/define.pb.go b/proto/sc/sc_pb/define.pb.go index 60b5b01..587c41b 100644 --- a/proto/sc/sc_pb/define.pb.go +++ b/proto/sc/sc_pb/define.pb.go @@ -7,7 +7,7 @@ package sc_pb import ( - _ "common/proto/sc/sc_common" + _ "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/proto/sc/sc_pb/service.pb.go b/proto/sc/sc_pb/service.pb.go index 4ba8aff..93530b8 100644 --- a/proto/sc/sc_pb/service.pb.go +++ b/proto/sc/sc_pb/service.pb.go @@ -7,7 +7,7 @@ package sc_pb import ( - _ "common/proto/sc/sc_common" + _ "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/proto/ss/grpc_pb/mocks/service_user_grpc.pb.go b/proto/ss/grpc_pb/mocks/service_user_grpc.pb.go index 3a71a9b..976b410 100644 --- a/proto/ss/grpc_pb/mocks/service_user_grpc.pb.go +++ b/proto/ss/grpc_pb/mocks/service_user_grpc.pb.go @@ -5,8 +5,8 @@ package mocks import ( - grpc_pb "common/proto/ss/grpc_pb" context "context" + grpc_pb "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb" reflect "reflect" gomock "github.com/golang/mock/gomock" diff --git a/proto/ss/grpc_pb/service_gateway.pb.go b/proto/ss/grpc_pb/service_gateway.pb.go index 6562b52..fe6e1d1 100644 --- a/proto/ss/grpc_pb/service_gateway.pb.go +++ b/proto/ss/grpc_pb/service_gateway.pb.go @@ -7,7 +7,7 @@ package grpc_pb import ( - _ "common/proto/ss/ss_common" + _ "git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/proto/ss/grpc_pb/service_scene.pb.go b/proto/ss/grpc_pb/service_scene.pb.go index 52bb24e..234fbf4 100644 --- a/proto/ss/grpc_pb/service_scene.pb.go +++ b/proto/ss/grpc_pb/service_scene.pb.go @@ -7,7 +7,7 @@ package grpc_pb import ( - _ "common/proto/ss/ss_common" + _ "git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/proto/ss/grpc_pb/service_user.pb.go b/proto/ss/grpc_pb/service_user.pb.go index adfb2c2..6731e7d 100644 --- a/proto/ss/grpc_pb/service_user.pb.go +++ b/proto/ss/grpc_pb/service_user.pb.go @@ -7,7 +7,7 @@ package grpc_pb import ( - _ "common/proto/ss/ss_common" + _ "git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" diff --git a/utils/test.go b/utils/test.go index 2273ac5..88ee9f2 100644 --- a/utils/test.go +++ b/utils/test.go @@ -2,8 +2,8 @@ package utils import ( "bytes" - "common/net/http/http_resp" "encoding/json" + "git.hlsq.asia/mmorpg/service-common/net/http/http_resp" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" "net/http/httptest"