diff --git a/app/mix/controller/login_api.go b/app/mix/controller/login_api.go index d8c3a0fc..3221927f 100644 --- a/app/mix/controller/login_api.go +++ b/app/mix/controller/login_api.go @@ -6,14 +6,14 @@ import ( "service/app/mix/service" "service/bizcommon/util" "service/library/logger" + "service/library/mediafiller" "github.com/gin-gonic/gin" ) func ApiLoginByPswd(ctx *gin.Context) { req := ctx.MustGet("client_req").(*loginproto.ApiLoginByPswdReq) - //isEnabled, token, accountVO, ec := service.DefaultService.ApiLoginByPswd(ctx, req) - ec := errcode.ErrCodeSuspend + isEnabled, token, accountVO, ec := service.DefaultService.ApiLoginByPswd(ctx, req) if ec != errcode.ErrCodeLoginSrvOk { logger.Error("ApiLoginByPswd fail, req: %v, ec: %v", util.ToJson(req), ec) ReplyErrCodeMsg(ctx, ec) @@ -21,13 +21,13 @@ func ApiLoginByPswd(ctx *gin.Context) { } //填充媒体切片 - // mediafiller.FillEntity(ctx, accountVO.Avatar) + mediafiller.FillEntity(ctx, accountVO.Avatar) - // ReplyOk(ctx, &loginproto.ApiLoginData{ - // IsEnabled: isEnabled, - // Token: token, - // AccountVO: accountVO, - // }) + ReplyOk(ctx, &loginproto.ApiLoginData{ + IsEnabled: isEnabled, + Token: token, + AccountVO: accountVO, + }) } @@ -107,7 +107,5 @@ func ApiLogout(ctx *gin.Context) { } func ApiValidate(ctx *gin.Context) { - ec := errcode.ErrCodeSuspend - ReplyErrCodeMsg(ctx, ec) - //ReplyOk(ctx, nil) + ReplyOk(ctx, nil) } diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go index 10bc2edd..a952af4a 100644 --- a/app/mix/service/apiservice.go +++ b/app/mix/service/apiservice.go @@ -76,6 +76,12 @@ func (s *Service) ApiLoginByPswd(ctx *gin.Context, req *loginproto.ApiLoginByPsw return } + // 20240326整改临时调整 + if util.DerefInt64(account.Status) != consts.Admin && util.DerefInt64(account.Status) != consts.Supportor { + ec = errcode.ErrCodeSuspend + return + } + // 2.让已登录的用户强制下线 if util.DerefInt64(login.IsLogined) == 1 { if _, ec = s.ApiLogout(ctx, &loginproto.ApiLogoutReq{