wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'feat-IRONFANS-122-Robin' (#534) from feat-IRONFANS-122-Robin into main 

Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/534
This commit is contained in:
chenhao 2024-06-15 17:58:54 +08:00
parent 0e3e21cd86 61189f4bbe
commit 39cb825dcb
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/mix/service/apiservice.go
View File

@ -82,7 +82,7 @@ func (s *Service) ApiLoginByPswd(ctx *gin.Context, req *loginproto.ApiLoginByPsw
}
// 2.让已登录的用户强制下线
if util.DerefInt64(login.IsLogined) == 1 {
if account.GetRole() == consts.User {
if _, ec = s.ApiLogout(ctx, &loginproto.ApiLogoutReq{
Mid: account.Mid,
}); ec != errcode.ErrCodeLoginSrvOk {
@ -157,7 +157,7 @@ func (s *Service) ApiLoginByVeriCode(ctx *gin.Context, req *loginproto.ApiLoginB
}
// 4.让已登录的用户强制下线
if util.DerefInt64(login.IsLogined) == 1 {
if account.GetRole() == consts.User {
if _, ec = s.ApiLogout(ctx, &loginproto.ApiLogoutReq{
Mid: account.Mid,
}); ec != errcode.ErrCodeLoginSrvOk {

32
app/mix/service/service.go
View File

@ -563,14 +563,14 @@ func (s *Service) OpLoginByPswd(ctx *gin.Context, req *loginproto.OpLoginByPswdR
}
// 2.让已登录的用户强制下线
if util.DerefInt64(login.IsLogined) == 1 {
if _, ec = s.OpLogout(ctx, &loginproto.OpLogoutReq{
Mid: account.Mid,
}); ec != errcode.ErrCodeLoginSrvOk {
logger.Error("OpLogout failed!")
return
}
}
// if util.DerefInt64(login.IsLogined) == 1 {
// if _, ec = s.OpLogout(ctx, &loginproto.OpLogoutReq{
// Mid: account.Mid,
// }); ec != errcode.ErrCodeLoginSrvOk {
// logger.Error("OpLogout failed!")
// return
// }
// }
// 3.生成token
token, err := _DefaultToken.OpGenerate(ctx, &tokenproto.OpCreateReq{
@ -634,14 +634,14 @@ func (s *Service) OpLoginByVeriCode(ctx *gin.Context, req *loginproto.OpLoginByV
}
// 4.让已登录的用户强制下线
if util.DerefInt64(login.IsLogined) == 1 {
if _, ec = s.OpLogout(ctx, &loginproto.OpLogoutReq{
Mid: account.Mid,
}); ec != errcode.ErrCodeLoginSrvOk {
logger.Error("OpLogout failed!")
return
}
}
// if util.DerefInt64(login.IsLogined) == 1 {
// if _, ec = s.OpLogout(ctx, &loginproto.OpLogoutReq{
// Mid: account.Mid,
// }); ec != errcode.ErrCodeLoginSrvOk {
// logger.Error("OpLogout failed!")
// return
// }
// }
// 5.生成token
token, err = _DefaultToken.OpGenerate(ctx, &tokenproto.OpCreateReq{