From 3cc6f0a32242c0c23c59be6d4d07fab27ee01c28 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Wed, 27 Mar 2024 15:45:01 +0800
Subject: [PATCH] by Robin at 20240327; alter down

---
 app/mix/controller/login_api.go | 18 ++++++++----------
 app/mix/service/apiservice.go   |  6 ------
 2 files changed, 8 insertions(+), 16 deletions(-)

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