文章编辑器问题

soul-api/internal/handler/upload.go

@@ -9,10 +9,10 @@ import (
 	"strings"
 	"time"
 
+	"soul-api/internal/config"
+
 	"github.com/gin-gonic/gin"
 )
-
-const uploadDir = "uploads"
 const maxUploadBytes = 5 * 1024 * 1024 // 5MB
 var allowedTypes = map[string]bool{"image/jpeg": true, "image/png": true, "image/gif": true, "image/webp": true}
 
@@ -40,6 +40,10 @@ func UploadPost(c *gin.Context) {
 	if folder == "" {
 		folder = "avatars"
 	}
+	uploadDir := config.Get().UploadDir
+	if uploadDir == "" {
+		uploadDir = "uploads"
+	}
 	dir := filepath.Join(uploadDir, folder)
 	_ = os.MkdirAll(dir, 0755)
 	name := fmt.Sprintf("%d_%s%s", time.Now().UnixNano(), randomStrUpload(6), ext)
@@ -48,8 +52,12 @@ func UploadPost(c *gin.Context) {
 		c.JSON(http.StatusInternalServerError, gin.H{"success": false, "error": "保存失败"})
 		return
 	}
-	url := "/" + filepath.ToSlash(filepath.Join(uploadDir, folder, name))
-	c.JSON(http.StatusOK, gin.H{"success": true, "url": url, "data": gin.H{"url": url, "fileName": name, "size": file.Size, "type": ct}})
+	relPath := "/uploads/" + filepath.ToSlash(filepath.Join(folder, name))
+	fullURL := relPath
+	if cfg := config.Get(); cfg != nil && cfg.BaseURL != "" {
+		fullURL = cfg.BaseURLJoin(relPath)
+	}
+	c.JSON(http.StatusOK, gin.H{"success": true, "url": fullURL, "data": gin.H{"url": fullURL, "fileName": name, "size": file.Size, "type": ct}})
 }
 
 func randomStrUpload(n int) string {
@@ -72,7 +80,13 @@ func UploadDelete(c *gin.Context) {
 		c.JSON(http.StatusForbidden, gin.H{"success": false, "error": "无权限删除此文件"})
 		return
 	}
-	fullPath := strings.TrimPrefix(path, "/")
+	rel := strings.TrimPrefix(path, "/uploads/")
+	rel = strings.TrimPrefix(rel, "uploads/")
+	uploadDir := config.Get().UploadDir
+	if uploadDir == "" {
+		uploadDir = "uploads"
+	}
+	fullPath := filepath.Join(uploadDir, filepath.FromSlash(rel))
 	if err := os.Remove(fullPath); err != nil {
 		c.JSON(http.StatusOK, gin.H{"success": false, "error": "文件不存在或删除失败"})
 		return