From eb9f6023f07f54658f9e7b0c28e62e5c5b35b594 Mon Sep 17 00:00:00 2001
From: ryan <ryan@arctel.net>
Date: Thu, 11 Jun 2026 14:17:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/apps/upload/file_server_test.go | 20 +++------------
 internal/apps/upload/routers.go          | 32 ++++++------------------
 2 files changed, 11 insertions(+), 41 deletions(-)

diff --git a/internal/apps/upload/file_server_test.go b/internal/apps/upload/file_server_test.go
index 23a14646..cc5de305 100644
--- a/internal/apps/upload/file_server_test.go
+++ b/internal/apps/upload/file_server_test.go
@@ -190,22 +190,8 @@ func TestGetDistinctUploadTypes(t *testing.T) {
 		t.Fatalf("unexpected error: %s", resp.ErrorMsg)
 	}
 
-	// Verify that custom_type_xyz and default types are present
-	hasCustom := false
-	hasAvatar := false
-	for _, typeName := range resp.Data {
-		if typeName == "custom_type_xyz" {
-			hasCustom = true
-		}
-		if typeName == "avatar" {
-			hasAvatar = true
-		}
-	}
-
-	if !hasCustom {
-		t.Errorf("expected custom_type_xyz to be in types, got: %v", resp.Data)
-	}
-	if !hasAvatar {
-		t.Errorf("expected avatar to be in types, got: %v", resp.Data)
+	// Verify that only custom_type_xyz is present
+	if len(resp.Data) != 1 || resp.Data[0] != "custom_type_xyz" {
+		t.Errorf("expected only custom_type_xyz in types list, got: %v", resp.Data)
 	}
 }
diff --git a/internal/apps/upload/routers.go b/internal/apps/upload/routers.go
index 42f57bfe..9bec0422 100644
--- a/internal/apps/upload/routers.go
+++ b/internal/apps/upload/routers.go
@@ -579,12 +579,9 @@ func saveUploadRecord(ctx context.Context, upload *model.Upload, storageDriver,
 	return ""
 }
 
-// DefaultUploadTypes 默认内置的文件业务类型
-var DefaultUploadTypes = []string{"avatar", "attachment", "doc", "generic"}
-
-// GetDistinctUploadTypes 获取所有已存在的文件业务类型及默认内置类型
+// GetDistinctUploadTypes 获取数据库中所有已存在的文件业务类型
 // @Summary 获取文件业务类型列表
-// @Description 返回系统中所有已上传文件所拥有的业务类型，并合并默认内置类型（avatar, attachment, doc, generic）
+// @Description 返回数据库中所有已上传文件实际拥有的业务类型列表
 // @Tags admin
 // @Produce json
 // @Security SessionCookie
@@ -595,27 +592,14 @@ var DefaultUploadTypes = []string{"avatar", "attachment", "doc", "generic"}
 // @Router /api/v1/admin/uploads/types [get]
 func GetDistinctUploadTypes(c *gin.Context) {
 	var dbTypes []string
-	if err := db.DB(c.Request.Context()).Model(&model.Upload{}).Distinct().Pluck("type", &dbTypes).Error; err != nil {
+	if err := db.DB(c.Request.Context()).Model(&model.Upload{}).
+		Where("type IS NOT NULL AND type != ''").
+		Distinct().
+		Pluck("type", &dbTypes).Error; err != nil {
 		c.JSON(http.StatusInternalServerError, util.Err(err.Error()))
 		return
 	}
 
-	// 合并默认内置类型并去重
-	typeMap := make(map[string]bool)
-	for _, t := range DefaultUploadTypes {
-		typeMap[t] = true
-	}
-	for _, t := range dbTypes {
-		if t != "" {
-			typeMap[t] = true
-		}
-	}
-
-	result := make([]string, 0, len(typeMap))
-	for t := range typeMap {
-		result = append(result, t)
-	}
-	sort.Strings(result)
-
-	c.JSON(http.StatusOK, util.OK(result))
+	sort.Strings(dbTypes)
+	c.JSON(http.StatusOK, util.OK(dbTypes))
 }