opt: optimize image compress alg, add cache control for image

api/core/app_server.go

@@ -336,9 +336,11 @@ func staticResourceMiddleware() gin.HandlerFunc {
 				log.Fatal(err)
 			}
 
+			// 设置图片缓存有效期为一年 (365天)
+			c.Header("Cache-Control", "max-age=31536000, public")
 			// 直接输出图像数据流
 			c.Data(http.StatusOK, "image/jpeg", buffer.Bytes())
-			return
+			c.Abort() // 中断请求
 		}
 		c.Next()
 	}

api/main.go

@@ -165,6 +165,11 @@ func main() {
 
 		// MidJourney service pool
 		fx.Provide(mj.NewServicePool),
+		fx.Invoke(func(pool *mj.ServicePool) {
+			if pool.HasAvailableService() {
+				pool.DownloadImages()
+			}
+		}),
 
 		// Stable Diffusion 机器人
 		fx.Provide(sd.NewServicePool),

api/service/mj/pool.go

@@ -4,7 +4,9 @@ import (
 	"chatplus/core/types"
 	"chatplus/service/oss"
 	"chatplus/store"
+	"chatplus/store/model"
 	"fmt"
+	"time"
 
 	"github.com/go-redis/redis/v8"
 	"gorm.io/gorm"
@@ -12,8 +14,10 @@ import (
 
 // ServicePool Mj service pool
 type ServicePool struct {
-	services  []*Service
-	taskQueue *store.RedisQueue
+	services        []*Service
+	taskQueue       *store.RedisQueue
+	db              *gorm.DB
+	uploaderManager *oss.UploaderManager
 }
 
 func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderManager, appConfig *types.AppConfig) *ServicePool {
@@ -29,7 +33,7 @@ func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderMa
 
 		name := fmt.Sprintf("MjService-%d", k)
 		// create mj service
-		service := NewService(name, queue, 4, 600, db, client, manager, appConfig.ProxyURL)
+		service := NewService(name, queue, 4, 600, db, client)
 		botName := fmt.Sprintf("MjBot-%d", k)
 		bot, err := NewBot(botName, appConfig.ProxyURL, &config, service)
 		if err != nil {
@@ -50,11 +54,39 @@ func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderMa
 	}
 
 	return &ServicePool{
-		taskQueue: queue,
-		services:  services,
+		taskQueue:       queue,
+		services:        services,
+		uploaderManager: manager,
+		db:              db,
 	}
 }
 
+func (p *ServicePool) DownloadImages() {
+	go func() {
+		var items []model.MidJourneyJob
+		for {
+			res := p.db.Where("img_url = ? AND progress = ?", "", 100).Find(&items)
+			if res.Error != nil {
+				continue
+			}
+
+			// download images
+			for _, item := range items {
+				imgURL, err := p.uploaderManager.GetUploadHandler().PutImg(item.OrgURL, true)
+				if err != nil {
+					logger.Error("error with download image: ", err)
+					continue
+				}
+
+				item.ImgURL = imgURL
+				p.db.Updates(&item)
+			}
+
+			time.Sleep(time.Second * 5)
+		}
+	}()
+}
+
 // PushTask push a new mj task in to task queue
 func (p *ServicePool) PushTask(task types.MjTask) {
 	logger.Debugf("add a new MidJourney task to the task list: %+v", task)

api/service/mj/service.go

@@ -2,7 +2,6 @@ package mj
 
 import (
 	"chatplus/core/types"
-	"chatplus/service/oss"
 	"chatplus/store"
 	"chatplus/store/model"
 	"gorm.io/gorm"
@@ -17,24 +16,20 @@ type Service struct {
 	client           *Client // MJ client
 	taskQueue        *store.RedisQueue
 	db               *gorm.DB
-	uploadManager    *oss.UploaderManager
-	proxyURL         string
 	maxHandleTaskNum int32             // max task number current service can handle
 	handledTaskNum   int32             // already handled task number
 	taskStartTimes   map[int]time.Time // task start time, to check if the task is timeout
 	taskTimeout      int64
 }
 
-func NewService(name string, queue *store.RedisQueue, maxTaskNum int32, timeout int64, db *gorm.DB, client *Client, manager *oss.UploaderManager, proxy string) *Service {
+func NewService(name string, queue *store.RedisQueue, maxTaskNum int32, timeout int64, db *gorm.DB, client *Client) *Service {
 	return &Service{
 		name:             name,
 		db:               db,
 		taskQueue:        queue,
 		client:           client,
-		uploadManager:    manager,
 		taskTimeout:      timeout,
 		maxHandleTaskNum: maxTaskNum,
-		proxyURL:         proxy,
 		taskStartTimes:   make(map[int]time.Time, 0),
 	}
 }
@@ -146,17 +141,6 @@ func (s *Service) Notify(data CBReq) {
 		return
 	}
 
-	// upload image
-	if data.Status == Finished {
-		imgURL, err := s.uploadManager.GetUploadHandler().PutImg(data.Image.URL, true)
-		if err != nil {
-			logger.Error("error with download img: ", err.Error())
-			return
-		}
-		job.ImgURL = imgURL
-		s.db.Updates(&job)
-	}
-
 	if data.Status == Finished {
 		// release lock task
 		atomic.AddInt32(&s.handledTaskNum, -1)