admin/bl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
Details

Browse Source
This commit is contained in:
昔念
2026-02-07 22:06:37 +08:00
parent d83d76ca8e
commit 907a3cdbfe
2 changed files with 34 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
logic/controller/login_getserver.go
View File

@@ -1,19 +1,5 @@
package controller
import (
"blazing/common/rpc"
"blazing/common/socket/errorcode"
"blazing/cool"
"blazing/logic/service/user"
"blazing/modules/base/service"
playerservice "blazing/modules/player/service"
"context"
"encoding/hex"
"fmt"
"github.com/panjf2000/gnet/v2"
)
// var sg singleflight.Group
// var ServerList []rpc.ServerInfo
@@ -24,45 +10,45 @@ import (
// }
// GetServerOnline 处理命令: 105
func (h Controller) GetServerOnline(data *user.SidInfo, c gnet.Conn) (result *rpc.CommendSvrInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
result = rpc.NewInInfo()
// tt, _ := cool.CacheManager.Keys(context.Background())
//g.Dump(tt)
t1 := hex.EncodeToString(data.Sid)
userid, ok := playerservice.User.Load(t1)
if !ok || userid != data.Head.UserID {
// func (h Controller) GetServerOnline(data *user.SidInfo, c gnet.Conn) (result *rpc.CommendSvrInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
// result = rpc.NewInInfo()
// // tt, _ := cool.CacheManager.Keys(context.Background())
// //g.Dump(tt)
// t1 := hex.EncodeToString(data.Sid)
// userid, ok := playerservice.User.Load(t1)
// if !ok || userid != data.Head.UserID {
defer c.Close()
return
}
// defer c.Close()
// return
// }
result.IsVip = 1
result.ServerList = rpc.GetServerInfoList(service.NewBaseSysUserService().GetPerson(data.Head.UserID).Debug)
ser := playerservice.NewUserService(data.Head.UserID)
f, b := ser.Friend.Get()
for _, v := range f {
result.FriendInfo = append(result.FriendInfo, rpc.FriendInfo{Userid: v, TimePoke: 1})
}
result.BlackInfo = b
defer func() {
// result.IsVip = 1
// result.ServerList = rpc.GetServerInfoList(service.NewBaseSysUserService().GetPerson(data.Head.UserID).Debug)
// ser := playerservice.NewUserService(data.Head.UserID)
// f, b := ser.Friend.Get()
// for _, v := range f {
// result.FriendInfo = append(result.FriendInfo, rpc.FriendInfo{Userid: v, TimePoke: 1})
// }
// result.BlackInfo = b
// defer func() {
// share.ShareManager.DeleteSession(t1)
// // share.ShareManager.DeleteSession(t1)
kickErr := ser.Info.Kick(data.Head.UserID)
if kickErr != nil {
fmt.Println("踢人失败", kickErr)
// kickErr := ser.Info.Kick(data.Head.UserID)
// if kickErr != nil {
// fmt.Println("踢人失败", kickErr)
}
logininfo := ser.Info.SetLogin()
if logininfo != nil {
cool.CacheManager.Set(context.TODO(), fmt.Sprintf("player:%d", data.Head.UserID), logininfo, 0)
cool.CacheManager.Set(context.Background(), fmt.Sprintf("session:%d", data.Head.UserID), t1, 0)
// }
// logininfo := ser.Info.SetLogin()
// if logininfo != nil {
// cool.CacheManager.Set(context.TODO(), fmt.Sprintf("player:%d", data.Head.UserID), logininfo, 0)
// cool.CacheManager.Set(context.Background(), fmt.Sprintf("session:%d", data.Head.UserID), t1, 0)
}
// }
}()
// }()
return
// return
//return //TODO 这里待实现改成接口调用Ret方法
}
// //return //TODO 这里待实现改成接口调用Ret方法
// }

2
logic/controller/login_main.go
View File

@@ -39,7 +39,7 @@ func (h Controller) Login(data *user.MAIN_LOGIN_IN, c gnet.Conn) (result *user.L
return
}
currentPlayer.Service = service.NewUserService(data.Head.UserID)
currentPlayer.Service.Info.Kick(data.Head.UserID)
h.RPCClient.Kick(data.Head.UserID) //通知其他服务器踢人
currentPlayer.Info = currentPlayer.Service.Info.SetLogin()
share.ShareManager.SetUserOnline(data.Head.UserID, h.Port) //设置用户登录服务器