feat: add mj_action_power system config item

api/core/types/config.go

@@ -147,9 +147,10 @@ type SystemConfig struct {
 	VipInfoText     string `json:"vip_info_text"`               // 会员页面充值说明
 	DefaultModels   []int  `json:"default_models,omitempty"`    // 默认开通的 AI 模型
 
-	MjPower   int `json:"mj_power,omitempty"`   // MJ 绘画消耗算力
-	SdPower   int `json:"sd_power,omitempty"`   // SD 绘画消耗算力
-	DallPower int `json:"dall_power,omitempty"` // DALLE3 绘图消耗算力
+	MjPower       int `json:"mj_power,omitempty"`   // MJ 绘画消耗算力
+	MjActionPower int `json:"mj_action_power"`      // MJ 操作（放大，变换）消耗算力
+	SdPower       int `json:"sd_power,omitempty"`   // SD 绘画消耗算力
+	DallPower     int `json:"dall_power,omitempty"` // DALLE3 绘图消耗算力
 
 	WechatCardURL string `json:"wechat_card_url,omitempty"` // 微信客服地址
 

api/handler/mj_handler.go

@@ -245,6 +245,7 @@ func (h *MidJourneyHandler) Upscale(c *gin.Context) {
 		TaskId:      taskId,
 		Progress:    0,
 		Prompt:      data.Prompt,
+		Power:       h.App.SysConfig.MjActionPower,
 		CreatedAt:   time.Now(),
 	}
 	if res := h.DB.Create(&job); res.Error != nil || res.RowsAffected == 0 {
@@ -268,7 +269,23 @@ func (h *MidJourneyHandler) Upscale(c *gin.Context) {
 	if client != nil {
 		_ = client.Send([]byte("Task Updated"))
 	}
-
+	// update user's power
+	tx := h.DB.Model(&model.User{}).Where("id = ?", job.UserId).UpdateColumn("power", gorm.Expr("power - ?", job.Power))
+	// 记录算力变化日志
+	if tx.Error == nil && tx.RowsAffected > 0 {
+		user, _ := h.GetLoginUser(c)
+		h.DB.Create(&model.PowerLog{
+			UserId:    user.Id,
+			Username:  user.Username,
+			Type:      types.PowerConsume,
+			Amount:    job.Power,
+			Balance:   user.Power - job.Power,
+			Mark:      types.PowerSub,
+			Model:     "mid-journey",
+			Remark:    fmt.Sprintf("Upscale 操作，任务ID：%s", job.TaskId),
+			CreatedAt: time.Now(),
+		})
+	}
 	resp.SUCCESS(c)
 }
 
@@ -295,7 +312,7 @@ func (h *MidJourneyHandler) Variation(c *gin.Context) {
 		TaskId:      taskId,
 		Progress:    0,
 		Prompt:      data.Prompt,
-		Power:       h.App.SysConfig.MjPower,
+		Power:       h.App.SysConfig.MjActionPower,
 		CreatedAt:   time.Now(),
 	}
 	if res := h.DB.Create(&job); res.Error != nil || res.RowsAffected == 0 {

api/service/mj/pool.go

@@ -162,11 +162,9 @@ func (p *ServicePool) SyncTaskProgress() {
 			for _, job := range items {
 				// 失败或者 30 分钟还没完成的任务删除并退回算力
 				if time.Now().Sub(job.CreatedAt) > time.Minute*30 || job.Progress == -1 {
+					// 删除任务
 					p.db.Delete(&job)
-					// 略过 Upscale 任务
-					if job.Type != types.TaskUpscale.String() {
-						continue
-					}
+					// 退回算力
 					tx := p.db.Model(&model.User{}).Where("id = ?", job.UserId).UpdateColumn("power", gorm.Expr("power + ?", job.Power))
 					if tx.Error == nil && tx.RowsAffected > 0 {
 						var user model.User

api/service/mj/service.go

@@ -67,7 +67,7 @@ func (s *Service) Run() {
 			continue
 		}
 
-		// 翻译提示词
+		// 如果是 mj-proxy 则自动翻译提示词
 		if utils.HasChinese(task.Prompt) && strings.HasPrefix(s.Name, "mj-proxy-service") {
 			content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.TranslatePromptTemplate, task.Prompt))
 			if err == nil {