Merge remote-tracking branch 'origin/feature/redis-auth-integration' into dev

# Conflicts:
#	go.mod
#	go.sum
#	internal/container/container.go
#	internal/repository/interfaces.go
#	internal/service/mocks_test.go
#	internal/service/texture_service_test.go
#	internal/service/token_service_test.go
#	pkg/redis/manager.go

Dockerfile

@@ -1,74 +0,0 @@
-# ==================== 构建阶段 ====================
-FROM golang:latest AS builder
-
-# 安装构建依赖
-RUN apk add --no-cache git ca-certificates tzdata
-
-# 设置工作目录
-WORKDIR /build
-
-# 复制依赖文件
-COPY go.mod go.sum ./
-
-# 配置 Go 代理并下载依赖
-ENV GOPROXY=https://goproxy.cn,direct
-RUN go mod download
-
-# 复制源代码
-COPY . .
-
-# 构建应用
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \
-    -ldflags="-w -s -X main.Version=$(git describe --tags --always --dirty 2>/dev/null || echo 'dev')" \
-    -o server ./cmd/server
-
-# ==================== 运行阶段 ====================
-FROM alpine:3.19
-
-# 安装运行时依赖
-RUN apk add --no-cache ca-certificates tzdata
-
-# 设置时区
-ENV TZ=Asia/Shanghai
-
-# 创建非 root 用户
-RUN adduser -D -g '' appuser
-
-# 设置工作目录
-WORKDIR /app
-
-# 从构建阶段复制二进制文件
-COPY --from=builder /build/server .
-
-# 复制配置文件目录结构
-COPY --from=builder /build/configs ./configs
-
-# 设置文件权限
-RUN chown -R appuser:appuser /app
-
-# 切换到非 root 用户
-USER appuser
-
-# 暴露端口
-EXPOSE 8080
-
-# 健康检查
-HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-    CMD wget --no-verbose --tries=1 --spider http://localhost:8080/api/health || exit 1
-
-# 启动应用
-ENTRYPOINT ["./server"]
-
-
-
-
-
-
-
-
-
-
-
-
-
-

cmd/server/main.go

@@ -21,6 +21,7 @@ import (
 	"carrotskin/internal/container"
 	"carrotskin/internal/handler"
 	"carrotskin/internal/middleware"
+	"carrotskin/internal/task"
 	"carrotskin/pkg/auth"
 	"carrotskin/pkg/config"
 	"carrotskin/pkg/database"
@@ -70,11 +71,18 @@ func main() {
 		loggerInstance.Fatal("JWT服务初始化失败", zap.Error(err))
 	}
 
-	// 初始化Redis
+	// 初始化Redis（开发/测试环境失败时会自动回退到miniredis）
 	if err := redis.Init(cfg.Redis, loggerInstance); err != nil {
-		loggerInstance.Fatal("Redis连接失败", zap.Error(err))
+		loggerInstance.Fatal("Redis初始化失败", zap.Error(err))
+	}
+	defer redis.Close()
+
+	// 记录Redis模式
+	if redis.IsUsingMiniRedis() {
+		loggerInstance.Info("使用miniredis进行开发/测试")
+	} else {
+		loggerInstance.Info("使用生产Redis")
 	}
-	defer redis.MustGetClient().Close()
 
 	// 初始化对象存储 (RustFS - S3兼容)
 	var storageClient *storage.StorageClient
@@ -128,6 +136,13 @@ func main() {
 	// 使用依赖注入方式注册路由
 	handler.RegisterRoutesWithDI(router, c)
 
+	// 启动后台任务（Token已迁移到Redis，不再需要清理任务）
+	// 如需使用数据库Token存储，可以恢复TokenCleanupTask
+	taskRunner := task.NewRunner(loggerInstance)
+	taskCtx, taskCancel := context.WithCancel(context.Background())
+	defer taskCancel()
+	taskRunner.Start(taskCtx)
+
 	// 创建HTTP服务器
 	srv := &http.Server{
 		Addr:         cfg.Server.Port,
@@ -150,6 +165,10 @@ func main() {
 	<-quit
 	loggerInstance.Info("正在关闭服务器...")
 
+	// 停止后台任务
+	taskCancel()
+	taskRunner.Wait()
+
 	// 设置关闭超时
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()

go.mod

@@ -5,6 +5,7 @@ go 1.24.0
 toolchain go1.24.2
 
 require (
+	github.com/alicebob/miniredis/v2 v2.31.1
 	github.com/gin-gonic/gin v1.11.0
 	github.com/golang-jwt/jwt/v5 v5.3.0
 	github.com/joho/godotenv v1.5.1
@@ -12,66 +13,40 @@ require (
 	github.com/minio/minio-go/v7 v7.0.97
 	github.com/redis/go-redis/v9 v9.17.2
 	github.com/spf13/viper v1.21.0
-	github.com/swaggo/files v1.0.1
-	github.com/swaggo/gin-swagger v1.6.1
-	github.com/swaggo/swag v1.16.6
 	github.com/wenlng/go-captcha-assets v1.0.7
 	github.com/wenlng/go-captcha/v2 v2.0.4
 	go.uber.org/zap v1.27.1
 	gorm.io/datatypes v1.2.7
 	gorm.io/driver/postgres v1.6.0
+	gorm.io/driver/sqlite v1.6.0
 	gorm.io/gorm v1.31.1
 )
 
 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
-	github.com/KyleBanks/depth v1.2.1 // indirect
+	github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
-	github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
 	github.com/bytedance/gopkg v0.1.3 // indirect
 	github.com/bytedance/sonic/loader v0.4.0 // indirect
-	github.com/casbin/casbin/v2 v2.134.0 // indirect
-	github.com/casbin/gorm-adapter/v3 v3.38.0 // indirect
-	github.com/casbin/govaluate v1.3.0 // indirect
 	github.com/cloudwego/base64x v0.1.6 // indirect
-	github.com/glebarez/go-sqlite v1.20.3 // indirect
-	github.com/glebarez/sqlite v1.7.0 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
-	github.com/go-openapi/jsonpointer v0.22.3 // indirect
-	github.com/go-openapi/jsonreference v0.21.3 // indirect
-	github.com/go-openapi/spec v0.22.1 // indirect
-	github.com/go-openapi/swag/conv v0.25.4 // indirect
-	github.com/go-openapi/swag/jsonname v0.25.4 // indirect
-	github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
-	github.com/go-openapi/swag/loading v0.25.4 // indirect
-	github.com/go-openapi/swag/stringutils v0.25.4 // indirect
-	github.com/go-openapi/swag/typeutils v0.25.4 // indirect
-	github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
 	github.com/go-sql-driver/mysql v1.9.3 // indirect
-	github.com/goccy/go-yaml v1.19.0 // indirect
+	github.com/goccy/go-yaml v1.18.0 // indirect
-	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
-	github.com/golang-sql/sqlexp v0.1.0 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/klauspost/crc32 v1.3.0 // indirect
-	github.com/microsoft/go-mssqldb v1.7.2 // indirect
+	github.com/mattn/go-sqlite3 v1.14.22 // indirect
-	github.com/minio/crc64nvme v1.1.1 // indirect
+	github.com/minio/crc64nvme v1.1.0 // indirect
 	github.com/philhofer/fwd v1.2.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
+	github.com/quic-go/qpack v0.5.1 // indirect
-	github.com/quic-go/qpack v0.6.0 // indirect
+	github.com/quic-go/quic-go v0.54.0 // indirect
-	github.com/quic-go/quic-go v0.57.1 // indirect
+	github.com/rogpeppe/go-internal v1.14.1 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230126093431-47fa9a501578 // indirect
+	github.com/tinylib/msgp v1.3.0 // indirect
-	github.com/tinylib/msgp v1.6.1 // indirect
+	github.com/yuin/gopher-lua v1.1.0 // indirect
-	go.uber.org/mock v0.6.0 // indirect
+	go.uber.org/mock v0.5.0 // indirect
 	golang.org/x/image v0.33.0 // indirect
 	golang.org/x/mod v0.30.0 // indirect
 	golang.org/x/sync v0.18.0 // indirect
 	gorm.io/driver/mysql v1.6.0 // indirect
-	gorm.io/driver/sqlserver v1.6.0 // indirect
-	gorm.io/plugin/dbresolver v1.6.0 // indirect
-	modernc.org/libc v1.22.2 // indirect
-	modernc.org/mathutil v1.5.0 // indirect
-	modernc.org/memory v1.5.0 // indirect
-	modernc.org/sqlite v1.20.3 // indirect
 )
 
 require (

go.sum

@@ -1,14 +1,10 @@
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U=
+github.com/DmitriyVTitov/size v1.5.0/go.mod h1:le6rNI4CoLQV1b9gzp1+3d7hMAD/uu2QcJ+aYbNgiU0=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.2/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U=
+github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0/go.mod h1:bhXu1AjYL+wutSL/kpSq6s7733q2Rb0yuot9Zgfqa/0=
+github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w=
+github.com/alicebob/miniredis/v2 v2.31.1 h1:7XAt0uUg3DtwEKW5ZAGa+K7FZV2DdKQo5K/6TTnfX8Y=
-github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4=
+github.com/alicebob/miniredis/v2 v2.31.1/go.mod h1:UB/T2Uztp7MlFSDakaX1sTXUv5CASoprx0wulRT6HBg=
-github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
-github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
-github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I=
-github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
@@ -19,16 +15,11 @@ github.com/bytedance/sonic v1.14.2 h1:k1twIoe97C1DtYUo+fZQy865IuHia4PR5RPiuGPPII
 github.com/bytedance/sonic v1.14.2/go.mod h1:T80iDELeHiHKSc0C9tubFygiuXoGzrkjKzX2quAx980=
 github.com/bytedance/sonic/loader v0.4.0 h1:olZ7lEqcxtZygCK9EKYKADnpQoYkRQxaeY2NYzevs+o=
 github.com/bytedance/sonic/loader v0.4.0/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo=
-github.com/casbin/casbin/v2 v2.134.0 h1:wyO3hZb487GzlGVAI2hUoHQT0ehFD+9B5P+HVG9BVTM=
-github.com/casbin/casbin/v2 v2.134.0/go.mod h1:FmcfntdXLTcYXv/hxgNntcRPqAbwOG9xsism0yXT+18=
-github.com/casbin/gorm-adapter/v3 v3.38.0 h1:j+2YEQU0F4RmlXaVihVV82OTe268/oKI7QKeHRkbu84=
-github.com/casbin/gorm-adapter/v3 v3.38.0/go.mod h1:kjXoK8MqA3E/CcqEF2l3SCkhJj1YiHVR6SF0LMvJoH4=
-github.com/casbin/govaluate v1.3.0 h1:VA0eSY0M2lA86dYd5kPPuNZMUD9QkWnOCnavGrw9myc=
-github.com/casbin/govaluate v1.3.0/go.mod h1:G/UnbIjZk/0uMNaLwZZmFQrR72tYRZWQkO70si/iR7A=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chai2010/webp v1.4.0 h1:6DA2pkkRUPnbOHvvsmGI3He1hBKf/bkRlniAiSGuEko=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chai2010/webp v1.4.0/go.mod h1:0XVwvZWdjjdxpUEIf7b9g9VkHFnInUSYujwqTLEuldU=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M=
 github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -36,8 +27,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
-github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
-github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
@@ -46,45 +35,12 @@ github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/gabriel-vasile/mimetype v1.4.11 h1:AQvxbp830wPhHTqc1u7nzoLT+ZFxGY7emj5DR5DYFik=
 github.com/gabriel-vasile/mimetype v1.4.11/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
-github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4=
-github.com/gin-contrib/gzip v0.0.6/go.mod h1:QOJlmV2xmayAjkNS2Y8NQsMneuRShOU/kjovCXNuzzk=
 github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
 github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
 github.com/gin-gonic/gin v1.11.0 h1:OW/6PLjyusp2PPXtyxKHU0RbX6I/l28FTdDlae5ueWk=
 github.com/gin-gonic/gin v1.11.0/go.mod h1:+iq/FyxlGzII0KHiBGjuNn4UNENUlKbGlNmc+W50Dls=
-github.com/glebarez/go-sqlite v1.20.3 h1:89BkqGOXR9oRmG58ZrzgoY/Fhy5x0M+/WV48U5zVrZ4=
-github.com/glebarez/go-sqlite v1.20.3/go.mod h1:u3N6D/wftiAzIOJtZl6BmedqxmmkDfH3q+ihjqxC9u0=
-github.com/glebarez/sqlite v1.7.0 h1:A7Xj/KN2Lvie4Z4rrgQHY8MsbebX3NyWsL3n2i82MVI=
-github.com/glebarez/sqlite v1.7.0/go.mod h1:PkeevrRlF/1BhQBCnzcMWzgrIk7IOop+qS2jUYLfHhk=
 github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
 github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
-github.com/go-openapi/jsonpointer v0.22.3 h1:dKMwfV4fmt6Ah90zloTbUKWMD+0he+12XYAsPotrkn8=
-github.com/go-openapi/jsonpointer v0.22.3/go.mod h1:0lBbqeRsQ5lIanv3LHZBrmRGHLHcQoOXQnf88fHlGWo=
-github.com/go-openapi/jsonreference v0.21.3 h1:96Dn+MRPa0nYAR8DR1E03SblB5FJvh7W6krPI0Z7qMc=
-github.com/go-openapi/jsonreference v0.21.3/go.mod h1:RqkUP0MrLf37HqxZxrIAtTWW4ZJIK1VzduhXYBEeGc4=
-github.com/go-openapi/spec v0.22.1 h1:beZMa5AVQzRspNjvhe5aG1/XyBSMeX1eEOs7dMoXh/k=
-github.com/go-openapi/spec v0.22.1/go.mod h1:c7aeIQT175dVowfp7FeCvXXnjN/MrpaONStibD2WtDA=
-github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM=
-github.com/go-openapi/swag/conv v0.25.4 h1:/Dd7p0LZXczgUcC/Ikm1+YqVzkEeCc9LnOWjfkpkfe4=
-github.com/go-openapi/swag/conv v0.25.4/go.mod h1:3LXfie/lwoAv0NHoEuY1hjoFAYkvlqI/Bn5EQDD3PPU=
-github.com/go-openapi/swag/jsonname v0.25.4 h1:bZH0+MsS03MbnwBXYhuTttMOqk+5KcQ9869Vye1bNHI=
-github.com/go-openapi/swag/jsonname v0.25.4/go.mod h1:GPVEk9CWVhNvWhZgrnvRA6utbAltopbKwDu8mXNUMag=
-github.com/go-openapi/swag/jsonutils v0.25.4 h1:VSchfbGhD4UTf4vCdR2F4TLBdLwHyUDTd1/q4i+jGZA=
-github.com/go-openapi/swag/jsonutils v0.25.4/go.mod h1:7OYGXpvVFPn4PpaSdPHJBtF0iGnbEaTk8AvBkoWnaAY=
-github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.4 h1:IACsSvBhiNJwlDix7wq39SS2Fh7lUOCJRmx/4SN4sVo=
-github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.4/go.mod h1:Mt0Ost9l3cUzVv4OEZG+WSeoHwjWLnarzMePNDAOBiM=
-github.com/go-openapi/swag/loading v0.25.4 h1:jN4MvLj0X6yhCDduRsxDDw1aHe+ZWoLjW+9ZQWIKn2s=
-github.com/go-openapi/swag/loading v0.25.4/go.mod h1:rpUM1ZiyEP9+mNLIQUdMiD7dCETXvkkC30z53i+ftTE=
-github.com/go-openapi/swag/stringutils v0.25.4 h1:O6dU1Rd8bej4HPA3/CLPciNBBDwZj9HiEpdVsb8B5A8=
-github.com/go-openapi/swag/stringutils v0.25.4/go.mod h1:GTsRvhJW5xM5gkgiFe0fV3PUlFm0dr8vki6/VSRaZK0=
-github.com/go-openapi/swag/typeutils v0.25.4 h1:1/fbZOUN472NTc39zpa+YGHn3jzHWhv42wAJSN91wRw=
-github.com/go-openapi/swag/typeutils v0.25.4/go.mod h1:Ou7g//Wx8tTLS9vG0UmzfCsjZjKhpjxayRKTHXf2pTE=
-github.com/go-openapi/swag/yamlutils v0.25.4 h1:6jdaeSItEUb7ioS9lFoCZ65Cne1/RZtPBZ9A56h92Sw=
-github.com/go-openapi/swag/yamlutils v0.25.4/go.mod h1:MNzq1ulQu+yd8Kl7wPOut/YHAAU/H6hL91fF+E2RFwc=
-github.com/go-openapi/testify/enable/yaml/v2 v2.0.2 h1:0+Y41Pz1NkbTHz8NngxTuAXxEodtNSI1WG1c/m5Akw4=
-github.com/go-openapi/testify/enable/yaml/v2 v2.0.2/go.mod h1:kme83333GCtJQHXQ8UKX3IBZu6z8T5Dvy5+CW3NLUUg=
-github.com/go-openapi/testify/v2 v2.0.2 h1:X999g3jeLcoY8qctY/c/Z8iBHTbwLz7R2WXd6Ub6wls=
-github.com/go-openapi/testify/v2 v2.0.2/go.mod h1:HCPmvFFnheKK2BuwSA0TbbdxJ3I16pjwMkYkP4Ywn54=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
@@ -99,32 +55,22 @@ github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9L
 github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/goccy/go-yaml v1.19.0 h1:EmkZ9RIsX+Uq4DYFowegAuJo8+xdX3T/2dwNPXbxEYE=
+github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
-github.com/goccy/go-yaml v1.19.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
+github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
-github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
 github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
-github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
 github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
-github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
-github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
@@ -133,12 +79,6 @@ github.com/jackc/pgx/v5 v5.7.6 h1:rWQc5FwZSPX58r1OQmkuaNicxdmExaEz5A2DO2hUuTk=
 github.com/jackc/pgx/v5 v5.7.6/go.mod h1:aruU7o91Tc2q2cFp5h4uP3f6ztExVpyVv88Xl/8Vl8M=
 github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
 github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
-github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
-github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
-github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
-github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
-github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc=
-github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
@@ -160,18 +100,16 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
 github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
-github.com/microsoft/go-mssqldb v0.19.0/go.mod h1:ukJCBnnzLzpVF0qYRT+eg1e+eSwjeQ7IvenUv8QPook=
 github.com/microsoft/go-mssqldb v1.7.2 h1:CHkFJiObW7ItKTJfHo1QX7QBBD1iV+mn1eOyRP3b/PA=
 github.com/microsoft/go-mssqldb v1.7.2/go.mod h1:kOvZKUdrhhFQmxLZqbwUV0rHkNkZpthMITIb2Ko1IoA=
-github.com/minio/crc64nvme v1.1.1 h1:8dwx/Pz49suywbO+auHCBpCtlW1OfpcLN7wYgVR6wAI=
+github.com/minio/crc64nvme v1.1.0 h1:e/tAguZ+4cw32D+IO/8GSf5UVr9y+3eJcxZI2WOO/7Q=
-github.com/minio/crc64nvme v1.1.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
+github.com/minio/crc64nvme v1.1.0/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
 github.com/minio/minio-go/v7 v7.0.97 h1:lqhREPyfgHTB/ciX8k2r8k0D93WaFqxbJX36UZq5occ=
@@ -181,27 +119,18 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
-github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
 github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 github.com/philhofer/fwd v1.2.0 h1:e6DnBTl7vGY+Gz322/ASL4Gyp1FspeMvx1RNDoToZuM=
 github.com/philhofer/fwd v1.2.0/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM=
-github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ=
-github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
+github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
-github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
+github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
-github.com/quic-go/quic-go v0.57.1 h1:25KAAR9QR8KZrCZRThWMKVAwGoiHIrNbT72ULHTuI10=
+github.com/quic-go/quic-go v0.54.0 h1:6s1YB9QotYI6Ospeiguknbp2Znb/jZYjZLRXn9kMQBg=
-github.com/quic-go/quic-go v0.57.1/go.mod h1:ly4QBAjHA2VhdnxhojRsCUOeJwKYg+taDlos92xb1+s=
+github.com/quic-go/quic-go v0.54.0/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY=
 github.com/redis/go-redis/v9 v9.17.2 h1:P2EGsA4qVIM3Pp+aPocCJ7DguDHhqrXNhVcEp4ViluI=
 github.com/redis/go-redis/v9 v9.17.2/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/remyoudompheng/bigfft v0.0.0-20230126093431-47fa9a501578 h1:VstopitMQi3hZP0fzvnsLmzXZdQGc4bEcgu24cp+d4M=
-github.com/remyoudompheng/bigfft v0.0.0-20230126093431-47fa9a501578/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
@@ -221,8 +150,6 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
@@ -232,14 +159,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-github.com/swaggo/files v1.0.1 h1:J1bVJ4XHZNq0I46UU90611i9/YzdrF7x92oX1ig5IdE=
+github.com/tinylib/msgp v1.3.0 h1:ULuf7GPooDaIlbyvgAxBV/FI7ynli6LZ1/nVUNu+0ww=
-github.com/swaggo/files v1.0.1/go.mod h1:0qXmMNH6sXNf+73t65aKeB+ApmgxdnkQzVTAj2uaMUg=
+github.com/tinylib/msgp v1.3.0/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0=
-github.com/swaggo/gin-swagger v1.6.1 h1:Ri06G4gc9N4t4k8hekMigJ9zKTFSlqj/9paAQCQs7cY=
-github.com/swaggo/gin-swagger v1.6.1/go.mod h1:LQ+hJStHakCWRiK/YNYtJOu4mR2FP+pxLnILT/qNiTw=
-github.com/swaggo/swag v1.16.6 h1:qBNcx53ZaX+M5dxVyTrgQ0PJ/ACK+NzhwcbieTt+9yI=
-github.com/swaggo/swag v1.16.6/go.mod h1:ngP2etMK5a0P3QBizic5MEwpRmluJZPHjXcMoj4Xesg=
-github.com/tinylib/msgp v1.6.1 h1:ESRv8eL3u+DNHUoSAAQRE50Hm162zqAnBoGv9PzScPY=
-github.com/tinylib/msgp v1.6.1/go.mod h1:RSp0LW9oSxFut3KzESt5Voq4GVWyS+PSulT77roAqEA=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY=
@@ -249,10 +170,12 @@ github.com/wenlng/go-captcha-assets v1.0.7/go.mod h1:zinRACsdYcL/S6pHgI9Iv7FKTU4
 github.com/wenlng/go-captcha/v2 v2.0.4 h1:5cSUF36ZyA03qeDMjKmeXGpbYJMXEexZIYK3Vga3ME0=
 github.com/wenlng/go-captcha/v2 v2.0.4/go.mod h1:5hac1em3uXoyC5ipZ0xFv9umNM/waQvYAQdr0cx/h34=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yuin/gopher-lua v1.1.0 h1:BojcDhfyDWgU2f2TOzYK/g5p2gxMrku8oupLDqlnSqE=
+github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
+go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
-go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
+go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
@@ -262,14 +185,7 @@ go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/arch v0.23.0 h1:lKF64A2jF6Zd8L0knGltUnegD62JMFBiCPBmQpToHhg=
 golang.org/x/arch v0.23.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
 golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
 golang.org/x/image v0.16.0/go.mod h1:ugSZItdV4nOxyqp56HmXwH0Ry0nBCpjnZdpDaIHdoPs=
@@ -277,86 +193,43 @@ golang.org/x/image v0.33.0 h1:LXRZRnv1+zGd5XBUVRFmYEphyyKJjQjCRiOuAP3sZfQ=
 golang.org/x/image v0.33.0/go.mod h1:DD3OsTYT9chzuzTQt+zMcOlBHgfoKQb1gry8p76Y1sc=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
 golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
 golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
 golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220224120231-95c6836cb0e7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
 golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
 golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
 golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
-golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
-golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
 golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -365,13 +238,7 @@ google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/datatypes v1.2.7 h1:ww9GAhF1aGXZY3EB3cJPJ7//JiuQo7DlQA7NNlVaTdk=
@@ -384,16 +251,5 @@ gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ=
 gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8=
 gorm.io/driver/sqlserver v1.6.0 h1:VZOBQVsVhkHU/NzNhRJKoANt5pZGQAS1Bwc6m6dgfnc=
 gorm.io/driver/sqlserver v1.6.0/go.mod h1:WQzt4IJo/WHKnckU9jXBLMJIVNMVeTu25dnOzehntWw=
-gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE=
 gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg=
 gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs=
-gorm.io/plugin/dbresolver v1.6.0 h1:XvKDeOtTn1EIX6s4SrKpEH82q0gXVemhYjbYZFGFVcw=
-gorm.io/plugin/dbresolver v1.6.0/go.mod h1:tctw63jdrOezFR9HmrKnPkmig3m5Edem9fdxk9bQSzM=
-modernc.org/libc v1.22.2 h1:4U7v51GyhlWqQmwCHj28Rdq2Yzwk55ovjFrdPjs8Hb0=
-modernc.org/libc v1.22.2/go.mod h1:uvQavJ1pZ0hIoC/jfqNoMLURIMhKzINIWypNM17puug=
-modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
-modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
-modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
-modernc.org/sqlite v1.20.3 h1:SqGJMMxjj1PHusLxdYxeQSodg7Jxn9WWkaAQjKrntZs=
-modernc.org/sqlite v1.20.3/go.mod h1:zKcGyrICaxNTMEHSr1HQ2GUraP0j+845GYw37+EyT6A=

internal/container/container.go

@@ -22,7 +22,6 @@ type Container struct {
 	Redis        *redis.Client
 	Logger       *zap.Logger
 	JWT          *auth.JWTService
-	Casbin       *auth.CasbinService
 	Storage      *storage.StorageClient
 	CacheManager *database.CacheManager
 
@@ -30,8 +29,8 @@ type Container struct {
 	UserRepo      repository.UserRepository
 	ProfileRepo   repository.ProfileRepository
 	TextureRepo   repository.TextureRepository
-	TokenRepo     repository.TokenRepository
 	ClientRepo    repository.ClientRepository
+	ConfigRepo    repository.SystemConfigRepository
 	YggdrasilRepo repository.YggdrasilRepository
 
 	// Service层
@@ -41,6 +40,7 @@ type Container struct {
 	TokenService        service.TokenService
 	YggdrasilService    service.YggdrasilService
 	VerificationService service.VerificationService
+	UploadService       service.UploadService
 	SecurityService     service.SecurityService
 	CaptchaService      service.CaptchaService
 	SignatureService    *service.SignatureService
@@ -52,7 +52,6 @@ func NewContainer(
 	redisClient *redis.Client,
 	logger *zap.Logger,
 	jwtService *auth.JWTService,
-	casbinService *auth.CasbinService,
 	storageClient *storage.StorageClient,
 	emailService interface{}, // 接受 email.Service 但使用 interface{} 避免循环依赖
 ) *Container {
@@ -61,6 +60,14 @@ func NewContainer(
 		Prefix:     "carrotskin:",
 		Expiration: 5 * time.Minute,
 		Enabled:    true,
+		Policy: database.CachePolicy{
+			UserTTL:        5 * time.Minute,
+			UserEmailTTL:   5 * time.Minute,
+			ProfileTTL:     5 * time.Minute,
+			ProfileListTTL: 3 * time.Minute,
+			TextureTTL:     5 * time.Minute,
+			TextureListTTL: 2 * time.Minute,
+		},
 	})
 
 	c := &Container{
@@ -68,7 +75,6 @@ func NewContainer(
 		Redis:        redisClient,
 		Logger:       logger,
 		JWT:          jwtService,
-		Casbin:       casbinService,
 		Storage:      storageClient,
 		CacheManager: cacheManager,
 	}
@@ -77,8 +83,8 @@ func NewContainer(
 	c.UserRepo = repository.NewUserRepository(db)
 	c.ProfileRepo = repository.NewProfileRepository(db)
 	c.TextureRepo = repository.NewTextureRepository(db)
-	c.TokenRepo = repository.NewTokenRepository(db)
 	c.ClientRepo = repository.NewClientRepository(db)
+	c.ConfigRepo = repository.NewSystemConfigRepository(db)
 	c.YggdrasilRepo = repository.NewYggdrasilRepository(db)
 
 	// 初始化SignatureService（作为依赖注入，避免在容器中创建并立即调用）
@@ -86,7 +92,7 @@ func NewContainer(
 	c.SignatureService = service.NewSignatureService(c.ProfileRepo, redisClient, logger)
 
 	// 初始化Service（注入缓存管理器）
-	c.UserService = service.NewUserService(c.UserRepo, jwtService, redisClient, cacheManager, storageClient, logger)
+	c.UserService = service.NewUserService(c.UserRepo, c.ConfigRepo, jwtService, redisClient, cacheManager, logger)
 	c.ProfileService = service.NewProfileService(c.ProfileRepo, c.UserRepo, cacheManager, logger)
 	c.TextureService = service.NewTextureService(c.TextureRepo, c.UserRepo, storageClient, cacheManager, logger)
 
@@ -98,13 +104,28 @@ func NewContainer(
 		logger.Fatal("获取Yggdrasil私钥失败", zap.Error(err))
 	}
 	yggdrasilJWT := auth.NewYggdrasilJWTService(privateKey, "carrotskin")
-	c.TokenService = service.NewTokenServiceJWT(c.TokenRepo, c.ClientRepo, c.ProfileRepo, yggdrasilJWT, logger)
+
+	// 创建Redis Token存储（必须使用Redis，包括miniredis回退）
+	if redisClient == nil {
+		logger.Fatal("Redis客户端未初始化，无法创建Token服务")
+	}
+
+	tokenStore := auth.NewTokenStoreRedis(
+		redisClient,
+		logger,
+		auth.WithKeyPrefix("token:"),
+		auth.WithDefaultTTL(24*time.Hour),
+		auth.WithStaleTTL(30*24*time.Hour),
+		auth.WithMaxTokensPerUser(10),
+	)
+	c.TokenService = service.NewTokenServiceRedis(tokenStore, c.ClientRepo, c.ProfileRepo, yggdrasilJWT, logger)
 
 	// 使用组合服务（内部包含认证、会话、序列化、证书服务）
-	c.YggdrasilService = service.NewYggdrasilServiceComposite(db, c.UserRepo, c.ProfileRepo, c.TokenRepo, c.YggdrasilRepo, c.SignatureService, redisClient, logger)
+	c.YggdrasilService = service.NewYggdrasilServiceComposite(db, c.UserRepo, c.ProfileRepo, c.YggdrasilRepo, c.SignatureService, redisClient, logger, c.TokenService)
 
 	// 初始化其他服务
 	c.SecurityService = service.NewSecurityService(redisClient)
+	c.UploadService = service.NewUploadService(storageClient)
 	c.CaptchaService = service.NewCaptchaService(redisClient, logger)
 
 	// 初始化VerificationService（需要email.Service）
@@ -185,10 +206,10 @@ func WithTextureRepo(repo repository.TextureRepository) Option {
 	}
 }
 
-// WithTokenRepo 设置令牌仓储
+// WithConfigRepo 设置系统配置仓储
-func WithTokenRepo(repo repository.TokenRepository) Option {
+func WithConfigRepo(repo repository.SystemConfigRepository) Option {
 	return func(c *Container) {
-		c.TokenRepo = repo
+		c.ConfigRepo = repo
 	}
 }
 
@@ -241,6 +262,13 @@ func WithVerificationService(svc service.VerificationService) Option {
 	}
 }
 
+// WithUploadService 设置上传服务
+func WithUploadService(svc service.UploadService) Option {
+	return func(c *Container) {
+		c.UploadService = svc
+	}
+}
+
 // WithSecurityService 设置安全服务
 func WithSecurityService(svc service.SecurityService) Option {
 	return func(c *Container) {

internal/errors/errors_test.go

@@ -0,0 +1,38 @@
+package errors
+
+import (
+	"errors"
+	"testing"
+)
+
+func TestAppErrorBasics(t *testing.T) {
+	root := errors.New("root")
+	appErr := NewBadRequest("bad", root)
+
+	if appErr.Code != 400 || appErr.Message != "bad" {
+		t.Fatalf("unexpected appErr fields: %+v", appErr)
+	}
+	if got := appErr.Error(); got != "bad: root" {
+		t.Fatalf("unexpected Error(): %s", got)
+	}
+	if !Is(appErr, root) {
+		t.Fatalf("Is should match wrapped error")
+	}
+	var target *AppError
+	if !As(appErr, &target) {
+		t.Fatalf("As should succeed")
+	}
+}
+
+func TestWrap(t *testing.T) {
+	if Wrap(nil, "msg") != nil {
+		t.Fatalf("Wrap nil should return nil")
+	}
+	err := errors.New("base")
+	wrapped := Wrap(err, "ctx")
+	if wrapped.Error() != "ctx: base" {
+		t.Fatalf("wrap message mismatch: %v", wrapped)
+	}
+}
+
+

internal/handler/swagger_test.go

@@ -0,0 +1,27 @@
+package handler
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+)
+
+// 仅验证降级路径（未初始化依赖时的响应）
+func TestHealthCheck_Degraded(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	router := gin.New()
+	router.GET("/health", HealthCheck)
+
+	req := httptest.NewRequest(http.MethodGet, "/health", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusServiceUnavailable {
+		t.Fatalf("expected 503 when dependencies missing, got %d", w.Code)
+	}
+}
+
+
+

internal/model/client.go

@@ -29,3 +29,10 @@ func (Client) TableName() string {
 
 
 
+
+
+
+
+
+
+

internal/model/token.go

@@ -1,23 +0,0 @@
-package model
-
-import "time"
-
-// Token Yggdrasil 认证令牌模型
-type Token struct {
-	AccessToken string     `gorm:"column:access_token;type:text;primaryKey" json:"access_token"` // 改为text以支持JWT长度
-	UserID      int64      `gorm:"column:user_id;not null;index:idx_tokens_user_id" json:"user_id"`
-	ClientToken string     `gorm:"column:client_token;type:varchar(64);not null;index:idx_tokens_client_token" json:"client_token"`
-	ProfileId   string     `gorm:"column:profile_id;type:varchar(36);index:idx_tokens_profile_id" json:"profile_id"` // 改为可空
-	Version     int        `gorm:"column:version;not null;default:0;index:idx_tokens_version" json:"version"`        // 新增：版本号
-	Usable      bool       `gorm:"column:usable;not null;default:true;index:idx_tokens_usable" json:"usable"`
-	IssueDate   time.Time  `gorm:"column:issue_date;type:timestamp;not null;default:CURRENT_TIMESTAMP;index:idx_tokens_issue_date,sort:desc" json:"issue_date"`
-	ExpiresAt   *time.Time `gorm:"column:expires_at;type:timestamp" json:"expires_at,omitempty"`       // 新增：过期时间
-	StaleAt     *time.Time `gorm:"column:stale_at;type:timestamp" json:"stale_at,omitempty"`           // 新增：过期但可用时间
-
-	// 关联
-	User    *User    `gorm:"foreignKey:UserID;constraint:OnDelete:CASCADE" json:"user,omitempty"`
-	Profile *Profile `gorm:"foreignKey:ProfileId;references:UUID;constraint:OnDelete:CASCADE" json:"profile,omitempty"`
-}
-
-// TableName 指定表名
-func (Token) TableName() string { return "tokens" }

internal/model/yggdrasil_test.go

@@ -0,0 +1,18 @@
+package model
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestGenerateRandomPassword(t *testing.T) {
+	pwd := GenerateRandomPassword(16)
+	if len(pwd) != 16 {
+		t.Fatalf("length mismatch: %d", len(pwd))
+	}
+	for _, ch := range pwd {
+		if !strings.ContainsRune(passwordChars, ch) {
+			t.Fatalf("unexpected char: %c", ch)
+		}
+	}
+}

internal/repository/interfaces.go

@@ -35,6 +35,7 @@ type ProfileRepository interface {
 	Delete(ctx context.Context, uuid string) error
 	BatchDelete(ctx context.Context, uuids []string) (int64, error) // 批量删除
 	CountByUserID(ctx context.Context, userID int64) (int64, error)
+	SetActive(ctx context.Context, uuid string, userID int64) error
 	UpdateLastUsedAt(ctx context.Context, uuid string) error
 	GetByNames(ctx context.Context, names []string) ([]*model.Profile, error)
 	GetKeyPair(ctx context.Context, profileId string) (*model.KeyPair, error)
@@ -66,16 +67,13 @@ type TextureRepository interface {
 	CountByUploaderID(ctx context.Context, uploaderID int64) (int64, error)
 }
 
-// TokenRepository 令牌仓储接口
+// SystemConfigRepository 系统配置仓储接口
-type TokenRepository interface {
+type SystemConfigRepository interface {
-	Create(ctx context.Context, token *model.Token) error
+	GetByKey(ctx context.Context, key string) (*model.SystemConfig, error)
-	FindByAccessToken(ctx context.Context, accessToken string) (*model.Token, error)
+	GetPublic(ctx context.Context) ([]model.SystemConfig, error)
-	GetByUserID(ctx context.Context, userId int64) ([]*model.Token, error)
+	GetAll(ctx context.Context) ([]model.SystemConfig, error)
-	GetUUIDByAccessToken(ctx context.Context, accessToken string) (string, error)
+	Update(ctx context.Context, config *model.SystemConfig) error
-	GetUserIDByAccessToken(ctx context.Context, accessToken string) (int64, error)
+	UpdateValue(ctx context.Context, key, value string) error
-	DeleteByAccessToken(ctx context.Context, accessToken string) error
-	DeleteByUserID(ctx context.Context, userId int64) error
-	BatchDelete(ctx context.Context, accessTokens []string) (int64, error)
 }
 
 // YggdrasilRepository Yggdrasil仓储接口

internal/repository/repository_sqlite_test.go

@@ -0,0 +1,278 @@
+package repository
+
+import (
+	"context"
+	"testing"
+
+	"carrotskin/internal/model"
+	"carrotskin/internal/testutil"
+)
+
+func TestUserRepository_BasicAndPoints(t *testing.T) {
+	db := testutil.NewTestDB(t)
+	repo := NewUserRepository(db)
+	ctx := context.Background()
+
+	user := &model.User{Username: "u1", Email: "e1@test.com", Password: "pwd", Status: 1}
+	if err := repo.Create(ctx, user); err != nil {
+		t.Fatalf("create user err: %v", err)
+	}
+
+	if u, err := repo.FindByID(ctx, user.ID); err != nil || u.Username != "u1" {
+		t.Fatalf("FindByID mismatch: %v %+v", err, u)
+	}
+	if u, err := repo.FindByUsername(ctx, "u1"); err != nil || u.Email != "e1@test.com" {
+		t.Fatalf("FindByUsername mismatch")
+	}
+	if u, err := repo.FindByEmail(ctx, "e1@test.com"); err != nil || u.ID != user.ID {
+		t.Fatalf("FindByEmail mismatch")
+	}
+
+	if err := repo.UpdateFields(ctx, user.ID, map[string]interface{}{"avatar": "a.png"}); err != nil {
+		t.Fatalf("UpdateFields err: %v", err)
+	}
+
+	if _, err := repo.BatchUpdate(ctx, []int64{user.ID}, map[string]interface{}{"status": 2}); err != nil {
+		t.Fatalf("BatchUpdate err: %v", err)
+	}
+
+	// 积分增加
+	if err := repo.UpdatePoints(ctx, user.ID, 10, "add", "bonus"); err != nil {
+		t.Fatalf("UpdatePoints add err: %v", err)
+	}
+	// 积分不足场景
+	if err := repo.UpdatePoints(ctx, user.ID, -100, "sub", "penalty"); err == nil {
+		t.Fatalf("expected insufficient points error")
+	}
+
+	if list, err := repo.FindByIDs(ctx, []int64{user.ID}); err != nil || len(list) != 1 {
+		t.Fatalf("FindByIDs mismatch: %v %d", err, len(list))
+	}
+	if list, err := repo.FindByIDs(ctx, []int64{}); err != nil || len(list) != 0 {
+		t.Fatalf("FindByIDs empty mismatch: %v %d", err, len(list))
+	}
+
+	// 软删除
+	if err := repo.Delete(ctx, user.ID); err != nil {
+		t.Fatalf("Delete err: %v", err)
+	}
+	deleted, _ := repo.FindByID(ctx, user.ID)
+	if deleted != nil {
+		t.Fatalf("expected deleted user filtered out")
+	}
+
+	// 批量操作边界
+	if _, err := repo.BatchUpdate(ctx, []int64{}, map[string]interface{}{"status": 1}); err != nil {
+		t.Fatalf("BatchUpdate empty should not error: %v", err)
+	}
+	if _, err := repo.BatchDelete(ctx, []int64{}); err != nil {
+		t.Fatalf("BatchDelete empty should not error: %v", err)
+	}
+
+	// 日志写入
+	_ = repo.CreateLoginLog(ctx, &model.UserLoginLog{UserID: user.ID, IPAddress: "127.0.0.1"})
+	_ = repo.CreatePointLog(ctx, &model.UserPointLog{UserID: user.ID, Amount: 1, ChangeType: "add"})
+}
+
+func TestProfileRepository_Basic(t *testing.T) {
+	db := testutil.NewTestDB(t)
+	userRepo := NewUserRepository(db)
+	profileRepo := NewProfileRepository(db)
+	ctx := context.Background()
+
+	u := &model.User{Username: "u2", Email: "u2@test.com", Password: "pwd", Status: 1}
+	_ = userRepo.Create(ctx, u)
+
+	p := &model.Profile{UUID: "p-uuid", UserID: u.ID, Name: "hero", IsActive: false}
+	if err := profileRepo.Create(ctx, p); err != nil {
+		t.Fatalf("create profile err: %v", err)
+	}
+
+	if got, err := profileRepo.FindByUUID(ctx, "p-uuid"); err != nil || got.Name != "hero" {
+		t.Fatalf("FindByUUID mismatch: %v %+v", err, got)
+	}
+	if list, err := profileRepo.FindByUserID(ctx, u.ID); err != nil || len(list) != 1 {
+		t.Fatalf("FindByUserID mismatch")
+	}
+	if count, err := profileRepo.CountByUserID(ctx, u.ID); err != nil || count != 1 {
+		t.Fatalf("CountByUserID mismatch: %d err=%v", count, err)
+	}
+
+	if err := profileRepo.SetActive(ctx, "p-uuid", u.ID); err != nil {
+		t.Fatalf("SetActive err: %v", err)
+	}
+	if err := profileRepo.UpdateLastUsedAt(ctx, "p-uuid"); err != nil {
+		t.Fatalf("UpdateLastUsedAt err: %v", err)
+	}
+
+	if got, err := profileRepo.FindByName(ctx, "hero"); err != nil || got == nil {
+		t.Fatalf("FindByName mismatch")
+	}
+	if list, err := profileRepo.FindByUUIDs(ctx, []string{"p-uuid"}); err != nil || len(list) != 1 {
+		t.Fatalf("FindByUUIDs mismatch")
+	}
+	if _, err := profileRepo.BatchUpdate(ctx, []string{"p-uuid"}, map[string]interface{}{"name": "hero2"}); err != nil {
+		t.Fatalf("BatchUpdate profile err: %v", err)
+	}
+
+	if err := profileRepo.Delete(ctx, "p-uuid"); err != nil {
+		t.Fatalf("Delete err: %v", err)
+	}
+	if _, err := profileRepo.BatchDelete(ctx, []string{}); err != nil {
+		t.Fatalf("BatchDelete empty err: %v", err)
+	}
+}
+
+func TestTextureRepository_Basic(t *testing.T) {
+	db := testutil.NewTestDB(t)
+	userRepo := NewUserRepository(db)
+	textureRepo := NewTextureRepository(db)
+	ctx := context.Background()
+
+	u := &model.User{Username: "u3", Email: "u3@test.com", Password: "pwd", Status: 1}
+	_ = userRepo.Create(ctx, u)
+
+	tex := &model.Texture{
+		UploaderID: u.ID,
+		Name:       "tex",
+		Hash:       "hash1",
+		URL:        "url1",
+		Type:       model.TextureTypeSkin,
+		IsPublic:   true,
+		Status:     1,
+	}
+	if err := textureRepo.Create(ctx, tex); err != nil {
+		t.Fatalf("create texture err: %v", err)
+	}
+
+	if got, _ := textureRepo.FindByHash(ctx, "hash1"); got == nil || got.ID != tex.ID {
+		t.Fatalf("FindByHash mismatch")
+	}
+	if got, _ := textureRepo.FindByHashAndUploaderID(ctx, "hash1", u.ID); got == nil {
+		t.Fatalf("FindByHashAndUploaderID mismatch")
+	}
+
+	_ = textureRepo.IncrementFavoriteCount(ctx, tex.ID)
+	_ = textureRepo.DecrementFavoriteCount(ctx, tex.ID)
+	_ = textureRepo.IncrementDownloadCount(ctx, tex.ID)
+	_ = textureRepo.CreateDownloadLog(ctx, &model.TextureDownloadLog{TextureID: tex.ID, UserID: &u.ID, IPAddress: "127.0.0.1"})
+
+	// 收藏
+	_ = textureRepo.AddFavorite(ctx, u.ID, tex.ID)
+	if fav, err := textureRepo.IsFavorited(ctx, u.ID, tex.ID); err == nil {
+		if !fav {
+			t.Fatalf("IsFavorited expected true")
+		}
+	} else {
+		t.Skipf("IsFavorited not supported by sqlite: %v", err)
+	}
+	_ = textureRepo.RemoveFavorite(ctx, u.ID, tex.ID)
+
+	// 批量更新与删除
+	if affected, err := textureRepo.BatchUpdate(ctx, []int64{tex.ID}, map[string]interface{}{"name": "tex-new"}); err != nil || affected != 1 {
+		t.Fatalf("BatchUpdate mismatch, affected=%d err=%v", affected, err)
+	}
+	if affected, err := textureRepo.BatchDelete(ctx, []int64{tex.ID}); err != nil || affected != 1 {
+		t.Fatalf("BatchDelete mismatch, affected=%d err=%v", affected, err)
+	}
+
+	// 搜索与收藏列表
+	_ = textureRepo.Create(ctx, &model.Texture{
+		UploaderID: u.ID,
+		Name:       "search-me",
+		Hash:       "hash2",
+		URL:        "url2",
+		Type:       model.TextureTypeCape,
+		IsPublic:   true,
+		Status:     1,
+	})
+	if list, total, err := textureRepo.Search(ctx, "search", model.TextureTypeCape, true, 1, 10); err != nil || total == 0 || len(list) == 0 {
+		t.Fatalf("Search mismatch, total=%d len=%d err=%v", total, len(list), err)
+	}
+	_ = textureRepo.AddFavorite(ctx, u.ID, tex.ID+1)
+	if favList, total, err := textureRepo.GetUserFavorites(ctx, u.ID, 1, 10); err != nil || total == 0 || len(favList) == 0 {
+		t.Fatalf("GetUserFavorites mismatch, total=%d len=%d err=%v", total, len(favList), err)
+	}
+	if _, total, err := textureRepo.Search(ctx, "", model.TextureTypeSkin, true, 1, 10); err != nil || total < 2 {
+		t.Fatalf("Search fallback mismatch")
+	}
+
+	// 列表与计数
+	if _, total, err := textureRepo.FindByUploaderID(ctx, u.ID, 1, 10); err != nil || total != 1 {
+		t.Fatalf("FindByUploaderID mismatch")
+	}
+	if cnt, err := textureRepo.CountByUploaderID(ctx, u.ID); err != nil || cnt != 1 {
+		t.Fatalf("CountByUploaderID mismatch")
+	}
+
+	_ = textureRepo.Delete(ctx, tex.ID)
+}
+
+func TestSystemConfigRepository_Basic(t *testing.T) {
+	db := testutil.NewTestDB(t)
+	repo := NewSystemConfigRepository(db)
+	ctx := context.Background()
+
+	cfg := &model.SystemConfig{Key: "site_name", Value: "Carrot", IsPublic: true}
+	if err := repo.Update(ctx, cfg); err != nil {
+		t.Fatalf("Update err: %v", err)
+	}
+	if v, err := repo.GetByKey(ctx, "site_name"); err != nil || v.Value != "Carrot" {
+		t.Fatalf("GetByKey mismatch")
+	}
+	_ = repo.UpdateValue(ctx, "site_name", "Carrot2")
+	if list, _ := repo.GetPublic(ctx); len(list) == 0 {
+		t.Fatalf("GetPublic expected entries")
+	}
+	if all, _ := repo.GetAll(ctx); len(all) == 0 {
+		t.Fatalf("GetAll expected entries")
+	}
+	if v, _ := repo.GetByKey(ctx, "site_name"); v.Value != "Carrot2" {
+		t.Fatalf("UpdateValue not applied")
+	}
+}
+
+func TestClientRepository_Basic(t *testing.T) {
+	db := testutil.NewTestDB(t)
+	repo := NewClientRepository(db)
+	ctx := context.Background()
+
+	client := &model.Client{UUID: "c-uuid", ClientToken: "ct-1", UserID: 9, Version: 1}
+	if err := repo.Create(ctx, client); err != nil {
+		t.Fatalf("Create client err: %v", err)
+	}
+	if got, _ := repo.FindByClientToken(ctx, "ct-1"); got == nil || got.UUID != "c-uuid" {
+		t.Fatalf("FindByClientToken mismatch")
+	}
+	if got, _ := repo.FindByUUID(ctx, "c-uuid"); got == nil || got.ClientToken != "ct-1" {
+		t.Fatalf("FindByUUID mismatch")
+	}
+	if list, _ := repo.FindByUserID(ctx, 9); len(list) != 1 {
+		t.Fatalf("FindByUserID mismatch")
+	}
+	_ = repo.IncrementVersion(ctx, "c-uuid")
+	updated, _ := repo.FindByUUID(ctx, "c-uuid")
+	if updated.Version != 2 {
+		t.Fatalf("IncrementVersion not applied, got %d", updated.Version)
+	}
+	_ = repo.DeleteByClientToken(ctx, "ct-1")
+	_ = repo.DeleteByUserID(ctx, 9)
+}
+
+func TestYggdrasilRepository_Basic(t *testing.T) {
+	db := testutil.NewTestDB(t)
+	userRepo := NewUserRepository(db)
+	yggRepo := NewYggdrasilRepository(db)
+	ctx := context.Background()
+
+	user := &model.User{Username: "u-ygg", Email: "ygg@test.com", Password: "pwd", Status: 1}
+	_ = userRepo.Create(ctx, user) // AfterCreate 会生成 yggdrasil 记录
+
+	pwd, err := yggRepo.GetPasswordByID(ctx, user.ID)
+	if err != nil || pwd == "" {
+		t.Fatalf("GetPasswordByID err=%v pwd=%s", err, pwd)
+	}
+	if err := yggRepo.ResetPassword(ctx, user.ID, "newpwd"); err != nil {
+		t.Fatalf("ResetPassword err: %v", err)
+	}
+}

internal/repository/token_repository.go

@@ -1,71 +0,0 @@
-package repository
-
-import (
-	"carrotskin/internal/model"
-	"context"
-
-	"gorm.io/gorm"
-)
-
-// tokenRepository TokenRepository的实现
-type tokenRepository struct {
-	db *gorm.DB
-}
-
-// NewTokenRepository 创建TokenRepository实例
-func NewTokenRepository(db *gorm.DB) TokenRepository {
-	return &tokenRepository{db: db}
-}
-
-func (r *tokenRepository) Create(ctx context.Context, token *model.Token) error {
-	return r.db.WithContext(ctx).Create(token).Error
-}
-
-func (r *tokenRepository) FindByAccessToken(ctx context.Context, accessToken string) (*model.Token, error) {
-	var token model.Token
-	err := r.db.WithContext(ctx).Where("access_token = ?", accessToken).First(&token).Error
-	if err != nil {
-		return nil, err
-	}
-	return &token, nil
-}
-
-func (r *tokenRepository) GetByUserID(ctx context.Context, userId int64) ([]*model.Token, error) {
-	var tokens []*model.Token
-	err := r.db.WithContext(ctx).Where("user_id = ?", userId).Find(&tokens).Error
-	return tokens, err
-}
-
-func (r *tokenRepository) GetUUIDByAccessToken(ctx context.Context, accessToken string) (string, error) {
-	var token model.Token
-	err := r.db.WithContext(ctx).Select("profile_id").Where("access_token = ?", accessToken).First(&token).Error
-	if err != nil {
-		return "", err
-	}
-	return token.ProfileId, nil
-}
-
-func (r *tokenRepository) GetUserIDByAccessToken(ctx context.Context, accessToken string) (int64, error) {
-	var token model.Token
-	err := r.db.WithContext(ctx).Select("user_id").Where("access_token = ?", accessToken).First(&token).Error
-	if err != nil {
-		return 0, err
-	}
-	return token.UserID, nil
-}
-
-func (r *tokenRepository) DeleteByAccessToken(ctx context.Context, accessToken string) error {
-	return r.db.WithContext(ctx).Where("access_token = ?", accessToken).Delete(&model.Token{}).Error
-}
-
-func (r *tokenRepository) DeleteByUserID(ctx context.Context, userId int64) error {
-	return r.db.WithContext(ctx).Where("user_id = ?", userId).Delete(&model.Token{}).Error
-}
-
-func (r *tokenRepository) BatchDelete(ctx context.Context, accessTokens []string) (int64, error) {
-	if len(accessTokens) == 0 {
-		return 0, nil
-	}
-	result := r.db.WithContext(ctx).Where("access_token IN ?", accessTokens).Delete(&model.Token{})
-	return result.RowsAffected, result.Error
-}

internal/repository/token_repository_test.go

@@ -1,123 +0,0 @@
-package repository
-
-import (
-	"testing"
-)
-
-// TestTokenRepository_BatchDeleteLogic 测试批量删除逻辑
-func TestTokenRepository_BatchDeleteLogic(t *testing.T) {
-	tests := []struct {
-		name           string
-		tokensToDelete []string
-		wantCount      int64
-		wantError      bool
-	}{
-		{
-			name:           "有效的token列表",
-			tokensToDelete: []string{"token1", "token2", "token3"},
-			wantCount:      3,
-			wantError:      false,
-		},
-		{
-			name:           "空列表应该返回0",
-			tokensToDelete: []string{},
-			wantCount:      0,
-			wantError:      false,
-		},
-		{
-			name:           "单个token",
-			tokensToDelete: []string{"token1"},
-			wantCount:      1,
-			wantError:      false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// 验证批量删除逻辑：空列表应该直接返回0
-			if len(tt.tokensToDelete) == 0 {
-				if tt.wantCount != 0 {
-					t.Errorf("Empty list should return count 0, got %d", tt.wantCount)
-				}
-			}
-		})
-	}
-}
-
-// TestTokenRepository_QueryConditions 测试token查询条件逻辑
-func TestTokenRepository_QueryConditions(t *testing.T) {
-	tests := []struct {
-		name        string
-		accessToken string
-		userID      int64
-		wantValid   bool
-	}{
-		{
-			name:        "有效的access token",
-			accessToken: "valid-token-123",
-			userID:      1,
-			wantValid:   true,
-		},
-		{
-			name:        "access token为空",
-			accessToken: "",
-			userID:      1,
-			wantValid:   false,
-		},
-		{
-			name:        "用户ID为0",
-			accessToken: "valid-token-123",
-			userID:      0,
-			wantValid:   false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			isValid := tt.accessToken != "" && tt.userID > 0
-			if isValid != tt.wantValid {
-				t.Errorf("Query condition validation failed: got %v, want %v", isValid, tt.wantValid)
-			}
-		})
-	}
-}
-
-// TestTokenRepository_FindTokenByIDLogic 测试根据ID查找token的逻辑
-func TestTokenRepository_FindTokenByIDLogic(t *testing.T) {
-	tests := []struct {
-		name        string
-		accessToken string
-		resultCount int
-		wantError   bool
-	}{
-		{
-			name:        "找到token",
-			accessToken: "token-123",
-			resultCount: 1,
-			wantError:   false,
-		},
-		{
-			name:        "未找到token",
-			accessToken: "token-123",
-			resultCount: 0,
-			wantError:   true, // 访问索引0会panic
-		},
-		{
-			name:        "找到多个token（异常情况）",
-			accessToken: "token-123",
-			resultCount: 2,
-			wantError:   false, // 返回第一个
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// 验证逻辑：如果结果为空，访问索引0会出错
-			hasError := tt.resultCount == 0
-			if hasError != tt.wantError {
-				t.Errorf("FindTokenByID logic failed: got error=%v, want error=%v", hasError, tt.wantError)
-			}
-		})
-	}
-}
-

internal/service/mocks_test.go

@@ -214,6 +214,10 @@ func (m *MockProfileRepository) CountByUserID(ctx context.Context, userID int64)
 	return int64(len(m.userProfiles[userID])), nil
 }
 
+func (m *MockProfileRepository) SetActive(ctx context.Context, uuid string, userID int64) error {
+	return nil
+}
+
 func (m *MockProfileRepository) UpdateLastUsedAt(ctx context.Context, uuid string) error {
 	return nil
 }
@@ -470,99 +474,51 @@ func (m *MockTextureRepository) BatchDelete(ctx context.Context, ids []int64) (i
 	return deleted, nil
 }
 
-// MockTokenRepository 模拟TokenRepository
+// MockSystemConfigRepository 模拟SystemConfigRepository
-type MockTokenRepository struct {
+type MockSystemConfigRepository struct {
-	tokens     map[string]*model.Token
+	configs map[string]*model.SystemConfig
-	userTokens map[int64][]*model.Token
-	FailCreate bool
-	FailFind   bool
-	FailDelete bool
 }
 
-func NewMockTokenRepository() *MockTokenRepository {
+func NewMockSystemConfigRepository() *MockSystemConfigRepository {
-	return &MockTokenRepository{
+	return &MockSystemConfigRepository{
-		tokens:     make(map[string]*model.Token),
+		configs: make(map[string]*model.SystemConfig),
-		userTokens: make(map[int64][]*model.Token),
 	}
 }
 
-func (m *MockTokenRepository) Create(ctx context.Context, token *model.Token) error {
+func (m *MockSystemConfigRepository) GetByKey(ctx context.Context, key string) (*model.SystemConfig, error) {
-	if m.FailCreate {
+	if config, ok := m.configs[key]; ok {
-		return errors.New("mock create error")
+		return config, nil
 	}
-	m.tokens[token.AccessToken] = token
+	return nil, nil
-	m.userTokens[token.UserID] = append(m.userTokens[token.UserID], token)
+}
+
+func (m *MockSystemConfigRepository) GetPublic(ctx context.Context) ([]model.SystemConfig, error) {
+	var result []model.SystemConfig
+	for _, v := range m.configs {
+		result = append(result, *v)
+	}
+	return result, nil
+}
+
+func (m *MockSystemConfigRepository) GetAll(ctx context.Context) ([]model.SystemConfig, error) {
+	var result []model.SystemConfig
+	for _, v := range m.configs {
+		result = append(result, *v)
+	}
+	return result, nil
+}
+
+func (m *MockSystemConfigRepository) Update(ctx context.Context, config *model.SystemConfig) error {
+	m.configs[config.Key] = config
 	return nil
 }
 
-func (m *MockTokenRepository) FindByAccessToken(ctx context.Context, accessToken string) (*model.Token, error) {
+func (m *MockSystemConfigRepository) UpdateValue(ctx context.Context, key, value string) error {
-	if m.FailFind {
+	if config, ok := m.configs[key]; ok {
-		return nil, errors.New("mock find error")
+		config.Value = value
+		return nil
 	}
-	if token, ok := m.tokens[accessToken]; ok {
+	return errors.New("config not found")
-		return token, nil
-	}
-	return nil, errors.New("token not found")
-}
-
-func (m *MockTokenRepository) GetByUserID(ctx context.Context, userId int64) ([]*model.Token, error) {
-	if m.FailFind {
-		return nil, errors.New("mock find error")
-	}
-	return m.userTokens[userId], nil
-}
-
-func (m *MockTokenRepository) GetUUIDByAccessToken(ctx context.Context, accessToken string) (string, error) {
-	if m.FailFind {
-		return "", errors.New("mock find error")
-	}
-	if token, ok := m.tokens[accessToken]; ok {
-		return token.ProfileId, nil
-	}
-	return "", errors.New("token not found")
-}
-
-func (m *MockTokenRepository) GetUserIDByAccessToken(ctx context.Context, accessToken string) (int64, error) {
-	if m.FailFind {
-		return 0, errors.New("mock find error")
-	}
-	if token, ok := m.tokens[accessToken]; ok {
-		return token.UserID, nil
-	}
-	return 0, errors.New("token not found")
-}
-
-func (m *MockTokenRepository) DeleteByAccessToken(ctx context.Context, accessToken string) error {
-	if m.FailDelete {
-		return errors.New("mock delete error")
-	}
-	delete(m.tokens, accessToken)
-	return nil
-}
-
-func (m *MockTokenRepository) DeleteByUserID(ctx context.Context, userId int64) error {
-	if m.FailDelete {
-		return errors.New("mock delete error")
-	}
-	for _, token := range m.userTokens[userId] {
-		delete(m.tokens, token.AccessToken)
-	}
-	m.userTokens[userId] = nil
-	return nil
-}
-
-func (m *MockTokenRepository) BatchDelete(ctx context.Context, accessTokens []string) (int64, error) {
-	if m.FailDelete {
-		return 0, errors.New("mock delete error")
-	}
-	var count int64
-	for _, accessToken := range accessTokens {
-		if _, ok := m.tokens[accessToken]; ok {
-			delete(m.tokens, accessToken)
-			count++
-		}
-	}
-	return count, nil
 }
 
 // ============================================================================
@@ -757,6 +713,10 @@ func (m *MockProfileService) Delete(uuid string, userID int64) error {
 	return nil
 }
 
+func (m *MockProfileService) SetActive(uuid string, userID int64) error {
+	return nil
+}
+
 func (m *MockProfileService) CheckLimit(userID int64, maxProfiles int) error {
 	count := 0
 	for _, profile := range m.profiles {
@@ -913,90 +873,11 @@ func (m *MockTextureService) CheckUploadLimit(uploaderID int64, maxTextures int)
 	return nil
 }
 
-// MockTokenService 模拟TokenService
-type MockTokenService struct {
-	tokens       map[string]*model.Token
-	FailCreate   bool
-	FailValidate bool
-	FailRefresh  bool
-}
-
-func NewMockTokenService() *MockTokenService {
-	return &MockTokenService{
-		tokens: make(map[string]*model.Token),
-	}
-}
-
-func (m *MockTokenService) Create(userID int64, uuid, clientToken string) (*model.Profile, []*model.Profile, string, string, error) {
-	if m.FailCreate {
-		return nil, nil, "", "", errors.New("mock create error")
-	}
-	accessToken := "mock-access-token"
-	if clientToken == "" {
-		clientToken = "mock-client-token"
-	}
-	token := &model.Token{
-		AccessToken: accessToken,
-		ClientToken: clientToken,
-		UserID:      userID,
-		ProfileId:   uuid,
-		Usable:      true,
-	}
-	m.tokens[accessToken] = token
-	return nil, nil, accessToken, clientToken, nil
-}
-
-func (m *MockTokenService) Validate(accessToken, clientToken string) bool {
-	if m.FailValidate {
-		return false
-	}
-	if token, ok := m.tokens[accessToken]; ok {
-		if clientToken == "" || token.ClientToken == clientToken {
-			return token.Usable
-		}
-	}
-	return false
-}
-
-func (m *MockTokenService) Refresh(accessToken, clientToken, selectedProfileID string) (string, string, error) {
-	if m.FailRefresh {
-		return "", "", errors.New("mock refresh error")
-	}
-	return "new-access-token", clientToken, nil
-}
-
-func (m *MockTokenService) Invalidate(accessToken string) {
-	delete(m.tokens, accessToken)
-}
-
-func (m *MockTokenService) InvalidateUserTokens(userID int64) {
-	for key, token := range m.tokens {
-		if token.UserID == userID {
-			delete(m.tokens, key)
-		}
-	}
-}
-
-func (m *MockTokenService) GetUUIDByAccessToken(accessToken string) (string, error) {
-	if token, ok := m.tokens[accessToken]; ok {
-		return token.ProfileId, nil
-	}
-	return "", errors.New("token not found")
-}
-
-func (m *MockTokenService) GetUserIDByAccessToken(accessToken string) (int64, error) {
-	if token, ok := m.tokens[accessToken]; ok {
-		return token.UserID, nil
-	}
-	return 0, errors.New("token not found")
-}
-
 // ============================================================================
-// CacheManager Mock - uses database.CacheManager with nil redis
+// CacheManager Mock - 使用 database.CacheManager 的内存版本
 // ============================================================================
 
-// NewMockCacheManager 创建一个禁用的 CacheManager 用于测试
+// NewMockCacheManager 创建一个内存 CacheManager 用于测试
-// 通过设置 Enabled = false，缓存操作会被跳过，测试不依赖 Redis
 func NewMockCacheManager() *database.CacheManager {
 	return database.NewCacheManager(nil, database.CacheConfig{
 		Prefix:     "test:",

internal/service/profile_service.go

@@ -11,7 +11,6 @@ import (
 	"encoding/pem"
 	"errors"
 	"fmt"
-	"time"
 
 	"github.com/google/uuid"
 	"go.uber.org/zap"
@@ -93,7 +92,7 @@ func (s *profileService) GetByUUID(ctx context.Context, uuid string) (*model.Pro
 	// 尝试从缓存获取
 	cacheKey := s.cacheKeys.Profile(uuid)
 	var profile model.Profile
-	if err := s.cache.Get(ctx, cacheKey, &profile); err == nil {
+	if ok, _ := s.cache.TryGet(ctx, cacheKey, &profile); ok {
 		return &profile, nil
 	}
 
@@ -106,11 +105,9 @@ func (s *profileService) GetByUUID(ctx context.Context, uuid string) (*model.Pro
 		return nil, fmt.Errorf("查询档案失败: %w", err)
 	}
 
-	// 存入缓存（异步，5分钟过期）
+	// 存入缓存（异步）
 	if profile2 != nil {
-		go func() {
+		s.cache.SetAsync(context.Background(), cacheKey, profile2, s.cache.Policy.ProfileTTL)
-			_ = s.cache.Set(context.Background(), cacheKey, profile2, 5*time.Minute)
-		}()
 	}
 
 	return profile2, nil
@@ -120,7 +117,7 @@ func (s *profileService) GetByUserID(ctx context.Context, userID int64) ([]*mode
 	// 尝试从缓存获取
 	cacheKey := s.cacheKeys.ProfileList(userID)
 	var profiles []*model.Profile
-	if err := s.cache.Get(ctx, cacheKey, &profiles); err == nil {
+	if ok, _ := s.cache.TryGet(ctx, cacheKey, &profiles); ok {
 		return profiles, nil
 	}
 
@@ -130,11 +127,9 @@ func (s *profileService) GetByUserID(ctx context.Context, userID int64) ([]*mode
 		return nil, fmt.Errorf("查询档案列表失败: %w", err)
 	}
 
-	// 存入缓存（异步，3分钟过期）
+	// 存入缓存（异步）
 	if profiles != nil {
-		go func() {
+		s.cache.SetAsync(context.Background(), cacheKey, profiles, s.cache.Policy.ProfileListTTL)
-			_ = s.cache.Set(context.Background(), cacheKey, profiles, 3*time.Minute)
-		}()
 	}
 
 	return profiles, nil

internal/service/texture_service.go

@@ -13,7 +13,6 @@ import (
 	"fmt"
 	"path/filepath"
 	"strings"
-	"time"
 
 	"go.uber.org/zap"
 )
@@ -52,7 +51,7 @@ func (s *textureService) GetByID(ctx context.Context, id int64) (*model.Texture,
 	// 尝试从缓存获取
 	cacheKey := s.cacheKeys.Texture(id)
 	var texture model.Texture
-	if err := s.cache.Get(ctx, cacheKey, &texture); err == nil {
+	if ok, _ := s.cache.TryGet(ctx, cacheKey, &texture); ok {
 		if texture.Status == -1 {
 			return nil, errors.New("材质已删除")
 		}
@@ -71,11 +70,9 @@ func (s *textureService) GetByID(ctx context.Context, id int64) (*model.Texture,
 		return nil, errors.New("材质已删除")
 	}
 
-	// 存入缓存（异步，5分钟过期）
+	// 存入缓存（异步）
 	if texture2 != nil {
-		go func() {
+		s.cache.SetAsync(context.Background(), cacheKey, texture2, s.cache.Policy.TextureTTL)
-			_ = s.cache.Set(context.Background(), cacheKey, texture2, 5*time.Minute)
-		}()
 	}
 
 	return texture2, nil
@@ -85,7 +82,7 @@ func (s *textureService) GetByHash(ctx context.Context, hash string) (*model.Tex
 	// 尝试从缓存获取
 	cacheKey := s.cacheKeys.TextureByHash(hash)
 	var texture model.Texture
-	if err := s.cache.Get(ctx, cacheKey, &texture); err == nil {
+	if ok, _ := s.cache.TryGet(ctx, cacheKey, &texture); ok {
 		if texture.Status == -1 {
 			return nil, errors.New("材质已删除")
 		}
@@ -104,10 +101,8 @@ func (s *textureService) GetByHash(ctx context.Context, hash string) (*model.Tex
 		return nil, errors.New("材质已删除")
 	}
 
-	// 存入缓存（异步，5分钟过期）
+	// 存入缓存（异步）
-	go func() {
+	s.cache.SetAsync(context.Background(), cacheKey, texture2, s.cache.Policy.TextureTTL)
-		_ = s.cache.Set(context.Background(), cacheKey, texture2, 5*time.Minute)
-	}()
 
 	return texture2, nil
 }
@@ -121,7 +116,7 @@ func (s *textureService) GetByUserID(ctx context.Context, uploaderID int64, page
 		Textures []*model.Texture
 		Total    int64
 	}
-	if err := s.cache.Get(ctx, cacheKey, &cachedResult); err == nil {
+	if ok, _ := s.cache.TryGet(ctx, cacheKey, &cachedResult); ok {
 		return cachedResult.Textures, cachedResult.Total, nil
 	}
 
@@ -131,14 +126,12 @@ func (s *textureService) GetByUserID(ctx context.Context, uploaderID int64, page
 		return nil, 0, err
 	}
 
-	// 存入缓存（异步，2分钟过期）
+	// 存入缓存（异步）
-	go func() {
+	result := struct {
-		result := struct {
+		Textures []*model.Texture
-			Textures []*model.Texture
+		Total    int64
-			Total    int64
+	}{Textures: textures, Total: total}
-		}{Textures: textures, Total: total}
+	s.cache.SetAsync(context.Background(), cacheKey, result, s.cache.Policy.TextureListTTL)
-		_ = s.cache.Set(context.Background(), cacheKey, result, 2*time.Minute)
-	}()
 
 	return textures, total, nil
 }
@@ -181,7 +174,7 @@ func (s *textureService) Update(ctx context.Context, textureID, uploaderID int64
 
 	// 清除 texture 缓存和用户列表缓存
 	s.cacheInv.OnUpdate(ctx, s.cacheKeys.Texture(textureID))
-	s.cacheInv.BatchInvalidate(ctx, fmt.Sprintf("texture:user:%d:*", uploaderID))
+	s.cacheInv.BatchInvalidate(ctx, s.cacheKeys.TextureListPattern(uploaderID))
 
 	return s.textureRepo.FindByID(ctx, textureID)
 }
@@ -206,7 +199,7 @@ func (s *textureService) Delete(ctx context.Context, textureID, uploaderID int64
 
 	// 清除 texture 缓存和用户列表缓存
 	s.cacheInv.OnDelete(ctx, s.cacheKeys.Texture(textureID))
-	s.cacheInv.BatchInvalidate(ctx, fmt.Sprintf("texture:user:%d:*", uploaderID))
+	s.cacheInv.BatchInvalidate(ctx, s.cacheKeys.TextureListPattern(uploaderID))
 
 	return nil
 }

internal/service/texture_service_test.go

@@ -478,6 +478,128 @@ func boolPtr(b bool) *bool {
 // 使用 Mock 的集成测试
 // ============================================================================
 
+// TestTextureServiceImpl_Create 测试创建Texture
+func TestTextureServiceImpl_Create(t *testing.T) {
+	textureRepo := NewMockTextureRepository()
+	userRepo := NewMockUserRepository()
+	logger := zap.NewNop()
+
+	// 预置用户
+	testUser := &model.User{
+		ID:       1,
+		Username: "testuser",
+		Email:    "test@example.com",
+		Status:   1,
+	}
+	_ = userRepo.Create(context.Background(), testUser)
+
+	cacheManager := NewMockCacheManager()
+	textureService := NewTextureService(textureRepo, userRepo, nil, cacheManager, logger)
+
+	tests := []struct {
+		name        string
+		uploaderID  int64
+		textureName string
+		textureType string
+		hash        string
+		wantErr     bool
+		errContains string
+		setupMocks  func()
+	}{
+		{
+			name:        "正常创建SKIN材质",
+			uploaderID:  1,
+			textureName: "TestSkin",
+			textureType: "SKIN",
+			hash:        "unique-hash-1",
+			wantErr:     false,
+		},
+		{
+			name:        "正常创建CAPE材质",
+			uploaderID:  1,
+			textureName: "TestCape",
+			textureType: "CAPE",
+			hash:        "unique-hash-2",
+			wantErr:     false,
+		},
+		{
+			name:        "用户不存在",
+			uploaderID:  999,
+			textureName: "TestTexture",
+			textureType: "SKIN",
+			hash:        "unique-hash-3",
+			wantErr:     true,
+		},
+		{
+			name:        "材质Hash已存在",
+			uploaderID:  1,
+			textureName: "DuplicateTexture",
+			textureType: "SKIN",
+			hash:        "existing-hash",
+			wantErr:     false,
+			setupMocks: func() {
+				_ = textureRepo.Create(context.Background(), &model.Texture{
+					ID:         100,
+					UploaderID: 1,
+					Name:       "ExistingTexture",
+					Hash:       "existing-hash",
+				})
+			},
+		},
+		{
+			name:        "无效的材质类型",
+			uploaderID:  1,
+			textureName: "InvalidTypeTexture",
+			textureType: "INVALID",
+			hash:        "unique-hash-4",
+			wantErr:     true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.setupMocks != nil {
+				tt.setupMocks()
+			}
+
+			ctx := context.Background()
+			texture, err := textureService.Create(
+				ctx,
+				tt.uploaderID,
+				tt.textureName,
+				"Test description",
+				tt.textureType,
+				"http://example.com/texture.png",
+				tt.hash,
+				512,
+				true,
+				false,
+			)
+
+			if tt.wantErr {
+				if err == nil {
+					t.Error("期望返回错误，但实际没有错误")
+					return
+				}
+				if tt.errContains != "" && !containsString(err.Error(), tt.errContains) {
+					t.Errorf("错误信息应包含 %q, 实际为: %v", tt.errContains, err.Error())
+				}
+			} else {
+				if err != nil {
+					t.Errorf("不期望返回错误: %v", err)
+					return
+				}
+				if texture == nil {
+					t.Error("返回的Texture不应为nil")
+				}
+				if texture.Name != tt.textureName {
+					t.Errorf("Texture名称不匹配: got %v, want %v", texture.Name, tt.textureName)
+				}
+			}
+		})
+	}
+}
+
 // TestTextureServiceImpl_GetByID 测试获取Texture
 func TestTextureServiceImpl_GetByID(t *testing.T) {
 	textureRepo := NewMockTextureRepository()

internal/service/token_service.go

@@ -1,305 +0,0 @@
-package service
-
-import (
-	"carrotskin/internal/model"
-	"carrotskin/internal/repository"
-	"context"
-	"errors"
-	"fmt"
-	"strconv"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"go.uber.org/zap"
-)
-
-// tokenService TokenService的实现
-type tokenService struct {
-	tokenRepo   repository.TokenRepository
-	profileRepo repository.ProfileRepository
-	logger      *zap.Logger
-}
-
-// NewTokenService 创建TokenService实例
-func NewTokenService(
-	tokenRepo repository.TokenRepository,
-	profileRepo repository.ProfileRepository,
-	logger *zap.Logger,
-) TokenService {
-	return &tokenService{
-		tokenRepo:   tokenRepo,
-		profileRepo: profileRepo,
-		logger:      logger,
-	}
-}
-
-const (
-	tokenExtendedTimeout = 10 * time.Second
-	tokensMaxCount       = 10
-)
-
-func (s *tokenService) Create(ctx context.Context, userID int64, UUID string, clientToken string) (*model.Profile, []*model.Profile, string, string, error) {
-	var (
-		selectedProfileID *model.Profile
-		availableProfiles []*model.Profile
-	)
-
-	// 设置超时上下文
-	ctx, cancel := context.WithTimeout(ctx, DefaultTimeout)
-	defer cancel()
-
-	// 验证用户存在
-	if UUID != "" {
-		_, err := s.profileRepo.FindByUUID(ctx, UUID)
-		if err != nil {
-			return selectedProfileID, availableProfiles, "", "", fmt.Errorf("获取用户信息失败: %w", err)
-		}
-	}
-
-	// 生成令牌
-	if clientToken == "" {
-		clientToken = uuid.New().String()
-	}
-
-	accessToken := uuid.New().String()
-	token := model.Token{
-		AccessToken: accessToken,
-		ClientToken: clientToken,
-		UserID:      userID,
-		Usable:      true,
-		IssueDate:   time.Now(),
-	}
-
-	// 获取用户配置文件
-	profiles, err := s.profileRepo.FindByUserID(ctx, userID)
-	if err != nil {
-		return selectedProfileID, availableProfiles, "", "", fmt.Errorf("获取用户配置文件失败: %w", err)
-	}
-
-	// 如果用户只有一个配置文件，自动选择
-	if len(profiles) == 1 {
-		selectedProfileID = profiles[0]
-		token.ProfileId = selectedProfileID.UUID
-	}
-	availableProfiles = profiles
-
-	// 插入令牌
-	err = s.tokenRepo.Create(ctx, &token)
-	if err != nil {
-		return selectedProfileID, availableProfiles, "", "", fmt.Errorf("创建Token失败: %w", err)
-	}
-
-	// 清理多余的令牌（使用独立的后台上下文）
-	go s.checkAndCleanupExcessTokens(context.Background(), userID)
-
-	return selectedProfileID, availableProfiles, accessToken, clientToken, nil
-}
-
-func (s *tokenService) Validate(ctx context.Context, accessToken, clientToken string) bool {
-	// 设置超时上下文
-	ctx, cancel := context.WithTimeout(ctx, DefaultTimeout)
-	defer cancel()
-
-	if accessToken == "" {
-		return false
-	}
-
-	token, err := s.tokenRepo.FindByAccessToken(ctx, accessToken)
-	if err != nil {
-		return false
-	}
-
-	if !token.Usable {
-		return false
-	}
-
-	if clientToken == "" {
-		return true
-	}
-
-	return token.ClientToken == clientToken
-}
-
-func (s *tokenService) Refresh(ctx context.Context, accessToken, clientToken, selectedProfileID string) (string, string, error) {
-	// 设置超时上下文
-	ctx, cancel := context.WithTimeout(ctx, DefaultTimeout)
-	defer cancel()
-
-	if accessToken == "" {
-		return "", "", errors.New("accessToken不能为空")
-	}
-
-	// 查找旧令牌
-	oldToken, err := s.tokenRepo.FindByAccessToken(ctx, accessToken)
-	if err != nil {
-		if errors.Is(err, pgx.ErrNoRows) {
-			return "", "", errors.New("accessToken无效")
-		}
-		s.logger.Error("查询Token失败", zap.Error(err), zap.String("accessToken", accessToken))
-		return "", "", fmt.Errorf("查询令牌失败: %w", err)
-	}
-
-	// 验证profile
-	if selectedProfileID != "" {
-		valid, validErr := s.validateProfileByUserID(ctx, oldToken.UserID, selectedProfileID)
-		if validErr != nil {
-			s.logger.Error("验证Profile失败",
-				zap.Error(err),
-				zap.Int64("userId", oldToken.UserID),
-				zap.String("profileId", selectedProfileID),
-			)
-			return "", "", fmt.Errorf("验证角色失败: %w", err)
-		}
-		if !valid {
-			return "", "", errors.New("角色与用户不匹配")
-		}
-	}
-
-	// 检查 clientToken 是否有效
-	if clientToken != "" && clientToken != oldToken.ClientToken {
-		return "", "", errors.New("clientToken无效")
-	}
-
-	// 检查 selectedProfileID 的逻辑
-	if selectedProfileID != "" {
-		if oldToken.ProfileId != "" && oldToken.ProfileId != selectedProfileID {
-			return "", "", errors.New("原令牌已绑定角色，无法选择新角色")
-		}
-	} else {
-		selectedProfileID = oldToken.ProfileId
-	}
-
-	// 生成新令牌
-	newAccessToken := uuid.New().String()
-	newToken := model.Token{
-		AccessToken: newAccessToken,
-		ClientToken: oldToken.ClientToken,
-		UserID:      oldToken.UserID,
-		Usable:      true,
-		ProfileId:   selectedProfileID,
-		IssueDate:   time.Now(),
-	}
-
-	// 先插入新令牌，再删除旧令牌
-	err = s.tokenRepo.Create(ctx, &newToken)
-	if err != nil {
-		s.logger.Error("创建新Token失败", zap.Error(err), zap.String("accessToken", accessToken))
-		return "", "", fmt.Errorf("创建新Token失败: %w", err)
-	}
-
-	err = s.tokenRepo.DeleteByAccessToken(ctx, accessToken)
-	if err != nil {
-		s.logger.Warn("删除旧Token失败，但新Token已创建",
-			zap.Error(err),
-			zap.String("oldToken", oldToken.AccessToken),
-			zap.String("newToken", newAccessToken),
-		)
-	}
-
-	s.logger.Info("成功刷新Token", zap.Int64("userId", oldToken.UserID), zap.String("accessToken", newAccessToken))
-	return newAccessToken, oldToken.ClientToken, nil
-}
-
-func (s *tokenService) Invalidate(ctx context.Context, accessToken string) {
-	// 设置超时上下文
-	ctx, cancel := context.WithTimeout(ctx, DefaultTimeout)
-	defer cancel()
-
-	if accessToken == "" {
-		return
-	}
-
-	err := s.tokenRepo.DeleteByAccessToken(ctx, accessToken)
-	if err != nil {
-		s.logger.Error("删除Token失败", zap.Error(err), zap.String("accessToken", accessToken))
-		return
-	}
-	s.logger.Info("成功删除Token", zap.String("token", accessToken))
-}
-
-func (s *tokenService) InvalidateUserTokens(ctx context.Context, userID int64) {
-	// 设置超时上下文
-	ctx, cancel := context.WithTimeout(ctx, DefaultTimeout)
-	defer cancel()
-
-	if userID == 0 {
-		return
-	}
-
-	err := s.tokenRepo.DeleteByUserID(ctx, userID)
-	if err != nil {
-		s.logger.Error("删除用户Token失败", zap.Error(err), zap.Int64("userId", userID))
-		return
-	}
-
-	s.logger.Info("成功删除用户Token", zap.Int64("userId", userID))
-}
-
-func (s *tokenService) GetUUIDByAccessToken(ctx context.Context, accessToken string) (string, error) {
-	// 设置超时上下文
-	ctx, cancel := context.WithTimeout(ctx, DefaultTimeout)
-	defer cancel()
-
-	return s.tokenRepo.GetUUIDByAccessToken(ctx, accessToken)
-}
-
-func (s *tokenService) GetUserIDByAccessToken(ctx context.Context, accessToken string) (int64, error) {
-	// 设置超时上下文
-	ctx, cancel := context.WithTimeout(ctx, DefaultTimeout)
-	defer cancel()
-
-	return s.tokenRepo.GetUserIDByAccessToken(ctx, accessToken)
-}
-
-// 私有辅助方法
-
-func (s *tokenService) checkAndCleanupExcessTokens(ctx context.Context, userID int64) {
-	if userID == 0 {
-		return
-	}
-
-	// 为清理操作设置更长的超时时间
-	ctx, cancel := context.WithTimeout(ctx, tokenExtendedTimeout)
-	defer cancel()
-
-	tokens, err := s.tokenRepo.GetByUserID(ctx, userID)
-	if err != nil {
-		s.logger.Error("获取用户Token失败", zap.Error(err), zap.String("userId", strconv.FormatInt(userID, 10)))
-		return
-	}
-
-	if len(tokens) <= tokensMaxCount {
-		return
-	}
-
-	tokensToDelete := make([]string, 0, len(tokens)-tokensMaxCount)
-	for i := tokensMaxCount; i < len(tokens); i++ {
-		tokensToDelete = append(tokensToDelete, tokens[i].AccessToken)
-	}
-
-	deletedCount, err := s.tokenRepo.BatchDelete(ctx, tokensToDelete)
-	if err != nil {
-		s.logger.Error("清理用户多余Token失败", zap.Error(err), zap.String("userId", strconv.FormatInt(userID, 10)))
-		return
-	}
-
-	if deletedCount > 0 {
-		s.logger.Info("成功清理用户多余Token", zap.Int64("userId", userID), zap.Int64("count", deletedCount))
-	}
-}
-
-func (s *tokenService) validateProfileByUserID(ctx context.Context, userID int64, UUID string) (bool, error) {
-	if userID == 0 || UUID == "" {
-		return false, errors.New("用户ID或配置文件ID不能为空")
-	}
-
-	profile, err := s.profileRepo.FindByUUID(ctx, UUID)
-	if err != nil {
-		if errors.Is(err, pgx.ErrNoRows) {
-			return false, errors.New("配置文件不存在")
-		}
-		return false, fmt.Errorf("验证配置文件失败: %w", err)
-	}
-	return profile.UserID == userID, nil
-}

internal/service/token_service_redis.go

@@ -7,7 +7,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"strconv"
 	"time"
 
 	"github.com/google/uuid"
@@ -15,40 +14,38 @@ import (
 	"go.uber.org/zap"
 )
 
-// tokenServiceJWT TokenService的JWT实现（使用JWT + Version机制）
+// tokenServiceRedis TokenService的Redis实现
-type tokenServiceJWT struct {
+type tokenServiceRedis struct {
-	tokenRepo        repository.TokenRepository
+	tokenStore     *auth.TokenStoreRedis
-	clientRepo       repository.ClientRepository
+	clientRepo     repository.ClientRepository
-	profileRepo      repository.ProfileRepository
+	profileRepo    repository.ProfileRepository
-	yggdrasilJWT     *auth.YggdrasilJWTService
+	yggdrasilJWT   *auth.YggdrasilJWTService
-	logger           *zap.Logger
+	logger         *zap.Logger
-	tokenExpireSec   int64 // Token过期时间（秒），0表示永不过期
+	tokenExpireSec int64 // Token过期时间（秒），0表示永不过期
-	tokenStaleSec    int64 // Token过期但可用时间（秒），0表示永不过期
+	tokenStaleSec  int64 // Token过期但可用时间（秒），0表示永不过期
 }
 
-// NewTokenServiceJWT 创建使用JWT的TokenService实例
+// NewTokenServiceRedis 创建使用Redis的TokenService实例
-func NewTokenServiceJWT(
+func NewTokenServiceRedis(
-	tokenRepo repository.TokenRepository,
+	tokenStore *auth.TokenStoreRedis,
 	clientRepo repository.ClientRepository,
 	profileRepo repository.ProfileRepository,
 	yggdrasilJWT *auth.YggdrasilJWTService,
 	logger *zap.Logger,
 ) TokenService {
-	return &tokenServiceJWT{
+	return &tokenServiceRedis{
-		tokenRepo:      tokenRepo,
+		tokenStore:     tokenStore,
 		clientRepo:     clientRepo,
 		profileRepo:    profileRepo,
 		yggdrasilJWT:   yggdrasilJWT,
 		logger:         logger,
-		tokenExpireSec: 24 * 3600,  // 默认24小时
+		tokenExpireSec: 24 * 3600,      // 默认24小时
 		tokenStaleSec:  30 * 24 * 3600, // 默认30天
 	}
 }
 
-// 常量已在 token_service.go 中定义，这里不重复定义
+// Create 创建Token（使用JWT + Redis存储）
-
+func (s *tokenServiceRedis) Create(ctx context.Context, userID int64, UUID string, clientToken string) (*model.Profile, []*model.Profile, string, string, error) {
-// Create 创建Token（使用JWT + Version机制）
-func (s *tokenServiceJWT) Create(ctx context.Context, userID int64, UUID string, clientToken string) (*model.Profile, []*model.Profile, string, string, error) {
 	var (
 		selectedProfileID *model.Profile
 		availableProfiles []*model.Profile
@@ -85,11 +82,11 @@ func (s *tokenServiceJWT) Create(ctx context.Context, userID int64, UUID string,
 			CreatedAt:   time.Now(),
 			UpdatedAt:   time.Now(),
 		}
-		
+
 		if UUID != "" {
 			client.ProfileID = UUID
 		}
-		
+
 		if err := s.clientRepo.Create(ctx, client); err != nil {
 			return selectedProfileID, availableProfiles, "", "", fmt.Errorf("创建Client失败: %w", err)
 		}
@@ -103,7 +100,7 @@ func (s *tokenServiceJWT) Create(ctx context.Context, userID int64, UUID string,
 		client.UpdatedAt = time.Now()
 		if UUID != "" {
 			client.ProfileID = UUID
-				if err := s.clientRepo.Update(ctx, client); err != nil {
+			if err := s.clientRepo.Update(ctx, client); err != nil {
 				return selectedProfileID, availableProfiles, "", "", fmt.Errorf("更新Client失败: %w", err)
 			}
 		}
@@ -130,14 +127,14 @@ func (s *tokenServiceJWT) Create(ctx context.Context, userID int64, UUID string,
 	// 生成Token过期时间
 	now := time.Now()
 	var expiresAt, staleAt time.Time
-	
+
 	if s.tokenExpireSec > 0 {
 		expiresAt = now.Add(time.Duration(s.tokenExpireSec) * time.Second)
 	} else {
-		// 使用遥远的未来时间（类似drasl的DISTANT_FUTURE）
+		// 使用遥远的未来时间
 		expiresAt = time.Date(2038, 1, 1, 0, 0, 0, 0, time.UTC)
 	}
-	
+
 	if s.tokenStaleSec > 0 {
 		staleAt = now.Add(time.Duration(s.tokenStaleSec) * time.Second)
 	} else {
@@ -157,36 +154,31 @@ func (s *tokenServiceJWT) Create(ctx context.Context, userID int64, UUID string,
 		return selectedProfileID, availableProfiles, "", "", fmt.Errorf("生成AccessToken失败: %w", err)
 	}
 
-	// 保存Token记录（用于查询和审计）
+	// 存储Token到Redis
-	token := model.Token{
+	ttl := expiresAt.Sub(now)
-		AccessToken: accessToken,
+	metadata := &auth.TokenMetadata{
-		ClientToken: clientToken,
 		UserID:      userID,
-		ProfileId:   profileID,
+		ProfileID:   profileID,
+		ClientUUID:  client.UUID,
+		ClientToken: client.ClientToken,
 		Version:     client.Version,
-		Usable:      true,
+		CreatedAt:   now.Unix(),
-		IssueDate:   now,
-		ExpiresAt:   &expiresAt,
-		StaleAt:     &staleAt,
 	}
 
-	err = s.tokenRepo.Create(ctx, &token)
+	if err := s.tokenStore.Store(ctx, accessToken, metadata, ttl); err != nil {
-	if err != nil {
+		s.logger.Warn("存储Token到Redis失败", zap.Error(err))
-		s.logger.Warn("保存Token记录失败，但JWT已生成", zap.Error(err))
 		// 不返回错误，因为JWT本身已经生成成功
 	}
 
-	// 清理多余的令牌（使用独立的后台上下文）
-	go s.checkAndCleanupExcessTokens(context.Background(), userID)
-
 	return selectedProfileID, availableProfiles, accessToken, clientToken, nil
 }
 
-// Validate 验证Token（使用JWT验证）
+// Validate 验证Token（使用JWT验证 + Redis存储验证）
-func (s *tokenServiceJWT) Validate(ctx context.Context, accessToken, clientToken string) bool {
+func (s *tokenServiceRedis) Validate(ctx context.Context, accessToken, clientToken string) bool {
 	// 设置超时上下文
 	ctx, cancel := context.WithTimeout(ctx, DefaultTimeout)
 	defer cancel()
+
 	if accessToken == "" {
 		return false
 	}
@@ -197,6 +189,13 @@ func (s *tokenServiceJWT) Validate(ctx context.Context, accessToken, clientToken
 		return false
 	}
 
+	// 从Redis获取Token元数据
+	metadata, err := s.tokenStore.Retrieve(ctx, accessToken)
+	if err != nil {
+		// Token可能已过期或不存在
+		return false
+	}
+
 	// 查找Client
 	client, err := s.clientRepo.FindByUUID(ctx, claims.Subject)
 	if err != nil {
@@ -209,18 +208,19 @@ func (s *tokenServiceJWT) Validate(ctx context.Context, accessToken, clientToken
 	}
 
 	// 验证ClientToken（如果提供）
-	if clientToken != "" && client.ClientToken != clientToken {
+	if clientToken != "" && metadata.ClientToken != clientToken {
 		return false
 	}
 
 	return true
 }
 
-// Refresh 刷新Token（使用Version机制，无需删除旧Token）
+// Refresh 刷新Token（使用Version机制，Redis存储）
-func (s *tokenServiceJWT) Refresh(ctx context.Context, accessToken, clientToken, selectedProfileID string) (string, string, error) {
+func (s *tokenServiceRedis) Refresh(ctx context.Context, accessToken, clientToken, selectedProfileID string) (string, string, error) {
 	// 设置超时上下文
 	ctx, cancel := context.WithTimeout(ctx, DefaultTimeout)
 	defer cancel()
+
 	if accessToken == "" {
 		return "", "", errors.New("accessToken不能为空")
 	}
@@ -279,16 +279,21 @@ func (s *tokenServiceJWT) Refresh(ctx context.Context, accessToken, clientToken,
 		return "", "", fmt.Errorf("更新Client版本失败: %w", err)
 	}
 
+	// 删除旧Token（从Redis）
+	if err := s.tokenStore.Delete(ctx, accessToken); err != nil {
+		s.logger.Warn("删除旧Token失败", zap.Error(err))
+	}
+
 	// 生成Token过期时间
 	now := time.Now()
 	var expiresAt, staleAt time.Time
-	
+
 	if s.tokenExpireSec > 0 {
 		expiresAt = now.Add(time.Duration(s.tokenExpireSec) * time.Second)
 	} else {
 		expiresAt = time.Date(2038, 1, 1, 0, 0, 0, 0, time.UTC)
 	}
-	
+
 	if s.tokenStaleSec > 0 {
 		staleAt = now.Add(time.Duration(s.tokenStaleSec) * time.Second)
 	} else {
@@ -308,30 +313,27 @@ func (s *tokenServiceJWT) Refresh(ctx context.Context, accessToken, clientToken,
 		return "", "", fmt.Errorf("生成新AccessToken失败: %w", err)
 	}
 
-	// 保存新Token记录
+	// 存储新Token到Redis
-	newToken := model.Token{
+	ttl := expiresAt.Sub(now)
-		AccessToken: newAccessToken,
+	metadata := &auth.TokenMetadata{
-		ClientToken: client.ClientToken,
 		UserID:      client.UserID,
-		ProfileId:   selectedProfileID,
+		ProfileID:   selectedProfileID,
+		ClientUUID:  client.UUID,
+		ClientToken: client.ClientToken,
 		Version:     client.Version,
-		Usable:      true,
+		CreatedAt:   now.Unix(),
-		IssueDate:   now,
-		ExpiresAt:   &expiresAt,
-		StaleAt:     &staleAt,
 	}
 
-	err = s.tokenRepo.Create(ctx, &newToken)
+	if err := s.tokenStore.Store(ctx, newAccessToken, metadata, ttl); err != nil {
-	if err != nil {
+		s.logger.Warn("存储新Token到Redis失败", zap.Error(err))
-		s.logger.Warn("保存新Token记录失败，但JWT已生成", zap.Error(err))
 	}
 
 	s.logger.Info("成功刷新Token", zap.Int64("userId", client.UserID), zap.Int("version", client.Version))
 	return newAccessToken, client.ClientToken, nil
 }
 
-// Invalidate 使Token失效（通过增加Version）
+// Invalidate 使Token失效（从Redis删除）
-func (s *tokenServiceJWT) Invalidate(ctx context.Context, accessToken string) {
+func (s *tokenServiceRedis) Invalidate(ctx context.Context, accessToken string) {
 	// 设置超时上下文
 	ctx, cancel := context.WithTimeout(ctx, DefaultTimeout)
 	defer cancel()
@@ -347,7 +349,7 @@ func (s *tokenServiceJWT) Invalidate(ctx context.Context, accessToken string) {
 		return
 	}
 
-	// 查找Client并增加Version
+	// 查找Client并增加Version（失效所有旧Token）
 	client, err := s.clientRepo.FindByUUID(ctx, claims.Subject)
 	if err != nil {
 		s.logger.Warn("无法找到对应的Client", zap.Error(err))
@@ -362,11 +364,17 @@ func (s *tokenServiceJWT) Invalidate(ctx context.Context, accessToken string) {
 		return
 	}
 
+	// 从Redis删除Token
+	if err := s.tokenStore.Delete(ctx, accessToken); err != nil {
+		s.logger.Warn("从Redis删除Token失败", zap.Error(err))
+		return
+	}
+
 	s.logger.Info("成功失效Token", zap.String("clientUUID", client.UUID), zap.Int("version", client.Version))
 }
 
-// InvalidateUserTokens 使用户所有Token失效
+// InvalidateUserTokens 使用户所有Token失效（从Redis删除）
-func (s *tokenServiceJWT) InvalidateUserTokens(ctx context.Context, userID int64) {
+func (s *tokenServiceRedis) InvalidateUserTokens(ctx context.Context, userID int64) {
 	// 设置超时上下文
 	ctx, cancel := context.WithTimeout(ctx, DefaultTimeout)
 	defer cancel()
@@ -391,15 +399,20 @@ func (s *tokenServiceJWT) InvalidateUserTokens(ctx context.Context, userID int64
 		}
 	}
 
+	// 从Redis删除用户所有Token
+	if err := s.tokenStore.DeleteByUserID(ctx, userID); err != nil {
+		s.logger.Error("从Redis删除用户Token失败", zap.Error(err), zap.Int64("userId", userID))
+		return
+	}
+
 	s.logger.Info("成功失效用户所有Token", zap.Int64("userId", userID), zap.Int("clientCount", len(clients)))
 }
 
 // GetUUIDByAccessToken 从AccessToken获取UUID（通过JWT解析）
-func (s *tokenServiceJWT) GetUUIDByAccessToken(ctx context.Context, accessToken string) (string, error) {
+func (s *tokenServiceRedis) GetUUIDByAccessToken(ctx context.Context, accessToken string) (string, error) {
 	claims, err := s.yggdrasilJWT.ParseAccessToken(accessToken, auth.StalePolicyAllow)
 	if err != nil {
-		// 如果JWT解析失败，尝试从数据库查询（向后兼容）
+		return "", errors.New("accessToken无效")
-		return s.tokenRepo.GetUUIDByAccessToken(ctx, accessToken)
 	}
 
 	if claims.ProfileID != "" {
@@ -420,11 +433,10 @@ func (s *tokenServiceJWT) GetUUIDByAccessToken(ctx context.Context, accessToken
 }
 
 // GetUserIDByAccessToken 从AccessToken获取UserID（通过JWT解析）
-func (s *tokenServiceJWT) GetUserIDByAccessToken(ctx context.Context, accessToken string) (int64, error) {
+func (s *tokenServiceRedis) GetUserIDByAccessToken(ctx context.Context, accessToken string) (int64, error) {
 	claims, err := s.yggdrasilJWT.ParseAccessToken(accessToken, auth.StalePolicyAllow)
 	if err != nil {
-		// 如果JWT解析失败，尝试从数据库查询（向后兼容）
+		return 0, errors.New("accessToken无效")
-		return s.tokenRepo.GetUserIDByAccessToken(ctx, accessToken)
 	}
 
 	// 从Client获取UserID
@@ -441,44 +453,8 @@ func (s *tokenServiceJWT) GetUserIDByAccessToken(ctx context.Context, accessToke
 	return client.UserID, nil
 }
 
-// 私有辅助方法
+// validateProfileByUserID 验证Profile是否属于用户
-
+func (s *tokenServiceRedis) validateProfileByUserID(ctx context.Context, userID int64, UUID string) (bool, error) {
-func (s *tokenServiceJWT) checkAndCleanupExcessTokens(ctx context.Context, userID int64) {
-	if userID == 0 {
-		return
-	}
-
-	// 为清理操作设置更长的超时时间
-	ctx, cancel := context.WithTimeout(ctx, tokenExtendedTimeout)
-	defer cancel()
-
-	tokens, err := s.tokenRepo.GetByUserID(ctx, userID)
-	if err != nil {
-		s.logger.Error("获取用户Token失败", zap.Error(err), zap.String("userId", strconv.FormatInt(userID, 10)))
-		return
-	}
-
-	if len(tokens) <= tokensMaxCount {
-		return
-	}
-
-	tokensToDelete := make([]string, 0, len(tokens)-tokensMaxCount)
-	for i := tokensMaxCount; i < len(tokens); i++ {
-		tokensToDelete = append(tokensToDelete, tokens[i].AccessToken)
-	}
-
-	deletedCount, err := s.tokenRepo.BatchDelete(ctx, tokensToDelete)
-	if err != nil {
-		s.logger.Error("清理用户多余Token失败", zap.Error(err), zap.String("userId", strconv.FormatInt(userID, 10)))
-		return
-	}
-
-	if deletedCount > 0 {
-		s.logger.Info("成功清理用户多余Token", zap.Int64("userId", userID), zap.Int64("count", deletedCount))
-	}
-}
-
-func (s *tokenServiceJWT) validateProfileByUserID(ctx context.Context, userID int64, UUID string) (bool, error) {
 	if userID == 0 || UUID == "" {
 		return false, errors.New("用户ID或配置文件ID不能为空")
 	}
@@ -492,24 +468,3 @@ func (s *tokenServiceJWT) validateProfileByUserID(ctx context.Context, userID in
 	}
 	return profile.UserID == userID, nil
 }
-
-// GetClientFromToken 从Token获取Client信息（辅助方法）
-func (s *tokenServiceJWT) GetClientFromToken(ctx context.Context, accessToken string, stalePolicy auth.StaleTokenPolicy) (*model.Client, error) {
-	claims, err := s.yggdrasilJWT.ParseAccessToken(accessToken, stalePolicy)
-	if err != nil {
-		return nil, err
-	}
-
-	client, err := s.clientRepo.FindByUUID(ctx, claims.Subject)
-	if err != nil {
-		return nil, err
-	}
-
-	// 验证Version
-	if claims.Version != client.Version {
-		return nil, errors.New("token版本不匹配")
-	}
-
-	return client, nil
-}
-

internal/service/user_service.go

@@ -188,7 +188,7 @@ func (s *userService) GetByID(ctx context.Context, id int64) (*model.User, error
 	cacheKey := s.cacheKeys.User(id)
 	return database.Cached(ctx, s.cache, cacheKey, func() (*model.User, error) {
 		return s.userRepo.FindByID(ctx, id)
-	}, 5*time.Minute)
+	}, s.cache.Policy.UserTTL)
 }
 
 func (s *userService) GetByEmail(ctx context.Context, email string) (*model.User, error) {
@@ -196,7 +196,7 @@ func (s *userService) GetByEmail(ctx context.Context, email string) (*model.User
 	cacheKey := s.cacheKeys.UserByEmail(email)
 	return database.Cached(ctx, s.cache, cacheKey, func() (*model.User, error) {
 		return s.userRepo.FindByEmail(ctx, email)
-	}, 5*time.Minute)
+	}, s.cache.Policy.UserEmailTTL)
 }
 
 func (s *userService) UpdateInfo(ctx context.Context, user *model.User) error {

internal/service/yggdrasil_service_composite.go

@@ -22,7 +22,7 @@ type yggdrasilServiceComposite struct {
 	serializationService SerializationService
 	certificateService   CertificateService
 	profileRepo          repository.ProfileRepository
-	tokenRepo            repository.TokenRepository
+	tokenService         TokenService // 使用TokenService接口，不直接依赖TokenRepository
 	logger               *zap.Logger
 }
 
@@ -31,11 +31,11 @@ func NewYggdrasilServiceComposite(
 	db *gorm.DB,
 	userRepo repository.UserRepository,
 	profileRepo repository.ProfileRepository,
-	tokenRepo repository.TokenRepository,
 	yggdrasilRepo repository.YggdrasilRepository,
 	signatureService *SignatureService,
 	redisClient *redis.Client,
 	logger *zap.Logger,
+	tokenService TokenService, // 新增：TokenService接口
 ) YggdrasilService {
 	// 创建各个专门的服务
 	authService := NewYggdrasilAuthService(db, userRepo, yggdrasilRepo, logger)
@@ -53,7 +53,7 @@ func NewYggdrasilServiceComposite(
 		serializationService: serializationService,
 		certificateService:   certificateService,
 		profileRepo:          profileRepo,
-		tokenRepo:            tokenRepo,
+		tokenService:         tokenService,
 		logger:               logger,
 	}
 }
@@ -75,8 +75,8 @@ func (s *yggdrasilServiceComposite) ResetYggdrasilPassword(ctx context.Context,
 
 // JoinServer 加入服务器
 func (s *yggdrasilServiceComposite) JoinServer(ctx context.Context, serverID, accessToken, selectedProfile, ip string) error {
-	// 验证Token
+	// 通过TokenService验证Token并获取UUID
-	token, err := s.tokenRepo.FindByAccessToken(ctx, accessToken)
+	uuid, err := s.tokenService.GetUUIDByAccessToken(ctx, accessToken)
 	if err != nil {
 		s.logger.Error("验证Token失败",
 			zap.Error(err),
@@ -87,7 +87,7 @@ func (s *yggdrasilServiceComposite) JoinServer(ctx context.Context, serverID, ac
 
 	// 格式化UUID并验证与Token关联的配置文件
 	formattedProfile := utils.FormatUUID(selectedProfile)
-	if token.ProfileId != formattedProfile {
+	if uuid != formattedProfile {
 		return errors.New("selectedProfile与Token不匹配")
 	}
 

internal/task/runner.go

@@ -0,0 +1,168 @@
+package task
+
+import (
+	"context"
+	"math/rand"
+	"runtime/debug"
+	"sync"
+	"time"
+
+	"go.uber.org/zap"
+)
+
+// Task 定义可调度任务
+type Task interface {
+	Name() string
+	Interval() time.Duration
+	Run(ctx context.Context) error
+}
+
+// Runner 简单的周期任务调度器
+type Runner struct {
+	tasks            []Task
+	logger           *zap.Logger
+	wg               sync.WaitGroup
+	startImmediately bool
+	jitterPercent    float64
+}
+
+// NewRunner 创建任务调度器
+func NewRunner(logger *zap.Logger, tasks ...Task) *Runner {
+	return NewRunnerWithOptions(logger, tasks)
+}
+
+// RunnerOption 运行器配置项
+type RunnerOption func(r *Runner)
+
+// WithStartImmediately 是否启动后立即执行一次（默认 true）
+func WithStartImmediately(start bool) RunnerOption {
+	return func(r *Runner) {
+		r.startImmediately = start
+	}
+}
+
+// WithJitter 为执行间隔增加 0~percent 之间的随机抖动（percent=0 关闭，默认0）
+// 可降低多个任务同时触发的概率
+func WithJitter(percent float64) RunnerOption {
+	return func(r *Runner) {
+		if percent < 0 {
+			percent = 0
+		}
+		r.jitterPercent = percent
+	}
+}
+
+// NewRunnerWithOptions 支持可选配置的创建函数
+func NewRunnerWithOptions(logger *zap.Logger, tasks []Task, opts ...RunnerOption) *Runner {
+	r := &Runner{
+		tasks:            tasks,
+		logger:           logger,
+		startImmediately: true,
+		jitterPercent:    0,
+	}
+	for _, opt := range opts {
+		opt(r)
+	}
+	return r
+}
+
+// Start 启动所有任务（异步）
+func (r *Runner) Start(ctx context.Context) {
+	for _, t := range r.tasks {
+		task := t
+		r.wg.Add(1)
+		go func() {
+			defer r.wg.Done()
+			defer r.recoverPanic(task)
+
+			interval := r.normalizeInterval(task.Interval())
+
+			// 可选：立即执行一次
+			if r.startImmediately {
+				r.runOnce(ctx, task)
+			}
+
+			// 周期执行
+			for {
+				wait := r.applyJitter(interval)
+				if !r.wait(ctx, wait) {
+					return
+				}
+
+				// 每轮读取最新的 interval，允许任务动态调整间隔
+				interval = r.normalizeInterval(task.Interval())
+
+				select {
+				case <-ctx.Done():
+					return
+				default:
+					r.runOnce(ctx, task)
+				}
+			}
+		}()
+	}
+}
+
+// Wait 等待所有任务退出
+func (r *Runner) Wait() {
+	r.wg.Wait()
+}
+
+func (r *Runner) runOnce(ctx context.Context, task Task) {
+	if err := task.Run(ctx); err != nil && r.logger != nil {
+		r.logger.Warn("任务执行失败", zap.String("task", task.Name()), zap.Error(err))
+	}
+}
+
+// normalizeInterval 确保间隔为正值
+func (r *Runner) normalizeInterval(d time.Duration) time.Duration {
+	if d <= 0 {
+		return time.Minute
+	}
+	return d
+}
+
+// applyJitter 在基础间隔上添加最多 jitterPercent 的随机抖动
+func (r *Runner) applyJitter(base time.Duration) time.Duration {
+	if r.jitterPercent <= 0 {
+		return base
+	}
+	maxJitter := time.Duration(float64(base) * r.jitterPercent)
+	if maxJitter <= 0 {
+		return base
+	}
+	return base + time.Duration(rand.Int63n(int64(maxJitter)))
+}
+
+// wait 封装带 context 的 sleep
+func (r *Runner) wait(ctx context.Context, d time.Duration) bool {
+	if d <= 0 {
+		select {
+		case <-ctx.Done():
+			return false
+		default:
+			return true
+		}
+	}
+
+	timer := time.NewTimer(d)
+	defer timer.Stop()
+
+	select {
+	case <-ctx.Done():
+		return false
+	case <-timer.C:
+		return true
+	}
+}
+
+// recoverPanic 防止任务 panic 导致 goroutine 退出
+func (r *Runner) recoverPanic(task Task) {
+	if rec := recover(); rec != nil && r.logger != nil {
+		r.logger.Error("任务发生panic",
+			zap.String("task", task.Name()),
+			zap.Any("panic", rec),
+			zap.ByteString("stack", debug.Stack()),
+		)
+	}
+}

internal/task/runner_test.go

@@ -0,0 +1,65 @@
+package task
+
+import (
+	"context"
+	"errors"
+	"sync/atomic"
+	"testing"
+	"time"
+
+	"go.uber.org/zap"
+)
+
+type mockTask struct {
+	name     string
+	interval time.Duration
+	err      error
+	runCount *atomic.Int32
+}
+
+func (m *mockTask) Name() string          { return m.name }
+func (m *mockTask) Interval() time.Duration { return m.interval }
+func (m *mockTask) Run(ctx context.Context) error {
+	if m.runCount != nil {
+		m.runCount.Add(1)
+	}
+	return m.err
+}
+
+func TestRunner_StartAndWait(t *testing.T) {
+	runCount := &atomic.Int32{}
+	task := &mockTask{name: "ok", interval: 20 * time.Millisecond, runCount: runCount}
+	runner := NewRunner(zap.NewNop(), task)
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	runner.Start(ctx)
+
+	time.Sleep(60 * time.Millisecond)
+	cancel()
+	runner.Wait()
+
+	if runCount.Load() == 0 {
+		t.Fatalf("expected task to run at least once")
+	}
+}
+
+func TestRunner_RunErrorLogged(t *testing.T) {
+	runCount := &atomic.Int32{}
+	task := &mockTask{name: "err", interval: 10 * time.Millisecond, err: errors.New("boom"), runCount: runCount}
+	runner := NewRunner(zap.NewNop(), task)
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	runner.Start(ctx)
+	time.Sleep(25 * time.Millisecond)
+	cancel()
+	runner.Wait()
+
+	if runCount.Load() == 0 {
+		t.Fatalf("expected task to be attempted")
+	}
+}
+
+
+

internal/testutil/testutil.go

@@ -0,0 +1,56 @@
+package testutil
+
+import (
+	"testing"
+	"time"
+
+	"carrotskin/internal/model"
+	"carrotskin/pkg/database"
+
+	"go.uber.org/zap"
+	"gorm.io/driver/sqlite"
+	"gorm.io/gorm"
+)
+
+// NewTestDB 返回基于内存的 sqlite 数据库并完成模型迁移
+func NewTestDB(t *testing.T) *gorm.DB {
+	t.Helper()
+
+	db, err := gorm.Open(sqlite.Open("file::memory:?cache=shared"), &gorm.Config{})
+	if err != nil {
+		t.Fatalf("failed to open sqlite memory db: %v", err)
+	}
+
+	if err := db.AutoMigrate(
+		&model.User{},
+		&model.UserPointLog{},
+		&model.UserLoginLog{},
+		&model.Profile{},
+		&model.Texture{},
+		&model.UserTextureFavorite{},
+		&model.TextureDownloadLog{},
+		&model.Client{},
+		&model.Yggdrasil{},
+		&model.SystemConfig{},
+		&model.AuditLog{},
+		&model.CasbinRule{},
+	); err != nil {
+		t.Fatalf("failed to migrate models: %v", err)
+	}
+
+	return db
+}
+
+// NewNoopLogger 返回无输出 logger
+func NewNoopLogger() *zap.Logger {
+	return zap.NewNop()
+}
+
+// NewTestCache 返回禁用 redis 的缓存管理器（用于单元测试）
+func NewTestCache() *database.CacheManager {
+	return database.NewCacheManager(nil, database.CacheConfig{
+		Prefix:     "test:",
+		Expiration: 1 * time.Minute,
+		Enabled:    false,
+	})
+}

internal/testutil/testutil_test.go

@@ -0,0 +1,27 @@
+package testutil
+
+import "testing"
+
+func TestNewTestDB(t *testing.T) {
+	db := NewTestDB(t)
+	sqlDB, err := db.DB()
+	if err != nil {
+		t.Fatalf("DB() err: %v", err)
+	}
+	if err := sqlDB.Ping(); err != nil {
+		t.Fatalf("ping err: %v", err)
+	}
+}
+
+func TestNewTestCache(t *testing.T) {
+	cache := NewTestCache()
+	if cache.Policy.UserTTL == 0 {
+		t.Fatalf("expected defaults filled")
+	}
+	// disabled cache should not error on Set
+	if err := cache.Set(nil, "k", "v"); err != nil {
+		t.Fatalf("Set on disabled cache should be nil err, got %v", err)
+	}
+}
+
+

pkg/auth/token_redis.go

@@ -0,0 +1,320 @@
+package auth
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"time"
+
+	"carrotskin/pkg/redis"
+
+	"go.uber.org/zap"
+)
+
+// TokenMetadata Token元数据（存储在Redis中）
+type TokenMetadata struct {
+	UserID      int64  `json:"user_id"`
+	ProfileID   string `json:"profile_id"`
+	ClientUUID  string `json:"client_uuid"`
+	ClientToken string `json:"client_token"`
+	Version     int    `json:"version"`
+	CreatedAt   int64  `json:"created_at"`
+}
+
+// TokenStoreRedis Redis Token存储实现
+type TokenStoreRedis struct {
+	redis            *redis.Client
+	logger           *zap.Logger
+	keyPrefix        string
+	defaultTTL       time.Duration
+	staleTTL         time.Duration
+	maxTokensPerUser int
+}
+
+// NewTokenStoreRedis 创建Redis Token存储
+func NewTokenStoreRedis(
+	redisClient *redis.Client,
+	logger *zap.Logger,
+	opts ...TokenStoreOption,
+) *TokenStoreRedis {
+	options := &tokenStoreOptions{
+		keyPrefix:        "token:",
+		defaultTTL:       24 * time.Hour,
+		staleTTL:         30 * 24 * time.Hour,
+		maxTokensPerUser: 10,
+	}
+
+	for _, opt := range opts {
+		opt(options)
+	}
+
+	return &TokenStoreRedis{
+		redis:            redisClient,
+		logger:           logger,
+		keyPrefix:        options.keyPrefix,
+		defaultTTL:       options.defaultTTL,
+		staleTTL:         options.staleTTL,
+		maxTokensPerUser: options.maxTokensPerUser,
+	}
+}
+
+// tokenStoreOptions Token存储配置选项
+type tokenStoreOptions struct {
+	keyPrefix        string
+	defaultTTL       time.Duration
+	staleTTL         time.Duration
+	maxTokensPerUser int
+}
+
+// TokenStoreOption Token存储配置选项函数
+type TokenStoreOption func(*tokenStoreOptions)
+
+// WithKeyPrefix 设置Key前缀
+func WithKeyPrefix(prefix string) TokenStoreOption {
+	return func(o *tokenStoreOptions) {
+		o.keyPrefix = prefix
+	}
+}
+
+// WithDefaultTTL 设置默认TTL
+func WithDefaultTTL(ttl time.Duration) TokenStoreOption {
+	return func(o *tokenStoreOptions) {
+		o.defaultTTL = ttl
+	}
+}
+
+// WithStaleTTL 设置过期但可用时间
+func WithStaleTTL(ttl time.Duration) TokenStoreOption {
+	return func(o *tokenStoreOptions) {
+		o.staleTTL = ttl
+	}
+}
+
+// WithMaxTokensPerUser 设置每个用户的最大Token数
+func WithMaxTokensPerUser(max int) TokenStoreOption {
+	return func(o *tokenStoreOptions) {
+		o.maxTokensPerUser = max
+	}
+}
+
+// Store 存储Token
+func (s *TokenStoreRedis) Store(ctx context.Context, accessToken string, metadata *TokenMetadata, ttl time.Duration) error {
+	if ttl <= 0 {
+		ttl = s.defaultTTL
+	}
+
+	// 序列化元数据
+	data, err := json.Marshal(metadata)
+	if err != nil {
+		return fmt.Errorf("序列化Token元数据失败: %w", err)
+	}
+
+	// 存储Token
+	tokenKey := s.getTokenKey(accessToken)
+	if err := s.redis.Set(ctx, tokenKey, data, ttl); err != nil {
+		return fmt.Errorf("存储Token失败: %w", err)
+	}
+
+	// 添加到用户Token集合
+	userTokensKey := s.getUserTokensKey(metadata.UserID)
+	if err := s.redis.SAdd(ctx, userTokensKey, accessToken); err != nil {
+		return fmt.Errorf("添加到用户Token集合失败: %w", err)
+	}
+
+	// 清理过期Token（后台执行）
+	go s.cleanupUserTokens(context.Background(), metadata.UserID)
+
+	s.logger.Debug("Token已存储",
+		zap.String("token", accessToken[:20]+"..."),
+		zap.Int64("userId", metadata.UserID),
+		zap.Duration("ttl", ttl),
+	)
+
+	return nil
+}
+
+// Retrieve 获取Token元数据
+func (s *TokenStoreRedis) Retrieve(ctx context.Context, accessToken string) (*TokenMetadata, error) {
+	tokenKey := s.getTokenKey(accessToken)
+	data, err := s.redis.Get(ctx, tokenKey)
+	if err != nil {
+		return nil, fmt.Errorf("获取Token失败: %w", err)
+	}
+
+	var metadata TokenMetadata
+	if err := json.Unmarshal([]byte(data), &metadata); err != nil {
+		return nil, fmt.Errorf("解析Token元数据失败: %w", err)
+	}
+
+	return &metadata, nil
+}
+
+// Delete 删除Token
+func (s *TokenStoreRedis) Delete(ctx context.Context, accessToken string) error {
+	tokenKey := s.getTokenKey(accessToken)
+
+	// 先获取Token元数据以获取UserID
+	metadata, err := s.Retrieve(ctx, accessToken)
+	if err != nil {
+		// Token可能已过期，忽略错误
+		return nil
+	}
+
+	// 删除Token
+	if err := s.redis.Del(ctx, tokenKey); err != nil {
+		return fmt.Errorf("删除Token失败: %w", err)
+	}
+
+	// 从用户Token集合中移除
+	userTokensKey := s.getUserTokensKey(metadata.UserID)
+	if err := s.redis.SRem(ctx, userTokensKey, accessToken); err != nil {
+		return fmt.Errorf("从用户Token集合移除失败: %w", err)
+	}
+
+	s.logger.Debug("Token已删除",
+		zap.String("token", accessToken[:20]+"..."),
+		zap.Int64("userId", metadata.UserID),
+	)
+
+	return nil
+}
+
+// DeleteByUserID 删除用户的所有Token
+func (s *TokenStoreRedis) DeleteByUserID(ctx context.Context, userID int64) error {
+	userTokensKey := s.getUserTokensKey(userID)
+
+	// 获取用户所有Token
+	tokens, err := s.redis.SMembers(ctx, userTokensKey)
+	if err != nil {
+		return fmt.Errorf("获取用户Token列表失败: %w", err)
+	}
+
+	// 删除所有Token
+	if len(tokens) > 0 {
+		tokenKeys := make([]string, len(tokens))
+		for i, token := range tokens {
+			tokenKeys[i] = s.getTokenKey(token)
+		}
+
+		if err := s.redis.Del(ctx, tokenKeys...); err != nil {
+			return fmt.Errorf("批量删除Token失败: %w", err)
+		}
+	}
+
+	// 删除用户Token集合
+	if err := s.redis.Del(ctx, userTokensKey); err != nil {
+		return fmt.Errorf("删除用户Token集合失败: %w", err)
+	}
+
+	s.logger.Info("用户所有Token已删除",
+		zap.Int64("userId", userID),
+		zap.Int("count", len(tokens)),
+	)
+
+	return nil
+}
+
+// Exists 检查Token是否存在
+func (s *TokenStoreRedis) Exists(ctx context.Context, accessToken string) (bool, error) {
+	tokenKey := s.getTokenKey(accessToken)
+	count, err := s.redis.Exists(ctx, tokenKey)
+	if err != nil {
+		return false, fmt.Errorf("检查Token存在失败: %w", err)
+	}
+	return count > 0, nil
+}
+
+// GetTTL 获取Token的剩余TTL
+func (s *TokenStoreRedis) GetTTL(ctx context.Context, accessToken string) (time.Duration, error) {
+	tokenKey := s.getTokenKey(accessToken)
+	return s.redis.TTL(ctx, tokenKey)
+}
+
+// RefreshTTL 刷新Token的TTL
+func (s *TokenStoreRedis) RefreshTTL(ctx context.Context, accessToken string, ttl time.Duration) error {
+	if ttl <= 0 {
+		ttl = s.defaultTTL
+	}
+
+	tokenKey := s.getTokenKey(accessToken)
+	if err := s.redis.Expire(ctx, tokenKey, ttl); err != nil {
+		return fmt.Errorf("刷新Token TTL失败: %w", err)
+	}
+
+	return nil
+}
+
+// GetCountByUser 获取用户的Token数量
+func (s *TokenStoreRedis) GetCountByUser(ctx context.Context, userID int64) (int64, error) {
+	userTokensKey := s.getUserTokensKey(userID)
+	count, err := s.redis.SMembers(ctx, userTokensKey)
+	if err != nil {
+		return 0, fmt.Errorf("获取用户Token数量失败: %w", err)
+	}
+	return int64(len(count)), nil
+}
+
+// cleanupUserTokens 清理用户的过期Token（保留最新的N个）
+func (s *TokenStoreRedis) cleanupUserTokens(ctx context.Context, userID int64) {
+	userTokensKey := s.getUserTokensKey(userID)
+
+	// 获取用户所有Token
+	tokens, err := s.redis.SMembers(ctx, userTokensKey)
+	if err != nil {
+		s.logger.Error("获取用户Token列表失败", zap.Error(err), zap.Int64("userId", userID))
+		return
+	}
+
+	// 清理过期的Token（验证它们是否仍存在）
+	validTokens := make([]string, 0, len(tokens))
+	for _, token := range tokens {
+		tokenKey := s.getTokenKey(token)
+		exists, err := s.redis.Exists(ctx, tokenKey)
+		if err != nil {
+			s.logger.Error("检查Token存在失败", zap.Error(err), zap.String("token", token[:20]+"..."))
+			continue
+		}
+
+		if exists > 0 {
+			validTokens = append(validTokens, token)
+		}
+	}
+
+	// 如果没有变化，直接返回
+	if len(validTokens) == len(tokens) {
+		return
+	}
+
+	// 更新用户Token集合
+	if len(validTokens) == 0 {
+		s.redis.Del(ctx, userTokensKey)
+	} else {
+		// 重新设置集合
+		s.redis.Del(ctx, userTokensKey)
+		for _, token := range validTokens {
+			s.redis.SAdd(ctx, userTokensKey, token)
+		}
+	}
+
+	// 如果超过限制，删除最旧的Token（这里简化处理，可以根据createdAt排序）
+	if len(validTokens) > s.maxTokensPerUser {
+		tokensToDelete := validTokens[s.maxTokensPerUser:]
+		for _, token := range tokensToDelete {
+			s.Delete(ctx, token)
+		}
+		s.logger.Info("清理用户多余Token",
+			zap.Int64("userId", userID),
+			zap.Int("deleted", len(tokensToDelete)),
+		)
+	}
+}
+
+// getTokenKey 生成Token的Redis Key
+func (s *TokenStoreRedis) getTokenKey(accessToken string) string {
+	return s.keyPrefix + accessToken
+}
+
+// getUserTokensKey 生成用户Token集合的Redis Key
+func (s *TokenStoreRedis) getUserTokensKey(userID int64) string {
+	return fmt.Sprintf("user:%d:tokens", userID)
+}

pkg/config/config_load_test.go

@@ -0,0 +1,47 @@
+package config
+
+import (
+	"os"
+	"testing"
+
+	"github.com/spf13/viper"
+)
+
+// 重置 viper，避免测试间干扰
+func resetViper() {
+	viper.Reset()
+}
+
+func TestLoad_DefaultsAndBucketsOverride(t *testing.T) {
+	resetViper()
+	// 设置部分环境变量覆盖
+	_ = os.Setenv("RUSTFS_BUCKET_TEXTURES", "tex-bkt")
+	_ = os.Setenv("RUSTFS_BUCKET_AVATARS", "ava-bkt")
+	_ = os.Setenv("DATABASE_MAX_IDLE_CONNS", "20")
+	_ = os.Setenv("DATABASE_MAX_OPEN_CONNS", "50")
+	_ = os.Setenv("DATABASE_CONN_MAX_LIFETIME", "2h")
+	_ = os.Setenv("DATABASE_CONN_MAX_IDLE_TIME", "30m")
+
+	cfg, err := Load()
+	if err != nil {
+		t.Fatalf("Load err: %v", err)
+	}
+
+	// 默认值检查
+	if cfg.Server.Port == "" || cfg.Database.Driver == "" || cfg.Redis.Host == "" {
+		t.Fatalf("expected defaults filled: %+v", cfg)
+	}
+
+	// 覆盖检查
+	if cfg.RustFS.Buckets["textures"] != "tex-bkt" || cfg.RustFS.Buckets["avatars"] != "ava-bkt" {
+		t.Fatalf("buckets override failed: %+v", cfg.RustFS.Buckets)
+	}
+	if cfg.Database.MaxIdleConns != 20 || cfg.Database.MaxOpenConns != 50 {
+		t.Fatalf("db pool override failed: %+v", cfg.Database)
+	}
+	if cfg.Database.ConnMaxLifetime.String() != "2h0m0s" || cfg.Database.ConnMaxIdleTime.String() != "30m0s" {
+		t.Fatalf("db duration override failed: %v %v", cfg.Database.ConnMaxLifetime, cfg.Database.ConnMaxIdleTime)
+	}
+}
+
+

pkg/database/cache.go

@@ -14,12 +14,24 @@ type CacheConfig struct {
 	Prefix     string        // 缓存键前缀
 	Expiration time.Duration // 过期时间
 	Enabled    bool          // 是否启用缓存
+	Policy     CachePolicy   // 缓存策略（可选，不配置则回落到 Expiration）
+}
+
+// CachePolicy 缓存策略，用于为不同实体设置默认 TTL
+type CachePolicy struct {
+	UserTTL        time.Duration
+	UserEmailTTL   time.Duration
+	ProfileTTL     time.Duration
+	ProfileListTTL time.Duration
+	TextureTTL     time.Duration
+	TextureListTTL time.Duration
 }
 
 // CacheManager 缓存管理器
 type CacheManager struct {
 	redis  *redis.Client
 	config CacheConfig
+	Policy CachePolicy
 }
 
 // NewCacheManager 创建缓存管理器
@@ -31,9 +43,33 @@ func NewCacheManager(redisClient *redis.Client, config CacheConfig) *CacheManage
 		config.Expiration = 5 * time.Minute
 	}
 
+	// 填充默认策略（未配置时退回全局过期时间）
+	applyPolicyDefaults := func(p *CachePolicy) {
+		if p.UserTTL == 0 {
+			p.UserTTL = config.Expiration
+		}
+		if p.UserEmailTTL == 0 {
+			p.UserEmailTTL = config.Expiration
+		}
+		if p.ProfileTTL == 0 {
+			p.ProfileTTL = config.Expiration
+		}
+		if p.ProfileListTTL == 0 {
+			p.ProfileListTTL = config.Expiration
+		}
+		if p.TextureTTL == 0 {
+			p.TextureTTL = config.Expiration
+		}
+		if p.TextureListTTL == 0 {
+			p.TextureListTTL = config.Expiration
+		}
+	}
+	applyPolicyDefaults(&config.Policy)
+
 	return &CacheManager{
 		redis:  redisClient,
 		config: config,
+		Policy: config.Policy,
 	}
 }
 
@@ -56,6 +92,14 @@ func (cm *CacheManager) Get(ctx context.Context, key string, dest interface{}) e
 	return json.Unmarshal(data, dest)
 }
 
+// TryGet 获取缓存，命中时返回 true，不视为错误
+func (cm *CacheManager) TryGet(ctx context.Context, key string, dest interface{}) (bool, error) {
+	if err := cm.Get(ctx, key, dest); err != nil {
+		return false, err
+	}
+	return true, nil
+}
+
 // Set 设置缓存
 func (cm *CacheManager) Set(ctx context.Context, key string, value interface{}, expiration ...time.Duration) error {
 	if !cm.config.Enabled || cm.redis == nil {
@@ -75,6 +119,13 @@ func (cm *CacheManager) Set(ctx context.Context, key string, value interface{},
 	return cm.redis.Set(ctx, cm.buildKey(key), data, exp)
 }
 
+// SetAsync 异步设置缓存，避免在主请求链路阻塞
+func (cm *CacheManager) SetAsync(ctx context.Context, key string, value interface{}, expiration ...time.Duration) {
+	go func() {
+		_ = cm.Set(ctx, key, value, expiration...)
+	}()
+}
+
 // Delete 删除缓存
 func (cm *CacheManager) Delete(ctx context.Context, keys ...string) error {
 	if !cm.config.Enabled || cm.redis == nil {
@@ -187,11 +238,7 @@ func Cached[T any](
 	}
 
 	// 设置缓存（异步，不阻塞）
-	go func() {
+	cache.SetAsync(context.Background(), key, data, expiration...)
-		cacheCtx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-		defer cancel()
-		_ = cache.Set(cacheCtx, key, data, expiration...)
-	}()
 
 	return data, nil
 }
@@ -217,11 +264,7 @@ func CachedList[T any](
 	}
 
 	// 设置缓存（异步，不阻塞）
-	go func() {
+	cache.SetAsync(context.Background(), key, data, expiration...)
-		cacheCtx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-		defer cancel()
-		_ = cache.Set(cacheCtx, key, data, expiration...)
-	}()
 
 	return data, nil
 }
@@ -306,6 +349,11 @@ func (b *CacheKeyBuilder) TextureList(userID int64, page int) string {
 	return fmt.Sprintf("%stexture:user:%d:page:%d", b.prefix, userID, page)
 }
 
+// TextureListPattern 构建材质列表缓存键模式（用于批量失效）
+func (b *CacheKeyBuilder) TextureListPattern(userID int64) string {
+	return fmt.Sprintf("%stexture:user:%d:*", b.prefix, userID)
+}
+
 // Token 构建令牌缓存键
 func (b *CacheKeyBuilder) Token(accessToken string) string {
 	return fmt.Sprintf("%stoken:%s", b.prefix, accessToken)

pkg/database/cache_test.go

@@ -0,0 +1,184 @@
+package database
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	pkgRedis "carrotskin/pkg/redis"
+
+	miniredis "github.com/alicebob/miniredis/v2"
+	goRedis "github.com/redis/go-redis/v9"
+)
+
+func newCacheWithMiniRedis(t *testing.T) (*CacheManager, func()) {
+	t.Helper()
+
+	mr, err := miniredis.Run()
+	if err != nil {
+		t.Fatalf("failed to start miniredis: %v", err)
+	}
+
+	rdb := goRedis.NewClient(&goRedis.Options{
+		Addr: mr.Addr(),
+	})
+	client := &pkgRedis.Client{Client: rdb}
+
+	cache := NewCacheManager(client, CacheConfig{
+		Prefix:     "t:",
+		Expiration: time.Minute,
+		Enabled:    true,
+		Policy: CachePolicy{
+			UserTTL:        2 * time.Minute,
+			UserEmailTTL:   3 * time.Minute,
+			ProfileTTL:     2 * time.Minute,
+			ProfileListTTL: 90 * time.Second,
+			TextureTTL:     2 * time.Minute,
+			TextureListTTL: 45 * time.Second,
+		},
+	})
+
+	cleanup := func() {
+		_ = rdb.Close()
+		mr.Close()
+	}
+	return cache, cleanup
+}
+
+func TestCacheManager_GetSet_TryGet(t *testing.T) {
+	cache, cleanup := newCacheWithMiniRedis(t)
+	defer cleanup()
+
+	ctx := context.Background()
+	type User struct {
+		ID   int
+		Name string
+	}
+
+	u := User{ID: 1, Name: "alice"}
+	if err := cache.Set(ctx, "user:1", u, 10*time.Second); err != nil {
+		t.Fatalf("Set err: %v", err)
+	}
+
+	var got User
+	if err := cache.Get(ctx, "user:1", &got); err != nil {
+		t.Fatalf("Get err: %v", err)
+	}
+	if got != u {
+		t.Fatalf("unexpected value: %+v", got)
+	}
+
+	var got2 User
+	ok, err := cache.TryGet(ctx, "user:1", &got2)
+	if err != nil || !ok {
+		t.Fatalf("TryGet failed, ok=%v err=%v", ok, err)
+	}
+	if got2 != u {
+		t.Fatalf("unexpected TryGet: %+v", got2)
+	}
+}
+
+func TestCacheManager_DeletePattern(t *testing.T) {
+	cache, cleanup := newCacheWithMiniRedis(t)
+	defer cleanup()
+	ctx := context.Background()
+
+	_ = cache.Set(ctx, "user:1", "a", 0)
+	_ = cache.Set(ctx, "user:2", "b", 0)
+	_ = cache.Set(ctx, "profile:1", "c", 0)
+
+	// 删除 user:* 键
+	if err := cache.DeletePattern(ctx, "user:*"); err != nil {
+		t.Fatalf("DeletePattern err: %v", err)
+	}
+
+	var v string
+	ok, _ := cache.TryGet(ctx, "user:1", &v)
+	if ok {
+		t.Fatalf("expected user:1 deleted")
+	}
+	ok, _ = cache.TryGet(ctx, "user:2", &v)
+	if ok {
+		t.Fatalf("expected user:2 deleted")
+	}
+	ok, _ = cache.TryGet(ctx, "profile:1", &v)
+	if !ok {
+		t.Fatalf("expected profile:1 kept")
+	}
+}
+
+func TestCachedAndCachedList(t *testing.T) {
+	cache, cleanup := newCacheWithMiniRedis(t)
+	defer cleanup()
+	ctx := context.Background()
+
+	callCount := 0
+	result, err := Cached(ctx, cache, "key1", func() (*string, error) {
+		callCount++
+		val := "hello"
+		return &val, nil
+	}, cache.Policy.UserTTL)
+	if err != nil || *result != "hello" || callCount != 1 {
+		t.Fatalf("Cached first call failed")
+	}
+	// 等待缓存写入完成
+	for i := 0; i < 10; i++ {
+		var tmp string
+		if ok, _ := cache.TryGet(ctx, "key1", &tmp); ok {
+			break
+		}
+		time.Sleep(10 * time.Millisecond)
+	}
+
+	// 第二次应命中缓存
+	_, err = Cached(ctx, cache, "key1", func() (*string, error) {
+		callCount++
+		val := "world"
+		return &val, nil
+	}, cache.Policy.UserTTL)
+	if err != nil || callCount != 1 {
+		t.Fatalf("Cached should hit cache, callCount=%d err=%v", callCount, err)
+	}
+
+	listCall := 0
+	_, err = CachedList(ctx, cache, "list", func() ([]string, error) {
+		listCall++
+		return []string{"a", "b"}, nil
+	}, cache.Policy.ProfileListTTL)
+	if err != nil || listCall != 1 {
+		t.Fatalf("CachedList first call failed")
+	}
+	for i := 0; i < 10; i++ {
+		var tmp []string
+		if ok, _ := cache.TryGet(ctx, "list", &tmp); ok {
+			break
+		}
+		time.Sleep(10 * time.Millisecond)
+	}
+	_, err = CachedList(ctx, cache, "list", func() ([]string, error) {
+		listCall++
+		return []string{"c"}, nil
+	}, cache.Policy.ProfileListTTL)
+	if err != nil || listCall != 1 {
+		t.Fatalf("CachedList should hit cache, calls=%d err=%v", listCall, err)
+	}
+}
+
+func TestIncrementWithExpire(t *testing.T) {
+	cache, cleanup := newCacheWithMiniRedis(t)
+	defer cleanup()
+	ctx := context.Background()
+
+	val, err := cache.IncrementWithExpire(ctx, "counter", time.Second)
+	if err != nil || val != 1 {
+		t.Fatalf("first increment failed, val=%d err=%v", val, err)
+	}
+	val, err = cache.IncrementWithExpire(ctx, "counter", time.Second)
+	if err != nil || val != 2 {
+		t.Fatalf("second increment failed, val=%d err=%v", val, err)
+	}
+	ttl, err := cache.TTL(ctx, "counter")
+	if err != nil || ttl <= 0 {
+		t.Fatalf("TTL not set: ttl=%v err=%v", ttl, err)
+	}
+}

pkg/database/manager.go

@@ -75,7 +75,6 @@ func AutoMigrate(logger *zap.Logger) error {
 		&model.TextureDownloadLog{},
 
 		// 认证相关表
-		&model.Token{},
 		&model.Client{}, // Client表用于管理Token版本
 
 		// Yggdrasil相关表（在User之后创建，因为它引用User）

pkg/database/manager_sqlite_test.go

@@ -0,0 +1,24 @@
+package database
+
+import (
+	"testing"
+
+	"go.uber.org/zap/zaptest"
+	"gorm.io/driver/sqlite"
+	"gorm.io/gorm"
+)
+
+// 使用内存 sqlite 验证 AutoMigrate 关键路径，无需真实 Postgres
+func TestAutoMigrate_WithSQLite(t *testing.T) {
+	db, err := gorm.Open(sqlite.Open("file::memory:?cache=shared"), &gorm.Config{})
+	if err != nil {
+		t.Fatalf("open sqlite err: %v", err)
+	}
+	dbInstance = db
+	defer func() { dbInstance = nil }()
+
+	logger := zaptest.NewLogger(t)
+	if err := AutoMigrate(logger); err != nil {
+		t.Fatalf("AutoMigrate sqlite err: %v", err)
+	}
+}

pkg/database/manager_test.go

@@ -9,11 +9,12 @@ import (
 
 // TestGetDB_NotInitialized 测试未初始化时获取数据库实例
 func TestGetDB_NotInitialized(t *testing.T) {
+	dbInstance = nil
 	_, err := GetDB()
 	if err == nil {
 		t.Error("未初始化时应该返回错误")
 	}
-	
+
 	expectedError := "数据库未初始化，请先调用 database.Init()"
 	if err.Error() != expectedError {
 		t.Errorf("错误消息 = %q, want %q", err.Error(), expectedError)
@@ -22,17 +23,19 @@ func TestGetDB_NotInitialized(t *testing.T) {
 
 // TestMustGetDB_Panic 测试MustGetDB在未初始化时panic
 func TestMustGetDB_Panic(t *testing.T) {
+	dbInstance = nil
 	defer func() {
 		if r := recover(); r == nil {
 			t.Error("MustGetDB 应该在未初始化时panic")
 		}
 	}()
-	
+
 	_ = MustGetDB()
 }
 
 // TestInit_Database 测试数据库初始化逻辑
 func TestInit_Database(t *testing.T) {
+	dbInstance = nil
 	cfg := config.DatabaseConfig{
 		Driver:          "postgres",
 		Host:            "localhost",
@@ -46,21 +49,21 @@ func TestInit_Database(t *testing.T) {
 		MaxOpenConns:    100,
 		ConnMaxLifetime: 0,
 	}
-	
+
 	logger := zaptest.NewLogger(t)
-	
+
 	// 验证Init函数存在且可调用
 	// 注意：实际连接可能失败，这是可以接受的
 	err := Init(cfg, logger)
 	if err != nil {
-		t.Logf("Init() 返回错误（可能正常，如果数据库未运行）: %v", err)
+		t.Skipf("数据库未运行，跳过连接测试: %v", err)
 	}
 }
 
 // TestAutoMigrate_ErrorHandling 测试AutoMigrate的错误处理逻辑
 func TestAutoMigrate_ErrorHandling(t *testing.T) {
 	logger := zaptest.NewLogger(t)
-	
+
 	// 测试未初始化时的错误处理
 	err := AutoMigrate(logger)
 	if err == nil {
@@ -82,4 +85,3 @@ func TestClose_NotInitialized(t *testing.T) {
 		t.Errorf("Close() 在未初始化时应该返回nil，实际返回: %v", err)
 	}
 }
-

pkg/email/email_test.go

@@ -0,0 +1,56 @@
+package email
+
+import (
+	"strings"
+	"sync"
+	"testing"
+
+	"carrotskin/pkg/config"
+
+	"go.uber.org/zap"
+)
+
+func resetEmailOnce() {
+	serviceInstance = nil
+	once = sync.Once{}
+}
+
+func TestEmailManager_Disabled(t *testing.T) {
+	resetEmailOnce()
+	cfg := config.EmailConfig{Enabled: false}
+	if err := Init(cfg, zap.NewNop()); err != nil {
+		t.Fatalf("Init disabled err: %v", err)
+	}
+	svc := MustGetService()
+	if err := svc.SendVerificationCode("to@test.com", "123456", "email_verification"); err == nil {
+		t.Fatalf("expected error when disabled")
+	}
+}
+
+func TestEmailManager_SendFailsWithInvalidSMTP(t *testing.T) {
+	resetEmailOnce()
+	cfg := config.EmailConfig{
+		Enabled:  true,
+		SMTPHost: "127.0.0.1",
+		SMTPPort: 1, // invalid/closed port to trigger error quickly
+		Username: "user",
+		Password: "pwd",
+		FromName: "name",
+	}
+	_ = Init(cfg, zap.NewNop())
+	svc := MustGetService()
+	if err := svc.SendVerificationCode("to@test.com", "123456", "reset_password"); err == nil {
+		t.Fatalf("expected send error with invalid smtp")
+	}
+}
+
+func TestEmailManager_SubjectAndBody(t *testing.T) {
+	svc := &Service{cfg: config.EmailConfig{FromName: "name", Username: "user"}, logger: zap.NewNop()}
+	if subj := svc.getSubject("email_verification"); subj == "" {
+		t.Fatalf("subject empty")
+	}
+	body := svc.getBody("123456", "change_email")
+	if !strings.Contains(body, "123456") || !strings.Contains(body, "更换邮箱") {
+		t.Fatalf("body content mismatch")
+	}
+}

pkg/email/manager_test.go

@@ -2,18 +2,25 @@ package email
 
 import (
 	"carrotskin/pkg/config"
+	"sync"
 	"testing"
 
 	"go.uber.org/zap/zaptest"
 )
 
+func resetEmail() {
+	serviceInstance = nil
+	once = sync.Once{}
+}
+
 // TestGetService_NotInitialized 测试未初始化时获取邮件服务
 func TestGetService_NotInitialized(t *testing.T) {
+	resetEmail()
 	_, err := GetService()
 	if err == nil {
 		t.Error("未初始化时应该返回错误")
 	}
-	
+
 	expectedError := "邮件服务未初始化，请先调用 email.Init()"
 	if err.Error() != expectedError {
 		t.Errorf("错误消息 = %q, want %q", err.Error(), expectedError)
@@ -22,33 +29,35 @@ func TestGetService_NotInitialized(t *testing.T) {
 
 // TestMustGetService_Panic 测试MustGetService在未初始化时panic
 func TestMustGetService_Panic(t *testing.T) {
+	resetEmail()
 	defer func() {
 		if r := recover(); r == nil {
 			t.Error("MustGetService 应该在未初始化时panic")
 		}
 	}()
-	
+
 	_ = MustGetService()
 }
 
 // TestInit_Email 测试邮件服务初始化
 func TestInit_Email(t *testing.T) {
+	resetEmail()
 	cfg := config.EmailConfig{
 		Enabled:  false,
-		SMTPHost:  "smtp.example.com",
+		SMTPHost: "smtp.example.com",
-		SMTPPort:  587,
+		SMTPPort: 587,
-		Username:  "user@example.com",
+		Username: "user@example.com",
-		Password:  "password",
+		Password: "password",
-		FromName:  "noreply@example.com",
+		FromName: "noreply@example.com",
 	}
-	
+
 	logger := zaptest.NewLogger(t)
-	
+
 	err := Init(cfg, logger)
 	if err != nil {
 		t.Errorf("Init() 错误 = %v, want nil", err)
 	}
-	
+
 	// 验证可以获取服务
 	service, err := GetService()
 	if err != nil {
@@ -58,4 +67,3 @@ func TestInit_Email(t *testing.T) {
 		t.Error("GetService() 返回的服务不应为nil")
 	}
 }
-

pkg/redis/manager.go

@@ -3,8 +3,11 @@ package redis
 import (
 	"carrotskin/pkg/config"
 	"fmt"
+	"os"
 	"sync"
 
+	"github.com/alicebob/miniredis/v2"
+	redis9 "github.com/redis/go-redis/v9"
 	"go.uber.org/zap"
 )
 
@@ -15,19 +18,69 @@ var (
 	once sync.Once
 	// initError 初始化错误
 	initError error
+	// miniredisInstance 用于测试/开发环境
+	miniredisInstance *miniredis.Miniredis
 )
 
 // Init 初始化Redis客户端（线程安全，只会执行一次）
+// 如果Redis连接失败且环境为测试/开发，则回退到miniredis
 func Init(cfg config.RedisConfig, logger *zap.Logger) error {
+	var err error
 	once.Do(func() {
-		clientInstance, initError = New(cfg, logger)
+		// 尝试连接真实Redis
-		if initError != nil {
+		clientInstance, err = New(cfg, logger)
-			return
+		if err != nil {
+			logger.Warn("Redis连接失败，尝试使用miniredis回退", zap.Error(err))
+
+			// 检查是否允许回退到miniredis（仅开发/测试环境）
+			if allowFallbackToMiniRedis() {
+				clientInstance, err = initMiniRedis(logger)
+				if err != nil {
+					initError = fmt.Errorf("Redis和miniredis都初始化失败: %w", err)
+					logger.Error("miniredis初始化失败", zap.Error(initError))
+					return
+				}
+				logger.Info("已回退到miniredis用于开发/测试环境")
+			} else {
+				initError = fmt.Errorf("Redis连接失败且不允许回退: %w", err)
+				logger.Error("Redis连接失败", zap.Error(initError))
+				return
+			}
 		}
 	})
 	return initError
 }
 
+// allowFallbackToMiniRedis 检查是否允许回退到miniredis
+func allowFallbackToMiniRedis() bool {
+	// 检查环境变量
+	env := os.Getenv("ENVIRONMENT")
+	return env == "development" || env == "test" || env == "dev" ||
+		os.Getenv("USE_MINIREDIS") == "true"
+}
+
+// initMiniRedis 初始化miniredis（用于开发/测试环境）
+func initMiniRedis(logger *zap.Logger) (*Client, error) {
+	var err error
+	miniredisInstance, err = miniredis.Run()
+	if err != nil {
+		return nil, fmt.Errorf("启动miniredis失败: %w", err)
+	}
+
+	// 创建Redis客户端连接到miniredis
+	redisClient := redis9.NewClient(&redis9.Options{
+		Addr: miniredisInstance.Addr(),
+	})
+
+	client := &Client{
+		Client: redisClient,
+		logger: logger,
+	}
+
+	logger.Info("miniredis已启动", zap.String("addr", miniredisInstance.Addr()))
+	return client, nil
+}
+
 // GetClient 获取Redis客户端实例（线程安全）
 func GetClient() (*Client, error) {
 	if clientInstance == nil {
@@ -45,13 +98,21 @@ func MustGetClient() *Client {
 	return client
 }
 
+// Close 关闭Redis连接（包括miniredis如果使用了）
+func Close() error {
+	var err error
+	if miniredisInstance != nil {
+		miniredisInstance.Close()
+		miniredisInstance = nil
+	}
+	if clientInstance != nil {
+		err = clientInstance.Close()
+		clientInstance = nil
+	}
+	return err
+}
 
-
+// IsUsingMiniRedis 检查是否使用了miniredis
-
+func IsUsingMiniRedis() bool {
-
+	return miniredisInstance != nil
-
+}
-
-
-
-
-

pkg/storage/minio_test.go

@@ -0,0 +1,71 @@
+package storage
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"carrotskin/pkg/config"
+
+	"github.com/minio/minio-go/v7"
+)
+
+// 使用 nil client 仅测试纯函数和错误分支
+func TestStorage_GetBucketAndBuildURL(t *testing.T) {
+	s := &StorageClient{
+		client:    (*minio.Client)(nil),
+		buckets:   map[string]string{"textures": "tex-bkt"},
+		publicURL: "http://localhost:9000",
+	}
+
+	if b, err := s.GetBucket("textures"); err != nil || b != "tex-bkt" {
+		t.Fatalf("GetBucket mismatch: %v %s", err, b)
+	}
+	if _, err := s.GetBucket("missing"); err == nil {
+		t.Fatalf("expected error for missing bucket")
+	}
+
+	if url := s.BuildFileURL("tex-bkt", "obj"); url != "http://localhost:9000/tex-bkt/obj" {
+		t.Fatalf("BuildFileURL mismatch: %s", url)
+	}
+}
+
+func TestNewStorage_SkipConnectWhenNoCreds(t *testing.T) {
+	// 当 AccessKey/Secret 为空时跳过 ListBuckets 测试，避免真实依赖
+	cfg := config.RustFSConfig{
+		Endpoint: "127.0.0.1:9000",
+		Buckets:  map[string]string{"avatars": "ava", "textures": "tex"},
+		UseSSL:   false,
+	}
+	if _, err := NewStorage(cfg); err != nil {
+		t.Fatalf("NewStorage should not error when creds empty: %v", err)
+	}
+}
+
+func TestPresignedHelpers_WithNilClient(t *testing.T) {
+	s := &StorageClient{
+		client:    (*minio.Client)(nil),
+		buckets:   map[string]string{"textures": "tex-bkt"},
+		publicURL: "http://localhost:9000",
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+
+	// 预期会panic（nil client），用recover捕获
+	func() {
+		defer func() {
+			if r := recover(); r == nil {
+				t.Fatalf("GeneratePresignedURL expected panic with nil client")
+			}
+		}()
+		_, _ = s.GeneratePresignedURL(ctx, "tex-bkt", "obj", time.Minute)
+	}()
+	func() {
+		defer func() {
+			if r := recover(); r == nil {
+				t.Fatalf("GeneratePresignedPostURL expected panic with nil client")
+			}
+		}()
+		_, _ = s.GeneratePresignedPostURL(ctx, "tex-bkt", "obj", 0, 10, time.Minute)
+	}()
+}