feat 包命名规范

internal/handler/httphandler/login.go

@@ -1,11 +1,11 @@
-package http_handler
+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/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/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"
 	"github.com/gin-gonic/gin"
@@ -29,51 +29,51 @@ type LoginResp struct {
 func Login(c *gin.Context) {
 	req := &LoginReq{}
 	if err := c.ShouldBindJSON(req); err != nil {
-		http_resp.JsonBadRequest(c)
+		httpresp.JsonBadRequest(c)
 		return
 	}
-	client, err := grpc_client.UserNewClientLB()
+	client, err := grpcclient.UserNewClientLB()
 	if err != nil {
 		log.Errorf("Login UserNewClientLB error: %v", err)
-		http_resp.JsonOK(c, http_resp.Error(http_resp.Failed))
+		httpresp.JsonOK(c, httpresp.Error(httpresp.Failed))
 		return
 	}
 
 	usn, name := int64(0), ""
 	if req.Phone != "" {
 		// TODO 校验验证码
-		login, err := client.PhoneLogin(c, &grpc_pb.PhoneLoginReq{
+		login, err := client.PhoneLogin(c, &rspb.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))
+			httpresp.JsonOK(c, httpresp.Error(httpresp.Failed))
 			return
 		}
 		usn, name = login.USN, login.Name
 	} else if req.WxMiniCode != "" {
-		login, err := client.WxMiniLogin(c, &grpc_pb.WxMiniLoginReq{
+		login, err := client.WxMiniLogin(c, &rspb.WxMiniLoginReq{
 			Code: req.WxMiniCode,
 		})
 		if err != nil {
 			log.Errorf("Login WxMiniLogin error: %v", err)
-			http_resp.JsonOK(c, http_resp.Error(http_resp.Failed))
+			httpresp.JsonOK(c, httpresp.Error(httpresp.Failed))
 			return
 		}
 		usn, name = login.USN, login.Name
 	} else {
-		http_resp.JsonBadRequest(c)
+		httpresp.JsonBadRequest(c)
 		return
 	}
 
 	at, rt, err := sessionLogin(c, usn)
 	if err != nil {
 		log.Errorf("Login sessionLogin error: %v, usn: %v", err, usn)
-		http_resp.JsonOK(c, http_resp.Error(http_resp.Failed))
+		httpresp.JsonOK(c, httpresp.Error(httpresp.Failed))
 		return
 	}
-	http_resp.JsonOK(c, http_resp.Success(&LoginResp{
+	httpresp.JsonOK(c, httpresp.Success(&LoginResp{
 		USN:          usn,
 		Name:         name,
 		AccessToken:  at,
@@ -93,13 +93,13 @@ type RefreshTokenResp struct {
 func RefreshToken(c *gin.Context) {
 	req := &RefreshTokenReq{}
 	if err := c.ShouldBindJSON(req); err != nil {
-		http_resp.JsonBadRequest(c)
+		httpresp.JsonBadRequest(c)
 		return
 	}
 	if req.RefreshToken == "" {
 		cookie, err := c.Cookie("refresh_token")
 		if err != nil {
-			http_resp.JsonUnauthorized(c)
+			httpresp.JsonUnauthorized(c)
 			return
 		}
 		req.RefreshToken = cookie
@@ -107,7 +107,7 @@ func RefreshToken(c *gin.Context) {
 
 	usn, _ := redis.GetClient().HGet(c, global.KeyGatewayRefreshToken+req.RefreshToken, (&utils.UserSession{}).GetUsnKey()).Int64()
 	if usn == 0 {
-		http_resp.JsonUnauthorized(c)
+		httpresp.JsonUnauthorized(c)
 		return
 	}
 
@@ -117,11 +117,11 @@ func RefreshToken(c *gin.Context) {
 	at, rt, err := sessionLogin(c, usn)
 	if err != nil {
 		log.Errorf("RefreshToken sessionLogin error: %v, usn: %v", err, usn)
-		http_resp.JsonOK(c, http_resp.Error(http_resp.Failed))
+		httpresp.JsonOK(c, httpresp.Error(httpresp.Failed))
 		return
 	}
 
-	http_resp.JsonOK(c, http_resp.Success(&RefreshTokenResp{
+	httpresp.JsonOK(c, httpresp.Success(&RefreshTokenResp{
 		AccessToken:  at,
 		RefreshToken: rt,
 	}))
@@ -137,13 +137,13 @@ type LogoutResp struct {
 func Logout(c *gin.Context) {
 	req := &LogoutReq{}
 	if err := c.ShouldBindJSON(req); err != nil {
-		http_resp.JsonBadRequest(c)
+		httpresp.JsonBadRequest(c)
 		return
 	}
 	if req.RefreshToken == "" {
 		cookie, err := c.Cookie("refresh_token")
 		if err != nil {
-			http_resp.JsonUnauthorized(c)
+			httpresp.JsonUnauthorized(c)
 			return
 		}
 		req.RefreshToken = cookie
@@ -151,5 +151,5 @@ func Logout(c *gin.Context) {
 	if err := sessionLogout(c, req.RefreshToken); err != nil {
 		log.Errorf("Logout sessionLogout error: %v", err)
 	}
-	http_resp.JsonOK(c, http_resp.Success(&LogoutResp{}))
+	httpresp.JsonOK(c, httpresp.Success(&LogoutResp{}))
 }

internal/handler/httphandler/login_test.go

@@ -1,12 +1,12 @@
-package http_handler
+package httphandler
 
 import (
 	"bou.ke/monkey"
 	"fmt"
-	"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/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"
 	"github.com/gin-gonic/gin"
@@ -30,21 +30,21 @@ func (ts *LoginTestSuite) TestLogin() {
 			Code:  "",
 		})
 		Login(c)
-		utils.AssertResponse(&ts.Suite, w, http.StatusBadRequest, http_resp.ParamError)
+		utils.AssertResponse(&ts.Suite, w, http.StatusBadRequest, httpresp.ParamError)
 	})
 
 	ts.Run("UserNewClientLB Failed", func() {
-		monkey.Patch(grpc_client.UserNewClientLB, func() (grpc_pb.UserClient, error) {
+		monkey.Patch(grpcclient.UserNewClientLB, func() (rspb.UserClient, error) {
 			return nil, assert.AnError
 		})
-		defer monkey.Unpatch(grpc_client.UserNewClientLB)
+		defer monkey.Unpatch(grpcclient.UserNewClientLB)
 
 		w, c := utils.CreateTestContext("POST", "/", &LoginReq{
 			Phone: "13800000000",
 			Code:  "1234",
 		})
 		Login(c)
-		utils.AssertResponse(&ts.Suite, w, http.StatusOK, http_resp.Failed)
+		utils.AssertResponse(&ts.Suite, w, http.StatusOK, httpresp.Failed)
 	})
 
 	ts.Run("Login Failed", func() {
@@ -55,17 +55,17 @@ func (ts *LoginTestSuite) TestLogin() {
 			PhoneLogin(gomock.Any(), gomock.Any()).
 			Return(nil, fmt.Errorf("gRPC failed"))
 
-		monkey.Patch(grpc_client.UserNewClientLB, func() (grpc_pb.UserClient, error) {
+		monkey.Patch(grpcclient.UserNewClientLB, func() (rspb.UserClient, error) {
 			return client, nil
 		})
-		defer monkey.Unpatch(grpc_client.UserNewClientLB)
+		defer monkey.Unpatch(grpcclient.UserNewClientLB)
 
 		w, c := utils.CreateTestContext("POST", "/", &LoginReq{
 			Phone: "13800000000",
 			Code:  "1234",
 		})
 		Login(c)
-		utils.AssertResponse(&ts.Suite, w, http.StatusOK, http_resp.Failed)
+		utils.AssertResponse(&ts.Suite, w, http.StatusOK, httpresp.Failed)
 	})
 
 	ts.Run("OK", func() {
@@ -74,19 +74,19 @@ func (ts *LoginTestSuite) TestLogin() {
 		client := mocks.NewMockUserClient(ctrl)
 		client.EXPECT().
 			PhoneLogin(gomock.Any(), gomock.Any()).
-			Return(&grpc_pb.PhoneLoginResp{USN: 1, Name: "hh"}, nil)
+			Return(&rspb.PhoneLoginResp{USN: 1, Name: "hh"}, nil)
 
-		monkey.Patch(grpc_client.UserNewClientLB, func() (grpc_pb.UserClient, error) {
+		monkey.Patch(grpcclient.UserNewClientLB, func() (rspb.UserClient, error) {
 			return client, nil
 		})
-		defer monkey.Unpatch(grpc_client.UserNewClientLB)
+		defer monkey.Unpatch(grpcclient.UserNewClientLB)
 
 		w, c := utils.CreateTestContext("POST", "/", &LoginReq{
 			Phone: "13800000000",
 			Code:  "1234",
 		})
 		Login(c)
-		utils.AssertResponse(&ts.Suite, w, http.StatusOK, http_resp.OK)
+		utils.AssertResponse(&ts.Suite, w, http.StatusOK, httpresp.OK)
 	})
 }
 
@@ -98,7 +98,7 @@ func (ts *LoginTestSuite) TestRefreshToken() {
 			RefreshToken: "",
 		})
 		RefreshToken(c)
-		utils.AssertResponse(&ts.Suite, w, http.StatusBadRequest, http_resp.ParamError)
+		utils.AssertResponse(&ts.Suite, w, http.StatusBadRequest, httpresp.ParamError)
 	})
 
 	ts.Run("ParseToken Failed", func() {
@@ -111,7 +111,7 @@ func (ts *LoginTestSuite) TestRefreshToken() {
 			RefreshToken: "abc",
 		})
 		RefreshToken(c)
-		utils.AssertResponse(&ts.Suite, w, http.StatusOK, http_resp.TokenInvalid)
+		utils.AssertResponse(&ts.Suite, w, http.StatusOK, httpresp.TokenInvalid)
 	})
 
 	//ts.Run("Redis Get Failed", func() {

internal/handler/httphandler/session.go

@@ -1,4 +1,4 @@
-package http_handler
+package httphandler
 
 import (
 	"git.hlsq.asia/mmorpg/service-common/db/redis"

internal/handler/wshandler/client/client_handler.go

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

internal/handler/wshandler/client/client_write.go

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

internal/handler/wshandler/login/login.go

@@ -5,12 +5,12 @@ import (
 	"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/proto/rs/grpc_pb"
-	"git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb"
+	"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/ws_handler/client"
+	"git.hlsq.asia/mmorpg/service-gateway/internal/handler/wshandler/client"
 	"sync"
 	"time"
 )
@@ -109,8 +109,8 @@ func (l *Login) Stop() {
 // StartLogin 开始登录流程
 func (l *Login) StartLogin(user *User) {
 	if !l.CheckToken(user) {
-		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.WriteMessage(sspb.MessageID_MESSAGE_ID_KICK_OUT, &sspb.S2C_KickOut{
+			ID: sspb.KickOutID_KICK_OUT_ID_TOKEN_INVALID,
 		})
 		user.Cli.CloseClient()
 		return
@@ -118,8 +118,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(ss_pb.MessageID_MESSAGE_ID_KICK_OUT, &ss_pb.S2C_KickOut{
-				ID: ss_pb.KickOutID_KICK_OUT_ID_SERVER_BUSY,
+			user.Cli.WriteMessage(sspb.MessageID_MESSAGE_ID_KICK_OUT, &sspb.S2C_KickOut{
+				ID: sspb.KickOutID_KICK_OUT_ID_SERVER_BUSY,
 			})
 			user.Cli.CloseClient()
 			return
@@ -128,8 +128,8 @@ func (l *Login) StartLogin(user *User) {
 	if client.UserMgr.GetSize() >= global.MaxOnlineSize {
 		// 如果人数满了就排队
 		if err := GetQueueUp().Enqueue(user.Cli); err != nil {
-			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.WriteMessage(sspb.MessageID_MESSAGE_ID_KICK_OUT, &sspb.S2C_KickOut{
+				ID: sspb.KickOutID_KICK_OUT_ID_QUEUE_UP_FULL,
 			})
 			user.Cli.CloseClient()
 			return
@@ -137,13 +137,13 @@ func (l *Login) StartLogin(user *User) {
 		// 告诉客户端正在排队
 		position, ok := GetQueueUp().GetPosition(user.Cli.USN)
 		if !ok {
-			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.WriteMessage(sspb.MessageID_MESSAGE_ID_KICK_OUT, &sspb.S2C_KickOut{
+				ID: sspb.KickOutID_KICK_OUT_ID_SERVER_BUSY,
 			})
 			user.Cli.CloseClient()
 			return
 		}
-		user.Cli.WriteMessage(ss_pb.MessageID_MESSAGE_ID_QUEUE_UP, &ss_pb.S2C_QueueUp{
+		user.Cli.WriteMessage(sspb.MessageID_MESSAGE_ID_QUEUE_UP, &sspb.S2C_QueueUp{
 			QueueUpCount: int32(position),
 		})
 	} else {
@@ -165,12 +165,12 @@ func (l *Login) CheckOnline(user *User) string {
 
 // KickUser 把玩家踢下线
 func (l *Login) KickUser(gatewaySID int64, usn int64) bool {
-	gc, err := grpc_client.GatewayNewClient(gatewaySID)
+	gc, err := grpcclient.GatewayNewClient(gatewaySID)
 	if err != nil {
 		log.Errorf("KickUser cannot find gateway client: %v, sid: %v", err, gatewaySID)
 		return false
 	}
-	_, err = gc.KickUser(l.ctx, &grpc_pb.KickUserReq{USN: usn})
+	_, err = gc.KickUser(l.ctx, &rspb.KickUserReq{USN: usn})
 	if err != nil {
 		log.Errorf("KickUser err: %v, sid: %v, usn: %v", err, gatewaySID, usn)
 		return false

internal/handler/wshandler/login/queue_up.go

@@ -3,7 +3,7 @@ package login
 import (
 	"context"
 	"errors"
-	"git.hlsq.asia/mmorpg/service-gateway/internal/handler/ws_handler/client"
+	"git.hlsq.asia/mmorpg/service-gateway/internal/handler/wshandler/client"
 	"sync"
 	"sync/atomic"
 )