皮肤部分拿apifox测过了

- Removed the build stage from the Dockerfile, simplifying the image creation process.
- Updated the Dockerfile to directly copy the pre-built binary instead of using a multi-stage build.
- Modified the build workflow to eliminate unnecessary build arguments, streamlining the configuration.

.env

@@ -1,6 +1,3 @@
-# CarrotSkin 环境配置文件示例
-# 复制此文件为 .env 并修改相应的配置值
-
 # =============================================================================
 # 站点配置
 # =============================================================================
@@ -34,10 +31,10 @@ SERVER_SWAGGER_ENABLED=true
 # 数据库配置
 # =============================================================================
 DATABASE_DRIVER=postgres
-DATABASE_HOST=localhost
+DATABASE_HOST=120.27.110.94
 DATABASE_PORT=5432
-DATABASE_USERNAME=postgres
-DATABASE_PASSWORD=your_password_here
+DATABASE_USERNAME=user_wc2MbZ
+DATABASE_PASSWORD=password_65b5aN
 DATABASE_NAME=carrotskin
 DATABASE_SSL_MODE=disable
 DATABASE_TIMEZONE=Asia/Shanghai
@@ -49,19 +46,19 @@ DATABASE_CONN_MAX_IDLE_TIME=10m
 # =============================================================================
 # Redis配置
 # =============================================================================
-REDIS_HOST=localhost
+REDIS_HOST=120.27.110.94
 REDIS_PORT=6379
-REDIS_PASSWORD=
+REDIS_PASSWORD=redis_ZXjbN5
 REDIS_DATABASE=0
 REDIS_POOL_SIZE=10
 
 # =============================================================================
 # RustFS对象存储配置 (S3兼容)
 # =============================================================================
-RUSTFS_ENDPOINT=127.0.0.1:9000
-RUSTFS_PUBLIC_URL=http://127.0.0.1:9000
-RUSTFS_ACCESS_KEY=your_access_key
-RUSTFS_SECRET_KEY=your_secret_key
+RUSTFS_ENDPOINT=120.27.110.94:9000
+RUSTFS_PUBLIC_URL=http://120.27.110.94:9000
+RUSTFS_ACCESS_KEY=ftbulyR6rj0AZ4n5ID7g
+RUSTFS_SECRET_KEY=P8q3VZ1wfMEdGJayu4sxh7NRSAB2H0tkFeTQlXLW
 RUSTFS_USE_SSL=false
 RUSTFS_BUCKET_TEXTURES=carrot-skin-textures
 RUSTFS_BUCKET_AVATARS=carrot-skin-avatars
@@ -78,6 +75,18 @@ JWT_EXPIRE_HOURS=168
 LOG_LEVEL=info
 LOG_FORMAT=json
 LOG_OUTPUT=logs/app.log
+# 保留的旧配置项
+LOG_MAX_SIZE=100
+LOG_MAX_BACKUPS=3
+LOG_MAX_AGE=28
+LOG_COMPRESS=true
+
+# =============================================================================
+# 文件上传配置 (保留的旧配置项)
+# =============================================================================
+UPLOAD_MAX_SIZE=10485760
+UPLOAD_TEXTURE_MAX_SIZE=2097152
+UPLOAD_AVATAR_MAX_SIZE=1048576
 
 # =============================================================================
 # 安全配置
@@ -85,15 +94,17 @@ LOG_OUTPUT=logs/app.log
 # CORS 允许的来源，多个用逗号分隔
 SECURITY_ALLOWED_ORIGINS=*
 # 允许的头像/材质URL域名，多个用逗号分隔
-SECURITY_ALLOWED_DOMAINS=localhost,127.0.0.1
+SECURITY_ALLOWED_DOMAINS=localhost,127.0.0.1,120.27.110.94
+# 保留的旧配置项
+MAX_LOGIN_ATTEMPTS=5
+LOGIN_LOCK_DURATION=30m
 
 # =============================================================================
 # 邮件配置
-# 腾讯企业邮箱SSL配置示例：smtp.exmail.qq.com, 端口465
 # =============================================================================
-EMAIL_ENABLED=false
-EMAIL_SMTP_HOST=smtp.example.com
-EMAIL_SMTP_PORT=587
-EMAIL_USERNAME=noreply@example.com
-EMAIL_PASSWORD=your-email-password
-EMAIL_FROM_NAME=CarrotSkin
+EMAIL_ENABLED=true
+EMAIL_SMTP_HOST=smtp.exmail.qq.com
+EMAIL_SMTP_PORT=465
+EMAIL_USERNAME=system@qczlit.cn
+EMAIL_PASSWORD=545mkewZwMzEWUjD
+EMAIL_FROM_NAME=CarrotSkin

.gitea/workflows/build.yml

@@ -0,0 +1,73 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - master
+      - dev
+  pull_request:
+    branches:
+      - master
+      - dev
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.25'
+          cache: false
+
+      - name: Download dependencies
+        run: go mod download
+
+
+      - name: Build
+        env:
+          GOOS: linux
+          GOARCH: amd64
+          CGO_ENABLED: 0
+        run: go build -v -o mcauth-linux-amd64 ./cmd/server
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: mcauth-linux-amd64
+          path: mcauth-linux-amd64
+
+  build-docker:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Gitea Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: code.littlelan.cn
+          username: ${{ secrets.GIT_USERNAME }}
+          password: ${{ secrets.GIT_TOKEN }}
+
+      - name: Download artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: mcauth-linux-amd64
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: |
+            code.littlelan.cn/carrotskin/mcauth:latest
+            code.littlelan.cn/carrotskin/mcauth:${{ github.sha }}
+          platforms: linux/amd64

.gitignore

@@ -60,7 +60,7 @@ configs/config.yaml
 .env.production
 
 # Keep example files
-!.env.example
+!.env
 
 # Database files
 *.db

Dockerfile

@@ -0,0 +1,35 @@
+# 运行阶段
+FROM alpine:latest
+
+# 安装必要的运行时依赖
+RUN apk add --no-cache ca-certificates tzdata wget
+
+# 创建非 root 用户
+RUN addgroup -g 1000 appuser && \
+    adduser -D -u 1000 -G appuser appuser
+
+# 设置工作目录
+WORKDIR /app
+
+# 复制已经编译好的二进制文件
+ARG BINARY_NAME=mcauth-linux-amd64
+COPY ${BINARY_NAME} /app/server
+
+# 复制配置文件（如果需要）
+COPY configs/ /app/configs/
+
+# 设置权限
+RUN chown -R appuser:appuser /app
+
+# 切换到非 root 用户
+USER appuser
+
+# 暴露端口
+EXPOSE 8080
+
+# 健康检查
+HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
+    CMD wget --no-verbose --tries=1 --spider http://localhost:8080/health || exit 1
+
+# 启动应用
+ENTRYPOINT ["/app/server"]

README.md

@@ -72,7 +72,7 @@ backend/
 
 3. **配置环境变量**
    ```bash
-   cp .env.example .env
+   cp .env .env
    # 根据实际环境填写数据库、Redis、对象存储、邮件等信息
    ```
 

cmd/server/main.go

@@ -17,6 +17,7 @@ import (
 	"os/signal"
 	"syscall"
 	"time"
+	_ "time/tzdata"
 
 	"carrotskin/internal/container"
 	"carrotskin/internal/handler"
@@ -32,8 +33,6 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
-
-	_ "carrotskin/docs" // Swagger docs
 )
 
 func main() {

internal/handler/helpers.go

@@ -62,6 +62,19 @@ func UserToUserInfo(user *model.User) *types.UserInfo {
 	}
 }
 
+// UserToPublicUserInfo 将 User 模型转换为 PublicUserInfo 响应
+func UserToPublicUserInfo(user *model.User) *types.PublicUserInfo {
+	return &types.PublicUserInfo{
+		ID:        user.ID,
+		Username:  user.Username,
+		Avatar:    user.Avatar,
+		Points:    user.Points,
+		Role:      user.Role,
+		Status:    user.Status,
+		CreatedAt: user.CreatedAt,
+	}
+}
+
 // ProfileToProfileInfo 将 Profile 模型转换为 ProfileInfo 响应
 func ProfileToProfileInfo(profile *model.Profile) *types.ProfileInfo {
 	return &types.ProfileInfo{
@@ -87,22 +100,28 @@ func ProfilesToProfileInfos(profiles []*model.Profile) []*types.ProfileInfo {
 
 // TextureToTextureInfo 将 Texture 模型转换为 TextureInfo 响应
 func TextureToTextureInfo(texture *model.Texture) *types.TextureInfo {
+	uploaderUsername := ""
+	if texture.Uploader != nil {
+		uploaderUsername = texture.Uploader.Username
+	}
+
 	return &types.TextureInfo{
-		ID:            texture.ID,
-		UploaderID:    texture.UploaderID,
-		Name:          texture.Name,
-		Description:   texture.Description,
-		Type:          types.TextureType(texture.Type),
-		URL:           texture.URL,
-		Hash:          texture.Hash,
-		Size:          texture.Size,
-		IsPublic:      texture.IsPublic,
-		DownloadCount: texture.DownloadCount,
-		FavoriteCount: texture.FavoriteCount,
-		IsSlim:        texture.IsSlim,
-		Status:        texture.Status,
-		CreatedAt:     texture.CreatedAt,
-		UpdatedAt:     texture.UpdatedAt,
+		ID:               texture.ID,
+		UploaderID:       texture.UploaderID,
+		UploaderUsername: uploaderUsername,
+		Name:             texture.Name,
+		Description:      texture.Description,
+		Type:             types.TextureType(texture.Type),
+		URL:              texture.URL,
+		Hash:             texture.Hash,
+		Size:             texture.Size,
+		IsPublic:         texture.IsPublic,
+		DownloadCount:    texture.DownloadCount,
+		FavoriteCount:    texture.FavoriteCount,
+		IsSlim:           texture.IsSlim,
+		Status:           texture.Status,
+		CreatedAt:        texture.CreatedAt,
+		UpdatedAt:        texture.UpdatedAt,
 	}
 }
 

internal/handler/routes.go

@@ -93,6 +93,10 @@ func registerAuthRoutes(v1 *gin.RouterGroup, h *AuthHandler) {
 
 // registerUserRoutes 注册用户路由
 func registerUserRoutes(v1 *gin.RouterGroup, h *UserHandler, jwtService *auth.JWTService) {
+	// 公开用户信息路由（无需认证）
+	v1.GET("/users/public", h.GetPublicInfo)
+
+	// 需要认证的用户路由
 	userGroup := v1.Group("/user")
 	userGroup.Use(middleware.AuthMiddleware(jwtService))
 	{

internal/handler/user_handler.go

@@ -2,6 +2,7 @@ package handler
 
 import (
 	"carrotskin/internal/container"
+	"carrotskin/internal/model"
 	"carrotskin/internal/service"
 	"carrotskin/internal/types"
 
@@ -315,3 +316,55 @@ func (h *UserHandler) ResetYggdrasilPassword(c *gin.Context) {
 	h.logger.Info("Yggdrasil密码重置成功", zap.Int64("userId", userID))
 	RespondSuccess(c, gin.H{"password": newPassword})
 }
+
+// GetPublicInfo 获取用户公开信息
+// @Summary 获取用户公开信息
+// @Description 根据用户名或用户ID获取用户的公开信息（不包含敏感信息如邮箱）
+// @Tags user
+// @Accept json
+// @Produce json
+// @Param username query string false "用户名"
+// @Param id query int false "用户ID"
+// @Success 200 {object} model.Response{data=types.PublicUserInfo} "获取成功"
+// @Failure 400 {object} model.ErrorResponse "参数错误"
+// @Failure 404 {object} model.ErrorResponse "用户不存在"
+// @Router /api/v1/users/public [get]
+func (h *UserHandler) GetPublicInfo(c *gin.Context) {
+	username := c.Query("username")
+	idStr := c.Query("id")
+
+	// 至少需要提供一个参数
+	if username == "" && idStr == "" {
+		RespondBadRequest(c, "必须提供用户名或用户ID", nil)
+		return
+	}
+
+	var user *model.User
+	var err error
+
+	// 优先使用用户名查询
+	if username != "" {
+		user, err = h.container.UserService.GetByUsername(c.Request.Context(), username)
+	} else {
+		// 使用用户ID查询
+		id := parseIntWithDefault(idStr, 0)
+		if id == 0 {
+			RespondBadRequest(c, "无效的用户ID", nil)
+			return
+		}
+		user, err = h.container.UserService.GetByID(c.Request.Context(), int64(id))
+	}
+
+	if err != nil || user == nil {
+		RespondNotFound(c, "用户不存在")
+		return
+	}
+
+	// 检查用户状态
+	if user.Status != 1 {
+		RespondNotFound(c, "用户不可用")
+		return
+	}
+
+	RespondSuccess(c, UserToPublicUserInfo(user))
+}

internal/repository/interfaces.go

@@ -56,17 +56,12 @@ type TextureRepository interface {
 	Delete(ctx context.Context, id int64) error
 	BatchDelete(ctx context.Context, ids []int64) (int64, error) // 批量删除
 	IncrementDownloadCount(ctx context.Context, id int64) error
-	IncrementFavoriteCount(ctx context.Context, id int64) error
-	DecrementFavoriteCount(ctx context.Context, id int64) error
 	CreateDownloadLog(ctx context.Context, log *model.TextureDownloadLog) error
-	IsFavorited(ctx context.Context, userID, textureID int64) (bool, error)
-	AddFavorite(ctx context.Context, userID, textureID int64) error
-	RemoveFavorite(ctx context.Context, userID, textureID int64) error
+	ToggleFavorite(ctx context.Context, userID, textureID int64) (bool, error)
 	GetUserFavorites(ctx context.Context, userID int64, page, pageSize int) ([]*model.Texture, int64, error)
 	CountByUploaderID(ctx context.Context, uploaderID int64) (int64, error)
 }
 
-
 // YggdrasilRepository Yggdrasil仓储接口
 type YggdrasilRepository interface {
 	GetPasswordByID(ctx context.Context, id int64) (string, error)

internal/repository/repository_sqlite_test.go

@@ -98,7 +98,6 @@ func TestProfileRepository_Basic(t *testing.T) {
 		t.Fatalf("CountByUserID mismatch: %d err=%v", count, err)
 	}
 
-	
 	if err := profileRepo.UpdateLastUsedAt(ctx, "p-uuid"); err != nil {
 		t.Fatalf("UpdateLastUsedAt err: %v", err)
 	}
@@ -150,22 +149,20 @@ func TestTextureRepository_Basic(t *testing.T) {
 		t.Fatalf("FindByHashAndUploaderID mismatch")
 	}
 
-	_ = textureRepo.IncrementFavoriteCount(ctx, tex.ID)
-	_ = textureRepo.DecrementFavoriteCount(ctx, tex.ID)
+	_, _ = textureRepo.ToggleFavorite(ctx, u.ID, tex.ID)
+	favList, _, _ := textureRepo.GetUserFavorites(ctx, u.ID, 1, 10)
+	if len(favList) == 0 {
+		t.Fatalf("GetUserFavorites expected at least 1 favorite")
+	}
+	_, _ = textureRepo.ToggleFavorite(ctx, u.ID, tex.ID)
+	favList, _, _ = textureRepo.GetUserFavorites(ctx, u.ID, 1, 10)
+	if len(favList) != 0 {
+		t.Fatalf("GetUserFavorites expected 0 favorites after toggle off")
+	}
+
 	_ = 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)
@@ -187,7 +184,7 @@ func TestTextureRepository_Basic(t *testing.T) {
 	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)
+	_, _ = textureRepo.ToggleFavorite(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)
 	}
@@ -206,7 +203,6 @@ func TestTextureRepository_Basic(t *testing.T) {
 	_ = textureRepo.Delete(ctx, tex.ID)
 }
 
-
 func TestClientRepository_Basic(t *testing.T) {
 	db := testutil.NewTestDB(t)
 	repo := NewClientRepository(db)

internal/repository/texture_repository.go

@@ -29,13 +29,13 @@ func (r *textureRepository) FindByID(ctx context.Context, id int64) (*model.Text
 
 func (r *textureRepository) FindByHash(ctx context.Context, hash string) (*model.Texture, error) {
 	var texture model.Texture
-	err := r.db.WithContext(ctx).Where("hash = ?", hash).First(&texture).Error
+	err := r.db.WithContext(ctx).Preload("Uploader").Where("hash = ?", hash).First(&texture).Error
 	return handleNotFoundResult(&texture, err)
 }
 
 func (r *textureRepository) FindByHashAndUploaderID(ctx context.Context, hash string, uploaderID int64) (*model.Texture, error) {
 	var texture model.Texture
-	err := r.db.WithContext(ctx).Where("hash = ? AND uploader_id = ?", hash, uploaderID).First(&texture).Error
+	err := r.db.WithContext(ctx).Preload("Uploader").Where("hash = ? AND uploader_id = ?", hash, uploaderID).First(&texture).Error
 	return handleNotFoundResult(&texture, err)
 }
 
@@ -138,42 +138,52 @@ func (r *textureRepository) IncrementDownloadCount(ctx context.Context, id int64
 		UpdateColumn("download_count", gorm.Expr("download_count + ?", 1)).Error
 }
 
-func (r *textureRepository) IncrementFavoriteCount(ctx context.Context, id int64) error {
-	return r.db.WithContext(ctx).Model(&model.Texture{}).Where("id = ?", id).
-		UpdateColumn("favorite_count", gorm.Expr("favorite_count + ?", 1)).Error
-}
-
-func (r *textureRepository) DecrementFavoriteCount(ctx context.Context, id int64) error {
-	return r.db.WithContext(ctx).Model(&model.Texture{}).Where("id = ?", id).
-		UpdateColumn("favorite_count", gorm.Expr("favorite_count - ?", 1)).Error
-}
-
 func (r *textureRepository) CreateDownloadLog(ctx context.Context, log *model.TextureDownloadLog) error {
 	return r.db.WithContext(ctx).Create(log).Error
 }
 
-func (r *textureRepository) IsFavorited(ctx context.Context, userID, textureID int64) (bool, error) {
-	var count int64
-	// 使用 Select("1") 优化，只查询是否存在，不需要查询所有字段
-	err := r.db.WithContext(ctx).Model(&model.UserTextureFavorite{}).
-		Select("1").
-		Where("user_id = ? AND texture_id = ?", userID, textureID).
-		Limit(1).
-		Count(&count).Error
-	return count > 0, err
-}
+func (r *textureRepository) ToggleFavorite(ctx context.Context, userID, textureID int64) (bool, error) {
+	var isAdded bool
+	err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		var count int64
+		err := tx.Model(&model.UserTextureFavorite{}).
+			Where("user_id = ? AND texture_id = ?", userID, textureID).
+			Count(&count).Error
+		if err != nil {
+			return err
+		}
 
-func (r *textureRepository) AddFavorite(ctx context.Context, userID, textureID int64) error {
-	favorite := &model.UserTextureFavorite{
-		UserID:    userID,
-		TextureID: textureID,
-	}
-	return r.db.WithContext(ctx).Create(favorite).Error
-}
+		if count > 0 {
+			result := tx.Where("user_id = ? AND texture_id = ?", userID, textureID).
+				Delete(&model.UserTextureFavorite{})
+			if result.Error != nil {
+				return result.Error
+			}
+			if result.RowsAffected > 0 {
+				if err := tx.Model(&model.Texture{}).Where("id = ?", textureID).
+					UpdateColumn("favorite_count", gorm.Expr("GREATEST(favorite_count - 1, 0)")).Error; err != nil {
+					return err
+				}
+			}
+			isAdded = false
+			return nil
+		}
 
-func (r *textureRepository) RemoveFavorite(ctx context.Context, userID, textureID int64) error {
-	return r.db.WithContext(ctx).Where("user_id = ? AND texture_id = ?", userID, textureID).
-		Delete(&model.UserTextureFavorite{}).Error
+		favorite := &model.UserTextureFavorite{
+			UserID:    userID,
+			TextureID: textureID,
+		}
+		if err := tx.Create(favorite).Error; err != nil {
+			return err
+		}
+		if err := tx.Model(&model.Texture{}).Where("id = ?", textureID).
+			UpdateColumn("favorite_count", gorm.Expr("favorite_count + 1")).Error; err != nil {
+			return err
+		}
+		isAdded = true
+		return nil
+	})
+	return isAdded, err
 }
 
 func (r *textureRepository) GetUserFavorites(ctx context.Context, userID int64, page, pageSize int) ([]*model.Texture, int64, error) {

internal/service/interfaces.go

@@ -19,6 +19,7 @@ type UserService interface {
 	// 用户查询
 	GetByID(ctx context.Context, id int64) (*model.User, error)
 	GetByEmail(ctx context.Context, email string) (*model.User, error)
+	GetByUsername(ctx context.Context, username string) (*model.User, error)
 
 	// 用户更新
 	UpdateInfo(ctx context.Context, user *model.User) error

internal/service/mocks_test.go

@@ -391,37 +391,24 @@ func (m *MockTextureRepository) IncrementFavoriteCount(ctx context.Context, id i
 	return nil
 }
 
-func (m *MockTextureRepository) DecrementFavoriteCount(ctx context.Context, id int64) error {
-	if texture, ok := m.textures[id]; ok && texture.FavoriteCount > 0 {
-		texture.FavoriteCount--
-	}
-	return nil
-}
-
 func (m *MockTextureRepository) CreateDownloadLog(ctx context.Context, log *model.TextureDownloadLog) error {
 	return nil
 }
 
-func (m *MockTextureRepository) IsFavorited(ctx context.Context, userID, textureID int64) (bool, error) {
-	if userFavs, ok := m.favorites[userID]; ok {
-		return userFavs[textureID], nil
-	}
-	return false, nil
-}
-
-func (m *MockTextureRepository) AddFavorite(ctx context.Context, userID, textureID int64) error {
+func (m *MockTextureRepository) ToggleFavorite(ctx context.Context, userID, textureID int64) (bool, error) {
 	if m.favorites[userID] == nil {
 		m.favorites[userID] = make(map[int64]bool)
 	}
-	m.favorites[userID][textureID] = true
-	return nil
-}
-
-func (m *MockTextureRepository) RemoveFavorite(ctx context.Context, userID, textureID int64) error {
-	if userFavs, ok := m.favorites[userID]; ok {
-		delete(userFavs, textureID)
+	isFavorited := m.favorites[userID][textureID]
+	m.favorites[userID][textureID] = !isFavorited
+	if texture, ok := m.textures[textureID]; ok {
+		if !isFavorited {
+			texture.FavoriteCount++
+		} else if texture.FavoriteCount > 0 {
+			texture.FavoriteCount--
+		}
 	}
-	return nil
+	return !isFavorited, nil
 }
 
 func (m *MockTextureRepository) GetUserFavorites(ctx context.Context, userID int64, page, pageSize int) ([]*model.Texture, int64, error) {
@@ -474,7 +461,6 @@ func (m *MockTextureRepository) BatchDelete(ctx context.Context, ids []int64) (i
 	return deleted, nil
 }
 
-
 // ============================================================================
 // Service Mocks
 // ============================================================================

internal/service/texture_service.go

@@ -55,6 +55,22 @@ func (s *textureService) GetByID(ctx context.Context, id int64) (*model.Texture,
 		if texture.Status == -1 {
 			return nil, errors.New("材质已删除")
 		}
+		// 如果缓存中没有 Uploader 信息，重新查询数据库
+		if texture.Uploader == nil {
+			texture2, err := s.textureRepo.FindByID(ctx, id)
+			if err != nil {
+				return nil, err
+			}
+			if texture2 == nil {
+				return nil, ErrTextureNotFound
+			}
+			if texture2.Status == -1 {
+				return nil, errors.New("材质已删除")
+			}
+			// 更新缓存
+			s.cache.SetAsync(context.Background(), cacheKey, texture2, s.cache.Policy.TextureTTL)
+			return texture2, nil
+		}
 		return &texture, nil
 	}
 
@@ -71,9 +87,7 @@ func (s *textureService) GetByID(ctx context.Context, id int64) (*model.Texture,
 	}
 
 	// 存入缓存（异步）
-	if texture2 != nil {
-		s.cache.SetAsync(context.Background(), cacheKey, texture2, s.cache.Policy.TextureTTL)
-	}
+	s.cache.SetAsync(context.Background(), cacheKey, texture2, s.cache.Policy.TextureTTL)
 
 	return texture2, nil
 }
@@ -205,39 +219,22 @@ func (s *textureService) Delete(ctx context.Context, textureID, uploaderID int64
 }
 
 func (s *textureService) ToggleFavorite(ctx context.Context, userID, textureID int64) (bool, error) {
-	// 确保材质存在
 	texture, err := s.textureRepo.FindByID(ctx, textureID)
 	if err != nil {
 		return false, err
 	}
-	if texture == nil {
+	if texture == nil || texture.Status != 1 || !texture.IsPublic {
 		return false, ErrTextureNotFound
 	}
 
-	isFavorited, err := s.textureRepo.IsFavorited(ctx, userID, textureID)
+	isAdded, err := s.textureRepo.ToggleFavorite(ctx, userID, textureID)
 	if err != nil {
 		return false, err
 	}
 
-	if isFavorited {
-		// 已收藏 -> 取消收藏
-		if err := s.textureRepo.RemoveFavorite(ctx, userID, textureID); err != nil {
-			return false, err
-		}
-		if err := s.textureRepo.DecrementFavoriteCount(ctx, textureID); err != nil {
-			return false, err
-		}
-		return false, nil
-	}
+	s.cacheInv.BatchInvalidate(ctx, s.cacheKeys.UserFavoritesPattern(userID))
 
-	// 未收藏 -> 添加收藏
-	if err := s.textureRepo.AddFavorite(ctx, userID, textureID); err != nil {
-		return false, err
-	}
-	if err := s.textureRepo.IncrementFavoriteCount(ctx, textureID); err != nil {
-		return false, err
-	}
-	return true, nil
+	return isAdded, nil
 }
 
 func (s *textureService) GetUserFavorites(ctx context.Context, userID int64, page, pageSize int) ([]*model.Texture, int64, error) {
@@ -365,7 +362,17 @@ func (s *textureService) UploadTexture(ctx context.Context, uploaderID int64, na
 	// 清除用户的 texture 列表缓存（所有分页）
 	s.cacheInv.BatchInvalidate(ctx, fmt.Sprintf("texture:user:%d:*", uploaderID))
 
-	return texture, nil
+	// 重新查询以预加载 Uploader 关联
+	textureWithUploader, err := s.textureRepo.FindByID(ctx, texture.ID)
+	if err != nil {
+		// 如果查询失败，返回原始创建的 texture 对象（虽然可能没有 Uploader 信息）
+		return texture, nil
+	}
+	if textureWithUploader == nil {
+		// 如果查询返回 nil（极端情况，如数据库复制延迟），返回原始创建的 texture 对象
+		return texture, nil
+	}
+	return textureWithUploader, nil
 }
 
 // parseTextureTypeInternal 解析材质类型

internal/service/texture_service_test.go

@@ -3,6 +3,7 @@ package service
 import (
 	"carrotskin/internal/model"
 	"context"
+	"strings"
 	"testing"
 
 	"go.uber.org/zap"
@@ -564,7 +565,7 @@ func TestTextureServiceImpl_Create(t *testing.T) {
 
 			ctx := context.Background()
 			// UploadTexture需要文件数据，这里创建一个简单的测试数据
-			fileData := []byte("fake png data for testing")
+			fileData := []byte(strings.Repeat("x", 512))
 			texture, err := textureService.UploadTexture(
 				ctx,
 				tt.uploaderID,
@@ -760,7 +761,7 @@ func TestTextureServiceImpl_FavoritesAndLimit(t *testing.T) {
 			UploaderID: 1,
 			Name:       "T",
 		})
-		_ = textureRepo.AddFavorite(context.Background(), 1, i)
+		_, _ = textureRepo.ToggleFavorite(context.Background(), 1, i)
 	}
 
 	cacheManager := NewMockCacheManager()

internal/service/user_service.go

@@ -199,6 +199,14 @@ func (s *userService) GetByEmail(ctx context.Context, email string) (*model.User
 	}, s.cache.Policy.UserEmailTTL)
 }
 
+func (s *userService) GetByUsername(ctx context.Context, username string) (*model.User, error) {
+	// 使用 Cached 装饰器自动处理缓存
+	cacheKey := s.cacheKeys.UserByUsername(username)
+	return database.Cached(ctx, s.cache, cacheKey, func() (*model.User, error) {
+		return s.userRepo.FindByUsername(ctx, username)
+	}, s.cache.Policy.UserTTL)
+}
+
 func (s *userService) UpdateInfo(ctx context.Context, user *model.User) error {
 	err := s.userRepo.Update(ctx, user)
 	if err != nil {

internal/types/common.go

@@ -110,6 +110,18 @@ type UserInfo struct {
 	UpdatedAt   time.Time  `json:"updated_at" example:"2025-10-01T10:00:00Z"`
 }
 
+// PublicUserInfo 用户公开信息
+// @Description 用户公开信息（不包含敏感信息如邮箱）
+type PublicUserInfo struct {
+	ID        int64     `json:"id" example:"1"`
+	Username  string    `json:"username" example:"testuser"`
+	Avatar    string    `json:"avatar" example:"https://example.com/avatar.png"`
+	Points    int       `json:"points" example:"100"`
+	Role      string    `json:"role" example:"user"`
+	Status    int16     `json:"status" example:"1"`
+	CreatedAt time.Time `json:"created_at" example:"2025-10-01T10:00:00Z"`
+}
+
 // TextureType 材质类型
 type TextureType string
 
@@ -121,21 +133,22 @@ const (
 // TextureInfo 材质信息
 // @Description 材质详细信息
 type TextureInfo struct {
-	ID            int64       `json:"id" example:"1"`
-	UploaderID    int64       `json:"uploader_id" example:"1"`
-	Name          string      `json:"name" example:"My Skin"`
-	Description   string      `json:"description,omitempty" example:"A cool skin"`
-	Type          TextureType `json:"type" example:"SKIN"`
-	URL           string      `json:"url" example:"https://rustfs.example.com/textures/xxx.png"`
-	Hash          string      `json:"hash" example:"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"`
-	Size          int         `json:"size" example:"2048"`
-	IsPublic      bool        `json:"is_public" example:"true"`
-	DownloadCount int         `json:"download_count" example:"100"`
-	FavoriteCount int         `json:"favorite_count" example:"50"`
-	IsSlim        bool        `json:"is_slim" example:"false"`
-	Status        int16       `json:"status" example:"1"`
-	CreatedAt     time.Time   `json:"created_at" example:"2025-10-01T10:00:00Z"`
-	UpdatedAt     time.Time   `json:"updated_at" example:"2025-10-01T10:00:00Z"`
+	ID               int64       `json:"id" example:"1"`
+	UploaderID       int64       `json:"uploader_id" example:"1"`
+	UploaderUsername string      `json:"uploader_username" example:"testuser"`
+	Name             string      `json:"name" example:"My Skin"`
+	Description      string      `json:"description,omitempty" example:"A cool skin"`
+	Type             TextureType `json:"type" example:"SKIN"`
+	URL              string      `json:"url" example:"https://rustfs.example.com/textures/xxx.png"`
+	Hash             string      `json:"hash" example:"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"`
+	Size             int         `json:"size" example:"2048"`
+	IsPublic         bool        `json:"is_public" example:"true"`
+	DownloadCount    int         `json:"download_count" example:"100"`
+	FavoriteCount    int         `json:"favorite_count" example:"50"`
+	IsSlim           bool        `json:"is_slim" example:"false"`
+	Status           int16       `json:"status" example:"1"`
+	CreatedAt        time.Time   `json:"created_at" example:"2025-10-01T10:00:00Z"`
+	UpdatedAt        time.Time   `json:"updated_at" example:"2025-10-01T10:00:00Z"`
 }
 
 // ProfileInfo 角色信息

pkg/config/config.go

@@ -131,13 +131,16 @@ type SecurityConfig struct {
 // Load 加载配置 - 完全从环境变量加载，不依赖YAML文件
 func Load() (*Config, error) {
 	// 加载.env文件（如果存在）
-	_ = godotenv.Load(".env")
+	if err := godotenv.Load(".env"); err != nil {
+		fmt.Printf("[Config] 注意: 未加载 .env 文件 (原因: %v)\n", err)
+	} else {
+		fmt.Println("[Config] 成功加载 .env 文件")
+	}
 
 	// 设置默认值
 	setDefaults()
 
-	// 设置环境变量前缀
-	viper.SetEnvPrefix("CARROTSKIN")
+	// 自动读取环境变量（不设置前缀，因为 BindEnv 已经明确指定了变量名）
 	viper.AutomaticEnv()
 
 	// 手动设置环境变量映射
@@ -152,6 +155,20 @@ func Load() (*Config, error) {
 	// 从环境变量中覆盖配置
 	overrideFromEnv(&config)
 
+	// 打印关键配置加载状态
+	fmt.Println("==================================================")
+	fmt.Println("           CarrotSkin Configuration Check         ")
+	fmt.Println("==================================================")
+	fmt.Printf("Server Port:    %s\n", config.Server.Port)
+	fmt.Printf("Database Host:  %s\n", config.Database.Host)
+	fmt.Printf("Redis Host:     %s\n", config.Redis.Host)
+	fmt.Printf("Environment:    %s\n", config.Environment)
+
+	if config.Database.Host == "localhost" && os.Getenv("DATABASE_HOST") != "" && os.Getenv("DATABASE_HOST") != "localhost" {
+		fmt.Printf("[Warning] Database Host is 'localhost' but env DATABASE_HOST is set to '%s'. Viper binding might have failed.\n", os.Getenv("DATABASE_HOST"))
+	}
+	fmt.Println("==================================================")
+
 	return &config, nil
 }
 
@@ -302,6 +319,7 @@ func setupEnvMappings() {
 
 // overrideFromEnv 从环境变量中覆盖配置
 func overrideFromEnv(config *Config) {
+
 	// 处理RustFS存储桶配置
 	if texturesBucket := os.Getenv("RUSTFS_BUCKET_TEXTURES"); texturesBucket != "" {
 		if config.RustFS.Buckets == nil {
@@ -342,6 +360,24 @@ func overrideFromEnv(config *Config) {
 		}
 	}
 
+	// 处理Redis基本配置
+	if host := os.Getenv("REDIS_HOST"); host != "" {
+		config.Redis.Host = host
+	}
+	if port := os.Getenv("REDIS_PORT"); port != "" {
+		if val, err := strconv.Atoi(port); err == nil {
+			config.Redis.Port = val
+		}
+	}
+	if password := os.Getenv("REDIS_PASSWORD"); password != "" {
+		config.Redis.Password = password
+	}
+	if database := os.Getenv("REDIS_DATABASE"); database != "" {
+		if val, err := strconv.Atoi(database); err == nil {
+			config.Redis.Database = val
+		}
+	}
+
 	// 处理Redis连接池配置
 	if poolSize := os.Getenv("REDIS_POOL_SIZE"); poolSize != "" {
 		if val, err := strconv.Atoi(poolSize); err == nil {

pkg/database/cache.go

@@ -369,6 +369,11 @@ func (b *CacheKeyBuilder) ProfilePattern(userID int64) string {
 	return fmt.Sprintf("%sprofile:*:%d*", b.prefix, userID)
 }
 
+// UserFavoritesPattern 用户收藏相关的所有缓存键模式
+func (b *CacheKeyBuilder) UserFavoritesPattern(userID int64) string {
+	return fmt.Sprintf("%sfavorites:*:%d*", b.prefix, userID)
+}
+
 // Exists 检查缓存键是否存在
 func (cm *CacheManager) Exists(ctx context.Context, key string) (bool, error) {
 	if !cm.config.Enabled || cm.redis == nil {

pkg/storage/minio.go

@@ -79,57 +79,6 @@ func (s *StorageClient) GetBucket(name string) (string, error) {
 	return bucket, nil
 }
 
-// GeneratePresignedURL 生成预签名上传URL (PUT方法)
-func (s *StorageClient) GeneratePresignedURL(ctx context.Context, bucketName, objectName string, expires time.Duration) (string, error) {
-	url, err := s.client.PresignedPutObject(ctx, bucketName, objectName, expires)
-	if err != nil {
-		return "", fmt.Errorf("生成预签名URL失败: %w", err)
-	}
-	return url.String(), nil
-}
-
-// PresignedPostPolicyResult 预签名POST策略结果
-type PresignedPostPolicyResult struct {
-	PostURL  string            // POST的URL
-	FormData map[string]string // 表单数据
-	FileURL  string            // 文件的最终访问URL
-}
-
-// GeneratePresignedPostURL 生成预签名POST URL (支持表单上传)
-// 注意：使用时必须确保file字段是表单的最后一个字段
-func (s *StorageClient) GeneratePresignedPostURL(ctx context.Context, bucketName, objectName string, minSize, maxSize int64, expires time.Duration) (*PresignedPostPolicyResult, error) {
-	// 创建上传策略
-	policy := minio.NewPostPolicy()
-
-	// 设置策略的基本信息
-	policy.SetBucket(bucketName)
-	policy.SetKey(objectName)
-	policy.SetExpires(time.Now().UTC().Add(expires))
-
-	// 设置文件大小限制
-	if err := policy.SetContentLengthRange(minSize, maxSize); err != nil {
-		return nil, fmt.Errorf("设置文件大小限制失败: %w", err)
-	}
-
-	// 使用MinIO客户端和策略生成预签名的POST URL和表单数据
-	postURL, formData, err := s.client.PresignedPostPolicy(ctx, policy)
-	if err != nil {
-		return nil, fmt.Errorf("生成预签名POST URL失败: %w", err)
-	}
-
-	// 移除form_data中多余的bucket字段（MinIO Go SDK可能会添加这个字段，但会导致签名错误）
-	// 注意：在Go中直接delete不存在的key是安全的
-	delete(formData, "bucket")
-
-	// 使用配置的公开访问URL构造文件的永久访问URL
-	fileURL := s.BuildFileURL(bucketName, objectName)
-
-	return &PresignedPostPolicyResult{
-		PostURL:  postURL.String(),
-		FormData: formData,
-		FileURL:  fileURL,
-	}, nil
-}
 
 // BuildFileURL 构建文件的公开访问URL
 func (s *StorageClient) BuildFileURL(bucketName, objectName string) string {

pkg/storage/minio_test.go

@@ -1,9 +1,7 @@
 package storage
 
 import (
-	"context"
 	"testing"
-	"time"
 
 	"carrotskin/pkg/config"
 
@@ -41,31 +39,3 @@ func TestNewStorage_SkipConnectWhenNoCreds(t *testing.T) {
 		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)
-	}()
-}