back

internal/logic/public/user/bindEmailWithVerificationLogic.go

@@ -56,28 +56,25 @@ func (l *BindEmailWithVerificationLogic) BindEmailWithVerification(req *types.Bi
 		scenes   = []string{constant.Security.String(), constant.Register.String()}
 		verified = false
 	)
-	if req.Code == "202511" {
-		verified = true
-	} else {
-		for _, scene := range scenes {
-			cacheKey := fmt.Sprintf("%s:%s:%s", config.AuthCodeCacheKey, scene, req.Email)
-			value, getErr := l.svcCtx.Redis.Get(l.ctx, cacheKey).Result()
-			if getErr != nil || value == "" {
-				continue
-			}
-			var p payload
-			if err := json.Unmarshal([]byte(value), &p); err != nil {
-				continue
-			}
-			if p.Code == req.Code {
-				_ = l.svcCtx.Redis.Del(l.ctx, cacheKey).Err()
-				verified = true
-				break
-			}
+	for _, scene := range scenes {
+		cacheKey := fmt.Sprintf("%s:%s:%s", config.AuthCodeCacheKey, scene, req.Email)
+		value, getErr := l.svcCtx.Redis.Get(l.ctx, cacheKey).Result()
+		if getErr != nil || value == "" {
+			continue
+		}
+		var p payload
+		if err := json.Unmarshal([]byte(value), &p); err != nil {
+			continue
+		}
+		// 校验验证码及有效期（10分钟）
+		if p.Code == req.Code && time.Now().Unix()-p.LastAt <= 600 {
+			_ = l.svcCtx.Redis.Del(l.ctx, cacheKey).Err()
+			verified = true
+			break
 		}
 	}
 	if !verified {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "code error")
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "code error or expired")
 	}
 
 	// 获取当前用户的设备标识符

internal/logic/public/user/verifyEmailLogic.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"time"
 
 	"github.com/perfect-panel/server/internal/config"
 	"github.com/perfect-panel/server/internal/model/user"
@@ -49,8 +50,8 @@ func (l *VerifyEmailLogic) VerifyEmail(req *types.VerifyEmailRequest) error {
 		l.Errorw("Redis Error", logger.Field("error", err.Error()), logger.Field("cacheKey", cacheKey))
 		return errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "code error")
 	}
-	if payload.Code != req.Code {
-		return errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "code error")
+	if payload.Code != req.Code || time.Now().Unix()-payload.LastAt > 600 {
+		return errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "code error or expired")
 	}
 	l.svcCtx.Redis.Del(l.ctx, cacheKey)