luma page, upload image and remove image function is ready

api/core/app_server.go

@@ -26,7 +26,6 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"path/filepath"
 	"runtime/debug"
 	"strings"
 	"time"
@@ -228,6 +227,7 @@ func needLogin(c *gin.Context) bool {
 		c.Request.URL.Path == "/api/suno/client" ||
 		c.Request.URL.Path == "/api/suno/detail" ||
 		c.Request.URL.Path == "/api/suno/play" ||
+		c.Request.URL.Path == "/api/download" ||
 		strings.HasPrefix(c.Request.URL.Path, "/api/test") ||
 		strings.HasPrefix(c.Request.URL.Path, "/api/user/clogin") ||
 		strings.HasPrefix(c.Request.URL.Path, "/api/config/") ||
@@ -316,64 +316,58 @@ func staticResourceMiddleware() gin.HandlerFunc {
 
 		url := c.Request.URL.String()
 		// 拦截生成缩略图请求
-		if strings.HasPrefix(url, "/static/") {
-			if strings.Contains(url, "?imageView2") {
-				r := strings.SplitAfter(url, "imageView2")
-				size := strings.Split(r[1], "/")
-				if len(size) != 8 {
-					c.String(http.StatusNotFound, "invalid thumb args")
-					return
-				}
-				with := utils.IntValue(size[3], 0)
-				height := utils.IntValue(size[5], 0)
-				quality := utils.IntValue(size[7], 75)
-
-				// 打开图片文件
-				filePath := strings.TrimLeft(c.Request.URL.Path, "/")
-				file, err := os.Open(filePath)
-				if err != nil {
-					c.String(http.StatusNotFound, "Image not found")
-					return
-				}
-				defer file.Close()
-
-				// 解码图片
-				img, _, err := image.Decode(file)
-				// for .webp image
-				if err != nil {
-					img, err = webp.Decode(file)
-				}
-				if err != nil {
-					c.String(http.StatusInternalServerError, "Error decoding image")
-					return
-				}
-
-				var newImg image.Image
-				if height == 0 || with == 0 {
-					// 固定宽度，高度自适应
-					newImg = resize.Resize(uint(with), uint(height), img, resize.Lanczos3)
-				} else {
-					// 生成缩略图
-					newImg = resize.Thumbnail(uint(with), uint(height), img, resize.Lanczos3)
-				}
-				var buffer bytes.Buffer
-				err = jpeg.Encode(&buffer, newImg, &jpeg.Options{Quality: quality})
-				if err != nil {
-					logger.Error(err)
-					c.String(http.StatusInternalServerError, err.Error())
-					return
-				}
-
-				// 设置图片缓存有效期为一年 (365天)
-				c.Header("Cache-Control", "max-age=31536000, public")
-				// 直接输出图像数据流
-				c.Data(http.StatusOK, "image/jpeg", buffer.Bytes())
-				c.Abort() // 中断请求
-			} else if strings.Contains(url, "?download=true") {
-				filename := filepath.Base(url)
-				c.Header("Content-Disposition", "attachment; filename="+filename)
-				c.Header("Content-Type", "application/octet-stream")
+		if strings.HasPrefix(url, "/static/") && strings.Contains(url, "?imageView2") {
+			r := strings.SplitAfter(url, "imageView2")
+			size := strings.Split(r[1], "/")
+			if len(size) != 8 {
+				c.String(http.StatusNotFound, "invalid thumb args")
+				return
 			}
+			with := utils.IntValue(size[3], 0)
+			height := utils.IntValue(size[5], 0)
+			quality := utils.IntValue(size[7], 75)
+
+			// 打开图片文件
+			filePath := strings.TrimLeft(c.Request.URL.Path, "/")
+			file, err := os.Open(filePath)
+			if err != nil {
+				c.String(http.StatusNotFound, "Image not found")
+				return
+			}
+			defer file.Close()
+
+			// 解码图片
+			img, _, err := image.Decode(file)
+			// for .webp image
+			if err != nil {
+				img, err = webp.Decode(file)
+			}
+			if err != nil {
+				c.String(http.StatusInternalServerError, "Error decoding image")
+				return
+			}
+
+			var newImg image.Image
+			if height == 0 || with == 0 {
+				// 固定宽度，高度自适应
+				newImg = resize.Resize(uint(with), uint(height), img, resize.Lanczos3)
+			} else {
+				// 生成缩略图
+				newImg = resize.Thumbnail(uint(with), uint(height), img, resize.Lanczos3)
+			}
+			var buffer bytes.Buffer
+			err = jpeg.Encode(&buffer, newImg, &jpeg.Options{Quality: quality})
+			if err != nil {
+				logger.Error(err)
+				c.String(http.StatusInternalServerError, err.Error())
+				return
+			}
+
+			// 设置图片缓存有效期为一年 (365天)
+			c.Header("Cache-Control", "max-age=31536000, public")
+			// 直接输出图像数据流
+			c.Data(http.StatusOK, "image/jpeg", buffer.Bytes())
+			c.Abort() // 中断请求
 
 		}
 		c.Next()

api/handler/upload_handler.go

@@ -17,19 +17,21 @@ import (
 	"geekai/utils/resp"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
+	"io"
+	"net/http"
 	"time"
 )
 
-type UploadHandler struct {
+type NetHandler struct {
 	BaseHandler
 	uploaderManager *oss.UploaderManager
 }
 
-func NewUploadHandler(app *core.AppServer, db *gorm.DB, manager *oss.UploaderManager) *UploadHandler {
-	return &UploadHandler{BaseHandler: BaseHandler{App: app, DB: db}, uploaderManager: manager}
+func NewNetHandler(app *core.AppServer, db *gorm.DB, manager *oss.UploaderManager) *NetHandler {
+	return &NetHandler{BaseHandler: BaseHandler{App: app, DB: db}, uploaderManager: manager}
 }
 
-func (h *UploadHandler) Upload(c *gin.Context) {
+func (h *NetHandler) Upload(c *gin.Context) {
 	file, err := h.uploaderManager.GetUploadHandler().PutFile(c, "file")
 	if err != nil {
 		resp.ERROR(c, err.Error())
@@ -60,7 +62,7 @@ func (h *UploadHandler) Upload(c *gin.Context) {
 	resp.SUCCESS(c, file)
 }
 
-func (h *UploadHandler) List(c *gin.Context) {
+func (h *NetHandler) List(c *gin.Context) {
 	var data struct {
 		Urls []string `json:"urls,omitempty"`
 	}
@@ -95,7 +97,7 @@ func (h *UploadHandler) List(c *gin.Context) {
 }
 
 // Remove remove files
-func (h *UploadHandler) Remove(c *gin.Context) {
+func (h *NetHandler) Remove(c *gin.Context) {
 	userId := h.GetLoginUserId(c)
 	id := h.GetInt(c, "id", 0)
 	var file model.File
@@ -119,3 +121,28 @@ func (h *UploadHandler) Remove(c *gin.Context) {
 	_ = h.uploaderManager.GetUploadHandler().Delete(objectKey)
 	resp.SUCCESS(c)
 }
+
+func (h *NetHandler) Download(c *gin.Context) {
+	fileUrl := c.Query("url")
+	// 使用http工具下载文件
+	if fileUrl == "" {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+	// 使用http.Get下载文件
+	r, err := http.Get(fileUrl)
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+	defer r.Body.Close()
+
+	if r.StatusCode != http.StatusOK {
+		resp.ERROR(c, "error status："+r.Status)
+		return
+	}
+
+	// 将下载的文件内容写入响应
+	c.Status(http.StatusOK)
+	_, _ = io.Copy(c.Writer, r.Body)
+}

api/main.go

@@ -128,7 +128,7 @@ func main() {
 		fx.Provide(handler.NewChatRoleHandler),
 		fx.Provide(handler.NewUserHandler),
 		fx.Provide(chatimpl.NewChatHandler),
-		fx.Provide(handler.NewUploadHandler),
+		fx.Provide(handler.NewNetHandler),
 		fx.Provide(handler.NewSmsHandler),
 		fx.Provide(handler.NewRedeemHandler),
 		fx.Provide(handler.NewCaptchaHandler),
@@ -249,10 +249,11 @@ func main() {
 			group.POST("tokens", h.Tokens)
 			group.GET("stop", h.StopGenerate)
 		}),
-		fx.Invoke(func(s *core.AppServer, h *handler.UploadHandler) {
+		fx.Invoke(func(s *core.AppServer, h *handler.NetHandler) {
 			s.Engine.POST("/api/upload", h.Upload)
 			s.Engine.POST("/api/upload/list", h.List)
 			s.Engine.GET("/api/upload/remove", h.Remove)
+			s.Engine.GET("/api/download", h.Download)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *handler.SmsHandler) {
 			group := s.Engine.Group("/api/sms/")