重构

logic/controller/login.go

@@ -1,8 +1,8 @@
 package controller
 
 import (
-	"blazing/common/data/entity"
 	"blazing/common/data/share"
+	"blazing/common/data/socket"
 	"blazing/common/socket/errorcode"
 	"blazing/common/socket/handler"
 	"blazing/logic/service"
@@ -11,59 +11,34 @@ import (
 	"blazing/logic/service/space"
 	blservice "blazing/modules/blazing/service"
 	"context"
-	"time"
 
 	"github.com/gogf/gf/v2/os/glog"
+	"github.com/jinzhu/copier"
 )
 
 // 处理命令: 1001
-func (h *Controller) Login(data *login.InInfo, c *entity.Conn) (result *login.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+func (h *Controller) Login(data *login.InInfo, c *socket.Conn) (result *login.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
 
 	if tt := data.CheakSession(); tt { //说明sid正确
 		h.RPCClient.Kick(data.Head.UserID) //先踢人
-
-		//	h.RPCClient.UserLogin(int32(h.Port), int32(data.Head.UserID)) //初始化用户登录
-		t := service.SetPlayer(c, data.Head.UserID)
-
+		playerinfo := blservice.NewUserService(data.Head.UserID).Person()
+		t := service.SetPlayer(c, playerinfo)
+		copier.Copy(playerinfo, t)                                 //先复制给内存信息
 		share.ShareManager.SetUserOnline(data.Head.UserID, h.Port) //设置用户登录服务器
 		t.CompleteLogin()                                          //通知客户端登录成功
-		t.MapId = 1
-		space.GetSpace(t.MapId).Set(t.UserID, t) //添加玩家
+
 		glog.Debug(context.Background(), "登录成功,初始地图 人数:", space.GetSpace(1).Len())
-		playerinfo := blservice.NewUserService(t.UserID).Person()
-		t.Nick = playerinfo.Nick
-		// blservice.NewPlayerService().ProcessAndSave(t.UserID, func(t *model.PlayerInfo) error {
 
-		// 	t.Nick = t.Nick + " (在线)"
-		// 	return nil
-		// })
 		result = login.NewOutInfo() //设置登录消息
-		result.UserID = t.UserID
-		result.RegisterTime = uint32(time.Now().Unix())
-		result.Nick = t.Nick
-		result.Color = playerinfo.Color
-		result.Pos = playerinfo.Pos
-		result.Clothes = playerinfo.Clothes ///append(result.Clothes, model.PeopleItemInfo{ID: 100717, Level: 1})
-		result.MapID = t.MapId
-		result.TimeLimit = playerinfo.TimeLimit //todo 待修复电池不正确问题
-		result.TimeToday = playerinfo.TimeToday
-		//result.PetList = playerinfo.PetList
+		copier.Copy(playerinfo, result)
 
-		defer func() {
-			space.GetSpace(t.MapId).Set(t.UserID, t) //添加玩家
+		defer space.GetSpace(t.Info.MapID).Set(t.Info.UserID, t).Range(func(playerID uint32, player *socket.Player) bool {
 			tt := maps.NewOutInfo()
-			tt.UserID = t.UserID
-			tt.Nick = t.Nick
-			tt.Pos = result.Pos
-
-			t1 := handler.NewTomeeHeader(2001, t.UserID)
-
-			space.GetSpace(t.MapId).Range(func(playerID uint32, player *entity.Player) bool {
-
-				player.SendPack(t1.Pack(&tt))
-				return true
-			})
-		}()
+			copier.Copy(playerinfo, tt)
+			t1 := handler.NewTomeeHeader(2001, t.Info.UserID)
+			player.SendPack(t1.Pack(&tt))
+			return true
+		})
 
 		return result, 0