refactor(socket): 重构 socket 模块

- 移除 common/data/socket 目录下的大部分文件 - 新增 service 目录，将 Player 和 Conn 结构体移至该目录 - 更新 LogicClient 中的方法签名，使用 service 包的类型 - 重构 Controller 中的方法，适应新的 service 包结构
2025-09-04 02:00:57 +08:00
parent afdf015d62
commit 621a9d3858
50 changed files with 886 additions and 849 deletions
--- a/logic/controller/CreatePlayer.go
+++ b/logic/controller/CreatePlayer.go
@@ -1,15 +1,15 @@
 package controller

 import (
-	"blazing/common/data/socket"
 	"blazing/common/socket/errorcode"
+	"blazing/logic/service"
 	"blazing/logic/service/login"
-	"blazing/modules/blazing/service"
+	blservice "blazing/modules/blazing/service"
 )

 // 处理命令: 1001
-func (h *Controller) CreatePlayer(data *login.CreatePlayerInboundInfo, c *socket.Conn) (result *login.CreatePlayerOutInfo, err errorcode.ErrorCode) {
+func (h *Controller) CreatePlayer(data *login.CreatePlayerInboundInfo, c *service.Conn) (result *login.CreatePlayerOutInfo, err errorcode.ErrorCode) {

-	service.NewUserService(data.Head.UserID).Reg(data.Nickname, data.Color)
+	blservice.NewUserService(data.Head.UserID).Reg(data.Nickname, data.Color)
 	return result, 0
 }
--- a/logic/controller/Friend.go
+++ b/logic/controller/Friend.go
@@ -1,12 +1,12 @@
 package controller

 import (
-	"blazing/common/data/socket"
 	"blazing/common/socket/errorcode"
+	"blazing/logic/service"
 	"blazing/logic/service/friend"
 )

-func (h Controller) OnSeeOnline(data *friend.SeeOnlineInboundInfo, c *socket.Player) (result *friend.SeeOnlineOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnSeeOnline(data *friend.SeeOnlineInboundInfo, c *service.Player) (result *friend.SeeOnlineOutboundInfo, err errorcode.ErrorCode) {
 	result = &friend.SeeOnlineOutboundInfo{}
 	result.Friends = make([]friend.OnlineInfo, 0)
 	return
--- a/logic/controller/controller.go
+++ b/logic/controller/controller.go
@@ -1,9 +1,9 @@
 package controller

 import (
-	"blazing/common/data/socket"
+	"blazing/common/socket"
 	"blazing/common/socket/errorcode"
-	"blazing/common/socket/handler"
+
 	"blazing/cool"
 	"blazing/logic/service"
 	"os"
@@ -38,7 +38,7 @@ type LogicClient struct {
 func (h *LogicClient) KickPerson(a int) error {

 	fmt.Println("检测到踢人请求", a)
-	service.KickPlayer(uint32(a))
+	socket.KickPlayer(uint32(a))
 	return nil
 }
 func (h *LogicClient) QuitSelf(a int) error {
@@ -50,9 +50,9 @@ func (h *LogicClient) QuitSelf(a int) error {
 		for {

 			//entity.ConutPlayer()
-			fmt.Println("当前在线人数", socket.ConutPlayer())
+			fmt.Println("当前在线人数", service.ConutPlayer())

-			if socket.ConutPlayer() <= 0 {
+			if service.ConutPlayer() <= 0 {
 				//执行退出逻辑
 				os.Exit(1)
 			}
@@ -107,7 +107,7 @@ func init() { //默认初始化扫描

 			}
 			glog.Debug(context.Background(), "注册方法", func_cmd, method.Name)
-			//	fmt.Println(methodValue.Interface().(func(gnet.Conn, handler.TomeeHeader)))
+			//	fmt.Println(methodValue.Interface().(func(gnet.Conn, service.TomeeHeader)))
 			_, ok := cool.CmdCache.LoadOrStore(func_cmd, methodValue) //TODO 待实现对不同用户初始化方法以取消全局cmdcache

 			if ok { //方法已存在init
@@ -136,7 +136,7 @@ func getcmd(t reflect.Type) []uint32 {
 		field := t.Field(i)
 		//fmt.Printf("- 字段名: %s\n", field.Name)
 		//fmt.Printf("  类型: %v\n", field.Type)
-		if field.Type == reflect.TypeOf(handler.TomeeHeader{}) {
+		if field.Type == reflect.TypeOf(service.TomeeHeader{}) {
 			//	fmt.Println(reflect.ValueOf(field))

 			return gconv.SliceUint32(strings.Split(field.Tag.Get("cmd"), "|"))
@@ -158,7 +158,7 @@ func getcmd(t reflect.Type) []uint32 {
 }

 // 遍历结构体方法并执行RECV_cmd
-func Recv(c *socket.Conn, data handler.TomeeHeader) {
+func Recv(c *service.Conn, data service.TomeeHeader) {

 	cmdlister, ok := cool.CmdCache.Load(data.CMD)
 	if !ok {
@@ -189,8 +189,8 @@ func Recv(c *socket.Conn, data handler.TomeeHeader) {
 	if nameField.IsValid() && nameField.CanSet() {
 		nameField.Set(reflect.ValueOf(data))
 	}
-	if cmdlister.Type().In(1) == reflect.TypeOf(&socket.Player{}) {
-		t := service.GetPlayer(c, data.UserID)
+	if cmdlister.Type().In(1) == reflect.TypeOf(&service.Player{}) {
+		t := socket.GetPlayer(c, data.UserID)
 		//	fmt.Println(data.CMD, "接收 变量的地址 ", &t.Info, t.Info.UserID)
 		err := t.WaitForLoginWithCtx(context.Background())
 		if err != nil {
--- a/logic/controller/fight.go
+++ b/logic/controller/fight.go
@@ -1,12 +1,12 @@
 package controller

 import (
-	"blazing/common/data/socket"
 	"blazing/common/socket/errorcode"
-	"blazing/common/socket/handler"
+
 	"math/rand"
 	"time"

+	"blazing/logic/service"
 	"blazing/logic/service/fight"
 	"blazing/logic/service/fight/info"
 	"blazing/modules/blazing/model"
@@ -14,7 +14,7 @@ import (
 	"github.com/jinzhu/copier"
 )

-func (h Controller) OnPlayerFightNpcMonster(data *info.FightNpcMonsterInboundInfo, c *socket.Player) (result *info.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnPlayerFightNpcMonster(data *fight.FightNpcMonsterInboundInfo, c *service.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {

 	ttt := info.NoteReadyToFightInfo{
 		OwnerID: data.Head.UserID,
@@ -43,42 +43,42 @@ func (h Controller) OnPlayerFightNpcMonster(data *info.FightNpcMonsterInboundInf
 	if err1 != nil {
 		panic(err)
 	}
-
-	fight.NewFight(&ttt, c) //把两个玩家都传进去
+	c.FightC = &service.FightC{}
+	c.FightC.NewFight(&ttt, c) //把两个玩家都传进去

 	return nil, -1
 }

 // 准备战斗
-func (h Controller) OnReadyToFight(data *info.ReadyToFightInboundInfo, c *socket.Player) (result *info.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnReadyToFight(data *fight.ReadyToFightInboundInfo, c *service.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {

-	fight.ReadyFight(c)
+	c.FightC.ReadyFight(c)
 	return nil, -1
 }

 // 接收战斗或者取消战斗的包
-func (h Controller) OnPlayerHandleFightInvite(data *info.HandleFightInviteInboundInfo, c *socket.Player) (result *info.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnPlayerHandleFightInvite(data *fight.HandleFightInviteInboundInfo, c *service.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {

 	return nil, -1
 }

 // 使用技能包
-func (h Controller) UseSkill(data *info.UseSkillInboundInfo, c *socket.Player) (result *info.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) UseSkill(data *fight.UseSkillInboundInfo, c *service.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {

 	return nil, 0
 }

 // 战斗逃跑
-func (h Controller) Escape(data *info.EscapeFightInboundInfo, c *socket.Player) (result *info.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) Escape(data *fight.EscapeFightInboundInfo, c *service.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {

 	defer func() {
 		//战斗结束Escape
-		ttt := handler.NewTomeeHeader(2506, c.Info.UserID)
+		ttt := service.NewTomeeHeader(2506, c.Info.UserID)

-		c.SendPack(ttt.Pack(&info.FightOverInfo{
+		c.SendPack(ttt.Pack(&fight.FightOverInfo{
 			Reason: 0,
 		}))
-		c.FightID = ""
+
 	}()

 	return nil, 0
--- a/logic/controller/getserver.go
+++ b/logic/controller/getserver.go
@@ -1,13 +1,13 @@
 package controller

 import (
-	"blazing/common/data/socket"
 	"blazing/common/socket/errorcode"
+	"blazing/logic/service"
 	"blazing/logic/service/commendsvr"
 )

 // 处理命令: 105
-func (h *Controller) GetServer(data *commendsvr.SidInfo, c *socket.Conn) (result *commendsvr.CommendSvrInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+func (h *Controller) GetServer(data *commendsvr.SidInfo, c *service.Conn) (result *commendsvr.CommendSvrInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
 	result = commendsvr.NewInInfo()
 	result.ServerList = commendsvr.GetServerInfoList()
 	return
--- a/logic/controller/item.go
+++ b/logic/controller/item.go
@@ -1,12 +1,12 @@
 package controller

 import (
-	"blazing/common/data/socket"
 	"blazing/common/socket/errorcode"
+	"blazing/logic/service"
 	"blazing/logic/service/item"
 )

-func (h Controller) UserItemList(data *item.ItemListInboundInfo, c *socket.Player) (result *item.ItemListOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) UserItemList(data *item.ItemListInboundInfo, c *service.Player) (result *item.ItemListOutboundInfo, err errorcode.ErrorCode) {
 	result = &item.ItemListOutboundInfo{}

 	return result, 0
--- a/logic/controller/login.go
+++ b/logic/controller/login.go
@@ -2,9 +2,10 @@ package controller

 import (
 	"blazing/common/data/share"
-	"blazing/common/data/socket"
+	"blazing/common/socket"
+
 	"blazing/common/socket/errorcode"
-	"blazing/common/socket/handler"
+
 	"blazing/logic/service"
 	"blazing/logic/service/login"
 	"blazing/logic/service/maps"
@@ -27,12 +28,12 @@ func IsToday(t time.Time) bool {
 }

 // 处理命令: 1001
-func (h *Controller) Login(data *login.InInfo, c *socket.Conn) (result *login.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+func (h *Controller) Login(data *login.InInfo, c *service.Conn) (result *login.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的

 	if tt := data.CheakSession(); tt { //说明sid正确
 		h.RPCClient.Kick(data.Head.UserID) //先踢人

-		t := service.GetPlayer(c, data.Head.UserID)
+		t := socket.GetPlayer(c, data.Head.UserID)
 		t.Info = blservice.NewUserService(data.Head.UserID).Person()
 		t.Info.UserID = data.Head.UserID
 		t.Onlinetime = uint32(time.Now().Unix())                   //保存时间戳
@@ -59,8 +60,8 @@ func (h *Controller) Login(data *login.InInfo, c *socket.Conn) (result *login.Ou

 		tt := maps.NewOutInfo()
 		//copier.Copy(t.Info, tt)
-		t1 := handler.NewTomeeHeader(2001, t.Info.UserID)
-		defer space.GetSpace(t.Info.MapID).Set(t.Info.UserID, t).Range(func(playerID uint32, player *socket.Player) bool {
+		t1 := service.NewTomeeHeader(2001, t.Info.UserID)
+		defer space.GetSpace(t.Info.MapID).Set(t.Info.UserID, t).Range(func(playerID uint32, player service.PlayerI) bool {

 			player.SendPack(t1.Pack(&tt))
 			return true
--- a/logic/controller/map.go
+++ b/logic/controller/map.go
@@ -1,8 +1,8 @@
 package controller

 import (
-	"blazing/common/data/socket"
 	"blazing/common/socket/errorcode"
+	"blazing/logic/service"
 	"blazing/logic/service/maphot"
 	"blazing/logic/service/maps"
 	"blazing/logic/service/space"
@@ -11,7 +11,7 @@ import (
 	"github.com/jinzhu/copier"
 )

-func (h *Controller) MapEnter(data *maps.InInfo, c *socket.Player) (result *maps.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+func (h *Controller) MapEnter(data *maps.InInfo, c *service.Player) (result *maps.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的

 	c.Info.MapID = data.MapId                          //登录地图
 	space.GetSpace(c.Info.MapID).Set(c.Info.UserID, c) //添加玩家
@@ -33,7 +33,7 @@ func (h *Controller) MapEnter(data *maps.InInfo, c *socket.Player) (result *maps

 		<-time.After(5 * time.Second)
 		// 首次刷新
-		if c.FightID == "" && c.Info.MapID != 0 {
+		if c.FightC == nil && c.Info.MapID != 0 {
 			data.SpawnMonsters(c, true)
 		}
 		//循环刷新怪物
@@ -48,7 +48,7 @@ func (h *Controller) MapEnter(data *maps.InInfo, c *socket.Player) (result *maps
 				return
 			case <-ticker.C:
 				// 刷新当前地图的怪物
-				if c.FightID == "" && c.Info.MapID != 0 {
+				if c.FightC == nil && c.Info.MapID != 0 {
 					data.SpawnMonsters(c, false)
 				}

@@ -57,7 +57,7 @@ func (h *Controller) MapEnter(data *maps.InInfo, c *socket.Player) (result *maps
 	}(c.StopChan, int(c.Info.MapID))
 	return nil, -1
 }
-func (h Controller) MapHot(data *maphot.InInfo, c *socket.Player) (result *maphot.OutInfo, err errorcode.ErrorCode) {
+func (h Controller) MapHot(data *maphot.InInfo, c *service.Player) (result *maphot.OutInfo, err errorcode.ErrorCode) {

 	result = &maphot.OutInfo{

@@ -66,7 +66,7 @@ func (h Controller) MapHot(data *maphot.InInfo, c *socket.Player) (result *mapho

 	return
 }
-func (h *Controller) MapLeave(data *maps.LeaveMapInboundInfo, c *socket.Player) (result *maps.LeaveMapOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+func (h *Controller) MapLeave(data *maps.LeaveMapInboundInfo, c *service.Player) (result *maps.LeaveMapOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
 	//result = &maps.LeaveMapOutboundInfo{UserID: c.GetUserID()}

 	data.Broadcast(c.Info.MapID, maps.LeaveMapOutboundInfo{UserID: c.Info.UserID}) //同步广播
@@ -79,14 +79,14 @@ func (h *Controller) MapLeave(data *maps.LeaveMapInboundInfo, c *socket.Player)
 	c.Info.MapID = 0 // 重置当前地图
 	return nil, -1
 }
-func (h *Controller) MapList(data *maps.ListMapPlayerInboundInfo, c *socket.Player) (result *maps.ListMapPlayerOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+func (h *Controller) MapList(data *maps.ListMapPlayerInboundInfo, c *service.Player) (result *maps.ListMapPlayerOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的

 	result = &maps.ListMapPlayerOutboundInfo{}
 	result.Player = make([]maps.OutInfo, 0)

-	space.GetSpace(c.Info.MapID).Range(func(userID uint32, player *socket.Player) bool {
+	space.GetSpace(c.Info.MapID).Range(func(userID uint32, player service.PlayerI) bool {
 		result1 := maps.NewOutInfo()
-		copier.Copy(result1, player.Info)
+		copier.Copy(result1, player)
 		result.Player = append(result.Player, *result1)
 		return true
 	})
--- a/logic/controller/pet.go
+++ b/logic/controller/pet.go
@@ -1,10 +1,10 @@
 package controller

 import (
-	"blazing/common/data/socket"
 	"blazing/common/socket/errorcode"
+	"blazing/logic/service"
 	"blazing/logic/service/pet"
-	"blazing/modules/blazing/service"
+
 	blservice "blazing/modules/blazing/service"

 	"github.com/jinzhu/copier"
@@ -13,10 +13,10 @@ import (
 // 获取精灵信息
 func (h *Controller) GetPetInfo(
 	data *pet.InInfo,
-	c *socket.Player) (result *pet.OutInfo,
+	c *service.Player) (result *pet.OutInfo,
 	err errorcode.ErrorCode) { //这个时候player应该是空的

-	t := service.NewUserService(c.Info.UserID).GetPetInfo(data.CatchTime)
+	t := blservice.NewUserService(c.Info.UserID).GetPetInfo(data.CatchTime)
 	return &pet.OutInfo{
 		PetInfo: t,
 	}, 0
@@ -25,7 +25,7 @@ func (h *Controller) GetPetInfo(
 // 获取仓库列表
 func (h *Controller) GetPetList(
 	data *pet.GetPetListInboundEmpty,
-	c *socket.Player) (result *pet.GetPetListOutboundInfo,
+	c *service.Player) (result *pet.GetPetListOutboundInfo,
 	err errorcode.ErrorCode) { //这个时候player应该是空的
 	result = &pet.GetPetListOutboundInfo{}

@@ -43,7 +43,7 @@ func (h *Controller) GetPetList(
 // 精灵背包仓库切换
 func (h *Controller) PetRelease(
 	data *pet.PetReleaseInboundInfo,
-	c *socket.Player) (
+	c *service.Player) (
 	result *pet.PetReleaseOutboundInfo,
 	err errorcode.ErrorCode) { //这个时候player应该是空的
 	//放入背包=数据库置1+添加到背包+pet release发包    仓库=数据库置0+移除背包   设置首发等于取到首发精灵后重新排序
@@ -51,7 +51,7 @@ func (h *Controller) PetRelease(
 	result = &pet.PetReleaseOutboundInfo{}
 	result.Flag = uint32(data.Flag)

-	t := service.NewUserService(c.Info.UserID).PetM(int(data.CatchTime), int(data.Flag))
+	t := blservice.NewUserService(c.Info.UserID).PetM(int(data.CatchTime), int(data.Flag))
 	switch data.Flag {
 	case 0:
 		//todo 仓库
--- a/logic/controller/room.go
+++ b/logic/controller/room.go
@@ -1,13 +1,13 @@
 package controller

 import (
-	"blazing/common/data/socket"
 	"blazing/common/socket/errorcode"
+	"blazing/logic/service"
 	"blazing/logic/service/room"
 )

 // 获取基地物品
-func (h Controller) OnFitmentUsering(data *room.FitmentUseringInboundInfo, c *socket.Player) (result *room.FitmentUseringOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnFitmentUsering(data *room.FitmentUseringInboundInfo, c *service.Player) (result *room.FitmentUseringOutboundInfo, err errorcode.ErrorCode) {

 	result = &room.FitmentUseringOutboundInfo{UserId: c.Info.UserID, RoomId: data.TargetUserID}
 	result.Fitments = make([]room.FitmentShowInfo, 0)
@@ -17,14 +17,14 @@ func (h Controller) OnFitmentUsering(data *room.FitmentUseringInboundInfo, c *so
 }

 // 获取基地展示精灵
-func (h Controller) OnGetRoomPetShowInfo(data *room.PetRoomListInboundInfo, c *socket.Player) (result *room.PetRoomListOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnGetRoomPetShowInfo(data *room.PetRoomListInboundInfo, c *service.Player) (result *room.PetRoomListOutboundInfo, err errorcode.ErrorCode) {
 	result = &room.PetRoomListOutboundInfo{}
 	result.Pets = make([]room.PetShowInfo, 0)
 	return
 }

 // 获取自己房间的家具
-func (h Controller) OnGetFitmentAll(data *room.FitmentAllInboundEmpty, c *socket.Player) (result *room.FitmentAllOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnGetFitmentAll(data *room.FitmentAllInboundEmpty, c *service.Player) (result *room.FitmentAllOutboundInfo, err errorcode.ErrorCode) {
 	result = &room.FitmentAllOutboundInfo{}
 	result.Fitments = make([]room.FitmentItemInfo, 0)

--- a/logic/controller/systemtime.go
+++ b/logic/controller/systemtime.go
@@ -1,12 +1,12 @@
 package controller

 import (
-	"blazing/common/data/socket"
 	"blazing/common/socket/errorcode"
+	"blazing/logic/service"
 	"blazing/logic/service/systemtime"
 )

-func (h Controller) SystemTimeInfo(data *systemtime.InInfo, c *socket.Player) (result *systemtime.OutInfo, err errorcode.ErrorCode) {
+func (h Controller) SystemTimeInfo(data *systemtime.InInfo, c *service.Player) (result *systemtime.OutInfo, err errorcode.ErrorCode) {

 	return systemtime.NewOutInfo(), 0
 }
--- a/logic/controller/task.go
+++ b/logic/controller/task.go
@@ -1,11 +1,11 @@
 package controller

 import (
-	"blazing/common/data/socket"
 	"blazing/common/socket/errorcode"
+	"blazing/logic/service"
 	"blazing/logic/service/task"
 	"blazing/modules/blazing/model"
-	"blazing/modules/blazing/service"
+	blservice "blazing/modules/blazing/service"
 	"math/rand"
 	"time"
 )
@@ -13,7 +13,7 @@ import (
 /**
 * 接受任务
 */
-func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *socket.Player) (result *task.AcceptTaskOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *service.Player) (result *task.AcceptTaskOutboundInfo, err errorcode.ErrorCode) {
 	//isdaliy := false
 	// if data.Head.CMD != 2201 { //判断是每日任务
 	// 	//isdaliy = true
@@ -31,20 +31,20 @@ func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *socket.Playe
 /**
 * 更新任务步骤
 */
-func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *socket.Player) (result *task.AddTaskBufOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *service.Player) (result *task.AddTaskBufOutboundInfo, err errorcode.ErrorCode) {
 	// isdaliy := false
 	// if data.Head.CMD != 2204 { //判断是每日任务
 	// 	isdaliy = true
 	// }
 	result = &task.AddTaskBufOutboundInfo{}

-	_, ok := service.NewUserService(c.Info.UserID).TaskInfo(data.TaskId)
+	_, ok := blservice.NewUserService(c.Info.UserID).TaskInfo(data.TaskId)
 	if ok {
-		service.NewUserService(c.Info.UserID).TaskSet(data.TaskId, model.TaskInfo{
+		blservice.NewUserService(c.Info.UserID).TaskSet(data.TaskId, model.TaskInfo{
 			Info: data.TaskList,
 		})
 	} else {
-		service.NewUserService(c.Info.UserID).TaskADD(data.TaskId, model.TaskInfo{
+		blservice.NewUserService(c.Info.UserID).TaskADD(data.TaskId, model.TaskInfo{

 			Info: data.TaskList,
 		})
@@ -65,7 +65,7 @@ func randInt0To24() int {
 /**
 * 完成任务
 */
-func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *socket.Player) (result *task.CompleteTaskOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *service.Player) (result *task.CompleteTaskOutboundInfo, err errorcode.ErrorCode) {

 	if c.Info.TaskList[data.TaskId] != 1 { //如果任务没有接受或者已经完成Complete_Task

@@ -94,7 +94,7 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *socket.
 		r := model.GenPetInfo(1, 1, 1, 1006, 1, 5)
 		result.CaptureTime = r.CatchTime
 		result.PetTypeId = r.ID
-		service.NewUserService(c.Info.UserID).PetAdd(*r)
+		blservice.NewUserService(c.Info.UserID).PetAdd(*r)
 	}
 	if data.TaskId == 87 { //新手注册任务

@@ -113,8 +113,8 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *socket.
 /**
 * 获取任务状态
 */
-func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *socket.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
-	info, _ := service.NewUserService(c.Info.UserID).TaskInfo(data.TaskId)
+func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *service.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
+	info, _ := blservice.NewUserService(c.Info.UserID).TaskInfo(data.TaskId)
 	result = &task.GetTaskBufOutboundInfo{}
 	result.TaskId = data.TaskId
 	result.TaskList = info.Info
@@ -125,7 +125,7 @@ func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *socket.Pla
 /**
 * 删除任务
 */
-func (h Controller) Delete_Task(data *task.DeleteTaskInboundInfo, c *socket.Player) (result *task.DeleteTaskOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) Delete_Task(data *task.DeleteTaskInboundInfo, c *service.Player) (result *task.DeleteTaskOutboundInfo, err errorcode.ErrorCode) {

 	// if data.Head.CMD == 2205 { //判断不是每日任务

--- a/logic/controller/walk.go
+++ b/logic/controller/walk.go
@@ -1,8 +1,8 @@
 package controller

 import (
-	"blazing/common/data/socket"
 	"blazing/common/socket/errorcode"
+	"blazing/logic/service"
 	"blazing/logic/service/space"
 	"context"

@@ -10,7 +10,7 @@ import (
 	"github.com/jinzhu/copier"
 )

-func (h Controller) Walk(data *space.InInfo, c *socket.Player) (result *space.OutInfo, err errorcode.ErrorCode) {
+func (h Controller) Walk(data *space.InInfo, c *service.Player) (result *space.OutInfo, err errorcode.ErrorCode) {
 	result = &space.OutInfo{}
 	err1 := copier.Copy(result, data)
 	result.UserID = data.Head.UserID