用户信息传到service

admin/internal/logic/adminloginlogic.go

@@ -7,9 +7,13 @@ import (
 	"admin/internal/svc"
 	"admin/validator"
 	"context"
+	"strconv"
+	"time"
 
+	jsoniter "github.com/json-iterator/go"
 	"github.com/zeromicro/go-zero/core/logx"
 	"pkg.local/modelbase"
+	"pkg.local/redis"
 	"pkg.local/utils"
 )
 
@@ -29,12 +33,13 @@ func NewAdminLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminL
 }
 
 func (l *AdminLoginLogic) AdminLogin(in *admin.AdminLoginRequest) (*admin.Response, error) {
+	l.Logger.Error("u:", in.Username, "p:", in.Password, "|")
 	var v validator.LoginValidator
 	if fail := l.checkParams(in, &v); fail != nil {
 		return fail, nil
 	}
 
-	phone, dErr := utils.DecryptPhone(in.Username)
+	phone, dErr := utils.EncryptPhone(in.Username)
 	if dErr != nil {
 		l.Logger.Error(dErr)
 		return l.fail(utils.Fail), nil
@@ -59,12 +64,12 @@ func (l *AdminLoginLogic) AdminLogin(in *admin.AdminLoginRequest) (*admin.Respon
 	}
 
 	data := dao.JwtInfo{
-		Id:       info.Id,
-		Name:     info.Name,
-		Email:    info.Email,
-		Phone:    info.Phone,
-		Avatar:   info.Avatar,
-		Roles:    info.Roles,
+		Id:     info.Id,
+		Name:   info.Name,
+		Email:  info.Email,
+		Phone:  info.Phone,
+		Avatar: info.Avatar,
+		//Roles:    info.Roles,
 		LastTime: utils.Now(),
 	}
 	retData := dao.Token{
@@ -77,16 +82,24 @@ func (l *AdminLoginLogic) AdminLogin(in *admin.AdminLoginRequest) (*admin.Respon
 }
 
 func (l *AdminLoginLogic) setLogin(token string, data dao.JwtInfo) {
-	//duration := utils.GetConfigInt("base.login_out_time")
-	//if data.Time > utils.NumberZero {
-	//	duration = int(time.Minute * time.Duration(int64(data.Time)))
-	//}
-	//redisKey := utils.GetLoginKey(utils.LoginUser, token)
-	//userStr, _ := jsoniter.Marshal(data)
-	//redis.New().Set(redisKey, string(userStr), duration).Result()
-	//oldAuth, oldErr := utils.Redis.HGet(utils.GetRedisKey(utils.LoginUserKey), strconv.Itoa(data.Id)).Result()
-	//if oldErr == nil {
-	//	utils.Redis.Del(utils.GetRedisKey(utils.LoginUser + oldAuth)).Result()
-	//}
-	//utils.Redis.HSet(utils.GetRedisKey(utils.LoginUserKey), strconv.Itoa(data.Id), token).Result()
+	expireMin := utils.GetConfigInt("base.login_out_time")
+	var expire time.Duration
+	// 默认使用配置时长
+	expire = time.Duration(expireMin) * time.Minute
+	// 如果用户自定义了过期时间则覆盖
+	if data.Time > utils.NumberZero {
+		expire = time.Duration(data.Time) * time.Minute
+	}
+
+	redisKey := utils.GetLoginKey(utils.LoginTypeAdmin, token)
+	l.Logger.Error(redisKey)
+	userStr, _ := jsoniter.Marshal(data)
+	ctx := context.Background()
+	redis.Client.Set(ctx, redisKey, userStr, expire).Result()
+	redisKeysKey := utils.GetLoginKeysKey(utils.LoginTypeAdmin)
+	oldAuth, oldErr := redis.Client.HGet(ctx, redisKeysKey, strconv.Itoa(int(data.Id))).Result()
+	if oldErr == nil {
+		redis.Client.Del(ctx, utils.GetLoginKey(utils.LoginTypeAdmin, oldAuth)).Result()
+	}
+	redis.Client.HSet(ctx, redisKeysKey, strconv.Itoa(int(data.Id)), token).Result()
 }