feat 修改包路径

This commit is contained in:
2026-10-28 15:58:40 +08:00
parent 82c4e67742
commit a0968db345
25 changed files with 92 additions and 92 deletions

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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"

2
deploy/Jenkinsfile vendored
View File

@@ -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

4
go.mod
View File

@@ -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

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -1,7 +1,7 @@
package client
import (
"git.hlsq.asia/mmorpg/service-gateway/internal/global"
"git.hlsq.asia/alex/service-gateway/internal/global"
"sync"
)

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"
)