fixed conflicts

api/handler/mj_handler.go

@@ -13,12 +13,13 @@ import (
 	"chatplus/utils/resp"
 	"encoding/base64"
 	"fmt"
-	"github.com/gin-gonic/gin"
-	"github.com/gorilla/websocket"
-	"gorm.io/gorm"
 	"net/http"
 	"strings"
 	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/gorilla/websocket"
+	"gorm.io/gorm"
 )
 
 type MidJourneyHandler struct {
@@ -294,6 +295,7 @@ func (h *MidJourneyHandler) JobList(c *gin.Context) {
 	userId := h.GetInt(c, "user_id", 0)
 	page := h.GetInt(c, "page", 0)
 	pageSize := h.GetInt(c, "page_size", 0)
+	publish := h.GetBool(c, "publish")
 
 	session := h.db.Session(&gorm.Session{})
 	if status == 1 {
@@ -304,6 +306,9 @@ func (h *MidJourneyHandler) JobList(c *gin.Context) {
 	if userId > 0 {
 		session = session.Where("user_id = ?", userId)
 	}
+	if publish {
+		session = session.Where("publish = ?", publish)
+	}
 	if page > 0 && pageSize > 0 {
 		offset := (page - 1) * pageSize
 		session = session.Offset(offset).Limit(pageSize)
@@ -396,3 +401,23 @@ func (h *MidJourneyHandler) Notify(c *gin.Context) {
 
 	resp.SUCCESS(c)
 }
+
+// Publish 发布图片到画廊显示
+func (h *MidJourneyHandler) Publish(c *gin.Context) {
+	var data struct {
+		Id     uint `json:"id"`
+		Action bool `json:"action"` // 发布动作，true => 发布，false => 取消分享
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	res := h.db.Model(&model.MidJourneyJob{Id: data.Id}).UpdateColumn("publish", data.Action)
+	if res.Error != nil {
+		resp.ERROR(c, "更新数据库失败")
+		return
+	}
+
+	resp.SUCCESS(c)
+}

api/handler/sd_handler.go

@@ -145,6 +145,7 @@ func (h *SdJobHandler) JobList(c *gin.Context) {
 	userId := h.GetInt(c, "user_id", 0)
 	page := h.GetInt(c, "page", 0)
 	pageSize := h.GetInt(c, "page_size", 0)
+	publish := h.GetBool(c, "publish")
 
 	session := h.db.Session(&gorm.Session{})
 	if status == 1 {
@@ -155,6 +156,9 @@ func (h *SdJobHandler) JobList(c *gin.Context) {
 	if userId > 0 {
 		session = session.Where("user_id = ?", userId)
 	}
+	if publish {
+		session = session.Where("publish", publish)
+	}
 	if page > 0 && pageSize > 0 {
 		offset := (page - 1) * pageSize
 		session = session.Offset(offset).Limit(pageSize)
@@ -224,3 +228,23 @@ func (h *SdJobHandler) Remove(c *gin.Context) {
 
 	resp.SUCCESS(c)
 }
+
+// Publish 发布/取消发布图片到画廊显示
+func (h *SdJobHandler) Publish(c *gin.Context) {
+	var data struct {
+		Id     uint `json:"id"`
+		Action bool `json:"action"` // 发布动作，true => 发布，false => 取消分享
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	res := h.db.Model(&model.SdJob{Id: data.Id}).UpdateColumn("publish", true)
+	if res.Error != nil {
+		resp.ERROR(c, "更新数据库失败")
+		return
+	}
+
+	resp.SUCCESS(c)
+}

api/main.go

@@ -240,12 +240,14 @@ func main() {
 			group.GET("jobs", h.JobList)
 			group.POST("remove", h.Remove)
 			group.POST("notify", h.Notify)
+			group.POST("publish", h.Publish)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *handler.SdJobHandler) {
 			group := s.Engine.Group("/api/sd")
 			group.POST("image", h.Image)
 			group.GET("jobs", h.JobList)
 			group.POST("remove", h.Remove)
+			group.POST("publish", h.Publish)
 		}),
 
 		// 管理后台控制器

api/store/model/mj_job.go

@@ -16,6 +16,7 @@ type MidJourneyJob struct {
 	Progress    int
 	Prompt      string
 	UseProxy    bool // 是否使用反代加载图片
+	Publish     bool //是否发布图片到画廊
 	CreatedAt   time.Time
 }
 

api/store/model/sd_job.go

@@ -11,6 +11,7 @@ type SdJob struct {
 	Progress  int
 	Prompt    string
 	Params    string
+	Publish   bool //是否发布图片到画廊
 	CreatedAt time.Time
 }
 

api/store/vo/mj_job.go

@@ -16,5 +16,6 @@ type MidJourneyJob struct {
 	Progress    int       `json:"progress"`
 	Prompt      string    `json:"prompt"`
 	UseProxy    bool      `json:"use_proxy"`
+	Publish     bool      `json:"publish"`
 	CreatedAt   time.Time `json:"created_at"`
 }

api/store/vo/sd_job.go

@@ -14,5 +14,6 @@ type SdJob struct {
 	Params    types.SdTaskParams `json:"params"`
 	Progress  int                `json:"progress"`
 	Prompt    string             `json:"prompt"`
+	Publish   bool               `json:"publish"`
 	CreatedAt time.Time          `json:"created_at"`
 }