移动端和 PC 端登录页都加了“图形验证码

backend/internal/modules/adminauth/repository.go

@@ -2,16 +2,13 @@ package adminauth
 
 import (
 	"context"
-	"crypto/rand"
-	"encoding/base64"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"html"
-	"math/big"
 	"strings"
 	"time"
 
+	"hfb_sys/backend/internal/captcha"
 	"hfb_sys/backend/internal/model"
 	"hfb_sys/backend/internal/modules/auth"
 
@@ -38,24 +35,17 @@ func NewRepository(db *gorm.DB, redis *redis.Client, jwt *auth.JWTManager) *Repo
 }
 
 func (r *Repository) Captcha(ctx context.Context) (*CaptchaDTO, error) {
-	if r.redis == nil {
+	item, err := captcha.Generate(ctx, r.redis, "admin", captchaTTL)
+	if errors.Is(err, captcha.ErrDependencyUnavailable) {
 		return nil, ErrDependencyUnavailable
 	}
-	captchaID, err := randomToken(16)
 	if err != nil {
 		return nil, err
 	}
-	code, err := randomCaptchaCode(4)
-	if err != nil {
-		return nil, err
-	}
-	if err := r.redis.Set(ctx, captchaKey(captchaID), strings.ToUpper(code), captchaTTL).Err(); err != nil {
-		return nil, err
-	}
 	return &CaptchaDTO{
-		CaptchaID: captchaID,
-		Image:     captchaImageDataURL(code),
-		ExpiresIn: int64(captchaTTL.Seconds()),
+		CaptchaID: item.CaptchaID,
+		Image:     item.Image,
+		ExpiresIn: item.ExpiresIn,
 	}, nil
 }
 
@@ -120,22 +110,14 @@ func (r *Repository) RevokeTokens(ctx context.Context, adminID uint64) error {
 }
 
 func (r *Repository) verifyCaptcha(ctx context.Context, captchaID string, captchaCode string) error {
-	if r.redis == nil {
+	err := captcha.Verify(ctx, r.redis, "admin", captchaID, captchaCode)
+	if errors.Is(err, captcha.ErrDependencyUnavailable) {
 		return ErrDependencyUnavailable
 	}
-	key := captchaKey(captchaID)
-	stored, err := r.redis.Get(ctx, key).Result()
-	if errors.Is(err, redis.Nil) {
+	if errors.Is(err, captcha.ErrInvalid) {
 		return ErrCaptchaInvalid
 	}
-	if err != nil {
-		return err
-	}
-	_ = r.redis.Del(ctx, key).Err()
-	if strings.ToUpper(strings.TrimSpace(captchaCode)) != stored {
-		return ErrCaptchaInvalid
-	}
-	return nil
+	return err
 }
 
 func (r *Repository) FindByID(ctx context.Context, id uint64) (*AdminDTO, error) {
@@ -273,39 +255,3 @@ func loginKeyPart(value string) string {
 	}
 	return value
 }
-
-func captchaKey(id string) string {
-	return "admin:captcha:" + id
-}
-
-func randomToken(length int) (string, error) {
-	buf := make([]byte, length)
-	if _, err := rand.Read(buf); err != nil {
-		return "", err
-	}
-	return base64.RawURLEncoding.EncodeToString(buf), nil
-}
-
-func randomCaptchaCode(length int) (string, error) {
-	const alphabet = "23456789ABCDEFGHJKLMNPQRSTUVWXYZ"
-	result := make([]byte, length)
-	for i := range result {
-		n, err := rand.Int(rand.Reader, big.NewInt(int64(len(alphabet))))
-		if err != nil {
-			return "", err
-		}
-		result[i] = alphabet[n.Int64()]
-	}
-	return string(result), nil
-}
-
-func captchaImageDataURL(code string) string {
-	safeCode := html.EscapeString(strings.ToUpper(code))
-	svg := fmt.Sprintf(`<svg xmlns="http://www.w3.org/2000/svg" width="132" height="44" viewBox="0 0 132 44">
-<rect width="132" height="44" rx="8" fill="#eef5f7"/>
-<path d="M8 32 C32 2, 62 52, 124 12" stroke="#0f766e" stroke-width="2" fill="none" opacity=".28"/>
-<path d="M10 13 C42 42, 86 0, 122 31" stroke="#2563eb" stroke-width="2" fill="none" opacity=".22"/>
-<text x="66" y="29" text-anchor="middle" font-family="Menlo,Consolas,monospace" font-size="24" font-weight="700" letter-spacing="4" fill="#111827">%s</text>
-</svg>`, safeCode)
-	return "data:image/svg+xml;base64," + base64.StdEncoding.EncodeToString([]byte(svg))
-}