alex/service-gateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: alex:master
Branches Tags
alex:master alex:release/v0.1.1 alex:feat/instgo
..
compare: alex:c67e98b9e2616ec920bd7593d50fe69aa98bf810
Branches Tags
alex:master alex:release/v0.1.1 alex:feat/instgo

3 Commits
master ... c67e98b9e2

Author SHA1 Message Date
DESKTOP-V763RJ7\Administrator
c67e98b9e2 feat 基础镜像amd64 2026-01-24 10:04:08 +08:00
DESKTOP-V763RJ7\Administrator
4b40806c85 feat 基础镜像amd64 2026-01-24 10:03:58 +08:00
DESKTOP-V763RJ7\Administrator
ad6b8d77af feat 基础镜像amd64 2026-01-24 09:54:31 +08:00
34 changed files with 552 additions and 645 deletions
Expand all files Collapse all files

32
app/app.go
View File

@@ -2,12 +2,12 @@ package app
import (
"fmt"
"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"
"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/grpc_server"
"github.com/judwhite/go-svc"
"sync"
)
@@ -17,18 +17,24 @@ type Program struct {
}
func (p *Program) Init(_ svc.Environment) error {
p.moduleList = append(p.moduleList, &module.Log{Cfg: config.Get().Log})
p.moduleList = append(p.moduleList, &module.DB{Cfg: config.Get().DB, AppName: config.Get().App.Name})
p.moduleList = append(p.moduleList, &module.Snowflake{})
base := &ModuleBase{}
if err := base.Init(); err != nil {
return err
}
p.moduleList = append(p.moduleList, base)
p.moduleList = append(p.moduleList, (&module.DB{}).Bind(config.Get().DB, common.KeyDiscoverServiceNameGateway))
p.moduleList = append(p.moduleList, &ModuleWebServer{})
p.moduleList = append(p.moduleList, &ModuleWebsocketServer{})
p.moduleList = append(p.moduleList, &ModuleLoginQueue{})
p.moduleList = append(p.moduleList, &module.Grpc{Server: grpcserver.NewServer(config.Get().Serve.Grpc)})
p.moduleList = append(p.moduleList, &module.Prometheus{Cfg: config.Get().Metric})
p.moduleList = append(p.moduleList, &module.Tracer{Cfg: config.Get().Metric, ServiceName: common.KeyDiscoverServiceNameGateway})
p.moduleList = append(p.moduleList, (&module.Grpc{}).Bind(grpc_server.NewServer(config.Get().Serve.Grpc)))
p.moduleList = append(p.moduleList, (&module.Prometheus{}).Bind(config.Get().Metric))
p.moduleList = append(p.moduleList, (&module.Tracer{}).Bind(config.Get().Metric, common.KeyDiscoverServiceNameGateway))
p.moduleList = append(p.moduleList, &module.Discover{})
for _, m := range p.moduleList {
for i, m := range p.moduleList {
if i == 0 {
continue
}
if err := m.Init(); err != nil {
return err
}

27
app/base.go Normal file
View File

@@ -0,0 +1,27 @@
package app
import (
"git.hlsq.asia/mmorpg/service-common/log"
"git.hlsq.asia/mmorpg/service-common/module"
"git.hlsq.asia/mmorpg/service-common/utils"
"git.hlsq.asia/mmorpg/service-gateway/config"
"math/rand"
)
// ModuleBase 基础模块，或者一些零散的模块
type ModuleBase struct {
module.DefaultModule
}
func (m *ModuleBase) Init() error {
// 配置
if err := config.LoadConfig(); err != nil {
return err
}
cfg := config.Get()
// 日志
log.Init(cfg.Log.Debug, cfg.Log.MaxSize, cfg.Log.MaxBackups, cfg.Log.MaxAge, cfg.Log.Level)
// 雪花
utils.InitSnowflake(int64(rand.Intn(1000)))
return nil
}

6
app/login_queue.go
View File

@@ -1,9 +1,9 @@
package app
import (
"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"
"git.hlsq.asia/mmorpg/service-common/module"
"git.hlsq.asia/mmorpg/service-gateway/internal/global"
"git.hlsq.asia/mmorpg/service-gateway/internal/handler/ws_handler/login"
"runtime"
"sync"
)

11
app/web.go
View File

@@ -4,10 +4,10 @@ import (
"context"
"errors"
"fmt"
"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"
"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/http_gateway"
"net/http"
"sync"
)
@@ -30,10 +30,9 @@ func (m *ModuleWebServer) Start(ready *sync.WaitGroup) error {
defer m.wg.Done()
m.server = &http.Server{
Addr: fmt.Sprintf("%v:%v", config.Get().Serve.Http.Address, config.Get().Serve.Http.Port),
Handler: httpgateway.InitRouter(),
Handler: http_gateway.InitRouter(),
}
ready.Done()
log.Infof("http server start, addr: %v", m.server.Addr)
if err := m.server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
log.Errorf("http server failed: %v", err.Error())
}

13
app/websocket.go
View File

@@ -2,11 +2,11 @@ package app
import (
"fmt"
"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"
"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/ws_gateway"
"github.com/panjf2000/gnet/v2"
"sync"
"time"
@@ -22,7 +22,7 @@ type ModuleWebsocketServer struct {
func (m *ModuleWebsocketServer) Init() error {
m.wg = &sync.WaitGroup{}
m.server = websocket.NewWSServer(
&wsgateway.GatewayWsServer{},
&ws_gateway.GatewayWsServer{},
log.GetLogger().Named("ws_server"),
5*time.Second,
)
@@ -34,7 +34,6 @@ func (m *ModuleWebsocketServer) Start(ready *sync.WaitGroup) error {
go func() {
defer m.wg.Done()
ready.Done()
log.Infof("websocket server start, port: %v", config.Get().Serve.Socket.Web.Port)
_ = m.server.Run(
fmt.Sprintf("tcp4://0.0.0.0:%v", config.Get().Serve.Socket.Web.Port),
true,

13
config/config.dev.yaml
View File

@@ -13,19 +13,19 @@ metric:
address: "0.0.0.0"
port: 18504
jaeger:
endpoint: "127.0.0.1:4317"
endpoint: "localhost:4317"
db:
etcd:
endpoints: [ "127.0.0.1:2379" ]
endpoints: [ "localhost:2379" ]
redis:
addr: "127.0.0.1:6379"
addr: "localhost:6379"
password: "lQ7aM8oB6lK0iD5k"
db: 0
serve:
grpc:
address: "127.0.0.1"
address: "10.0.40.199"
port: 18500
ttl: 20
socket:
@@ -40,5 +40,6 @@ serve:
port: 18503
auth:
shortExpire: 3600
longExpire: 604800
secret: "bMa3mU4oCsX2KBex5o7GzwSnACpumFq3SdlDXYZgVTU="
shortExpire: 60
longExpire: 10080

3
config/config.go
View File

@@ -1,6 +1,6 @@
package config
import "git.hlsq.asia/alex/service-common/config"
import "git.hlsq.asia/mmorpg/service-common/config"
const path = "./config"
@@ -14,6 +14,7 @@ type Config struct {
}
type AuthConfig struct {
Secret string `yaml:"secret"`
ShortExpire int64 `yaml:"shortExpire"`
LongExpire int64 `yaml:"longExpire"`
}

5
config/config.prod.yaml
View File

@@ -40,5 +40,6 @@ serve:
port: 18503
auth:
shortExpire: 3600
longExpire: 604800
secret: "bMa3mU4oCsX2KBex5o7GzwSnACpumFq3SdlDXYZgVTU="
shortExpire: 15
longExpire: 10080

2
deploy/Dockerfile
View File

@@ -6,7 +6,7 @@ RUN apk add --no-cache tzdata && \
COPY service-gateway /app/service-gateway
COPY config /app/config
RUN chmod 777 /app/service-gateway
RUN chmod +x /app/service-gateway
WORKDIR /app
CMD ["./service-gateway"]

2
deploy/Jenkinsfile vendored
View File

@@ -3,7 +3,7 @@ pipeline {
environment {
// 仓库
REPO_URL = 'https://git.hlsq.asia/alex/service-gateway.git'
REPO_URL = 'https://git.hlsq.asia/mmorpg/service-gateway.git'
REPO_CREDENTIALS_ID = '80805ba2-f4ac-4d84-aee6-d4cce5fc0a96'
// Registry

8
go.mod
View File

@@ -1,19 +1,19 @@
module git.hlsq.asia/alex/service-gateway
module git.hlsq.asia/mmorpg/service-gateway
go 1.24.0
require (
bou.ke/monkey v1.0.2
git.hlsq.asia/alex/service-common master
git.hlsq.asia/mmorpg/service-common v0.0.0-20260123132258-4d661d08134e
github.com/alicebob/miniredis/v2 v2.35.0
github.com/gin-contrib/cors v1.7.6
github.com/gin-gonic/gin v1.11.0
github.com/golang/mock v1.6.0
github.com/google/uuid v1.6.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3
github.com/judwhite/go-svc v1.2.1
github.com/panjf2000/gnet/v2 v2.9.7
github.com/prometheus/client_golang v1.20.5
github.com/redis/go-redis/v9 v9.10.0
github.com/stretchr/testify v1.11.1
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.64.0
go.uber.org/zap v1.27.0
@@ -58,6 +58,7 @@ require (
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
@@ -85,7 +86,6 @@ require (
github.com/quic-go/qpack v0.6.0 // indirect
github.com/quic-go/quic-go v0.57.1 // indirect
github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
github.com/redis/go-redis/v9 v9.10.0 // indirect
github.com/sagikazarmark/locafero v0.11.0 // indirect
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
github.com/spf13/afero v1.15.0 // indirect

6
go.sum
View File

@@ -2,10 +2,8 @@ bou.ke/monkey v1.0.2 h1:kWcnsrCNUatbxncxR/ThdYqbytgOIArtYWqcQLQzKLI=
bou.ke/monkey v1.0.2/go.mod h1:OqickVX3tNx6t33n1xvtTtu85YN5s6cKwVug+oHMaIA=
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
git.hlsq.asia/alex/service-common v0.0.0-20260207051302-0ca8a0ccbb14 h1:4r3tNWRzGVY3Xx6UiGjJJnwoMoWlVqbyGrljxl5d/nQ=
git.hlsq.asia/alex/service-common v0.0.0-20260207051302-0ca8a0ccbb14/go.mod h1:mMhZcumphj6gaVTppVYsMTkd+5HupmQgAc53Pd4MH9I=
git.hlsq.asia/alex/service-common v0.0.0-20260211064821-558677bc3a2e h1:MNVS1NXNVn4DeTZPcvvA8YFM8afCzZedLPUYMffNgZs=
git.hlsq.asia/alex/service-common v0.0.0-20260211064821-558677bc3a2e/go.mod h1:mMhZcumphj6gaVTppVYsMTkd+5HupmQgAc53Pd4MH9I=
git.hlsq.asia/mmorpg/service-common v0.0.0-20260123132258-4d661d08134e h1:jcDwaL280D5BVGCfcIC3mQCjmwPz5fxX7NO1qf6nAIo=
git.hlsq.asia/mmorpg/service-common v0.0.0-20260123132258-4d661d08134e/go.mod h1:mMhZcumphj6gaVTppVYsMTkd+5HupmQgAc53Pd4MH9I=
github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/IBM/sarama v1.46.3 h1:njRsX6jNlnR+ClJ8XmkO+CM4unbrNr/2vB5KK6UA+IE=

7
internal/global/global.go
View File

@@ -10,12 +10,11 @@ const (
ServiceStatusStopping // 停止中
)
var GatewaySID int64
var GatewaySID string
const (
KeyGatewayAccessToken = "gateway:token:access:"
KeyGatewayRefreshToken = "gateway:token:refresh:"
KeyGatewaySession = "gateway:session:"
KeyGatewayAccessToken = "gateway:token:access:%v"
KeyGatewayRefreshToken = "gateway:token:refresh:%v"
KeyGatewayInfo = "gateway:info:%v"
HFieldInfoGatewaySID = "gateway_sid"

28
internal/grpcserver/server.go → internal/grpc_server/server.go
View File

@@ -1,17 +1,17 @@
package grpcserver
package grpc_server
import (
"context"
"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"
"git.hlsq.asia/mmorpg/service-common/log"
"git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb"
"git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb"
"git.hlsq.asia/mmorpg/service-gateway/internal/global"
"git.hlsq.asia/mmorpg/service-gateway/internal/handler/ws_handler/client"
"google.golang.org/protobuf/proto"
"sync"
)
func (s *Server) ToClient(server rspb.Gateway_ToClientServer) error {
func (s *Server) ToClient(server grpc_pb.Gateway_ToClientServer) error {
wg := &sync.WaitGroup{}
wg.Add(1)
go func() {
@@ -25,15 +25,15 @@ func (s *Server) ToClient(server rspb.Gateway_ToClientServer) error {
if args, err := server.Recv(); err != nil {
return
} else {
if args.USN == -1 {
if args.USN == "" {
//utils.WorkerPool(ws_handler.UserMgr.GetAllInterface(), func(task interface{}) {
// client := task.(*ws_handler.Client)
// client.WriteBytes(ss_pb.MessageID(args.MessageID), args.Payload)
//})
data, err := proto.Marshal(&sspb.Message{
ID: sspb.MessageID(args.MessageID),
data, err := proto.Marshal(&ss_pb.Message{
ID: ss_pb.MessageID(args.MessageID),
Payload: args.Payload,
})
if err != nil {
@@ -51,7 +51,7 @@ func (s *Server) ToClient(server rspb.Gateway_ToClientServer) error {
//}
} else {
if cli := client.UserMgr.GetByUSN(args.USN); cli != nil {
cli.WriteBytes(sspb.MessageID(args.MessageID), args.Payload)
cli.WriteBytes(ss_pb.MessageID(args.MessageID), args.Payload)
global.FlowCounter.Add(float64(len(args.Payload)))
}
}
@@ -59,12 +59,12 @@ func (s *Server) ToClient(server rspb.Gateway_ToClientServer) error {
}
}()
wg.Wait()
return server.SendAndClose(&rspb.ToClientResp{})
return server.SendAndClose(&grpc_pb.ToClientResp{})
}
func (s *Server) KickUser(ctx context.Context, req *rspb.KickUserReq) (*rspb.KickUserResp, error) {
func (s *Server) KickUser(ctx context.Context, req *grpc_pb.KickUserReq) (*grpc_pb.KickUserResp, error) {
if cli := client.UserMgr.GetByUSN(req.USN); cli != nil {
cli.CloseClient()
}
return &rspb.KickUserResp{}, nil
return &grpc_pb.KickUserResp{}, nil
}

16
internal/grpcserver/server_init.go → internal/grpc_server/server_init.go
View File

@@ -1,16 +1,16 @@
package grpcserver
package grpc_server
import (
"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"
"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/grpc_pb"
"git.hlsq.asia/mmorpg/service-gateway/internal/global"
"google.golang.org/grpc"
)
type Server struct {
rspb.UnimplementedGatewayServer
grpc_pb.UnimplementedGatewayServer
service.Base
}
@@ -34,7 +34,7 @@ func (s *Server) OnCustomGrpcServerOption() []grpc.ServerOption {
func (s *Server) OnInit(serve *grpc.Server) {
global.GatewaySID = s.SID
rspb.RegisterGatewayServer(serve, s)
grpc_pb.RegisterGatewayServer(serve, s)
}
func (s *Server) OnClose() {

139
internal/handler/http_handler/login.go Normal file
View File

@@ -0,0 +1,139 @@
package http_handler
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/grpc_client"
"git.hlsq.asia/mmorpg/service-common/net/http/http_resp"
"git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb"
"git.hlsq.asia/mmorpg/service-common/utils"
"git.hlsq.asia/mmorpg/service-gateway/config"
"git.hlsq.asia/mmorpg/service-gateway/internal/global"
"github.com/gin-gonic/gin"
"time"
)
// 这个模块处理用户登录
type LoginReq struct {
Phone string `json:"phone"` // 手机号
Code string `json:"code"` // 验证码
WxMiniCode string `json:"wxMiniCode"` // 微信小程序登录
}
type LoginResp struct {
USN string `json:"usn"`
Name string `json:"name"`
AccessToken string `json:"accessToken"`
RefreshToken string `json:"refreshToken"`
}
func Login(c *gin.Context) {
req := &LoginReq{}
if err := c.ShouldBindJSON(req); err != nil {
http_resp.JsonBadRequest(c)
return
}
client, err := grpc_client.UserNewClientLB()
if err != nil {
log.Errorf("Login UserNewClientLB error: %v", err)
http_resp.JsonOK(c, http_resp.Error(http_resp.Failed))
return
}
usn, name := "", ""
if req.Phone != "" {
// TODO 校验验证码
login, err := client.PhoneLogin(c, &grpc_pb.PhoneLoginReq{
Phone: req.Phone,
Code: req.Code,
})
if err != nil {
log.Errorf("Login PhoneLogin error: %v", err)
http_resp.JsonOK(c, http_resp.Error(http_resp.Failed))
return
}
usn, name = login.USN, login.Name
} else if req.WxMiniCode != "" {
login, err := client.WxMiniLogin(c, &grpc_pb.WxMiniLoginReq{
Code: req.WxMiniCode,
})
if err != nil {
log.Errorf("Login WxMiniLogin error: %v", err)
http_resp.JsonOK(c, http_resp.Error(http_resp.Failed))
return
}
usn, name = login.USN, login.Name
} else {
http_resp.JsonBadRequest(c)
return
}
at, rt, err := genToken(c, usn)
http_resp.JsonOK(c, http_resp.Success(&LoginResp{
USN: usn,
Name: name,
AccessToken: at,
RefreshToken: rt,
}))
}
type RefreshTokenReq struct {
RefreshToken string `json:"refreshToken" binding:"required,min=1"`
}
type RefreshTokenResp struct {
AccessToken string `json:"accessToken"`
RefreshToken string `json:"refreshToken"`
}
func RefreshToken(c *gin.Context) {
req := &RefreshTokenReq{}
if err := c.ShouldBindJSON(req); err != nil {
http_resp.JsonBadRequest(c)
return
}
claims, err := utils.ParseToken(req.RefreshToken, config.Get().Auth.Secret)
if err != nil {
http_resp.JsonUnauthorized(c)
return
}
if redis.GetClient().Get(c, fmt.Sprintf(global.KeyGatewayRefreshToken, claims.USN)).Val() != req.RefreshToken {
http_resp.JsonUnauthorized(c)
return
}
at, rt, err := genToken(c, claims.USN)
if err != nil {
log.Errorf("RefreshToken genToken error: %v, usn: %v", err, claims.USN)
http_resp.JsonOK(c, http_resp.Error(http_resp.Failed))
return
}
http_resp.JsonOK(c, http_resp.Success(&RefreshTokenResp{
AccessToken: at,
RefreshToken: rt,
}))
}
func genToken(ctx context.Context, usn string) (string, string, error) {
at, err := genTokenOne(ctx, global.KeyGatewayAccessToken, usn, time.Duration(config.Get().Auth.ShortExpire)*time.Minute)
if err != nil {
return "", "", err
}
rt, err := genTokenOne(ctx, global.KeyGatewayRefreshToken, usn, time.Duration(config.Get().Auth.LongExpire)*time.Minute)
if err != nil {
return "", "", err
}
return at, rt, nil
}
func genTokenOne(ctx context.Context, key string, usn string, ttl time.Duration) (string, error) {
token, err := utils.GenToken(usn, config.Get().Auth.Secret, ttl)
if err != nil {
return "", err
}
redis.GetClient().Set(ctx, fmt.Sprintf(key, usn), token, ttl)
return token, err
}

172
internal/handler/http_handler/login_test.go Normal file
View File

@@ -0,0 +1,172 @@
package http_handler
import (
"bou.ke/monkey"
"context"
"fmt"
"git.hlsq.asia/mmorpg/service-common/db/redis"
"git.hlsq.asia/mmorpg/service-common/net/grpc/grpc_client"
"git.hlsq.asia/mmorpg/service-common/net/http/http_resp"
"git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb"
"git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/mocks"
"git.hlsq.asia/mmorpg/service-common/utils"
"git.hlsq.asia/mmorpg/service-gateway/internal/global"
"git.hlsq.asia/mmorpg/service-gateway/internal/testutil"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
redis2 "github.com/redis/go-redis/v9"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"net/http"
"strconv"
"testing"
)
type LoginTestSuite struct {
testutil.TestSuite
}
func (ts *LoginTestSuite) TestGenToken() {
usn := utils.RandInt(1, 100000000)
at, rt, err := genToken(context.Background(), strconv.Itoa(usn))
ts.Assert().NoError(err)
redisAt := redis.GetClient().Get(context.Background(), fmt.Sprintf(global.KeyGatewayAccessToken, usn)).Val()
ts.Assert().Equal(at, redisAt)
redisRt := redis.GetClient().Get(context.Background(), fmt.Sprintf(global.KeyGatewayRefreshToken, usn)).Val()
ts.Assert().Equal(rt, redisRt)
}
func (ts *LoginTestSuite) TestLogin() {
gin.SetMode(gin.TestMode)
ts.Run("ShouldBindJSON Failed", func() {
w, c := utils.CreateTestContext("POST", "/", &LoginReq{
Phone: "",
Code: "",
})
Login(c)
utils.AssertResponse(&ts.Suite, w, http.StatusBadRequest, http_resp.ParamError)
})
ts.Run("UserNewClientLB Failed", func() {
monkey.Patch(grpc_client.UserNewClientLB, func() (grpc_pb.UserClient, error) {
return nil, assert.AnError
})
defer monkey.Unpatch(grpc_client.UserNewClientLB)
w, c := utils.CreateTestContext("POST", "/", &LoginReq{
Phone: "13800000000",
Code: "1234",
})
Login(c)
utils.AssertResponse(&ts.Suite, w, http.StatusOK, http_resp.Failed)
})
ts.Run("Login Failed", func() {
ctrl := gomock.NewController(ts.T())
defer ctrl.Finish()
client := mocks.NewMockUserClient(ctrl)
client.EXPECT().
PhoneLogin(gomock.Any(), gomock.Any()).
Return(nil, fmt.Errorf("gRPC failed"))
monkey.Patch(grpc_client.UserNewClientLB, func() (grpc_pb.UserClient, error) {
return client, nil
})
defer monkey.Unpatch(grpc_client.UserNewClientLB)
w, c := utils.CreateTestContext("POST", "/", &LoginReq{
Phone: "13800000000",
Code: "1234",
})
Login(c)
utils.AssertResponse(&ts.Suite, w, http.StatusOK, http_resp.Failed)
})
ts.Run("OK", func() {
ctrl := gomock.NewController(ts.T())
defer ctrl.Finish()
client := mocks.NewMockUserClient(ctrl)
client.EXPECT().
PhoneLogin(gomock.Any(), gomock.Any()).
Return(&grpc_pb.PhoneLoginResp{USN: "1", Name: "hh"}, nil)
monkey.Patch(grpc_client.UserNewClientLB, func() (grpc_pb.UserClient, error) {
return client, nil
})
defer monkey.Unpatch(grpc_client.UserNewClientLB)
w, c := utils.CreateTestContext("POST", "/", &LoginReq{
Phone: "13800000000",
Code: "1234",
})
Login(c)
utils.AssertResponse(&ts.Suite, w, http.StatusOK, http_resp.OK)
})
}
func (ts *LoginTestSuite) TestRefreshToken() {
gin.SetMode(gin.TestMode)
ts.Run("ShouldBindJSON Failed", func() {
w, c := utils.CreateTestContext("POST", "/", &RefreshTokenReq{
RefreshToken: "",
})
RefreshToken(c)
utils.AssertResponse(&ts.Suite, w, http.StatusBadRequest, http_resp.ParamError)
})
ts.Run("ParseToken Failed", func() {
monkey.Patch(utils.ParseToken, func(tokenString string, secret string) (*utils.Claims, error) {
return nil, assert.AnError
})
defer monkey.Unpatch(utils.ParseToken)
w, c := utils.CreateTestContext("POST", "/", &RefreshTokenReq{
RefreshToken: "abc",
})
RefreshToken(c)
utils.AssertResponse(&ts.Suite, w, http.StatusOK, http_resp.TokenInvalid)
})
ts.Run("Redis Get Failed", func() {
monkey.Patch(utils.ParseToken, func(tokenString string, secret string) (*utils.Claims, error) {
if tokenString == "abc" {
return &utils.Claims{USN: "1"}, nil
}
return nil, assert.AnError
})
defer monkey.Unpatch(utils.ParseToken)
redis.GetClient().Set(context.Background(), fmt.Sprintf(global.KeyGatewayRefreshToken, 1), "ab", redis2.KeepTTL)
w, c := utils.CreateTestContext("POST", "/", &RefreshTokenReq{
RefreshToken: "abc",
})
RefreshToken(c)
utils.AssertResponse(&ts.Suite, w, http.StatusOK, http_resp.TokenInvalid)
})
ts.Run("OK", func() {
monkey.Patch(utils.ParseToken, func(tokenString string, secret string) (*utils.Claims, error) {
if tokenString == "abc" {
return &utils.Claims{USN: "1"}, nil
}
return nil, assert.AnError
})
defer monkey.Unpatch(utils.ParseToken)
redis.GetClient().Set(context.Background(), fmt.Sprintf(global.KeyGatewayRefreshToken, 1), "abc", redis2.KeepTTL)
w, c := utils.CreateTestContext("POST", "/", &RefreshTokenReq{
RefreshToken: "abc",
})
RefreshToken(c)
utils.AssertResponse(&ts.Suite, w, http.StatusOK, http_resp.OK)
})
}
func TestLoginTestSuite(t *testing.T) {
suite.Run(t, &LoginTestSuite{})
}

155
internal/handler/httphandler/login.go
View File

@@ -1,155 +0,0 @@
package httphandler
import (
"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"
)
// 这个模块处理用户登录
type LoginReq struct {
Phone string `json:"phone"` // 手机号
Code string `json:"code"` // 验证码
WxMiniCode string `json:"wxMiniCode"` // 微信小程序登录
}
type LoginResp struct {
USN int64 `json:"usn"`
Name string `json:"name"`
AccessToken string `json:"accessToken"`
RefreshToken string `json:"refreshToken"`
}
func Login(c *gin.Context) {
req := &LoginReq{}
if err := c.ShouldBindJSON(req); err != nil {
httpresp.JsonBadRequest(c)
return
}
client, err := grpcclient.UserNewClientLB()
if err != nil {
log.Errorf("Login UserNewClientLB error: %v", err)
httpresp.JsonOK(c, httpresp.Error(httpresp.Failed))
return
}
usn, name := int64(0), ""
if req.Phone != "" {
// TODO 校验验证码
login, err := client.PhoneLogin(c, &rspb.PhoneLoginReq{
Phone: req.Phone,
Code: req.Code,
})
if err != nil {
log.Errorf("Login PhoneLogin error: %v", err)
httpresp.JsonOK(c, httpresp.Error(httpresp.Failed))
return
}
usn, name = login.USN, login.Name
} else if req.WxMiniCode != "" {
login, err := client.WxMiniLogin(c, &rspb.WxMiniLoginReq{
Code: req.WxMiniCode,
})
if err != nil {
log.Errorf("Login WxMiniLogin error: %v", err)
httpresp.JsonOK(c, httpresp.Error(httpresp.Failed))
return
}
usn, name = login.USN, login.Name
} else {
httpresp.JsonBadRequest(c)
return
}
at, rt, err := sessionLogin(c, usn)
if err != nil {
log.Errorf("Login sessionLogin error: %v, usn: %v", err, usn)
httpresp.JsonOK(c, httpresp.Error(httpresp.Failed))
return
}
httpresp.JsonOK(c, httpresp.Success(&LoginResp{
USN: usn,
Name: name,
AccessToken: at,
RefreshToken: rt,
}))
}
type RefreshTokenReq struct {
RefreshToken string `json:"refreshToken"`
}
type RefreshTokenResp struct {
AccessToken string `json:"accessToken"`
RefreshToken string `json:"refreshToken"`
}
func RefreshToken(c *gin.Context) {
req := &RefreshTokenReq{}
if err := c.ShouldBindJSON(req); err != nil {
httpresp.JsonBadRequest(c)
return
}
if req.RefreshToken == "" {
cookie, err := c.Cookie("refresh_token")
if err != nil {
httpresp.JsonUnauthorized(c)
return
}
req.RefreshToken = cookie
}
usn, _ := redis.GetClient().HGet(c, global.KeyGatewayRefreshToken+req.RefreshToken, (&utils.UserSession{}).GetUsnKey()).Int64()
if usn == 0 {
httpresp.JsonUnauthorized(c)
return
}
if err := sessionLogout(c, req.RefreshToken); err != nil {
log.Errorf("RefreshToken sessionLogout error: %v, usn: %v", err, usn)
}
at, rt, err := sessionLogin(c, usn)
if err != nil {
log.Errorf("RefreshToken sessionLogin error: %v, usn: %v", err, usn)
httpresp.JsonOK(c, httpresp.Error(httpresp.Failed))
return
}
httpresp.JsonOK(c, httpresp.Success(&RefreshTokenResp{
AccessToken: at,
RefreshToken: rt,
}))
}
type LogoutReq struct {
RefreshToken string `json:"refreshToken"`
}
type LogoutResp struct {
}
func Logout(c *gin.Context) {
req := &LogoutReq{}
if err := c.ShouldBindJSON(req); err != nil {
httpresp.JsonBadRequest(c)
return
}
if req.RefreshToken == "" {
cookie, err := c.Cookie("refresh_token")
if err != nil {
httpresp.JsonUnauthorized(c)
return
}
req.RefreshToken = cookie
}
if err := sessionLogout(c, req.RefreshToken); err != nil {
log.Errorf("Logout sessionLogout error: %v", err)
}
httpresp.JsonOK(c, httpresp.Success(&LogoutResp{}))
}

156
internal/handler/httphandler/login_test.go
View File

@@ -1,156 +0,0 @@
package httphandler
import (
"bou.ke/monkey"
"fmt"
"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"
"github.com/stretchr/testify/suite"
"net/http"
"testing"
)
type LoginTestSuite struct {
testutil.TestSuite
}
func (ts *LoginTestSuite) TestLogin() {
gin.SetMode(gin.TestMode)
ts.Run("ShouldBindJSON Failed", func() {
w, c := utils.CreateTestContext("POST", "/", &LoginReq{
Phone: "",
Code: "",
})
Login(c)
utils.AssertResponse(&ts.Suite, w, http.StatusBadRequest, httpresp.ParamError)
})
ts.Run("UserNewClientLB Failed", func() {
monkey.Patch(grpcclient.UserNewClientLB, func() (rspb.UserClient, error) {
return nil, assert.AnError
})
defer monkey.Unpatch(grpcclient.UserNewClientLB)
w, c := utils.CreateTestContext("POST", "/", &LoginReq{
Phone: "13800000000",
Code: "1234",
})
Login(c)
utils.AssertResponse(&ts.Suite, w, http.StatusOK, httpresp.Failed)
})
ts.Run("Login Failed", func() {
ctrl := gomock.NewController(ts.T())
defer ctrl.Finish()
client := mocks.NewMockUserClient(ctrl)
client.EXPECT().
PhoneLogin(gomock.Any(), gomock.Any()).
Return(nil, fmt.Errorf("gRPC failed"))
monkey.Patch(grpcclient.UserNewClientLB, func() (rspb.UserClient, error) {
return client, nil
})
defer monkey.Unpatch(grpcclient.UserNewClientLB)
w, c := utils.CreateTestContext("POST", "/", &LoginReq{
Phone: "13800000000",
Code: "1234",
})
Login(c)
utils.AssertResponse(&ts.Suite, w, http.StatusOK, httpresp.Failed)
})
ts.Run("OK", func() {
ctrl := gomock.NewController(ts.T())
defer ctrl.Finish()
client := mocks.NewMockUserClient(ctrl)
client.EXPECT().
PhoneLogin(gomock.Any(), gomock.Any()).
Return(&rspb.PhoneLoginResp{USN: 1, Name: "hh"}, nil)
monkey.Patch(grpcclient.UserNewClientLB, func() (rspb.UserClient, error) {
return client, nil
})
defer monkey.Unpatch(grpcclient.UserNewClientLB)
w, c := utils.CreateTestContext("POST", "/", &LoginReq{
Phone: "13800000000",
Code: "1234",
})
Login(c)
utils.AssertResponse(&ts.Suite, w, http.StatusOK, httpresp.OK)
})
}
func (ts *LoginTestSuite) TestRefreshToken() {
gin.SetMode(gin.TestMode)
ts.Run("ShouldBindJSON Failed", func() {
w, c := utils.CreateTestContext("POST", "/", &RefreshTokenReq{
RefreshToken: "",
})
RefreshToken(c)
utils.AssertResponse(&ts.Suite, w, http.StatusBadRequest, httpresp.ParamError)
})
ts.Run("ParseToken Failed", func() {
monkey.Patch(utils.ParseToken, func(tokenString string, secret string) (*utils.Claims, error) {
return nil, assert.AnError
})
defer monkey.Unpatch(utils.ParseToken)
w, c := utils.CreateTestContext("POST", "/", &RefreshTokenReq{
RefreshToken: "abc",
})
RefreshToken(c)
utils.AssertResponse(&ts.Suite, w, http.StatusOK, httpresp.TokenInvalid)
})
//ts.Run("Redis Get Failed", func() {
// monkey.Patch(utils.ParseToken, func(tokenString string, secret string) (*utils.Claims, error) {
// if tokenString == "abc" {
// return &utils.Claims{USN: 1}, nil
// }
// return nil, assert.AnError
// })
// defer monkey.Unpatch(utils.ParseToken)
//
// redis.GetClient().Set(context.Background(), global.KeyGatewayRefreshToken+1, "ab", redis2.KeepTTL)
//
// w, c := utils.CreateTestContext("POST", "/", &RefreshTokenReq{
// RefreshToken: "abc",
// })
// RefreshToken(c)
// utils.AssertResponse(&ts.Suite, w, http.StatusOK, http_resp.TokenInvalid)
//})
//
//ts.Run("OK", func() {
// monkey.Patch(utils.ParseToken, func(tokenString string, secret string) (*utils.Claims, error) {
// if tokenString == "abc" {
// return &utils.Claims{USN: 1}, nil
// }
// return nil, assert.AnError
// })
// defer monkey.Unpatch(utils.ParseToken)
//
// redis.GetClient().Set(context.Background(), fmt.Sprintf(global.KeyGatewayRefreshToken, 1), "abc", redis2.KeepTTL)
//
// w, c := utils.CreateTestContext("POST", "/", &RefreshTokenReq{
// RefreshToken: "abc",
// })
// RefreshToken(c)
// utils.AssertResponse(&ts.Suite, w, http.StatusOK, http_resp.OK)
//})
}
func TestLoginTestSuite(t *testing.T) {
suite.Run(t, &LoginTestSuite{})
}

108
internal/handler/httphandler/session.go
View File

@@ -1,108 +0,0 @@
package httphandler
import (
"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"
)
var (
scriptLoginSha1 string
scriptLogin = `
local at_key = KEYS[1] .. ARGV[1]
local rt_key = KEYS[2] .. ARGV[2]
local session_key = KEYS[3] .. ARGV[3]
redis.call("HSET", at_key,
"usn", ARGV[3],
"ip", ARGV[6],
"ua", ARGV[7],
"rt", ARGV[2]
)
redis.call("EXPIRE", at_key, tonumber(ARGV[4]))
redis.call("HSET", rt_key,
"usn", ARGV[3],
"ip", ARGV[6],
"ua", ARGV[7],
"at", ARGV[1]
)
redis.call("EXPIRE", rt_key, tonumber(ARGV[5]))
local all_rts = redis.call("SMEMBERS", session_key)
-- 只允许最大10个会话，多了的随机踢掉
if #all_rts >= 10 then
local rk = KEYS[2] .. all_rts[1]
local ak = KEYS[1] .. redis.call("HGET", rk, "at")
redis.call("DEL", rk)
redis.call("DEL", ak)
end
-- 清理已经失效的会话
for i, rt in ipairs(all_rts) do
if redis.call("EXISTS", KEYS[2] .. rt) == 0 then
redis.call("SREM", session_key, rt)
end
end
redis.call("SADD", session_key, ARGV[2])
redis.call("EXPIRE", session_key, tonumber(ARGV[5]) + 600)
return 1
`
)
func sessionLogin(c *gin.Context, usn int64) (string, string, error) {
if scriptLoginSha1 == "" {
scriptLoginSha1 = redis.GetClient().ScriptLoad(c, scriptLogin).Val()
}
at := uuid.New().String()
rt := uuid.New().String()
err := redis.GetClient().EvalSha(
c, scriptLoginSha1,
[]string{global.KeyGatewayAccessToken, global.KeyGatewayRefreshToken, global.KeyGatewaySession},
at,
rt,
usn,
config.Get().Auth.ShortExpire,
config.Get().Auth.LongExpire,
c.RemoteIP(),
c.GetHeader("User-Agent"),
).Err()
if err != nil {
return "", "", utils.ErrorsWrap(err)
}
c.SetCookie("refresh_token", rt, int(config.Get().Auth.LongExpire), "/", ".hlsq.asia", true, true)
return at, rt, nil
}
var (
scriptLogoutSha1 string
scriptLogout = `
local rt_key = KEYS[2] .. ARGV[1]
local usn = redis.call("HGET", rt_key, "usn")
local at = redis.call("HGET", rt_key, "at")
local at_key = KEYS[1] .. at
local session_key = KEYS[3] .. usn
redis.call("DEL", at_key)
redis.call("DEL", rt_key)
redis.call("SREM", session_key, ARGV[1])
return 1
`
)
func sessionLogout(c *gin.Context, rt string) error {
if scriptLogoutSha1 == "" {
scriptLogoutSha1 = redis.GetClient().ScriptLoad(c, scriptLogout).Val()
}
return redis.GetClient().EvalSha(
c, scriptLogoutSha1,
[]string{global.KeyGatewayAccessToken, global.KeyGatewayRefreshToken, global.KeyGatewaySession},
rt,
).Err()
}

24
internal/handler/wshandler/client/client.go → internal/handler/ws_handler/client/client.go
View File

@@ -3,10 +3,10 @@ package client
import (
"context"
"fmt"
"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"
"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"
"go.uber.org/zap"
"runtime/debug"
"sync"
@@ -23,16 +23,17 @@ type Client struct {
heartBeat time.Time // 最后一次心跳
Status int32 // 状态：0 登陆中 1 正常 2 离线
USN int64 // 用户ID
SceneSID int64 // 场景服ID
USN string // 用户ID
SceneSID string // 场景服ID
InstanceID int32 // 副本ID，副本类型
UniqueNo int64 // 副本唯一编号
UniqueNo string // 副本唯一编号
}
func NewClient(conn socket.ISocketConn) *Client {
func NewClient(usn string, conn socket.ISocketConn) *Client {
client := &Client{
USN: usn,
conn: conn,
logger: log.GetLogger(),
logger: log.GetLogger().Named(fmt.Sprintf("usn:%v", usn)),
heartBeat: time.Now(),
mailChan: make(chan Event, 1024),
}
@@ -42,11 +43,6 @@ func NewClient(conn socket.ISocketConn) *Client {
return client
}
func (c *Client) SetUSN(usn int64) {
c.USN = usn
c.logger = log.GetLogger().Named(fmt.Sprintf("usn:%v", usn))
}
func (c *Client) Loop() {
defer func() {
if err := recover(); err != nil {

0
internal/handler/wshandler/client/client_event.go → internal/handler/ws_handler/client/client_event.go
View File

42
internal/handler/wshandler/client/client_handler.go → internal/handler/ws_handler/client/client_handler.go
View File

@@ -3,11 +3,11 @@ package client
import (
"context"
"fmt"
"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"
"git.hlsq.asia/mmorpg/service-common/db/redis"
"git.hlsq.asia/mmorpg/service-common/net/grpc/grpc_client"
"git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb"
"git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb"
"git.hlsq.asia/mmorpg/service-gateway/internal/global"
"google.golang.org/protobuf/proto"
"time"
)
@@ -15,23 +15,23 @@ import (
func (c *Client) handle(event Event) {
switch e := event.(type) {
case *ClientEvent:
msg := &sspb.Message{}
msg := &ss_pb.Message{}
if err := proto.Unmarshal(e.Msg, msg); err != nil {
c.logger.Errorf("handle event proto.Unmarshal err: %v", err)
c.cancel()
return
}
switch msg.ID {
case sspb.MessageID_MESSAGE_ID_ENTER_INSTANCE:
m := &sspb.C2S_EnterInstance{}
case ss_pb.MessageID_MESSAGE_ID_ENTER_INSTANCE:
m := &ss_pb.C2S_EnterInstance{}
if err := proto.Unmarshal(msg.Payload, m); err != nil {
c.logger.Errorf("handle event proto.Unmarshal err: %v", err)
c.cancel()
return
}
c.onEnter(m)
case sspb.MessageID_MESSAGE_ID_ACTION:
m := &sspb.C2S_Action{}
case ss_pb.MessageID_MESSAGE_ID_ACTION:
m := &ss_pb.C2S_Action{}
if err := proto.Unmarshal(msg.Payload, m); err != nil {
c.logger.Errorf("handle event proto.Unmarshal err: %v", err)
c.cancel()
@@ -46,20 +46,20 @@ func (c *Client) handle(event Event) {
c.Status = 1
UserMgr.Add(c.USN, c)
redis.GetClient().HSet(c.ctx, fmt.Sprintf(global.KeyGatewayInfo, c.USN), global.HFieldInfoGatewaySID, global.GatewaySID)
c.WriteMessage(sspb.MessageID_MESSAGE_ID_LOGIN_SUCCESS, &sspb.S2C_LoginSuccess{
c.WriteMessage(ss_pb.MessageID_MESSAGE_ID_LOGIN_SUCCESS, &ss_pb.S2C_LoginSuccess{
InstanceID: 1,
})
}
}
}
func (c *Client) onEnter(msg *sspb.C2S_EnterInstance) {
client, err := grpcclient.SceneNewClientLB()
func (c *Client) onEnter(msg *ss_pb.C2S_EnterInstance) {
client, err := grpc_client.SceneNewClientLB()
if err != nil {
c.logger.Errorf("SceneNewClient err: %v", err)
return
}
resp, err := client.Enter(c.ctx, &rspb.EnterReq{
resp, err := client.Enter(c.ctx, &grpc_pb.EnterReq{
USN: c.USN,
GatewaySID: global.GatewaySID,
InstanceID: msg.InstanceID,
@@ -71,19 +71,19 @@ func (c *Client) onEnter(msg *sspb.C2S_EnterInstance) {
c.SceneSID = resp.SceneSID
c.UniqueNo = resp.UniqueNo
c.InstanceID = msg.InstanceID
c.WriteBytes(sspb.MessageID(resp.MessageID), resp.Payload)
c.WriteBytes(ss_pb.MessageID(resp.MessageID), resp.Payload)
}
func (c *Client) onLeave() {
if c.SceneSID == 0 {
if c.SceneSID == "" {
return
}
client, err := grpcclient.SceneNewClient(c.SceneSID)
client, err := grpc_client.SceneNewClient(c.SceneSID)
if err != nil {
c.logger.Errorf("SceneNewClient err: %v", err)
return
}
_, err = client.Leave(context.Background(), &rspb.LeaveReq{
_, err = client.Leave(context.Background(), &grpc_pb.LeaveReq{
USN: c.USN,
UniqueNo: c.UniqueNo,
})
@@ -93,11 +93,11 @@ func (c *Client) onLeave() {
}
}
func (c *Client) onAction(msg *sspb.C2S_Action) {
if c.SceneSID == 0 {
func (c *Client) onAction(msg *ss_pb.C2S_Action) {
if c.SceneSID == "" {
return
}
if err := grpcclient.SendMessageToScene(c.SceneSID, grpcclient.FunAction, &rspb.ActionReq{
if err := grpc_client.SendMessageToScene(c.SceneSID, grpc_client.FunAction, &grpc_pb.ActionReq{
UniqueNo: c.UniqueNo,
USN: c.USN,
Action: int32(msg.Action),

10
internal/handler/wshandler/client/client_write.go → internal/handler/ws_handler/client/client_write.go
View File

@@ -1,12 +1,12 @@
package client
import (
"git.hlsq.asia/alex/service-common/proto/ss/sspb"
"git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb"
"google.golang.org/protobuf/proto"
)
// WriteMessage 向客户端发送消息
func (c *Client) WriteMessage(id sspb.MessageID, data proto.Message) {
func (c *Client) WriteMessage(id ss_pb.MessageID, data proto.Message) {
if c.conn == nil || c.conn.IsClose() {
return
}
@@ -15,7 +15,7 @@ func (c *Client) WriteMessage(id sspb.MessageID, data proto.Message) {
c.logger.Errorf("WriteMessage proto.Marshal err: %v", err)
return
}
m, err := proto.Marshal(&sspb.Message{
m, err := proto.Marshal(&ss_pb.Message{
ID: id,
Payload: d,
})
@@ -29,11 +29,11 @@ func (c *Client) WriteMessage(id sspb.MessageID, data proto.Message) {
}
// WriteBytes 向客户端发送字节数据
func (c *Client) WriteBytes(id sspb.MessageID, data []byte) {
func (c *Client) WriteBytes(id ss_pb.MessageID, data []byte) {
if c.conn == nil || c.conn.IsClose() {
return
}
m, err := proto.Marshal(&sspb.Message{
m, err := proto.Marshal(&ss_pb.Message{
ID: id,
Payload: data,
})

16
internal/handler/wshandler/client/manager.go → internal/handler/ws_handler/client/manager.go
View File

@@ -1,42 +1,42 @@
package client
import (
"git.hlsq.asia/alex/service-gateway/internal/global"
"git.hlsq.asia/mmorpg/service-gateway/internal/global"
"sync"
)
var UserMgr *userManager
type userManager struct {
userMap map[int64]*Client
userMap map[string]*Client
sync.RWMutex
}
func init() {
UserMgr = &userManager{
userMap: make(map[int64]*Client),
userMap: make(map[string]*Client),
}
}
func (m *userManager) Add(usn int64, client *Client) {
func (m *userManager) Add(usn string, client *Client) {
m.Lock()
defer m.Unlock()
m.userMap[usn] = client
global.OnlineUsersGauge.Inc()
}
func (m *userManager) Delete(usn int64) {
func (m *userManager) Delete(usn string) {
m.Lock()
defer m.Unlock()
delete(m.userMap, usn)
global.OnlineUsersGauge.Dec()
}
func (m *userManager) GetAll() map[int64]*Client {
func (m *userManager) GetAll() map[string]*Client {
m.RLock()
defer m.RUnlock()
copyMap := make(map[int64]*Client, len(m.userMap))
copyMap := make(map[string]*Client, len(m.userMap))
for k, v := range m.userMap {
copyMap[k] = v
}
@@ -54,7 +54,7 @@ func (m *userManager) GetAllInterface() []interface{} {
return r
}
func (m *userManager) GetByUSN(usn int64) *Client {
func (m *userManager) GetByUSN(usn string) *Client {
m.RLock()
defer m.RUnlock()
return m.userMap[usn]

43
internal/handler/wshandler/login/login.go → internal/handler/ws_handler/login/login.go
View File

@@ -3,14 +3,13 @@ package login
import (
"context"
"fmt"
"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"
"git.hlsq.asia/mmorpg/service-common/db/redis"
"git.hlsq.asia/mmorpg/service-common/log"
"git.hlsq.asia/mmorpg/service-common/net/grpc/grpc_client"
"git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb"
"git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb"
"git.hlsq.asia/mmorpg/service-gateway/internal/global"
"git.hlsq.asia/mmorpg/service-gateway/internal/handler/ws_handler/client"
"sync"
"time"
)
@@ -109,8 +108,8 @@ func (l *Login) Stop() {
// StartLogin 开始登录流程
func (l *Login) StartLogin(user *User) {
if !l.CheckToken(user) {
user.Cli.WriteMessage(sspb.MessageID_MESSAGE_ID_KICK_OUT, &sspb.S2C_KickOut{
ID: sspb.KickOutID_KICK_OUT_ID_TOKEN_INVALID,
user.Cli.WriteMessage(ss_pb.MessageID_MESSAGE_ID_KICK_OUT, &ss_pb.S2C_KickOut{
ID: ss_pb.KickOutID_KICK_OUT_ID_TOKEN_INVALID,
})
user.Cli.CloseClient()
return
@@ -118,8 +117,8 @@ func (l *Login) StartLogin(user *User) {
if gatewaySID := l.CheckOnline(user); len(gatewaySID) > 0 {
// 如果在线就要踢，如果踢失败了就返回服务器繁忙，一般不应该走到这里
if !l.KickUser(user.Cli.SceneSID, user.Cli.USN) {
user.Cli.WriteMessage(sspb.MessageID_MESSAGE_ID_KICK_OUT, &sspb.S2C_KickOut{
ID: sspb.KickOutID_KICK_OUT_ID_SERVER_BUSY,
user.Cli.WriteMessage(ss_pb.MessageID_MESSAGE_ID_KICK_OUT, &ss_pb.S2C_KickOut{
ID: ss_pb.KickOutID_KICK_OUT_ID_SERVER_BUSY,
})
user.Cli.CloseClient()
return
@@ -128,8 +127,8 @@ func (l *Login) StartLogin(user *User) {
if client.UserMgr.GetSize() >= global.MaxOnlineSize {
// 如果人数满了就排队
if err := GetQueueUp().Enqueue(user.Cli); err != nil {
user.Cli.WriteMessage(sspb.MessageID_MESSAGE_ID_KICK_OUT, &sspb.S2C_KickOut{
ID: sspb.KickOutID_KICK_OUT_ID_QUEUE_UP_FULL,
user.Cli.WriteMessage(ss_pb.MessageID_MESSAGE_ID_KICK_OUT, &ss_pb.S2C_KickOut{
ID: ss_pb.KickOutID_KICK_OUT_ID_QUEUE_UP_FULL,
})
user.Cli.CloseClient()
return
@@ -137,13 +136,13 @@ func (l *Login) StartLogin(user *User) {
// 告诉客户端正在排队
position, ok := GetQueueUp().GetPosition(user.Cli.USN)
if !ok {
user.Cli.WriteMessage(sspb.MessageID_MESSAGE_ID_KICK_OUT, &sspb.S2C_KickOut{
ID: sspb.KickOutID_KICK_OUT_ID_SERVER_BUSY,
user.Cli.WriteMessage(ss_pb.MessageID_MESSAGE_ID_KICK_OUT, &ss_pb.S2C_KickOut{
ID: ss_pb.KickOutID_KICK_OUT_ID_SERVER_BUSY,
})
user.Cli.CloseClient()
return
}
user.Cli.WriteMessage(sspb.MessageID_MESSAGE_ID_QUEUE_UP, &sspb.S2C_QueueUp{
user.Cli.WriteMessage(ss_pb.MessageID_MESSAGE_ID_QUEUE_UP, &ss_pb.S2C_QueueUp{
QueueUpCount: int32(position),
})
} else {
@@ -153,9 +152,7 @@ func (l *Login) StartLogin(user *User) {
// CheckToken 校验Token是否有效
func (l *Login) CheckToken(user *User) bool {
usn, _ := redis.GetClient().HGet(context.Background(), global.KeyGatewayAccessToken+user.Token, (&utils.UserSession{}).GetUsnKey()).Int64()
user.Cli.SetUSN(usn)
return usn > 0
return redis.GetClient().Get(l.ctx, fmt.Sprintf(global.KeyGatewayAccessToken, user.Cli.USN)).Val() == user.Token
}
// CheckOnline 校验是否在线
@@ -164,13 +161,13 @@ func (l *Login) CheckOnline(user *User) string {
}
// KickUser 把玩家踢下线
func (l *Login) KickUser(gatewaySID int64, usn int64) bool {
gc, err := grpcclient.GatewayNewClient(gatewaySID)
func (l *Login) KickUser(gatewaySID string, usn string) bool {
gc, err := grpc_client.GatewayNewClient(gatewaySID)
if err != nil {
log.Errorf("KickUser cannot find gateway client: %v, sid: %v", err, gatewaySID)
return false
}
_, err = gc.KickUser(l.ctx, &rspb.KickUserReq{USN: usn})
_, err = gc.KickUser(l.ctx, &grpc_pb.KickUserReq{USN: usn})
if err != nil {
log.Errorf("KickUser err: %v, sid: %v, usn: %v", err, gatewaySID, usn)
return false

6
internal/handler/wshandler/login/queue_up.go → internal/handler/ws_handler/login/queue_up.go
View File

@@ -3,7 +3,7 @@ package login
import (
"context"
"errors"
"git.hlsq.asia/alex/service-gateway/internal/handler/wshandler/client"
"git.hlsq.asia/mmorpg/service-gateway/internal/handler/ws_handler/client"
"sync"
"sync/atomic"
)
@@ -78,7 +78,7 @@ func (q *QueueUp) Dequeue() (*client.Client, error) {
}
// GetPosition 返回用户前面还有多少人在排队
func (q *QueueUp) GetPosition(usn int64) (int64, bool) {
func (q *QueueUp) GetPosition(usn string) (int64, bool) {
val, ok := q.waiting.Load(usn)
if !ok {
return 0, false
@@ -88,7 +88,7 @@ func (q *QueueUp) GetPosition(usn int64) (int64, bool) {
}
// RemoveUser 安全移除用户（标记为取消）
func (q *QueueUp) RemoveUser(usn int64) bool {
func (q *QueueUp) RemoveUser(usn string) bool {
_, loaded := q.waiting.LoadAndDelete(usn)
return loaded
}

24
internal/net/httpgateway/middleward.go → internal/net/http_gateway/middleward.go
View File

@@ -1,11 +1,10 @@
package httpgateway
package http_gateway
import (
"fmt"
"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"
"git.hlsq.asia/mmorpg/service-common/net/http/http_resp"
"git.hlsq.asia/mmorpg/service-common/utils"
"git.hlsq.asia/mmorpg/service-gateway/config"
"github.com/gin-contrib/cors"
"github.com/gin-gonic/gin"
"go.uber.org/zap"
@@ -47,7 +46,7 @@ func authJwt() gin.HandlerFunc {
return func(c *gin.Context) {
pList := strings.SplitN(c.Request.URL.Path, "/", 4)
if len(pList) < 4 || pList[2] == "" {
httpresp.JsonNotFound(c)
http_resp.JsonNotFound(c)
c.Abort()
return
}
@@ -60,22 +59,21 @@ func authJwt() gin.HandlerFunc {
c.Next()
return
}
httpresp.JsonUnauthorized(c)
http_resp.JsonUnauthorized(c)
c.Abort()
return
}
usn, _ := redis.GetClient().HGet(c, global.KeyGatewayAccessToken+token, (&utils.UserSession{}).GetUsnKey()).Int64()
if usn == 0 {
httpresp.JsonUnauthorized(c)
claims, err := utils.ParseToken(token, config.Get().Auth.Secret)
if err != nil {
http_resp.JsonUnauthorized(c)
c.Abort()
return
}
// 这里将Header写到请求中，grpc-gateway框架会读取然后传给grpc服务
c.Request.Header.Set("X-Usn", utils.Int64ToString(usn))
c.Request.Header.Set("X-Usn", claims.USN)
// 这里写到上下文中，打日志
c.Set("usn", usn)
c.Set("usn", claims.USN)
c.Next()
}
}

55
internal/net/httpgateway/router.go → internal/net/http_gateway/router.go
View File

@@ -1,20 +1,19 @@
package httpgateway
package http_gateway
import (
"context"
"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"
"git.hlsq.asia/mmorpg/service-common/discover/common"
"git.hlsq.asia/mmorpg/service-common/log"
"git.hlsq.asia/mmorpg/service-common/net/grpc/grpc_client"
"git.hlsq.asia/mmorpg/service-common/net/http/http_resp"
"git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb"
"git.hlsq.asia/mmorpg/service-gateway/internal/handler/http_handler"
"git.hlsq.asia/mmorpg/service-gateway/internal/net/http_gateway/wrapper"
"github.com/gin-contrib/cors"
"github.com/gin-gonic/gin"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin"
"google.golang.org/protobuf/encoding/protojson"
"strings"
)
func InitServeMux() *runtime.ServeMux {
@@ -50,22 +49,16 @@ func InitRouter() *gin.Engine {
gin.Recovery(),
ginLogger(log.GetLogger().Named("GIN")),
cors.New(corsConfig()),
otelgin.Middleware(
common.KeyDiscoverServiceNameGateway,
otelgin.WithSpanNameFormatter(func(c *gin.Context) string {
method := strings.ToUpper(c.Request.Method)
return method + " " + c.Request.URL.Path
}),
),
otelgin.Middleware(common.KeyDiscoverServiceNameGateway),
)
r.HandleMethodNotAllowed = true
r.NoMethod(func(c *gin.Context) {
httpresp.JsonMethodNotAllowed(c)
http_resp.JsonMethodNotAllowed(c)
c.Abort()
})
r.NoRoute(func(c *gin.Context) {
httpresp.JsonNotFound(c)
http_resp.JsonNotFound(c)
c.Abort()
})
@@ -73,7 +66,7 @@ func InitRouter() *gin.Engine {
auth.Use(authJwt())
// 网关
initGatewayPath(auth)
initBaseRoute(auth)
// 用户中心
initUserPath(auth)
// 奇怪的知识-服务端
@@ -82,25 +75,22 @@ func InitRouter() *gin.Engine {
return r
}
func initGatewayPath(r *gin.RouterGroup) {
g := r.Group("/" + common.KeyDiscoverServiceNameGateway)
g.POST("/open/login", httphandler.Login)
g.POST("/open/refresh_token", httphandler.RefreshToken)
g.POST("/open/logout", httphandler.Logout)
func initBaseRoute(r *gin.RouterGroup) {
g := r.Group("/gw")
g.POST("/open/login", http_handler.Login)
g.POST("/open/refresh_token", http_handler.RefreshToken)
}
func initUserPath(r *gin.RouterGroup) {
g := r.Group("/" + common.KeyDiscoverServiceNameUser)
client, err := grpcclient.UserNewClientLB()
g := r.Group("/user")
client, err := grpc_client.UserNewClientLB()
if err != nil {
log.Errorf("get user conn failed: %v", err)
return
}
gwMux := InitServeMux()
if err = rspb.RegisterUserHandlerClient(context.Background(), gwMux, client); err != nil {
if err = grpc_pb.RegisterUserHandlerClient(context.Background(), gwMux, client); err != nil {
log.Errorf("RegisterUserHandlerClient err: %v", err)
return
}
@@ -109,16 +99,15 @@ func initUserPath(r *gin.RouterGroup) {
}
func initQgdzsPath(r *gin.RouterGroup) {
g := r.Group("/" + common.KeyDiscoverServiceNameQgdzs)
client, err := grpcclient.QgdzsNewClientLB()
g := r.Group("/qgdzs")
client, err := grpc_client.QgdzsNewClientLB()
if err != nil {
log.Errorf("get qgdzs conn failed: %v", err)
return
}
gwMux := InitServeMux()
if err = rspb.RegisterQgdzsHandlerClient(context.Background(), gwMux, client); err != nil {
if err = grpc_pb.RegisterQgdzsHandlerClient(context.Background(), gwMux, client); err != nil {
log.Errorf("RegisterQgdzsHandlerClient err: %v", err)
return
}

16
internal/net/httpgateway/wrapper/error_handler.go → internal/net/http_gateway/wrapper/error_handler.go
View File

@@ -3,8 +3,8 @@ package wrapper
import (
"context"
"encoding/json"
"git.hlsq.asia/alex/service-common/net/http/httpresp"
"git.hlsq.asia/alex/service-common/proto/rs/rscommon"
"git.hlsq.asia/mmorpg/service-common/net/http/http_resp"
"git.hlsq.asia/mmorpg/service-common/proto/rs/rs_common"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
@@ -17,32 +17,32 @@ func ErrorHandler(_ context.Context, _ *runtime.ServeMux, _ runtime.Marshaler, w
if !ok {
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusInternalServerError)
_ = json.NewEncoder(w).Encode(httpresp.Error(httpresp.Failed))
_ = json.NewEncoder(w).Encode(http_resp.Error(http_resp.Failed))
return
}
code, msg := 0, ""
for _, detail := range st.Details() {
if errorInfo, ok := detail.(*rscommon.ErrorInfo); ok {
if errorInfo, ok := detail.(*rs_common.ErrorInfo); ok {
code = int(errorInfo.Code)
msg = errorInfo.Msg
break
}
}
if code == 0 {
code = httpresp.Failed.Code()
msg = httpresp.Failed.Error()
code = http_resp.Failed.Code()
msg = http_resp.Failed.Error()
}
if st.Code() == codes.Unknown || st.Code() == codes.Unimplemented || st.Code() == codes.NotFound {
msg = st.Message()
}
if st.Code() == codes.NotFound {
code = httpresp.NotFound.Code()
code = http_resp.NotFound.Code()
}
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(grpcCodeToHTTPCode(st.Code()))
_ = json.NewEncoder(w).Encode(httpresp.Error(httpresp.NewCode(code, msg)))
_ = json.NewEncoder(w).Encode(http_resp.Error(http_resp.NewCode(code, msg)))
}
// 这里定义 Internal 属于业务错误，其他的属于 500 报错

6
internal/net/httpgateway/wrapper/marshal.go → internal/net/http_gateway/wrapper/marshal.go
View File

@@ -2,7 +2,7 @@ package wrapper
import (
"encoding/json"
"git.hlsq.asia/alex/service-common/net/http/httpresp"
"git.hlsq.asia/mmorpg/service-common/net/http/http_resp"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"io"
)
@@ -20,9 +20,9 @@ func NewWrappedMarshaler(inner runtime.Marshaler) *WrappedMarshaler {
func (w *WrappedMarshaler) Marshal(v interface{}) ([]byte, error) {
dataBytes, err := w.inner.Marshal(v)
if err != nil {
return json.Marshal(httpresp.Error(httpresp.Failed))
return json.Marshal(http_resp.Error(http_resp.Failed))
}
return json.Marshal(httpresp.Success(json.RawMessage(dataBytes)))
return json.Marshal(http_resp.Success(json.RawMessage(dataBytes)))
}
func (w *WrappedMarshaler) Unmarshal(data []byte, v interface{}) error {

25
internal/net/wsgateway/server.go → internal/net/ws_gateway/server.go
View File

@@ -1,11 +1,13 @@
package wsgateway
package ws_gateway
import (
"fmt"
"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"
"git.hlsq.asia/mmorpg/service-common/log"
"git.hlsq.asia/mmorpg/service-common/net/socket"
"git.hlsq.asia/mmorpg/service-common/utils"
"git.hlsq.asia/mmorpg/service-gateway/config"
"git.hlsq.asia/mmorpg/service-gateway/internal/handler/ws_handler/client"
"git.hlsq.asia/mmorpg/service-gateway/internal/handler/ws_handler/login"
"go.uber.org/zap"
"time"
)
@@ -25,11 +27,16 @@ func (g *GatewayWsServer) OnHandShake(conn socket.ISocketConn) socket.Action {
g.logger.Warnf("token is invalid")
return socket.Close
}
claims, err := utils.ParseToken(token, config.Get().Auth.Secret)
if err != nil {
g.logger.Warnf("token is invalid")
return socket.Close
}
cli := client.NewClient(conn)
cli := client.NewClient(claims.USN, conn)
conn.SetParam("client", cli)
if !login.GetLoginQueue().AddToLoginQueue(&login.User{Cli: cli, Token: token}) {
g.logger.Warnf("AddToLoginQueue err, login queue full")
g.logger.Warnf("AddToLoginQueue err, login queue full, usn: %v", claims.USN)
return socket.Close
}
return socket.None
@@ -37,7 +44,7 @@ func (g *GatewayWsServer) OnHandShake(conn socket.ISocketConn) socket.Action {
func (g *GatewayWsServer) OnMessage(conn socket.ISocketConn, bytes []byte) socket.Action {
cli, ok := conn.GetParam("client").(*client.Client)
if !ok || cli.USN == 0 || cli.Status != 1 {
if !ok || cli.USN == "" || cli.Status != 1 {
return socket.Close
}
cli.OnEvent(&client.ClientEvent{Msg: bytes})
@@ -46,7 +53,7 @@ func (g *GatewayWsServer) OnMessage(conn socket.ISocketConn, bytes []byte) socke
func (g *GatewayWsServer) OnPong(conn socket.ISocketConn) {
cli, ok := conn.GetParam("client").(*client.Client)
if !ok || cli.USN == 0 {
if !ok || cli.USN == "" {
return
}
cli.OnEvent(&client.PongEvent{})

7
internal/testutil/suite.go
View File

@@ -1,9 +1,9 @@
package testutil
import (
config2 "git.hlsq.asia/alex/service-common/config"
"git.hlsq.asia/alex/service-common/db/redis"
"git.hlsq.asia/alex/service-gateway/config"
config2 "git.hlsq.asia/mmorpg/service-common/config"
"git.hlsq.asia/mmorpg/service-common/db/redis"
"git.hlsq.asia/mmorpg/service-gateway/config"
"github.com/alicebob/miniredis/v2"
"github.com/stretchr/testify/suite"
)
@@ -28,6 +28,7 @@ func (ts *TestSuite) SetupSuite() {
},
},
Auth: &config.AuthConfig{
Secret: "test",
ShortExpire: 15,
LongExpire: 10080,
},

6
main.go
View File

@@ -2,16 +2,12 @@ package main
import (
"fmt"
"git.hlsq.asia/alex/service-gateway/app"
"git.hlsq.asia/alex/service-gateway/config"
"git.hlsq.asia/mmorpg/service-gateway/app"
"github.com/judwhite/go-svc"
"syscall"
)
func main() {
if err := config.LoadConfig(); err != nil {
fmt.Println(err)
}
if err := svc.Run(&app.Program{}, syscall.SIGINT, syscall.SIGTERM, syscall.SIGKILL); err != nil {
fmt.Println(err)
}