15ttl

internal/logic/auth/emailLoginLogic.go

@@ -73,7 +73,7 @@ func (l *EmailLoginLogic) EmailLogin(req *types.EmailLoginRequest) (resp *types.
 		if err := json.Unmarshal([]byte(value), &payload); err != nil {
 			continue
 		}
-		if payload.Code == req.Code && time.Now().Unix()-payload.LastAt <= 600 {
+		if payload.Code == req.Code && time.Now().Unix()-payload.LastAt <= 900 {
 			verified = true
 			cacheKeyUsed = cacheKey
 			break

internal/logic/auth/resetPasswordLogic.go

@@ -79,9 +79,14 @@ func (l *ResetPasswordLogic) ResetPassword(req *types.ResetPasswordRequest) (res
 			l.Errorw("Unmarshal errors", logger.Field("cacheKey", cacheKey), logger.Field("error", err.Error()), logger.Field("value", value))
 			return nil, errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "Verification code error")
 		}
-		if payload.Code != req.Code || time.Now().Unix()-payload.LastAt > 600 {
-			l.Errorw("Verification code error", logger.Field("cacheKey", cacheKey), logger.Field("error", "Verification code error or expired"), logger.Field("reqCode", req.Code), logger.Field("payloadCode", payload.Code))
-			return nil, errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "Verification code error or expired")
+		if payload.Code != req.Code {
+			l.Errorw("Verification code error", logger.Field("cacheKey", cacheKey), logger.Field("error", "Verification code error"), logger.Field("reqCode", req.Code), logger.Field("payloadCode", payload.Code))
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "Verification code error")
+		}
+		// 校验有效期（15分钟）
+		if time.Now().Unix()-payload.LastAt > 900 {
+			l.Errorw("Verification code expired", logger.Field("cacheKey", cacheKey), logger.Field("error", "Verification code expired"), logger.Field("reqCode", req.Code), logger.Field("payloadCode", payload.Code))
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "code expired")
 		}
 		l.svcCtx.Redis.Del(l.ctx, cacheKey)
 	}

internal/logic/auth/userRegisterLogic.go

@@ -74,8 +74,12 @@ func (l *UserRegisterLogic) UserRegister(req *types.UserRegisterRequest) (resp *
 			l.Errorw("Unmarshal Error", logger.Field("error", err.Error()), logger.Field("value", value))
 			return nil, errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "code error")
 		}
-		if payload.Code != req.Code || time.Now().Unix()-payload.LastAt > 600 {
-			return nil, errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "code error or expired")
+		if payload.Code != req.Code {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "code error")
+		}
+		// 校验有效期（15分钟）
+		if time.Now().Unix()-payload.LastAt > 900 {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "code expired")
 		}
 		l.svcCtx.Redis.Del(l.ctx, cacheKey)
 	}