diff --git a/app/app.go b/app/app.go index e88477d..96de42b 100644 --- a/app/app.go +++ b/app/app.go @@ -2,12 +2,12 @@ package app import ( "fmt" - "git.hlsq.asia/mmorpg/service-common/discover/common" - "git.hlsq.asia/mmorpg/service-common/log" - "git.hlsq.asia/mmorpg/service-common/module" - "git.hlsq.asia/mmorpg/service-gateway/config" - "git.hlsq.asia/mmorpg/service-gateway/internal/global" - "git.hlsq.asia/mmorpg/service-gateway/internal/grpcserver" + "git.hlsq.asia/alex/service-common/discover/common" + "git.hlsq.asia/alex/service-common/log" + "git.hlsq.asia/alex/service-common/module" + "git.hlsq.asia/alex/service-gateway/config" + "git.hlsq.asia/alex/service-gateway/internal/global" + "git.hlsq.asia/alex/service-gateway/internal/grpcserver" "github.com/judwhite/go-svc" "sync" ) diff --git a/app/login_queue.go b/app/login_queue.go index b40153d..e60f9e3 100644 --- a/app/login_queue.go +++ b/app/login_queue.go @@ -1,9 +1,9 @@ package app import ( - "git.hlsq.asia/mmorpg/service-common/module" - "git.hlsq.asia/mmorpg/service-gateway/internal/global" - "git.hlsq.asia/mmorpg/service-gateway/internal/handler/wshandler/login" + "git.hlsq.asia/alex/service-common/module" + "git.hlsq.asia/alex/service-gateway/internal/global" + "git.hlsq.asia/alex/service-gateway/internal/handler/wshandler/login" "runtime" "sync" ) diff --git a/app/web.go b/app/web.go index 2d4ddc6..445aff2 100644 --- a/app/web.go +++ b/app/web.go @@ -4,10 +4,10 @@ import ( "context" "errors" "fmt" - "git.hlsq.asia/mmorpg/service-common/log" - "git.hlsq.asia/mmorpg/service-common/module" - "git.hlsq.asia/mmorpg/service-gateway/config" - "git.hlsq.asia/mmorpg/service-gateway/internal/net/httpgateway" + "git.hlsq.asia/alex/service-common/log" + "git.hlsq.asia/alex/service-common/module" + "git.hlsq.asia/alex/service-gateway/config" + "git.hlsq.asia/alex/service-gateway/internal/net/httpgateway" "net/http" "sync" ) diff --git a/app/websocket.go b/app/websocket.go index b0067ab..df4a9ca 100644 --- a/app/websocket.go +++ b/app/websocket.go @@ -2,11 +2,11 @@ package app import ( "fmt" - "git.hlsq.asia/mmorpg/service-common/log" - "git.hlsq.asia/mmorpg/service-common/module" - "git.hlsq.asia/mmorpg/service-common/net/socket/websocket" - "git.hlsq.asia/mmorpg/service-gateway/config" - "git.hlsq.asia/mmorpg/service-gateway/internal/net/wsgateway" + "git.hlsq.asia/alex/service-common/log" + "git.hlsq.asia/alex/service-common/module" + "git.hlsq.asia/alex/service-common/net/socket/websocket" + "git.hlsq.asia/alex/service-gateway/config" + "git.hlsq.asia/alex/service-gateway/internal/net/wsgateway" "github.com/panjf2000/gnet/v2" "sync" "time" diff --git a/config/config.go b/config/config.go index fdbba6e..28633fa 100644 --- a/config/config.go +++ b/config/config.go @@ -1,6 +1,6 @@ package config -import "git.hlsq.asia/mmorpg/service-common/config" +import "git.hlsq.asia/alex/service-common/config" const path = "./config" diff --git a/deploy/Jenkinsfile b/deploy/Jenkinsfile index 8549495..c5cabaa 100644 --- a/deploy/Jenkinsfile +++ b/deploy/Jenkinsfile @@ -3,7 +3,7 @@ pipeline { environment { // 仓库 - REPO_URL = 'https://git.hlsq.asia/mmorpg/service-gateway.git' + REPO_URL = 'https://git.hlsq.asia/alex/service-gateway.git' REPO_CREDENTIALS_ID = '80805ba2-f4ac-4d84-aee6-d4cce5fc0a96' // Registry diff --git a/go.mod b/go.mod index a3c3465..d4d42ec 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ -module git.hlsq.asia/mmorpg/service-gateway +module git.hlsq.asia/alex/service-gateway go 1.24.0 require ( bou.ke/monkey v1.0.2 - git.hlsq.asia/mmorpg/service-common v0.0.0-20260211064821-558677bc3a2e + git.hlsq.asia/alex/service-common v0.0.0-20260211064821-558677bc3a2e github.com/alicebob/miniredis/v2 v2.35.0 github.com/gin-contrib/cors v1.7.6 github.com/gin-gonic/gin v1.11.0 diff --git a/internal/grpcserver/server.go b/internal/grpcserver/server.go index 5ac52b8..885e1c0 100644 --- a/internal/grpcserver/server.go +++ b/internal/grpcserver/server.go @@ -2,11 +2,11 @@ package grpcserver import ( "context" - "git.hlsq.asia/mmorpg/service-common/log" - "git.hlsq.asia/mmorpg/service-common/proto/rs/rspb" - "git.hlsq.asia/mmorpg/service-common/proto/ss/sspb" - "git.hlsq.asia/mmorpg/service-gateway/internal/global" - "git.hlsq.asia/mmorpg/service-gateway/internal/handler/wshandler/client" + "git.hlsq.asia/alex/service-common/log" + "git.hlsq.asia/alex/service-common/proto/rs/rspb" + "git.hlsq.asia/alex/service-common/proto/ss/sspb" + "git.hlsq.asia/alex/service-gateway/internal/global" + "git.hlsq.asia/alex/service-gateway/internal/handler/wshandler/client" "google.golang.org/protobuf/proto" "sync" ) diff --git a/internal/grpcserver/server_init.go b/internal/grpcserver/server_init.go index 16c0170..7c45a47 100644 --- a/internal/grpcserver/server_init.go +++ b/internal/grpcserver/server_init.go @@ -1,11 +1,11 @@ package grpcserver import ( - "git.hlsq.asia/mmorpg/service-common/config" - "git.hlsq.asia/mmorpg/service-common/discover/common" - "git.hlsq.asia/mmorpg/service-common/net/grpc/service" - "git.hlsq.asia/mmorpg/service-common/proto/rs/rspb" - "git.hlsq.asia/mmorpg/service-gateway/internal/global" + "git.hlsq.asia/alex/service-common/config" + "git.hlsq.asia/alex/service-common/discover/common" + "git.hlsq.asia/alex/service-common/net/grpc/service" + "git.hlsq.asia/alex/service-common/proto/rs/rspb" + "git.hlsq.asia/alex/service-gateway/internal/global" "google.golang.org/grpc" ) diff --git a/internal/handler/httphandler/login.go b/internal/handler/httphandler/login.go index c382226..f305f1a 100644 --- a/internal/handler/httphandler/login.go +++ b/internal/handler/httphandler/login.go @@ -1,13 +1,13 @@ package httphandler import ( - "git.hlsq.asia/mmorpg/service-common/db/redis" - "git.hlsq.asia/mmorpg/service-common/log" - "git.hlsq.asia/mmorpg/service-common/net/grpc/grpcclient" - "git.hlsq.asia/mmorpg/service-common/net/http/httpresp" - "git.hlsq.asia/mmorpg/service-common/proto/rs/rspb" - "git.hlsq.asia/mmorpg/service-common/utils" - "git.hlsq.asia/mmorpg/service-gateway/internal/global" + "git.hlsq.asia/alex/service-common/db/redis" + "git.hlsq.asia/alex/service-common/log" + "git.hlsq.asia/alex/service-common/net/grpc/grpcclient" + "git.hlsq.asia/alex/service-common/net/http/httpresp" + "git.hlsq.asia/alex/service-common/proto/rs/rspb" + "git.hlsq.asia/alex/service-common/utils" + "git.hlsq.asia/alex/service-gateway/internal/global" "github.com/gin-gonic/gin" ) diff --git a/internal/handler/httphandler/login_test.go b/internal/handler/httphandler/login_test.go index a112ccd..eca5365 100644 --- a/internal/handler/httphandler/login_test.go +++ b/internal/handler/httphandler/login_test.go @@ -3,12 +3,12 @@ package httphandler import ( "bou.ke/monkey" "fmt" - "git.hlsq.asia/mmorpg/service-common/net/grpc/grpcclient" - "git.hlsq.asia/mmorpg/service-common/net/http/httpresp" - "git.hlsq.asia/mmorpg/service-common/proto/rs/rspb" - "git.hlsq.asia/mmorpg/service-common/proto/rs/rspb/mocks" - "git.hlsq.asia/mmorpg/service-common/utils" - "git.hlsq.asia/mmorpg/service-gateway/internal/testutil" + "git.hlsq.asia/alex/service-common/net/grpc/grpcclient" + "git.hlsq.asia/alex/service-common/net/http/httpresp" + "git.hlsq.asia/alex/service-common/proto/rs/rspb" + "git.hlsq.asia/alex/service-common/proto/rs/rspb/mocks" + "git.hlsq.asia/alex/service-common/utils" + "git.hlsq.asia/alex/service-gateway/internal/testutil" "github.com/gin-gonic/gin" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" diff --git a/internal/handler/httphandler/session.go b/internal/handler/httphandler/session.go index 172c182..6aff8cc 100644 --- a/internal/handler/httphandler/session.go +++ b/internal/handler/httphandler/session.go @@ -1,10 +1,10 @@ package httphandler import ( - "git.hlsq.asia/mmorpg/service-common/db/redis" - "git.hlsq.asia/mmorpg/service-common/utils" - "git.hlsq.asia/mmorpg/service-gateway/config" - "git.hlsq.asia/mmorpg/service-gateway/internal/global" + "git.hlsq.asia/alex/service-common/db/redis" + "git.hlsq.asia/alex/service-common/utils" + "git.hlsq.asia/alex/service-gateway/config" + "git.hlsq.asia/alex/service-gateway/internal/global" "github.com/gin-gonic/gin" "github.com/google/uuid" ) diff --git a/internal/handler/wshandler/client/client.go b/internal/handler/wshandler/client/client.go index 92c88eb..49e0544 100644 --- a/internal/handler/wshandler/client/client.go +++ b/internal/handler/wshandler/client/client.go @@ -3,10 +3,10 @@ package client import ( "context" "fmt" - "git.hlsq.asia/mmorpg/service-common/db/redis" - "git.hlsq.asia/mmorpg/service-common/log" - "git.hlsq.asia/mmorpg/service-common/net/socket" - "git.hlsq.asia/mmorpg/service-gateway/internal/global" + "git.hlsq.asia/alex/service-common/db/redis" + "git.hlsq.asia/alex/service-common/log" + "git.hlsq.asia/alex/service-common/net/socket" + "git.hlsq.asia/alex/service-gateway/internal/global" "go.uber.org/zap" "runtime/debug" "sync" diff --git a/internal/handler/wshandler/client/client_handler.go b/internal/handler/wshandler/client/client_handler.go index 925266d..6bc45cb 100644 --- a/internal/handler/wshandler/client/client_handler.go +++ b/internal/handler/wshandler/client/client_handler.go @@ -3,11 +3,11 @@ package client import ( "context" "fmt" - "git.hlsq.asia/mmorpg/service-common/db/redis" - "git.hlsq.asia/mmorpg/service-common/net/grpc/grpcclient" - "git.hlsq.asia/mmorpg/service-common/proto/rs/rspb" - "git.hlsq.asia/mmorpg/service-common/proto/ss/sspb" - "git.hlsq.asia/mmorpg/service-gateway/internal/global" + "git.hlsq.asia/alex/service-common/db/redis" + "git.hlsq.asia/alex/service-common/net/grpc/grpcclient" + "git.hlsq.asia/alex/service-common/proto/rs/rspb" + "git.hlsq.asia/alex/service-common/proto/ss/sspb" + "git.hlsq.asia/alex/service-gateway/internal/global" "google.golang.org/protobuf/proto" "time" ) diff --git a/internal/handler/wshandler/client/client_write.go b/internal/handler/wshandler/client/client_write.go index 9cf57f3..a347ee2 100644 --- a/internal/handler/wshandler/client/client_write.go +++ b/internal/handler/wshandler/client/client_write.go @@ -1,7 +1,7 @@ package client import ( - "git.hlsq.asia/mmorpg/service-common/proto/ss/sspb" + "git.hlsq.asia/alex/service-common/proto/ss/sspb" "google.golang.org/protobuf/proto" ) diff --git a/internal/handler/wshandler/client/manager.go b/internal/handler/wshandler/client/manager.go index c46537c..ea91256 100644 --- a/internal/handler/wshandler/client/manager.go +++ b/internal/handler/wshandler/client/manager.go @@ -1,7 +1,7 @@ package client import ( - "git.hlsq.asia/mmorpg/service-gateway/internal/global" + "git.hlsq.asia/alex/service-gateway/internal/global" "sync" ) diff --git a/internal/handler/wshandler/login/login.go b/internal/handler/wshandler/login/login.go index c267908..963c3b1 100644 --- a/internal/handler/wshandler/login/login.go +++ b/internal/handler/wshandler/login/login.go @@ -3,14 +3,14 @@ package login import ( "context" "fmt" - "git.hlsq.asia/mmorpg/service-common/db/redis" - "git.hlsq.asia/mmorpg/service-common/log" - "git.hlsq.asia/mmorpg/service-common/net/grpc/grpcclient" - "git.hlsq.asia/mmorpg/service-common/proto/rs/rspb" - "git.hlsq.asia/mmorpg/service-common/proto/ss/sspb" - "git.hlsq.asia/mmorpg/service-common/utils" - "git.hlsq.asia/mmorpg/service-gateway/internal/global" - "git.hlsq.asia/mmorpg/service-gateway/internal/handler/wshandler/client" + "git.hlsq.asia/alex/service-common/db/redis" + "git.hlsq.asia/alex/service-common/log" + "git.hlsq.asia/alex/service-common/net/grpc/grpcclient" + "git.hlsq.asia/alex/service-common/proto/rs/rspb" + "git.hlsq.asia/alex/service-common/proto/ss/sspb" + "git.hlsq.asia/alex/service-common/utils" + "git.hlsq.asia/alex/service-gateway/internal/global" + "git.hlsq.asia/alex/service-gateway/internal/handler/wshandler/client" "sync" "time" ) diff --git a/internal/handler/wshandler/login/queue_up.go b/internal/handler/wshandler/login/queue_up.go index f53c34a..8767592 100644 --- a/internal/handler/wshandler/login/queue_up.go +++ b/internal/handler/wshandler/login/queue_up.go @@ -3,7 +3,7 @@ package login import ( "context" "errors" - "git.hlsq.asia/mmorpg/service-gateway/internal/handler/wshandler/client" + "git.hlsq.asia/alex/service-gateway/internal/handler/wshandler/client" "sync" "sync/atomic" ) diff --git a/internal/net/httpgateway/middleward.go b/internal/net/httpgateway/middleward.go index 9da4e05..a1a389d 100644 --- a/internal/net/httpgateway/middleward.go +++ b/internal/net/httpgateway/middleward.go @@ -2,10 +2,10 @@ package httpgateway import ( "fmt" - "git.hlsq.asia/mmorpg/service-common/db/redis" - "git.hlsq.asia/mmorpg/service-common/net/http/httpresp" - "git.hlsq.asia/mmorpg/service-common/utils" - "git.hlsq.asia/mmorpg/service-gateway/internal/global" + "git.hlsq.asia/alex/service-common/db/redis" + "git.hlsq.asia/alex/service-common/net/http/httpresp" + "git.hlsq.asia/alex/service-common/utils" + "git.hlsq.asia/alex/service-gateway/internal/global" "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" "go.uber.org/zap" diff --git a/internal/net/httpgateway/router.go b/internal/net/httpgateway/router.go index 7730909..a00c8a4 100644 --- a/internal/net/httpgateway/router.go +++ b/internal/net/httpgateway/router.go @@ -2,13 +2,13 @@ package httpgateway import ( "context" - "git.hlsq.asia/mmorpg/service-common/discover/common" - "git.hlsq.asia/mmorpg/service-common/log" - "git.hlsq.asia/mmorpg/service-common/net/grpc/grpcclient" - "git.hlsq.asia/mmorpg/service-common/net/http/httpresp" - "git.hlsq.asia/mmorpg/service-common/proto/rs/rspb" - "git.hlsq.asia/mmorpg/service-gateway/internal/handler/httphandler" - "git.hlsq.asia/mmorpg/service-gateway/internal/net/httpgateway/wrapper" + "git.hlsq.asia/alex/service-common/discover/common" + "git.hlsq.asia/alex/service-common/log" + "git.hlsq.asia/alex/service-common/net/grpc/grpcclient" + "git.hlsq.asia/alex/service-common/net/http/httpresp" + "git.hlsq.asia/alex/service-common/proto/rs/rspb" + "git.hlsq.asia/alex/service-gateway/internal/handler/httphandler" + "git.hlsq.asia/alex/service-gateway/internal/net/httpgateway/wrapper" "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" diff --git a/internal/net/httpgateway/wrapper/error_handler.go b/internal/net/httpgateway/wrapper/error_handler.go index 62ee37d..fedc756 100644 --- a/internal/net/httpgateway/wrapper/error_handler.go +++ b/internal/net/httpgateway/wrapper/error_handler.go @@ -3,8 +3,8 @@ package wrapper import ( "context" "encoding/json" - "git.hlsq.asia/mmorpg/service-common/net/http/httpresp" - "git.hlsq.asia/mmorpg/service-common/proto/rs/rscommon" + "git.hlsq.asia/alex/service-common/net/http/httpresp" + "git.hlsq.asia/alex/service-common/proto/rs/rscommon" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/net/httpgateway/wrapper/marshal.go b/internal/net/httpgateway/wrapper/marshal.go index c629191..0b7b755 100644 --- a/internal/net/httpgateway/wrapper/marshal.go +++ b/internal/net/httpgateway/wrapper/marshal.go @@ -2,7 +2,7 @@ package wrapper import ( "encoding/json" - "git.hlsq.asia/mmorpg/service-common/net/http/httpresp" + "git.hlsq.asia/alex/service-common/net/http/httpresp" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "io" ) diff --git a/internal/net/wsgateway/server.go b/internal/net/wsgateway/server.go index 9e7bdcd..c3feea3 100644 --- a/internal/net/wsgateway/server.go +++ b/internal/net/wsgateway/server.go @@ -2,10 +2,10 @@ package wsgateway import ( "fmt" - "git.hlsq.asia/mmorpg/service-common/log" - "git.hlsq.asia/mmorpg/service-common/net/socket" - "git.hlsq.asia/mmorpg/service-gateway/internal/handler/wshandler/client" - "git.hlsq.asia/mmorpg/service-gateway/internal/handler/wshandler/login" + "git.hlsq.asia/alex/service-common/log" + "git.hlsq.asia/alex/service-common/net/socket" + "git.hlsq.asia/alex/service-gateway/internal/handler/wshandler/client" + "git.hlsq.asia/alex/service-gateway/internal/handler/wshandler/login" "go.uber.org/zap" "time" ) diff --git a/internal/testutil/suite.go b/internal/testutil/suite.go index 2ebb428..f3890f6 100644 --- a/internal/testutil/suite.go +++ b/internal/testutil/suite.go @@ -1,9 +1,9 @@ package testutil import ( - config2 "git.hlsq.asia/mmorpg/service-common/config" - "git.hlsq.asia/mmorpg/service-common/db/redis" - "git.hlsq.asia/mmorpg/service-gateway/config" + config2 "git.hlsq.asia/alex/service-common/config" + "git.hlsq.asia/alex/service-common/db/redis" + "git.hlsq.asia/alex/service-gateway/config" "github.com/alicebob/miniredis/v2" "github.com/stretchr/testify/suite" ) diff --git a/main.go b/main.go index b36be17..4a84ef3 100644 --- a/main.go +++ b/main.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "git.hlsq.asia/mmorpg/service-gateway/app" - "git.hlsq.asia/mmorpg/service-gateway/config" + "git.hlsq.asia/alex/service-gateway/app" + "git.hlsq.asia/alex/service-gateway/config" "github.com/judwhite/go-svc" "syscall" )