optimize foot copyright snaps

api/core/types/task.go

@@ -78,3 +78,16 @@ type DallTask struct {
 
 	Power int `json:"power"`
 }
+
+type SunoTask struct {
+	Id           int    `json:"id"`
+	UserId       string `json:"user_id"`
+	Type         int    `json:"type"`
+	TaskId       string `json:"task_id"`
+	Title        string `json:"title"`
+	ReferenceId  string `json:"reference_id"`
+	Prompt       string `json:"prompt"`
+	Tags         string `json:"tags"`
+	Instrumental bool   `json:"instrumental"` // 是否纯音乐
+	ExtendSecs   int    `json:"extend_secs"`  // 延长秒杀
+}

api/handler/admin/chat_model_handler.go

@@ -49,28 +49,33 @@ func (h *ChatModelHandler) Save(c *gin.Context) {
 		return
 	}
 
-	item := model.ChatModel{
-		Platform:    data.Platform,
-		Name:        data.Name,
-		Value:       data.Value,
-		Enabled:     data.Enabled,
-		Open:        data.Open,
-		MaxTokens:   data.MaxTokens,
-		MaxContext:  data.MaxContext,
-		Temperature: data.Temperature,
-		KeyId:       data.KeyId,
-		Power:       data.Power}
+	item := model.ChatModel{}
+	// 更新
+	if data.Id > 0 {
+		h.DB.Where("id", data.Id).First(&item)
+	}
+
+	item.Name = data.Name
+	item.Value = data.Value
+	item.Enabled = data.Enabled
+	item.SortNum = data.SortNum
+	item.Open = data.Open
+	item.Platform = data.Platform
+	item.Power = data.Power
+	item.MaxTokens = data.MaxTokens
+	item.MaxContext = data.MaxContext
+	item.Temperature = data.Temperature
+	item.KeyId = data.KeyId
+
 	var res *gorm.DB
 	if data.Id > 0 {
-		item.Id = data.Id
-		item.SortNum = data.SortNum
-		res = h.DB.Select("*").Omit("created_at").Updates(&item)
+		res = h.DB.Updates(&item)
 	} else {
 		res = h.DB.Create(&item)
 	}
 	if res.Error != nil {
 		logger.Error("error with update database：", res.Error)
-		resp.ERROR(c, "更新数据库失败！")
+		resp.ERROR(c, res.Error.Error())
 		return
 	}
 

api/handler/admin/user_handler.go

@@ -112,7 +112,7 @@ func (h *UserHandler) Save(c *gin.Context) {
 		res = h.DB.Select("username", "status", "vip", "power", "chat_roles_json", "chat_models_json", "expired_time").Updates(&user)
 		if res.Error != nil {
 			logger.Error("error with update database：", res.Error)
-			resp.ERROR(c, "更新数据库失败！")
+			resp.ERROR(c, res.Error.Error())
 			return
 		}
 		// 记录算力日志
@@ -136,6 +136,13 @@ func (h *UserHandler) Save(c *gin.Context) {
 			})
 		}
 	} else {
+		// 检查用户是否已经存在
+		h.DB.Where("username", data.Username).First(&user)
+		if user.Id > 0 {
+			resp.ERROR(c, "用户名已存在")
+			return
+		}
+
 		salt := utils.RandString(8)
 		u := model.User{
 			Username:    data.Username,

api/handler/chat_model_handler.go

@@ -31,9 +31,14 @@ func (h *ChatModelHandler) List(c *gin.Context) {
 	var items []model.ChatModel
 	var chatModels = make([]vo.ChatModel, 0)
 	var res *gorm.DB
+	session := h.DB.Session(&gorm.Session{}).Where("enabled", true)
+	t := c.Query("type")
+	if t != "" {
+		session = session.Where("type", t)
+	}
 	// 如果用户没有登录，则加载所有开放模型
 	if !h.IsLogin(c) {
-		res = h.DB.Where("enabled", true).Where("open", true).Order("sort_num ASC").Find(&items)
+		res = session.Where("open", true).Order("sort_num ASC").Find(&items)
 	} else {
 		user, _ := h.GetLoginUser(c)
 		var models []int

api/handler/suno_handler.go

@@ -0,0 +1,63 @@
+package handler
+
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// * Copyright 2023 The Geek-AI Authors. All rights reserved.
+// * Use of this source code is governed by a Apache-2.0 license
+// * that can be found in the LICENSE file.
+// * @Author yangjian102621@163.com
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+import (
+	"geekai/core"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+type SunoHandler struct {
+	BaseHandler
+}
+
+func NewSunoHandler(app *core.AppServer, db *gorm.DB) *SunoHandler {
+	return &SunoHandler{
+		BaseHandler: BaseHandler{
+			App: app,
+			DB:  db,
+		},
+	}
+}
+
+// Client WebSocket 客户端，用于通知任务状态变更
+func (h *SunoHandler) Client(c *gin.Context) {
+	//ws, err := (&websocket.Upgrader{CheckOrigin: func(r *http.Request) bool { return true }}).Upgrade(c.Writer, c.Request, nil)
+	//if err != nil {
+	//	logger.Error(err)
+	//	c.Abort()
+	//	return
+	//}
+	//
+	//userId := h.GetInt(c, "user_id", 0)
+	//if userId == 0 {
+	//	logger.Info("Invalid user ID")
+	//	c.Abort()
+	//	return
+	//}
+	//
+	////client := types.NewWsClient(ws)
+	//logger.Infof("New websocket connected, IP: %s", c.RemoteIP())
+}
+
+func (h *SunoHandler) Create(c *gin.Context) {
+
+}
+
+func (h *SunoHandler) List(c *gin.Context) {
+
+}
+
+func (h *SunoHandler) Remove(c *gin.Context) {
+
+}
+
+func (h *SunoHandler) Publish(c *gin.Context) {
+
+}

api/service/mj/service.go

@@ -29,6 +29,7 @@ type Service struct {
 	notifyQueue *store.RedisQueue
 	db          *gorm.DB
 	running     bool
+	retryCount  map[uint]int
 }
 
 func NewService(name string, taskQueue *store.RedisQueue, notifyQueue *store.RedisQueue, db *gorm.DB, cli Client) *Service {
@@ -39,6 +40,7 @@ func NewService(name string, taskQueue *store.RedisQueue, notifyQueue *store.Red
 		notifyQueue: notifyQueue,
 		Client:      cli,
 		running:     true,
+		retryCount:  make(map[uint]int),
 	}
 }
 
@@ -57,8 +59,13 @@ func (s *Service) Run() {
 		//  如果配置了多个中转平台的 API KEY
 		// U,V 操作必须和 Image 操作属于同一个平台，否则找不到关联任务，需重新放回任务列表
 		if task.ChannelId != "" && task.ChannelId != s.Name {
+			if s.retryCount[task.Id] > 5 {
+				s.db.Model(model.MidJourneyJob{Id: task.Id}).Delete(&model.MidJourneyJob{})
+				continue
+			}
 			logger.Debugf("handle other service task, name: %s, channel_id: %s, drop it.", s.Name, task.ChannelId)
 			s.taskQueue.RPush(task)
+			s.retryCount[task.Id]++
 			time.Sleep(time.Second)
 			continue
 		}

api/service/suno/service.go

@@ -0,0 +1,66 @@
+package dalle
+
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// * Copyright 2023 The Geek-AI Authors. All rights reserved.
+// * Use of this source code is governed by a Apache-2.0 license
+// * that can be found in the LICENSE file.
+// * @Author yangjian102621@163.com
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+import (
+	"geekai/core/types"
+	logger2 "geekai/logger"
+	"geekai/service/oss"
+	"geekai/store"
+	"github.com/go-redis/redis/v8"
+	"time"
+
+	"github.com/imroc/req/v3"
+	"gorm.io/gorm"
+)
+
+var logger = logger2.GetLogger()
+
+type Service struct {
+	httpClient    *req.Client
+	db            *gorm.DB
+	uploadManager *oss.UploaderManager
+	taskQueue     *store.RedisQueue
+	notifyQueue   *store.RedisQueue
+	Clients       *types.LMap[uint, *types.WsClient] // UserId => Client
+}
+
+func NewService(db *gorm.DB, manager *oss.UploaderManager, redisCli *redis.Client) *Service {
+	return &Service{
+		httpClient:    req.C().SetTimeout(time.Minute * 3),
+		db:            db,
+		taskQueue:     store.NewRedisQueue("Suno_Task_Queue", redisCli),
+		notifyQueue:   store.NewRedisQueue("Suno_Notify_Queue", redisCli),
+		Clients:       types.NewLMap[uint, *types.WsClient](),
+		uploadManager: manager,
+	}
+}
+
+func (s *Service) PushTask(task types.SunoTask) {
+	logger.Infof("add a new Suno task to the task list: %+v", task)
+	s.taskQueue.RPush(task)
+}
+
+func (s *Service) Run() {
+	logger.Info("Starting Suno job consumer...")
+	go func() {
+		for {
+			var task types.SunoTask
+			err := s.taskQueue.LPop(&task)
+			if err != nil {
+				logger.Errorf("taking task with error: %v", err)
+				continue
+			}
+
+		}
+	}()
+}
+
+func (s *Service) Create(task types.SunoTask) {
+
+}

api/store/vo/chat_model.go

@@ -12,6 +12,6 @@ type ChatModel struct {
 	MaxTokens   int     `json:"max_tokens"`  // 最大响应长度
 	MaxContext  int     `json:"max_context"` // 最大上下文长度
 	Temperature float32 `json:"temperature"` // 模型温度
-	KeyId       int     `json:"key_id"`
+	KeyId       int     `json:"key_id,omitempty"`
 	KeyName     string  `json:"key_name"`
 }