feat: added delete file function

Merge pull request !4 from 鲸落/qwen

CHANGELOG.md

@@ -1,4 +1,39 @@
 # 更新日志
+## v3.2.7
+* 功能重构：采用 Vant 重构移动页面，新增 MidJourney 功能
+* 功能优化：优化 PC 端 MidJourney 页面布局，新增融图和换脸功能
+* Bug修复：修复 issue [
+  管理界面操作用户存在的两个问题](https://github.com/yangjian102621/chatgpt-plus/issues/117#issuecomment-1909201532)
+* 功能优化：在对话和聊天记录表中新增冗余字段 model，存储对话模型
+* Bug修复：IPhone 手机验证码触摸事件坐标错位 [issue 144](https://github.com/yangjian102621/chatgpt-plus/issues/144)
+* Bug修复：重新生成按钮功能失效问题
+* Bug修复：对话输入HTML标签不显示的问题
+* 功能优化：gpt-4-all/gpts/midjourney-plus 支持第三方平台的 API KEY
+* 功能新增：新增删除文件功能
+
+## v3.2.6
+* 功能优化：恢复关闭注册系统配置项，管理员可以在后台关闭用户注册，只允许内部添加账号
+* 功能优化：兼用旧版本微信收款消息解析
+* 功能优化：优化订单扫码支付状态轮询功能，当关闭二维码时取消轮询，节约网络资源
+* 功能新增：新增图片发布功能，画廊只显示用户已发布的图片
+* 功能新增：后台新增配置微信客服二维码，可以上传自己的微信客服二维码
+* 功能新增：新增网站公告，可以在管理后台自定义配置
+* 功能新增：新增阿里通义千问大模型支持
+* Bug修复：修复 MJ 放大任务失败时候 img_call 会增加的 Bug
+* 功能优化：新增虎皮椒和PayJS订单状态校验功能，增加安全性
+* Bug修复：修复微信转账交易 ID 提取失败 Bug
+* 功能优化：给所有的 websocket 连接加上心跳，解决 "close 1006 (abnormal closure): unexpected EOF" Bug
+* 功能新增：新增短信宝短信平台发送平台集成
+
+
+## v3.2.5
+* 功能新增：**重磅更新！！！** 新增 MidJourney-Plus API 支持，一秒配置，开箱即用，高效稳定。
+* 功能新增：**重磅更新！！！** 新增 GPT4-ALL 和 GPTs 模型支持，你只需花几块钱，可以丝滑享受 ChatGPT-Plus 会员的所有功能，无需再订阅 Plus 账号了！！！
+* 功能优化：增强 markdown 图片和引用块解析。
+* 功能新增：新增用户文件管理，目前一支持上传文件跟 GPT 进行多态对话。
+* 功能优化：function call 兼用中转 API。
+* Bug修复：修复部分已知的 Bug。
+
 ## v3.2.4.1
 * 功能新增：新增 PayJs 支付通道
 * Bug修复：紧急修复后台添加用户失败问题

README.md

@@ -73,7 +73,7 @@ ChatGLM,讯飞星火，文心一言等多个平台的大语言模型。集成了
 **演示站不提供任何充值点卡售卖或者VIP充值服务。** 如果您体验过后觉得还不错的话，可以花两分钟用下面的一键部署脚本自己部署一套。
 
 ```shell
-bash -c "$(curl -fsSL https://img.r9it.com/tmp/install-v3.2.4-7b5ff48154.sh)"
+bash -c "$(curl -fsSL https://img.r9it.com/tmp/install-v3.2.5-400fea2598.sh)"
 ```
 
 目前仅支持 Ubuntu 和 Centos 系统。 部署成功之后可以访问下面地址
@@ -114,11 +114,7 @@ KEY。
 
 ## 项目文档
 
-*
-
-*
-最新的部署视频教程：[https://www.bilibili.com/video/BV1ge411C7uA/](https://www.bilibili.com/video/BV1ge411C7uA/?vd_source=dee8b15703ccfcbd24a60ee9a0fabb73)
-**
+最新的部署视频教程：[https://www.bilibili.com/video/BV1Cc411t7CX/](https://www.bilibili.com/video/BV1Cc411t7CX/)
 
 详细的部署和开发文档请参考 [**ChatGPT-Plus 文档**](https://ai.r9it.com/docs/)。
 

api/config.sample.toml

@@ -25,7 +25,16 @@ WeChatBot = false
   AppId = ""
   Token = ""
 
-[SmsConfig] # 阿里云短信服务配置
+
+[SMS] # Sms 配置，用于发送短信
+   Active = "Ali" # 当前启用的短信服务，默认使用阿里云
+   [SMS.Bao]
+      Username = ""
+      Password = ""
+      Domain = "api.smsbao.com"
+      Sign = "【极客学长】"
+      CodeTemplate = "您的验证码是{code}。5分钟有效，若非本人操作，请忽略本短信。"
+   [SMS.Ali]
       AccessKey = ""
       AccessSecret = ""
       Product = "Dysmsapi"
@@ -63,16 +72,12 @@ WeChatBot = false
   DiscordCDN = "https://mj.r9it.com:8002" # mj 图片反代地址
   DiscordGateway = "wss://mj.r9it.com:8003" # discord 机器人反代地址
 
-[[MjConfigs]]
+[[MjPlusConfigs]]
   Enabled = false
-  UserToken = ""
-  BotToken = ""
-  GuildId = ""
-  ChanelId = ""
-  UseCDN = false #是否使用反向代理访问，设置为true下面的设置才会生效
-  DiscordAPI = "https://mj.r9it.com:8001" # discord API 反代地址
-  DiscordCDN = "https://mj.r9it.com:8002" # mj 图片反代地址
-  DiscordGateway = "wss://mj.r9it.com:8003" # discord 机器人反代地址
+  ApiURL = "https://api.chatgpt-plus.net" # 目前暂时不支持更改
+  CdnURL = "" # CND 加速的 URL，如果有的话就设置
+  ApiKey = "sk-xxx"
+  NotifyURL = "https://ai.r9it.com/api/mj/notify" # 这里需要改成你的域名
 
 [[SdConfigs]]
   Enabled = false
@@ -80,18 +85,6 @@ WeChatBot = false
   ApiKey = ""
   Txt2ImgJsonPath = "res/sd/text2img.json"
 
-[[SdConfigs]]
-  Enabled = false
-  ApiURL = ""
-  ApiKey = ""
-  Txt2ImgJsonPath = "res/sd/text2img.json"
-
-[[SdConfigs]]
-  Enabled = false
-  ApiURL = ""
-  ApiKey = ""
-  Txt2ImgJsonPath = "res/text2img.json"
-
 [XXLConfig] # xxl-job 配置，需要你部署 XXL-JOB 定时任务工具，用来定期清理未支付订单和清理过期 VIP，如果你没有启用支付服务，则该服务也无需启动
   Enabled = false # 是否启用 XXL JOB 服务
   ServerAddr = "http://172.22.11.47:8080/xxl-job-admin" # xxl-job-admin 管理地址
@@ -114,9 +107,9 @@ WeChatBot = false
 [HuPiPayConfig]
   Enabled = false
   Name = "wechat"
-  AppId = "201906161477"
-  AppSecret = "7f403199d510fb2c6f0b9f2311800e7c"
-  PayURL = "https://api.xunhupay.com/payment/do.html"
+  AppId = ""
+  AppSecret = ""
+  ApiURL = "https://api.xunhupay.com"
   NotifyURL = "https://ai.r9it.com/api/payment/hupipay/notify"
 
 [SmtpConfig] # 注意，阿里云服务器禁用了25号端口，所以如果需要使用邮件功能，请别用阿里云服务器
@@ -131,5 +124,5 @@ WeChatBot = false
   Name = "wechat" # 请不要改动
   AppId = "" # 商户 ID
   PrivateKey = "" # 秘钥
-  ApiURL = "https://payjs.cn/api/native"
+  ApiURL = "https://payjs.cn"
   NotifyURL = "https://ai.r9it.com/api/payment/payjs/notify" # 异步回调地址，域名改成你自己的

api/core/app_server.go

@@ -152,9 +152,9 @@ func authorizeMiddleware(s *AppServer, client *redis.Client) gin.HandlerFunc {
 			c.Request.URL.Path == "/api/role/list" ||
 			c.Request.URL.Path == "/api/mj/jobs" ||
 			c.Request.URL.Path == "/api/mj/client" ||
+			c.Request.URL.Path == "/api/mj/notify" ||
 			c.Request.URL.Path == "/api/invite/hits" ||
 			c.Request.URL.Path == "/api/sd/jobs" ||
-			c.Request.URL.Path == "/api/upload" ||
 			strings.HasPrefix(c.Request.URL.Path, "/api/test") ||
 			strings.HasPrefix(c.Request.URL.Path, "/api/function/") ||
 			strings.HasPrefix(c.Request.URL.Path, "/api/sms/") ||

api/core/types/chat.go

@@ -12,6 +12,9 @@ type ApiRequest struct {
 	Functions   []interface{} `json:"functions,omitempty"` // 兼容中转平台
 
 	ToolChoice string `json:"tool_choice,omitempty"`
+
+	Input      map[string]interface{} `json:"input,omitempty"`      //兼容阿里通义千问
+	Parameters map[string]interface{} `json:"parameters,omitempty"` //兼容阿里通义千问
 }
 
 type Message struct {

api/core/types/config.go

@@ -15,9 +15,10 @@ type AppConfig struct {
 	StaticUrl     string                  // 静态资源 URL
 	Redis         RedisConfig             // redis 连接信息
 	ApiConfig     ChatPlusApiConfig       // ChatPlus API authorization configs
-	SmsConfig AliYunSmsConfig         // AliYun send message service config
+	SMS           SMSConfig               // send mobile message config
 	OSS           OSSConfig               // OSS config
 	MjConfigs     []MidJourneyConfig      // mj AI draw service pool
+	MjPlusConfigs []MidJourneyPlusConfig  // MJ plus config
 	WeChatBot     bool                    // 是否启用微信机器人
 	SdConfigs     []StableDiffusionConfig // sd AI draw service pool
 
@@ -36,16 +37,6 @@ type SmtpConfig struct {
 	Password string // 发件人邮箱密码
 }
 
-// JPayConfig PayJs 支付配置
-type JPayConfig struct {
-	Enabled    bool
-	Name       string // 支付名称，默认 wechat
-	AppId      string // 商户 ID
-	PrivateKey string // 私钥
-	ApiURL     string // API 网关
-	NotifyURL  string // 异步回调地址
-}
-
 type ChatPlusApiConfig struct {
 	ApiURL string
 	AppId  string
@@ -59,8 +50,8 @@ type MidJourneyConfig struct {
 	GuildId        string // Server ID
 	ChanelId       string // Chanel ID
 	UseCDN         bool
+	ImgCdnURL      string // 图片反代加速地址
 	DiscordAPI     string
-	DiscordCDN     string
 	DiscordGateway string
 }
 
@@ -71,13 +62,12 @@ type StableDiffusionConfig struct {
 	Txt2ImgJsonPath string
 }
 
-type AliYunSmsConfig struct {
-	AccessKey    string
-	AccessSecret string
-	Product      string
-	Domain       string
-	Sign         string // 短信签名
-	CodeTempId   string // 验证码短信模板 ID
+type MidJourneyPlusConfig struct {
+	Enabled   bool   // 如果启用了 MidJourney Plus，将会自动禁用原生的MidJourney服务
+	ApiURL    string // api 地址
+	CdnURL    string // CDN 加速地址
+	ApiKey    string
+	NotifyURL string // 任务进度更新回调地址
 }
 
 type AlipayConfig struct {
@@ -97,10 +87,20 @@ type HuPiPayConfig struct { //虎皮椒第四方支付配置
 	Name      string // 支付名称，如：wechat/alipay
 	AppId     string // App ID
 	AppSecret string // app 密钥
-	PayURL    string // 支付网关
+	ApiURL    string // 支付网关
 	NotifyURL string // 异步通知回调
 }
 
+// JPayConfig PayJs 支付配置
+type JPayConfig struct {
+	Enabled    bool
+	Name       string // 支付名称，默认 wechat
+	AppId      string // 商户 ID
+	PrivateKey string // 私钥
+	ApiURL     string // API 网关
+	NotifyURL  string // 异步回调地址
+}
+
 type XXLConfig struct { // XXL 任务调度配置
 	Enabled      bool
 	ServerAddr   string
@@ -148,6 +148,7 @@ const Azure = Platform("Azure")
 const ChatGLM = Platform("ChatGLM")
 const Baidu = Platform("Baidu")
 const XunFei = Platform("XunFei")
+const QWen = Platform("QWen")
 
 // UserChatConfig 用户的聊天配置
 type UserChatConfig struct {
@@ -173,6 +174,7 @@ type SystemConfig struct {
 	VipMonthImgCalls int    `json:"vip_month_img_calls"` // VIP 会员每月赠送绘图次数
 
 	RegisterWays    []string `json:"register_ways"`    // 注册方式：支持手机，邮箱注册
+	EnabledRegister bool     `json:"enabled_register"` // 是否开放注册
 
 	RewardImg     string  `json:"reward_img"`      // 众筹收款二维码地址
 	EnabledReward bool    `json:"enabled_reward"`  // 启用众筹功能
@@ -185,5 +187,5 @@ type SystemConfig struct {
 	InviteChatCalls  int      `json:"invite_chat_calls"`   // 邀请用户注册奖励对话次数
 	InviteImgCalls   int      `json:"invite_img_calls"`    // 邀请用户注册奖励绘图次数
 
-	ShowDemoNotice bool `json:"show_demo_notice"` // 显示演示站公告
+	WechatCardURL string `json:"wechat_card_url"` // 微信客服地址
 }

api/core/types/sms.go

@@ -0,0 +1,26 @@
+package types
+
+type SMSConfig struct {
+	Active string
+	Ali    SmsConfigAli
+	Bao    SmsConfigBao
+}
+
+// SmsConfigAli 阿里云短信平台配置
+type SmsConfigAli struct {
+	AccessKey    string
+	AccessSecret string
+	Product      string
+	Domain       string
+	Sign         string // 短信签名
+	CodeTempId   string // 验证码短信模板 ID
+}
+
+// SmsConfigBao 短信宝平台配置
+type SmsConfigBao struct {
+	Username     string //短信宝平台注册的用户名
+	Password     string //短信宝平台注册的密码
+	Domain       string //域名
+	Sign         string // 短信签名
+	CodeTemplate string // 验证码短信模板 匹配
+}

api/core/types/task.go

@@ -9,13 +9,17 @@ func (t TaskType) String() string {
 
 const (
 	TaskImage     = TaskType("image")
+	TaskBlend     = TaskType("blend")
+	TaskSwapFace  = TaskType("swapFace")
 	TaskUpscale   = TaskType("upscale")
 	TaskVariation = TaskType("variation")
 )
 
 // MjTask MidJourney 任务
 type MjTask struct {
-	Id          int      `json:"id"`
+	Id          uint     `json:"id"`
+	TaskId      string   `json:"task_id"`
+	ImgArr      []string `json:"img_arr"`
 	ChannelId   string   `json:"channel_id"`
 	SessionId   string   `json:"session_id"`
 	Type        TaskType `json:"type"`

api/handler/admin/config_handler.go

@@ -33,8 +33,9 @@ func (h *ConfigHandler) Update(c *gin.Context) {
 		resp.ERROR(c, types.InvalidArgs)
 		return
 	}
-	str := utils.JsonEncode(&data.Config)
-	config := model.Config{Key: data.Key, Config: str}
+
+	value := utils.JsonEncode(&data.Config)
+	config := model.Config{Key: data.Key, Config: value}
 	res := h.db.FirstOrCreate(&config, model.Config{Key: data.Key})
 	if res.Error != nil {
 		resp.ERROR(c, res.Error.Error())
@@ -42,7 +43,7 @@ func (h *ConfigHandler) Update(c *gin.Context) {
 	}
 
 	if config.Id > 0 {
-		config.Config = str
+		config.Config = value
 		res := h.db.Updates(&config)
 		if res.Error != nil {
 			resp.ERROR(c, res.Error.Error())

api/handler/chatimpl/azure_handler.go

@@ -135,6 +135,7 @@ func (h *ChatHandler) sendAzureMessage(
 					Content:    template.HTMLEscapeString(prompt),
 					Tokens:     promptToken,
 					UseContext: true,
+					Model:      req.Model,
 				}
 				historyUserMsg.CreatedAt = promptCreatedAt
 				historyUserMsg.UpdatedAt = promptCreatedAt
@@ -156,6 +157,7 @@ func (h *ChatHandler) sendAzureMessage(
 					Content:    message.Content,
 					Tokens:     totalTokens,
 					UseContext: true,
+					Model:      req.Model,
 				}
 				historyReplyMsg.CreatedAt = replyCreatedAt
 				historyReplyMsg.UpdatedAt = replyCreatedAt
@@ -181,6 +183,7 @@ func (h *ChatHandler) sendAzureMessage(
 				} else {
 					chatItem.Title = prompt
 				}
+				chatItem.Model = req.Model
 				h.db.Create(&chatItem)
 			}
 		}

api/handler/chatimpl/baidu_handler.go

@@ -160,6 +160,7 @@ func (h *ChatHandler) sendBaiduMessage(
 					Content:    template.HTMLEscapeString(prompt),
 					Tokens:     promptToken,
 					UseContext: true,
+					Model:      req.Model,
 				}
 				historyUserMsg.CreatedAt = promptCreatedAt
 				historyUserMsg.UpdatedAt = promptCreatedAt
@@ -181,6 +182,7 @@ func (h *ChatHandler) sendBaiduMessage(
 					Content:    message.Content,
 					Tokens:     totalTokens,
 					UseContext: true,
+					Model:      req.Model,
 				}
 				historyReplyMsg.CreatedAt = replyCreatedAt
 				historyReplyMsg.UpdatedAt = replyCreatedAt
@@ -205,6 +207,7 @@ func (h *ChatHandler) sendBaiduMessage(
 				} else {
 					chatItem.Title = prompt
 				}
+				chatItem.Model = req.Model
 				h.db.Create(&chatItem)
 			}
 		}

api/handler/chatimpl/chat_handler.go

@@ -26,7 +26,8 @@ import (
 )
 
 const ErrorMsg = "抱歉，AI 助手开小差了，请稍后再试。"
-const ErrImg = "![](/images/wx.png)"
+
+var ErrImg = "![](/images/wx.png)"
 
 var logger = logger2.GetLogger()
 
@@ -45,6 +46,13 @@ func NewChatHandler(app *core.AppServer, db *gorm.DB, redis *redis.Client) *Chat
 	return &h
 }
 
+func (h *ChatHandler) Init() {
+	// 如果后台有上传微信客服微信二维码，则覆盖
+	if h.App.SysConfig.WechatCardURL != "" {
+		ErrImg = fmt.Sprintf("![](%s)", h.App.SysConfig.WechatCardURL)
+	}
+}
+
 var chatConfig types.ChatConfig
 
 // ChatHandle 处理聊天 WebSocket 请求
@@ -89,7 +97,7 @@ func (h *ChatHandler) ChatHandle(c *gin.Context) {
 
 	// use old chat data override the chat model and role ID
 	var chat model.ChatItem
-	res = h.db.Where("chat_id=?", chatId).First(&chat)
+	res = h.db.Where("chat_id = ?", chatId).First(&chat)
 	if res.Error == nil {
 		chatModel.Id = chat.ModelId
 		roleId = int(chat.RoleId)
@@ -126,7 +134,6 @@ func (h *ChatHandler) ChatHandle(c *gin.Context) {
 		for {
 			_, msg, err := client.Receive()
 			if err != nil {
-				logger.Error(err)
 				client.Close()
 				h.App.ChatClients.Delete(sessionId)
 				cancelFunc := h.App.ReqCancelFunc.Get(sessionId)
@@ -137,19 +144,30 @@ func (h *ChatHandler) ChatHandle(c *gin.Context) {
 				return
 			}
 
-			message := string(msg)
-			logger.Info("Receive a message: ", message)
-			//utils.ReplyMessage(client, "这是一条测试消息！")
+			var message types.WsMessage
+			err = utils.JsonDecode(string(msg), &message)
+			if err != nil {
+				continue
+			}
+
+			// 心跳消息
+			if message.Type == "heartbeat" {
+				logger.Debug("收到 Chat 心跳消息：", message.Content)
+				continue
+			}
+
+			logger.Info("Receive a message: ", message.Content)
+
 			ctx, cancel := context.WithCancel(context.Background())
 			h.App.ReqCancelFunc.Put(sessionId, cancel)
 			// 回复消息
-			err = h.sendMessage(ctx, session, chatRole, message, client)
+			err = h.sendMessage(ctx, session, chatRole, utils.InterfaceToString(message.Content), client)
 			if err != nil {
 				logger.Error(err)
 				utils.ReplyChunkMessage(client, types.WsMessage{Type: types.WsEnd})
 			} else {
 				utils.ReplyChunkMessage(client, types.WsMessage{Type: types.WsEnd})
-				logger.Info("回答完毕: " + string(message))
+				logger.Infof("回答完毕: %v", message.Content)
 			}
 
 		}
@@ -267,6 +285,10 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
 		req.Temperature = h.App.ChatConfig.XunFei.Temperature
 		req.MaxTokens = h.App.ChatConfig.XunFei.MaxTokens
 		break
+	case types.QWen:
+		req.Input = map[string]interface{}{"messages": []map[string]string{{"role": "system", "content": "You are a helpful assistant."}, {"role": "user", "content": prompt}}}
+		req.Parameters = map[string]interface{}{}
+		break
 	default:
 		utils.ReplyMessage(ws, "不支持的平台："+session.Model.Platform+"，请联系管理员！")
 		utils.ReplyMessage(ws, ErrImg)
@@ -340,7 +362,8 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
 		return h.sendBaiduMessage(chatCtx, req, userVo, ctx, session, role, prompt, ws)
 	case types.XunFei:
 		return h.sendXunFeiMessage(chatCtx, req, userVo, ctx, session, role, prompt, ws)
-
+	case types.QWen:
+		return h.sendQWenMessage(chatCtx, req, userVo, ctx, session, role, prompt, ws)
 	}
 	utils.ReplyChunkMessage(ws, types.WsMessage{
 		Type:    types.WsMiddle,
@@ -434,6 +457,10 @@ func (h *ChatHandler) doRequest(ctx context.Context, req types.ApiRequest, platf
 	case types.Baidu:
 		apiURL = strings.Replace(apiKey.ApiURL, "{model}", req.Model, 1)
 		break
+	case types.QWen:
+		apiURL = apiKey.ApiURL
+		req.Messages = nil
+		break
 	default:
 		apiURL = apiKey.ApiURL
 	}
@@ -476,7 +503,7 @@ func (h *ChatHandler) doRequest(ctx context.Context, req types.ApiRequest, platf
 	} else {
 		client = http.DefaultClient
 	}
-	logger.Debugf("Sending %s request, ApiURL:%s, ApiKey:%s, PROXY: %s, Model: %s", platform, apiURL, apiKey.Value, proxyURL, req.Model)
+	logger.Debugf("Sending %s request, ApiURL:%s, Password:%s, PROXY: %s, Model: %s", platform, apiURL, apiKey.Value, proxyURL, req.Model)
 	switch platform {
 	case types.Azure:
 		request.Header.Set("api-key", apiKey.Value)
@@ -492,6 +519,11 @@ func (h *ChatHandler) doRequest(ctx context.Context, req types.ApiRequest, platf
 		request.RequestURI = ""
 	case types.OpenAI:
 		request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", apiKey.Value))
+		break
+	case types.QWen:
+		request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", apiKey.Value))
+		request.Header.Set("X-DashScope-SSE", "enable")
+		break
 	}
 	return client.Do(request)
 }

api/handler/chatimpl/chatglm_handler.go

@@ -139,6 +139,7 @@ func (h *ChatHandler) sendChatGLMMessage(
 					Content:    template.HTMLEscapeString(prompt),
 					Tokens:     promptToken,
 					UseContext: true,
+					Model:      req.Model,
 				}
 				historyUserMsg.CreatedAt = promptCreatedAt
 				historyUserMsg.UpdatedAt = promptCreatedAt
@@ -160,6 +161,7 @@ func (h *ChatHandler) sendChatGLMMessage(
 					Content:    message.Content,
 					Tokens:     totalTokens,
 					UseContext: true,
+					Model:      req.Model,
 				}
 				historyReplyMsg.CreatedAt = replyCreatedAt
 				historyReplyMsg.UpdatedAt = replyCreatedAt
@@ -184,6 +186,7 @@ func (h *ChatHandler) sendChatGLMMessage(
 				} else {
 					chatItem.Title = prompt
 				}
+				chatItem.Model = req.Model
 				h.db.Create(&chatItem)
 			}
 		}

api/handler/chatimpl/openai_handler.go

@@ -206,6 +206,7 @@ func (h *ChatHandler) sendOpenAiMessage(
 					Content:    template.HTMLEscapeString(prompt),
 					Tokens:     promptToken,
 					UseContext: useContext,
+					Model:      req.Model,
 				}
 				historyUserMsg.CreatedAt = promptCreatedAt
 				historyUserMsg.UpdatedAt = promptCreatedAt
@@ -235,6 +236,7 @@ func (h *ChatHandler) sendOpenAiMessage(
 					Content:    message.Content,
 					Tokens:     totalTokens,
 					UseContext: useContext,
+					Model:      req.Model,
 				}
 				historyReplyMsg.CreatedAt = replyCreatedAt
 				historyReplyMsg.UpdatedAt = replyCreatedAt
@@ -260,6 +262,7 @@ func (h *ChatHandler) sendOpenAiMessage(
 				} else {
 					chatItem.Title = prompt
 				}
+				chatItem.Model = req.Model
 				h.db.Create(&chatItem)
 			}
 		}

api/handler/chatimpl/qwen_handler.go

@@ -0,0 +1,232 @@
+package chatimpl
+
+import (
+	"bufio"
+	"chatplus/core/types"
+	"chatplus/store/model"
+	"chatplus/store/vo"
+	"chatplus/utils"
+	"context"
+	"encoding/json"
+	"fmt"
+	"html/template"
+	"io"
+	"strings"
+	"time"
+	"unicode/utf8"
+)
+
+type qWenResp struct {
+	Output struct {
+		FinishReason string `json:"finish_reason"`
+		Text         string `json:"text"`
+	} `json:"output"`
+	Usage struct {
+		TotalTokens  int `json:"total_tokens"`
+		InputTokens  int `json:"input_tokens"`
+		OutputTokens int `json:"output_tokens"`
+	} `json:"usage"`
+	RequestID string `json:"request_id"`
+}
+
+// 通义千问消息发送实现
+func (h *ChatHandler) sendQWenMessage(
+	chatCtx []interface{},
+	req types.ApiRequest,
+	userVo vo.User,
+	ctx context.Context,
+	session *types.ChatSession,
+	role model.ChatRole,
+	prompt string,
+	ws *types.WsClient) error {
+	promptCreatedAt := time.Now() // 记录提问时间
+	start := time.Now()
+	var apiKey = model.ApiKey{}
+	response, err := h.doRequest(ctx, req, session.Model.Platform, &apiKey)
+	logger.Info("HTTP请求完成，耗时：", time.Now().Sub(start))
+	if err != nil {
+		if strings.Contains(err.Error(), "context canceled") {
+			logger.Info("用户取消了请求：", prompt)
+			return nil
+		} else if strings.Contains(err.Error(), "no available key") {
+			utils.ReplyMessage(ws, "抱歉😔😔😔，系统已经没有可用的 API KEY，请联系管理员！")
+			return nil
+		} else {
+			logger.Error(err)
+		}
+
+		utils.ReplyMessage(ws, ErrorMsg)
+		utils.ReplyMessage(ws, ErrImg)
+		return err
+	} else {
+		defer response.Body.Close()
+	}
+	contentType := response.Header.Get("Content-Type")
+	if strings.Contains(contentType, "text/event-stream") {
+		replyCreatedAt := time.Now() // 记录回复时间
+		// 循环读取 Chunk 消息
+		var message = types.Message{}
+		var contents = make([]string, 0)
+		scanner := bufio.NewScanner(response.Body)
+
+		var content, lastText, newText string
+
+		for scanner.Scan() {
+			line := scanner.Text()
+			if len(line) < 5 || strings.HasPrefix(line, "id:") ||
+				strings.HasPrefix(line, "event:") || strings.HasPrefix(line, ":HTTP_STATUS/200") {
+				continue
+			}
+			if strings.HasPrefix(line, "data:") {
+				content = line[5:]
+			}
+			// 处理代码换行
+			if len(content) == 0 {
+				content = "\n"
+			}
+
+			var resp qWenResp
+			err := utils.JsonDecode(content, &resp)
+			if err != nil {
+				logger.Error("error with parse data line: ", err)
+				utils.ReplyMessage(ws, fmt.Sprintf("**解析数据行失败：%s**", err))
+				break
+			}
+
+			if len(contents) == 0 { // 发送消息头
+				utils.ReplyChunkMessage(ws, types.WsMessage{Type: types.WsStart})
+			}
+
+			//通过比较 lastText（上一次的文本）和 currentText（当前的文本），
+			//提取出新添加的文本部分。然后只将这部分新文本发送到客户端。
+			//每次循环结束后，lastText 会更新为当前的完整文本，以便于下一次循环进行比较。
+			currentText := resp.Output.Text
+			if currentText != lastText {
+				// 提取新增文本
+				newText = strings.Replace(currentText, lastText, "", 1)
+				utils.ReplyChunkMessage(ws, types.WsMessage{
+					Type:    types.WsMiddle,
+					Content: utils.InterfaceToString(newText),
+				})
+				lastText = currentText // 更新 lastText
+			}
+			contents = append(contents, newText)
+
+			if resp.Output.FinishReason == "stop" {
+				break
+			}
+
+		} //end for
+
+		if err := scanner.Err(); err != nil {
+			if strings.Contains(err.Error(), "context canceled") {
+				logger.Info("用户取消了请求：", prompt)
+			} else {
+				logger.Error("信息读取出错：", err)
+			}
+		}
+
+		// 消息发送成功
+		if len(contents) > 0 {
+			// 更新用户的对话次数
+			h.subUserCalls(userVo, session)
+
+			if message.Role == "" {
+				message.Role = "assistant"
+			}
+			message.Content = strings.Join(contents, "")
+			useMsg := types.Message{Role: "user", Content: prompt}
+
+			// 更新上下文消息，如果是调用函数则不需要更新上下文
+			if h.App.ChatConfig.EnableContext {
+				chatCtx = append(chatCtx, useMsg)  // 提问消息
+				chatCtx = append(chatCtx, message) // 回复消息
+				h.App.ChatContexts.Put(session.ChatId, chatCtx)
+			}
+
+			// 追加聊天记录
+			if h.App.ChatConfig.EnableHistory {
+				// for prompt
+				promptToken, err := utils.CalcTokens(prompt, req.Model)
+				if err != nil {
+					logger.Error(err)
+				}
+				historyUserMsg := model.HistoryMessage{
+					UserId:     userVo.Id,
+					ChatId:     session.ChatId,
+					RoleId:     role.Id,
+					Type:       types.PromptMsg,
+					Icon:       userVo.Avatar,
+					Content:    template.HTMLEscapeString(prompt),
+					Tokens:     promptToken,
+					UseContext: true,
+					Model:      req.Model,
+				}
+				historyUserMsg.CreatedAt = promptCreatedAt
+				historyUserMsg.UpdatedAt = promptCreatedAt
+				res := h.db.Save(&historyUserMsg)
+				if res.Error != nil {
+					logger.Error("failed to save prompt history message: ", res.Error)
+				}
+
+				// for reply
+				// 计算本次对话消耗的总 token 数量
+				replyToken, _ := utils.CalcTokens(message.Content, req.Model)
+				totalTokens := replyToken + getTotalTokens(req)
+				historyReplyMsg := model.HistoryMessage{
+					UserId:     userVo.Id,
+					ChatId:     session.ChatId,
+					RoleId:     role.Id,
+					Type:       types.ReplyMsg,
+					Icon:       role.Icon,
+					Content:    message.Content,
+					Tokens:     totalTokens,
+					UseContext: true,
+					Model:      req.Model,
+				}
+				historyReplyMsg.CreatedAt = replyCreatedAt
+				historyReplyMsg.UpdatedAt = replyCreatedAt
+				res = h.db.Create(&historyReplyMsg)
+				if res.Error != nil {
+					logger.Error("failed to save reply history message: ", res.Error)
+				}
+				// 更新用户信息
+				h.incUserTokenFee(userVo.Id, totalTokens)
+			}
+
+			// 保存当前会话
+			var chatItem model.ChatItem
+			res := h.db.Where("chat_id = ?", session.ChatId).First(&chatItem)
+			if res.Error != nil {
+				chatItem.ChatId = session.ChatId
+				chatItem.UserId = session.UserId
+				chatItem.RoleId = role.Id
+				chatItem.ModelId = session.Model.Id
+				if utf8.RuneCountInString(prompt) > 30 {
+					chatItem.Title = string([]rune(prompt)[:30]) + "..."
+				} else {
+					chatItem.Title = prompt
+				}
+				chatItem.Model = req.Model
+				h.db.Create(&chatItem)
+			}
+		}
+	} else {
+		body, err := io.ReadAll(response.Body)
+		if err != nil {
+			return fmt.Errorf("error with reading response: %v", err)
+		}
+
+		var res struct {
+			Code int    `json:"error_code"`
+			Msg  string `json:"error_msg"`
+		}
+		err = json.Unmarshal(body, &res)
+		if err != nil {
+			return fmt.Errorf("error with decode response: %v", err)
+		}
+		utils.ReplyMessage(ws, "请求通义千问大模型 API 失败："+res.Msg)
+	}
+
+	return nil
+}

api/handler/chatimpl/xunfei_handler.go

@@ -198,6 +198,7 @@ func (h *ChatHandler) sendXunFeiMessage(
 				Content:    template.HTMLEscapeString(prompt),
 				Tokens:     promptToken,
 				UseContext: true,
+				Model:      req.Model,
 			}
 			historyUserMsg.CreatedAt = promptCreatedAt
 			historyUserMsg.UpdatedAt = promptCreatedAt
@@ -219,6 +220,7 @@ func (h *ChatHandler) sendXunFeiMessage(
 				Content:    message.Content,
 				Tokens:     totalTokens,
 				UseContext: true,
+				Model:      req.Model,
 			}
 			historyReplyMsg.CreatedAt = replyCreatedAt
 			historyReplyMsg.UpdatedAt = replyCreatedAt
@@ -243,6 +245,7 @@ func (h *ChatHandler) sendXunFeiMessage(
 			} else {
 				chatItem.Title = prompt
 			}
+			chatItem.Model = req.Model
 			h.db.Create(&chatItem)
 		}
 	}

api/handler/function_handler.go

@@ -247,7 +247,7 @@ func (h *FunctionHandler) Dall3(c *gin.Context) {
 	} else {
 		request = req.C().R()
 	}
-	logger.Debugf("Sending %s request, ApiURL:%s, ApiKey:%s, PROXY: %s", apiKey.Platform, apiKey.ApiURL, apiKey.Value, h.proxyURL)
+	logger.Debugf("Sending %s request, ApiURL:%s, Password:%s, PROXY: %s", apiKey.Platform, apiKey.ApiURL, apiKey.Value, h.proxyURL)
 	r, err := request.SetHeader("Content-Type", "application/json").
 		SetHeader("Authorization", "Bearer "+apiKey.Value).
 		SetBody(imgReq{

api/handler/mj_handler.go

@@ -5,6 +5,7 @@ import (
 	"chatplus/core/types"
 	"chatplus/service"
 	"chatplus/service/mj"
+	"chatplus/service/mj/plus"
 	"chatplus/service/oss"
 	"chatplus/store/model"
 	"chatplus/store/vo"
@@ -12,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 {
@@ -85,6 +87,7 @@ func (h *MidJourneyHandler) Client(c *gin.Context) {
 func (h *MidJourneyHandler) Image(c *gin.Context) {
 	var data struct {
 		SessionId string   `json:"session_id"`
+		TaskType  string   `json:"task_type"`
 		Prompt    string   `json:"prompt"`
 		NegPrompt string   `json:"neg_prompt"`
 		Rate      string   `json:"rate"`
@@ -93,7 +96,7 @@ func (h *MidJourneyHandler) Image(c *gin.Context) {
 		Raw       bool     `json:"raw"`
 		Seed      int64    `json:"seed"`
 		Stylize   int      `json:"stylize"`
-		Img       string  `json:"img"`
+		ImgArr    []string `json:"img_arr"`
 		Tile      bool     `json:"tile"`
 		Quality   float32  `json:"quality"`
 		Weight    float32  `json:"weight"`
@@ -119,12 +122,9 @@ func (h *MidJourneyHandler) Image(c *gin.Context) {
 	if data.Chaos > 0 && !strings.Contains(prompt, "--c") && !strings.Contains(prompt, "--chaos") {
 		prompt += fmt.Sprintf(" --c %d", data.Chaos)
 	}
-	if data.Img != "" {
-		prompt = fmt.Sprintf("%s %s", data.Img, prompt)
 	if data.Weight > 0 {
 		prompt += fmt.Sprintf(" --iw %f", data.Weight)
 	}
-	}
 	if data.Raw {
 		prompt += " --style raw"
 	}
@@ -141,6 +141,11 @@ func (h *MidJourneyHandler) Image(c *gin.Context) {
 		prompt += fmt.Sprintf(" %s", data.Model)
 	}
 
+	// 处理融图和换脸的提示词
+	if data.TaskType == types.TaskSwapFace.String() || data.TaskType == types.TaskBlend.String() {
+		prompt = fmt.Sprintf("%s:%s", data.TaskType, strings.Join(data.ImgArr, ","))
+	}
+
 	idValue, _ := c.Get(types.LoginUserID)
 	userId := utils.IntValue(utils.InterfaceToString(idValue), 0)
 	// generate task id
@@ -150,28 +155,37 @@ func (h *MidJourneyHandler) Image(c *gin.Context) {
 		return
 	}
 	job := model.MidJourneyJob{
-		Type:      types.TaskImage.String(),
+		Type:      data.TaskType,
 		UserId:    userId,
 		TaskId:    taskId,
 		Progress:  0,
 		Prompt:    prompt,
 		CreatedAt: time.Now(),
 	}
-	if res := h.db.Create(&job); res.Error != nil {
+	if data.TaskType == types.TaskBlend.String() {
+		data.Prompt = "融图：" + strings.Join(data.ImgArr, ",")
+	} else if data.TaskType == types.TaskSwapFace.String() {
+		data.Prompt = "换脸：" + strings.Join(data.ImgArr, ",")
+	}
+	if res := h.db.Create(&job); res.Error != nil || res.RowsAffected == 0 {
 		resp.ERROR(c, "添加任务失败："+res.Error.Error())
 		return
 	}
 
 	h.pool.PushTask(types.MjTask{
-		Id:        int(job.Id),
+		Id:        job.Id,
+		TaskId:    taskId,
 		SessionId: data.SessionId,
-		Type:      types.TaskImage,
-		Prompt:    fmt.Sprintf("%s %s", taskId, prompt),
+		Type:      types.TaskType(data.TaskType),
+		Prompt:    prompt,
 		UserId:    userId,
+		ImgArr:    data.ImgArr,
 	})
 
 	client := h.pool.Clients.Get(uint(job.UserId))
+	if client != nil {
 		_ = client.Send([]byte("Task Updated"))
+	}
 
 	// update user's img calls
 	h.db.Model(&model.User{}).Where("id = ?", job.UserId).UpdateColumn("img_calls", gorm.Expr("img_calls - ?", 1))
@@ -203,7 +217,6 @@ func (h *MidJourneyHandler) Upscale(c *gin.Context) {
 	}
 
 	idValue, _ := c.Get(types.LoginUserID)
-	jobId := 0
 	userId := utils.IntValue(utils.InterfaceToString(idValue), 0)
 	taskId, _ := h.snowflake.Next(true)
 	job := model.MidJourneyJob{
@@ -215,13 +228,13 @@ func (h *MidJourneyHandler) Upscale(c *gin.Context) {
 		Prompt:      data.Prompt,
 		CreatedAt:   time.Now(),
 	}
-	if res := h.db.Create(&job); res.Error != nil {
+	if res := h.db.Create(&job); res.Error != nil || res.RowsAffected == 0 {
 		resp.ERROR(c, "添加任务失败："+res.Error.Error())
 		return
 	}
 
 	h.pool.PushTask(types.MjTask{
-		Id:          jobId,
+		Id:          job.Id,
 		SessionId:   data.SessionId,
 		Type:        types.TaskUpscale,
 		Prompt:      data.Prompt,
@@ -233,7 +246,9 @@ func (h *MidJourneyHandler) Upscale(c *gin.Context) {
 	})
 
 	client := h.pool.Clients.Get(uint(job.UserId))
+	if client != nil {
 		_ = client.Send([]byte("Task Updated"))
+	}
 
 	resp.SUCCESS(c)
 }
@@ -251,7 +266,6 @@ func (h *MidJourneyHandler) Variation(c *gin.Context) {
 	}
 
 	idValue, _ := c.Get(types.LoginUserID)
-	jobId := 0
 	userId := utils.IntValue(utils.InterfaceToString(idValue), 0)
 	taskId, _ := h.snowflake.Next(true)
 	job := model.MidJourneyJob{
@@ -264,13 +278,13 @@ func (h *MidJourneyHandler) Variation(c *gin.Context) {
 		Prompt:      data.Prompt,
 		CreatedAt:   time.Now(),
 	}
-	if res := h.db.Create(&job); res.Error != nil {
+	if res := h.db.Create(&job); res.Error != nil || res.RowsAffected == 0 {
 		resp.ERROR(c, "添加任务失败："+res.Error.Error())
 		return
 	}
 
 	h.pool.PushTask(types.MjTask{
-		Id:          jobId,
+		Id:          job.Id,
 		SessionId:   data.SessionId,
 		Type:        types.TaskVariation,
 		Prompt:      data.Prompt,
@@ -282,7 +296,9 @@ func (h *MidJourneyHandler) Variation(c *gin.Context) {
 	})
 
 	client := h.pool.Clients.Get(uint(job.UserId))
+	if client != nil {
 		_ = client.Send([]byte("Task Updated"))
+	}
 
 	// update user's img calls
 	h.db.Model(&model.User{}).Where("id = ?", job.UserId).UpdateColumn("img_calls", gorm.Expr("img_calls - ?", 1))
@@ -295,6 +311,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 {
@@ -305,6 +322,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)
@@ -325,25 +345,22 @@ func (h *MidJourneyHandler) JobList(c *gin.Context) {
 			continue
 		}
 
+		// 失败的任务直接删除
 		if job.Progress == -1 {
 			h.db.Delete(&model.MidJourneyJob{Id: job.Id})
-		}
-
-		if item.Progress < 100 {
-			// 10 分钟还没完成的任务直接删除
-			if time.Now().Sub(item.CreatedAt) > time.Minute*10 {
-				h.db.Delete(&item)
-				// 退回绘图次数
-				h.db.Model(&model.User{}).Where("id = ?", item.UserId).UpdateColumn("img_calls", gorm.Expr("img_calls + ?", 1))
+			jobs = append(jobs, job)
 			continue
 		}
 
-			// 正在运行中任务使用代理访问图片
-			if item.ImgURL == "" && item.OrgURL != "" {
+		if item.Progress < 100 && item.ImgURL == "" && item.OrgURL != "" {
+			// discord 服务器图片需要使用代理转发图片数据流
+			if strings.HasPrefix(item.OrgURL, "https://cdn.discordapp.com") {
 				image, err := utils.DownloadImage(item.OrgURL, h.App.Config.ProxyURL)
 				if err == nil {
 					job.ImgURL = "data:image/png;base64," + base64.StdEncoding.EncodeToString(image)
 				}
+			} else {
+				job.ImgURL = job.OrgURL
 			}
 		}
 
@@ -378,7 +395,50 @@ func (h *MidJourneyHandler) Remove(c *gin.Context) {
 	}
 
 	client := h.pool.Clients.Get(data.UserId)
+	if client != nil {
 		_ = client.Send([]byte("Task Updated"))
+	}
+
+	resp.SUCCESS(c)
+}
+
+// Notify MidJourney Plus 服务任务回调处理
+func (h *MidJourneyHandler) Notify(c *gin.Context) {
+	var data plus.CBReq
+	if err := c.ShouldBindJSON(&data); err != nil {
+		logger.Error("非法任务回调：%+v", err)
+		return
+	}
+	err := h.pool.Notify(data)
+	if err != nil {
+		logger.Error(err)
+	} else {
+		userId := h.GetLoginUserId(c)
+		client := h.pool.Clients.Get(userId)
+		if client != nil {
+			_ = client.Send([]byte("Task Updated"))
+		}
+	}
+
+	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/payment_handler.go

@@ -76,6 +76,12 @@ func (h *PaymentHandler) DoPay(c *gin.Context) {
 		return
 	}
 
+	// fix: 这里先检查一下订单状态，如果已经支付了，就直接返回
+	if order.Status == types.OrderPaidSuccess {
+		resp.ERROR(c, "This order had been paid, please do not pay twice")
+		return
+	}
+
 	// 更新扫码状态
 	h.db.Model(&order).UpdateColumn("status", types.OrderScanned)
 	if payWay == "alipay" { // 支付宝
@@ -101,30 +107,12 @@ func (h *PaymentHandler) DoPay(c *gin.Context) {
 			NotifyURL:    h.App.Config.HuPiPayConfig.NotifyURL,
 			WapName:      "极客学长",
 		}
-		res, err := h.huPiPayService.Pay(params)
+		r, err := h.huPiPayService.Pay(params)
 		if err != nil {
-			resp.ERROR(c, "error with generate pay url: "+err.Error())
+			resp.ERROR(c, err.Error())
 			return
 		}
 
-		var r struct {
-			Openid    interface{} `json:"openid"`
-			UrlQrcode string      `json:"url_qrcode"`
-			URL       string      `json:"url"`
-			ErrCode   int         `json:"errcode"`
-			ErrMsg    string      `json:"errmsg,omitempty"`
-		}
-		err = utils.JsonDecode(res, &r)
-		if err != nil {
-			logger.Debugf(res)
-			resp.ERROR(c, "error with decode payment result: "+err.Error())
-			return
-		}
-
-		if r.ErrCode != 0 {
-			resp.ERROR(c, "error with generate pay url: "+r.ErrMsg)
-			return
-		}
 		c.Redirect(302, r.URL)
 	}
 	resp.ERROR(c, "Invalid operations")
@@ -199,13 +187,17 @@ func (h *PaymentHandler) PayQrcode(c *gin.Context) {
 	}
 
 	var payWay string
+	var notifyURL string
 	switch data.PayWay {
 	case "hupi":
 		payWay = PayWayXunHu
+		notifyURL = h.App.Config.HuPiPayConfig.NotifyURL
 	case "payjs":
 		payWay = PayWayJs
+		notifyURL = h.App.Config.JPayConfig.NotifyURL
 	default:
 		payWay = PayWayAlipay
+		notifyURL = h.App.Config.AlipayConfig.NotifyURL
 	}
 	// 创建订单
 	remark := types.OrderRemark{
@@ -218,7 +210,7 @@ func (h *PaymentHandler) PayQrcode(c *gin.Context) {
 	}
 	order := model.Order{
 		UserId:    user.Id,
-		Mobile:    user.Username,
+		Username:  user.Username,
 		ProductId: product.Id,
 		OrderNo:   orderNo,
 		Subject:   product.Name,
@@ -228,7 +220,7 @@ func (h *PaymentHandler) PayQrcode(c *gin.Context) {
 		Remark:    utils.JsonEncode(remark),
 	}
 	res = h.db.Create(&order)
-	if res.Error != nil {
+	if res.Error != nil || res.RowsAffected == 0 {
 		resp.ERROR(c, "error with create order: "+res.Error.Error())
 		return
 	}
@@ -267,7 +259,7 @@ func (h *PaymentHandler) PayQrcode(c *gin.Context) {
 		return
 	}
 
-	parse, err := url.Parse(h.App.Config.AlipayConfig.NotifyURL)
+	parse, err := url.Parse(notifyURL)
 	if err != nil {
 		resp.ERROR(c, err.Error())
 		return
@@ -284,7 +276,7 @@ func (h *PaymentHandler) PayQrcode(c *gin.Context) {
 }
 
 // 异步通知回调公共逻辑
-func (h *PaymentHandler) notify(orderNo string) error {
+func (h *PaymentHandler) notify(orderNo string, tradeNo string) error {
 	var order model.Order
 	res := h.db.Where("order_no = ?", orderNo).First(&order)
 	if res.Error != nil {
@@ -293,6 +285,9 @@ func (h *PaymentHandler) notify(orderNo string) error {
 		return err
 	}
 
+	h.lock.Lock()
+	defer h.lock.Unlock()
+
 	// 已支付订单，直接返回
 	if order.Status == types.OrderPaidSuccess {
 		return nil
@@ -314,30 +309,25 @@ func (h *PaymentHandler) notify(orderNo string) error {
 		return err
 	}
 
-	// 1. 点卡：days == 0, calls > 0
-	// 2. vip 套餐：days > 0, calls == 0
-	if remark.Days > 0 {
-		if user.ExpiredTime > time.Now().Unix() {
+	if user.Vip { // 已经是 VIP 用户
+		if remark.Days > 0 { // 只延期 VIP，不增加调用次数
 			user.ExpiredTime = time.Unix(user.ExpiredTime, 0).AddDate(0, 0, remark.Days).Unix()
-		} else {
-			user.ExpiredTime = time.Now().AddDate(0, 0, remark.Days).Unix()
+		} else { // 充值点卡，直接增加次数即可
+			user.Calls += remark.Calls
+			user.ImgCalls += remark.ImgCalls
 		}
+
+	} else { // 非 VIP 用户
+		if remark.Days > 0 { // vip 套餐：days > 0, calls == 0
+			user.ExpiredTime = time.Now().AddDate(0, 0, remark.Days).Unix()
+			user.Calls += h.App.SysConfig.VipMonthCalls
+			user.ImgCalls += h.App.SysConfig.VipMonthImgCalls
 			user.Vip = true
 
-	} else if !user.Vip { // 充值点卡的非 VIP 用户
-		user.ExpiredTime = time.Now().AddDate(0, 0, 30).Unix()
-	}
-
-	if remark.Calls > 0 { // 充值点卡
+		} else { //点卡：days == 0, calls > 0
 			user.Calls += remark.Calls
-	} else {
-		user.Calls += h.App.SysConfig.VipMonthCalls
-	}
-
-	if remark.ImgCalls > 0 {
 			user.ImgCalls += remark.ImgCalls
-	} else {
-		user.ImgCalls += h.App.SysConfig.VipMonthImgCalls
+		}
 	}
 
 	// 更新用户信息
@@ -351,6 +341,7 @@ func (h *PaymentHandler) notify(orderNo string) error {
 	// 更新订单状态
 	order.PayTime = time.Now().Unix()
 	order.Status = types.OrderPaidSuccess
+	order.TradeNo = tradeNo
 	res = h.db.Updates(&order)
 	if res.Error != nil {
 		err := fmt.Errorf("error with update order info: %v", res.Error)
@@ -387,12 +378,15 @@ func (h *PaymentHandler) HuPiPayNotify(c *gin.Context) {
 	}
 
 	orderNo := c.Request.Form.Get("trade_order_id")
-	logger.Infof("收到订单支付回调，订单 NO：%s", orderNo)
-	// TODO 是否要保存订单交易流水号
-	h.lock.Lock()
-	defer h.lock.Unlock()
+	tradeNo := c.Request.Form.Get("open_order_id")
+	logger.Infof("收到虎皮椒订单支付回调，订单 NO：%s，交易流水号：%s", orderNo, tradeNo)
 
-	err = h.notify(orderNo)
+	if err = h.huPiPayService.Check(tradeNo); err != nil {
+		logger.Error("订单校验失败：", err)
+		c.String(http.StatusOK, "fail")
+		return
+	}
+	err = h.notify(orderNo, tradeNo)
 	if err != nil {
 		c.String(http.StatusOK, "fail")
 		return
@@ -409,19 +403,17 @@ func (h *PaymentHandler) AlipayNotify(c *gin.Context) {
 		return
 	}
 
-	// TODO：这里最好用支付宝的公钥签名签证一下交易真假
-	//res := h.alipayService.TradeVerify(c.Request.Form)
-	r := h.alipayService.TradeQuery(c.Request.Form.Get("out_trade_no"))
-	logger.Infof("验证支付结果：%+v", r)
-	if !r.Success() {
+	// TODO：验证交易签名
+	res := h.alipayService.TradeVerify(c.Request.Form)
+	logger.Infof("验证支付结果：%+v", res)
+	if !res.Success() {
+		logger.Error("订单校验失败：", res.Message)
 		c.String(http.StatusOK, "fail")
 		return
 	}
 
-	h.lock.Lock()
-	defer h.lock.Unlock()
-
-	err = h.notify(r.OutTradeNo)
+	tradeNo := c.Request.Form.Get("trade_no")
+	err = h.notify(res.OutTradeNo, tradeNo)
 	if err != nil {
 		c.String(http.StatusOK, "fail")
 		return
@@ -446,10 +438,16 @@ func (h *PaymentHandler) PayJsNotify(c *gin.Context) {
 		return
 	}
 
-	h.lock.Lock()
-	defer h.lock.Unlock()
+	// 校验订单支付状态
+	tradeNo := c.Request.Form.Get("payjs_order_id")
+	err = h.js.Check(tradeNo)
+	if err != nil {
+		logger.Error("订单校验失败：", err)
+		c.String(http.StatusOK, "fail")
+		return
+	}
 
-	err = h.notify(orderNo)
+	err = h.notify(orderNo, tradeNo)
 	if err != nil {
 		c.String(http.StatusOK, "fail")
 		return

api/handler/sd_handler.go

@@ -11,6 +11,8 @@ import (
 	"chatplus/utils/resp"
 	"encoding/base64"
 	"fmt"
+	"github.com/gorilla/websocket"
+	"net/http"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -36,6 +38,27 @@ func NewSdJobHandler(app *core.AppServer, db *gorm.DB, pool *sd.ServicePool, man
 	return &h
 }
 
+// Client WebSocket 客户端，用于通知任务状态变更
+func (h *SdJobHandler) 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)
+	h.pool.Clients.Put(uint(userId), client)
+	logger.Infof("New websocket connected, IP: %s", c.RemoteIP())
+}
+
 func (h *SdJobHandler) checkLimits(c *gin.Context) bool {
 	user, err := utils.GetLoginUser(c, h.db)
 	if err != nil {
@@ -145,6 +168,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 +179,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 +251,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/handler/sms_handler.go

@@ -4,6 +4,7 @@ import (
 	"chatplus/core"
 	"chatplus/core/types"
 	"chatplus/service"
+	"chatplus/service/sms"
 	"chatplus/utils"
 	"chatplus/utils/resp"
 	"strings"
@@ -17,7 +18,7 @@ const CodeStorePrefix = "/verify/codes/"
 type SmsHandler struct {
 	BaseHandler
 	redis   *redis.Client
-	sms     *service.AliYunSmsService
+	sms     *sms.ServiceManager
 	smtp    *service.SmtpService
 	captcha *service.CaptchaService
 }
@@ -25,7 +26,7 @@ type SmsHandler struct {
 func NewSmsHandler(
 	app *core.AppServer,
 	client *redis.Client,
-	sms *service.AliYunSmsService,
+	sms *sms.ServiceManager,
 	smtp *service.SmtpService,
 	captcha *service.CaptchaService) *SmsHandler {
 	handler := &SmsHandler{redis: client, sms: sms, captcha: captcha, smtp: smtp}
@@ -63,7 +64,8 @@ func (h *SmsHandler) SendCode(c *gin.Context) {
 			resp.ERROR(c, "系统已禁用手机号注册！")
 			return
 		}
-		err = h.sms.SendVerifyCode(data.Receiver, code)
+		err = h.sms.GetService().SendVerifyCode(data.Receiver, code)
+
 	}
 	if err != nil {
 		resp.ERROR(c, err.Error())

api/handler/test_handler.go

@@ -7,8 +7,8 @@ import (
 	"chatplus/utils"
 	"chatplus/utils/resp"
 	"fmt"
-
 	"github.com/gin-gonic/gin"
+	"github.com/imroc/req/v3"
 	"gorm.io/gorm"
 )
 
@@ -22,23 +22,176 @@ func NewTestHandler(db *gorm.DB, snowflake *service.Snowflake, js *payment.PayJS
 	return &TestHandler{db: db, snowflake: snowflake, js: js}
 }
 
-func (h *TestHandler) Test(c *gin.Context) {
-	//h.initUserNickname(c)
-	//h.initMjTaskId(c)
+type reqBody struct {
+	BotType       string        `json:"botType"`
+	Prompt        string        `json:"prompt"`
+	Base64Array   []interface{} `json:"base64Array,omitempty"`
+	AccountFilter struct {
+		InstanceId          string        `json:"instanceId"`
+		Modes               []interface{} `json:"modes"`
+		Remix               bool          `json:"remix"`
+		RemixAutoConsidered bool          `json:"remixAutoConsidered"`
+	} `json:"accountFilter,omitempty"`
+	NotifyHook string `json:"notifyHook"`
+	State      string `json:"state,omitempty"`
+}
 
-	orderId, _ := h.snowflake.Next(false)
-	params := payment.JPayReq{
-		TotalFee:   12345,
-		OutTradeNo: orderId,
-		Subject:    "支付测试",
+type resBody struct {
+	Code        int    `json:"code"`
+	Description string `json:"description"`
+	Properties  struct {
+	} `json:"properties"`
+	Result string `json:"result"`
+}
+
+func (h *TestHandler) Test(c *gin.Context) {
+	image(c)
+
+}
+
+func upscale(c *gin.Context) {
+	apiURL := "https://api.openai1s.cn/mj/submit/action"
+	token := "sk-QpBaQn9Z5vngsjJaFdDfC9Db90C845EaB5E764578a7d292a"
+	body := map[string]string{
+		"customId":   "MJ::JOB::upsample::1::c80a8eb1-f2d1-4f40-8785-97eb99b7ba0a",
+		"taskId":     "1704880156226095",
+		"notifyHook": "http://r9it.com:6004/api/test/mj",
 	}
-	r := h.js.Pay(params)
-	if !r.IsOK() {
-		resp.ERROR(c, r.ReturnMsg)
+	var res resBody
+	var resErr errRes
+	r, err := req.C().R().
+		SetHeader("Authorization", "Bearer "+token).
+		SetBody(body).
+		SetSuccessResult(&res).
+		SetErrorResult(&resErr).
+		Post(apiURL)
+	if err != nil {
+		resp.ERROR(c, "请求出错："+err.Error())
 		return
 	}
-	resp.SUCCESS(c, r)
 
+	if r.IsErrorState() {
+		resp.ERROR(c, "返回错误状态："+resErr.Error.Message)
+		return
+	}
+
+	resp.SUCCESS(c, res)
+
+}
+
+type queryRes struct {
+	Action  string `json:"action"`
+	Buttons []struct {
+		CustomId string `json:"customId"`
+		Emoji    string `json:"emoji"`
+		Label    string `json:"label"`
+		Style    int    `json:"style"`
+		Type     int    `json:"type"`
+	} `json:"buttons"`
+	Description string `json:"description"`
+	FailReason  string `json:"failReason"`
+	FinishTime  int    `json:"finishTime"`
+	Id          string `json:"id"`
+	ImageUrl    string `json:"imageUrl"`
+	Progress    string `json:"progress"`
+	Prompt      string `json:"prompt"`
+	PromptEn    string `json:"promptEn"`
+	Properties  struct {
+	} `json:"properties"`
+	StartTime  int    `json:"startTime"`
+	State      string `json:"state"`
+	Status     string `json:"status"`
+	SubmitTime int    `json:"submitTime"`
+}
+
+func query(c *gin.Context) {
+	apiURL := "https://api.openai1s.cn/mj/task/1704960661008372/fetch"
+	token := "sk-QpBaQn9Z5vngsjJaFdDfC9Db90C845EaB5E764578a7d292a"
+	var res queryRes
+	r, err := req.C().R().SetHeader("Authorization", "Bearer "+token).
+		SetSuccessResult(&res).
+		Get(apiURL)
+
+	if err != nil {
+		resp.ERROR(c, "请求出错："+err.Error())
+		return
+	}
+
+	if r.IsErrorState() {
+		resp.ERROR(c, "返回错误状态："+r.Status)
+		return
+	}
+
+	resp.SUCCESS(c, res)
+}
+
+type errRes struct {
+	Error struct {
+		Message string `json:"message"`
+	} `json:"error"`
+}
+
+func image(c *gin.Context) {
+	apiURL := "https://api.openai1s.cn/mj-fast/mj/submit/imagine"
+	token := "sk-QpBaQn9Z5vngsjJaFdDfC9Db90C845EaB5E764578a7d292a"
+	body := reqBody{
+		BotType:    "MID_JOURNEY",
+		Prompt:     "一个中国美女，手上拿着一桶爆米花，脸上带着迷人的微笑，白色衣服 --s 750 --v 6",
+		NotifyHook: "http://r9it.com:6004/api/test/mj",
+	}
+	var res resBody
+	var resErr errRes
+	r, err := req.C().R().
+		SetHeader("Authorization", "Bearer "+token).
+		SetBody(body).
+		SetSuccessResult(&res).
+		SetErrorResult(&resErr).
+		Post(apiURL)
+	if err != nil {
+		resp.ERROR(c, "请求出错："+err.Error())
+		return
+	}
+
+	if r.IsErrorState() {
+		resp.ERROR(c, "返回错误状态："+resErr.Error.Message)
+		return
+	}
+
+	resp.SUCCESS(c, res)
+}
+
+type cbReq struct {
+	Id          string      `json:"id"`
+	Action      string      `json:"action"`
+	Status      string      `json:"status"`
+	Prompt      string      `json:"prompt"`
+	PromptEn    string      `json:"promptEn"`
+	Description string      `json:"description"`
+	SubmitTime  int64       `json:"submitTime"`
+	StartTime   int64       `json:"startTime"`
+	FinishTime  int64       `json:"finishTime"`
+	Progress    string      `json:"progress"`
+	ImageUrl    string      `json:"imageUrl"`
+	FailReason  interface{} `json:"failReason"`
+	Properties  struct {
+		FinalPrompt string `json:"finalPrompt"`
+	} `json:"properties"`
+}
+
+func (h *TestHandler) Mj(c *gin.Context) {
+	var data cbReq
+	if err := c.ShouldBindJSON(&data); err != nil {
+		logger.Error(err)
+	}
+	logger.Debugf("任务ID：%s,任务进度：%s,图片地址：%s, 最终提示词：%s", data.Id, data.Progress, data.ImageUrl, data.Properties.FinalPrompt)
+	apiURL := "https://api.openai1s.cn/mj/task/" + data.Id + "/fetch"
+	token := "sk-QpBaQn9Z5vngsjJaFdDfC9Db90C845EaB5E764578a7d292a"
+	var res queryRes
+	_, _ = req.C().R().SetHeader("Authorization", "Bearer "+token).
+		SetSuccessResult(&res).
+		Get(apiURL)
+
+	fmt.Println(res.State, ",", res.ImageUrl, ",", res.Progress)
 }
 
 func (h *TestHandler) initUserNickname(c *gin.Context) {

api/handler/upload_handler.go

@@ -3,9 +3,13 @@ package handler
 import (
 	"chatplus/core"
 	"chatplus/service/oss"
+	"chatplus/store/model"
+	"chatplus/store/vo"
+	"chatplus/utils"
 	"chatplus/utils/resp"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
+	"time"
 )
 
 type UploadHandler struct {
@@ -21,11 +25,73 @@ func NewUploadHandler(app *core.AppServer, db *gorm.DB, manager *oss.UploaderMan
 }
 
 func (h *UploadHandler) Upload(c *gin.Context) {
-	fileURL, err := h.uploaderManager.GetUploadHandler().PutFile(c, "file")
+	file, err := h.uploaderManager.GetUploadHandler().PutFile(c, "file")
 	if err != nil {
 		resp.ERROR(c, err.Error())
 		return
 	}
 
-	resp.SUCCESS(c, fileURL)
+	userId := h.GetLoginUserId(c)
+	res := h.db.Create(&model.File{
+		UserId:    userId,
+		Name:      file.Name,
+		ObjKey:    file.ObjKey,
+		URL:       file.URL,
+		Ext:       file.Ext,
+		Size:      file.Size,
+		CreatedAt: time.Time{},
+	})
+	if res.Error != nil || res.RowsAffected == 0 {
+		resp.ERROR(c, "error with update database: "+res.Error.Error())
+		return
+	}
+
+	resp.SUCCESS(c, file)
+}
+
+func (h *UploadHandler) List(c *gin.Context) {
+	userId := h.GetLoginUserId(c)
+	var items []model.File
+	var files = make([]vo.File, 0)
+	h.db.Where("user_id = ?", userId).Find(&items)
+	if len(items) > 0 {
+		for _, v := range items {
+			var file vo.File
+			err := utils.CopyObject(v, &file)
+			if err != nil {
+				logger.Error(err)
+				continue
+			}
+			file.CreatedAt = v.CreatedAt.Unix()
+			files = append(files, file)
+		}
+	}
+
+	resp.SUCCESS(c, files)
+}
+
+// Remove remove files
+func (h *UploadHandler) Remove(c *gin.Context) {
+	userId := h.GetLoginUserId(c)
+	id := h.GetInt(c, "id", 0)
+	var file model.File
+	tx := h.db.Where("user_id = ? AND id = ?", userId, id).First(&file)
+	if tx.Error != nil || file.Id == 0 {
+		resp.ERROR(c, "file not existed")
+		return
+	}
+
+	// remove database
+	tx = h.db.Model(&model.File{}).Delete("id = ?", id)
+	if tx.Error != nil || tx.RowsAffected == 0 {
+		resp.ERROR(c, "failed to update database")
+		return
+	}
+	// remove files
+	objectKey := file.ObjKey
+	if objectKey == "" {
+		objectKey = file.URL
+	}
+	_ = h.uploaderManager.GetUploadHandler().Delete(objectKey)
+	resp.SUCCESS(c)
 }

api/main.go

@@ -12,6 +12,7 @@ import (
 	"chatplus/service/oss"
 	"chatplus/service/payment"
 	"chatplus/service/sd"
+	"chatplus/service/sms"
 	"chatplus/service/wx"
 	"chatplus/store"
 	"context"
@@ -59,11 +60,13 @@ func main() {
 	}
 	debug, _ := strconv.ParseBool(os.Getenv("APP_DEBUG"))
 	logger.Info("Loading config file: ", configFile)
+	if !debug {
 		defer func() {
 			if err := recover(); err != nil {
 				logger.Error("Panic Error:", err)
 			}
 		}()
+	}
 
 	app := fx.New(
 		// 初始化配置应用配置
@@ -135,7 +138,7 @@ func main() {
 		fx.Provide(admin.NewOrderHandler),
 
 		// 创建服务
-		fx.Provide(service.NewAliYunSmsService),
+		fx.Provide(sms.NewSendServiceManager),
 		fx.Provide(func(config *types.AppConfig) *service.CaptchaService {
 			return service.NewCaptchaService(config.ApiConfig)
 		}),
@@ -162,6 +165,7 @@ func main() {
 			if pool.HasAvailableService() {
 				pool.DownloadImages()
 				pool.CheckTaskNotify()
+				pool.SyncTaskProgress()
 			}
 		}),
 
@@ -213,6 +217,8 @@ func main() {
 		}),
 		fx.Invoke(func(s *core.AppServer, h *handler.UploadHandler) {
 			s.Engine.POST("/api/upload", h.Upload)
+			s.Engine.GET("/api/upload/list", h.List)
+			s.Engine.GET("/api/upload/remove", h.Remove)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *handler.SmsHandler) {
 			group := s.Engine.Group("/api/sms/")
@@ -235,12 +241,15 @@ func main() {
 			group.POST("variation", h.Variation)
 			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)
 		}),
 
 		// 管理后台控制器
@@ -367,6 +376,7 @@ func main() {
 		fx.Provide(handler.NewTestHandler),
 		fx.Invoke(func(s *core.AppServer, h *handler.TestHandler) {
 			s.Engine.GET("/api/test", h.Test)
+			s.Engine.POST("/api/test/mj", h.Mj)
 		}),
 		fx.Invoke(func(s *core.AppServer, db *gorm.DB) {
 			err := s.Run(db)
@@ -374,7 +384,9 @@ func main() {
 				log.Fatal(err)
 			}
 		}),
-
+		fx.Invoke(func(h *chatimpl.ChatHandler) {
+			h.Init()
+		}),
 		// 注册生命周期回调函数
 		fx.Invoke(func(lifecycle fx.Lifecycle, lc *AppLifecycle) {
 			lifecycle.Append(fx.Hook{

api/service/mj/bot.go

@@ -33,7 +33,7 @@ func NewBot(name string, proxy string, config types.MidJourneyConfig, service *S
 	// use CDN reverse proxy
 	if config.UseCDN {
 		discordgo.SetEndpointDiscord(config.DiscordAPI)
-		discordgo.SetEndpointCDN(config.DiscordCDN)
+		discordgo.SetEndpointCDN("https://cdn.discordapp.com")
 		discordgo.SetEndpointStatus(config.DiscordAPI + "/api/v2/")
 		bot.MjGateway = config.DiscordGateway + "/"
 	} else { // use proxy

api/service/mj/client.go

@@ -2,6 +2,7 @@ package mj
 
 import (
 	"chatplus/core/types"
+	"errors"
 	"fmt"
 	"time"
 
@@ -32,7 +33,7 @@ func NewClient(config types.MidJourneyConfig, proxy string) *Client {
 	return &Client{client: client, Config: config, apiURL: apiURL}
 }
 
-func (c *Client) Imagine(prompt string) error {
+func (c *Client) Imagine(task types.MjTask) error {
 	interactionsReq := &InteractionsRequest{
 		Type:          2,
 		ApplicationID: ApplicationID,
@@ -48,7 +49,7 @@ func (c *Client) Imagine(prompt string) error {
 				{
 					"type":  3,
 					"name":  "prompt",
-					"value": prompt,
+					"value": fmt.Sprintf("%s %s", task.TaskId, task.Prompt),
 				},
 			},
 			"application_command": map[string]any{
@@ -87,20 +88,28 @@ func (c *Client) Imagine(prompt string) error {
 	return nil
 }
 
+func (c *Client) Blend(task types.MjTask) error {
+	return errors.New("function not implemented")
+}
+
+func (c *Client) SwapFace(task types.MjTask) error {
+	return errors.New("function not implemented")
+}
+
 // Upscale 放大指定的图片
-func (c *Client) Upscale(index int, messageId string, hash string) error {
+func (c *Client) Upscale(task types.MjTask) error {
 	flags := 0
 	interactionsReq := &InteractionsRequest{
 		Type:          3,
 		ApplicationID: ApplicationID,
 		GuildID:       c.Config.GuildId,
 		ChannelID:     c.Config.ChanelId,
-		MessageFlags:  &flags,
-		MessageID:     &messageId,
+		MessageFlags:  flags,
+		MessageID:     task.MessageId,
 		SessionID:     SessionID,
 		Data: map[string]any{
 			"component_type": 2,
-			"custom_id":      fmt.Sprintf("MJ::JOB::upsample::%d::%s", index, hash),
+			"custom_id":      fmt.Sprintf("MJ::JOB::upsample::%d::%s", task.Index, task.MessageHash),
 		},
 		Nonce: fmt.Sprintf("%d", time.Now().UnixNano()),
 	}
@@ -119,19 +128,19 @@ func (c *Client) Upscale(index int, messageId string, hash string) error {
 }
 
 // Variation  以指定的图片的视角进行变换再创作，注意需要在对应的频道中关闭 Remix 变换，否则 Variation 指令将不会生效
-func (c *Client) Variation(index int, messageId string, hash string) error {
+func (c *Client) Variation(task types.MjTask) error {
 	flags := 0
 	interactionsReq := &InteractionsRequest{
 		Type:          3,
 		ApplicationID: ApplicationID,
 		GuildID:       c.Config.GuildId,
 		ChannelID:     c.Config.ChanelId,
-		MessageFlags:  &flags,
-		MessageID:     &messageId,
+		MessageFlags:  flags,
+		MessageID:     task.MessageId,
 		SessionID:     SessionID,
 		Data: map[string]any{
 			"component_type": 2,
-			"custom_id":      fmt.Sprintf("MJ::JOB::variation::%d::%s", index, hash),
+			"custom_id":      fmt.Sprintf("MJ::JOB::variation::%d::%s", task.Index, task.MessageHash),
 		},
 		Nonce: fmt.Sprintf("%d", time.Now().UnixNano()),
 	}

api/service/mj/plus/client.go

@@ -0,0 +1,288 @@
+package plus
+
+import (
+	"chatplus/core/types"
+	logger2 "chatplus/logger"
+	"chatplus/utils"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"io"
+
+	"github.com/gin-gonic/gin"
+
+	"github.com/imroc/req/v3"
+)
+
+var logger = logger2.GetLogger()
+
+// Client MidJourney Plus Client
+type Client struct {
+	Config types.MidJourneyPlusConfig
+	apiURL string
+}
+
+func NewClient(config types.MidJourneyPlusConfig) *Client {
+	var apiURL string
+	if config.CdnURL != "" {
+		apiURL = config.CdnURL
+	} else {
+		apiURL = config.ApiURL
+	}
+	return &Client{Config: config, apiURL: apiURL}
+}
+
+type ImageReq struct {
+	BotType       string   `json:"botType"`
+	Prompt        string   `json:"prompt,omitempty"`
+	Dimensions    string   `json:"dimensions,omitempty"`
+	Base64Array   []string `json:"base64Array,omitempty"`
+	AccountFilter struct {
+		InstanceId          string        `json:"instanceId"`
+		Modes               []interface{} `json:"modes"`
+		Remix               bool          `json:"remix"`
+		RemixAutoConsidered bool          `json:"remixAutoConsidered"`
+	} `json:"accountFilter,omitempty"`
+	NotifyHook string `json:"notifyHook"`
+	State      string `json:"state,omitempty"`
+}
+
+type ImageRes struct {
+	Code        int    `json:"code"`
+	Description string `json:"description"`
+	Properties  struct {
+	} `json:"properties"`
+	Result string `json:"result"`
+}
+
+type ErrRes struct {
+	Error struct {
+		Message string `json:"message"`
+	} `json:"error"`
+}
+
+func (c *Client) Imagine(task types.MjTask) (ImageRes, error) {
+	apiURL := fmt.Sprintf("%s/mj-fast/mj/submit/imagine", c.apiURL)
+	body := ImageReq{
+		BotType:     "MID_JOURNEY",
+		Prompt:      task.Prompt,
+		NotifyHook:  c.Config.NotifyURL,
+		Base64Array: make([]string, 0),
+	}
+	// 生成图片 Base64 编码
+	if len(task.ImgArr) > 0 {
+		imageData, err := utils.DownloadImage(task.ImgArr[0], "")
+		if err != nil {
+			logger.Error("error with download image: ", err)
+		} else {
+			body.Base64Array = append(body.Base64Array, "data:image/png;base64,"+base64.StdEncoding.EncodeToString(imageData))
+		}
+
+	}
+	var res ImageRes
+	var errRes ErrRes
+	r, err := req.C().R().
+		SetHeader("Authorization", "Bearer "+c.Config.ApiKey).
+		SetBody(body).
+		SetSuccessResult(&res).
+		SetErrorResult(&errRes).
+		Post(apiURL)
+	if err != nil {
+		return ImageRes{}, fmt.Errorf("请求 API 出错：%v", err)
+	}
+
+	if r.IsErrorState() {
+		errStr, _ := io.ReadAll(r.Body)
+		return ImageRes{}, fmt.Errorf("API 返回错误：%s，%v", errRes.Error.Message, string(errStr))
+	}
+
+	return res, nil
+}
+
+// Blend 融图
+func (c *Client) Blend(task types.MjTask) (ImageRes, error) {
+	apiURL := fmt.Sprintf("%s/mj-fast/mj/submit/blend", c.apiURL)
+	body := ImageReq{
+		BotType:     "MID_JOURNEY",
+		Dimensions:  "SQUARE",
+		NotifyHook:  c.Config.NotifyURL,
+		Base64Array: make([]string, 0),
+	}
+	// 生成图片 Base64 编码
+	if len(task.ImgArr) > 0 {
+		for _, imgURL := range task.ImgArr {
+			imageData, err := utils.DownloadImage(imgURL, "")
+			if err != nil {
+				logger.Error("error with download image: ", err)
+			} else {
+				body.Base64Array = append(body.Base64Array, "data:image/png;base64,"+base64.StdEncoding.EncodeToString(imageData))
+			}
+		}
+	}
+	var res ImageRes
+	var errRes ErrRes
+	r, err := req.C().R().
+		SetHeader("Authorization", "Bearer "+c.Config.ApiKey).
+		SetBody(body).
+		SetSuccessResult(&res).
+		SetErrorResult(&errRes).
+		Post(apiURL)
+	if err != nil {
+		errStr, _ := io.ReadAll(r.Body)
+		return ImageRes{}, fmt.Errorf("请求 API 出错：%v，%v", err, string(errStr))
+	}
+
+	if r.IsErrorState() {
+		return ImageRes{}, fmt.Errorf("API 返回错误：%s", errRes.Error.Message)
+	}
+
+	return res, nil
+}
+
+// SwapFace 换脸
+func (c *Client) SwapFace(task types.MjTask) (ImageRes, error) {
+	apiURL := fmt.Sprintf("%s/mj-fast/mj/insight-face/swap", c.apiURL)
+	// 生成图片 Base64 编码
+	if len(task.ImgArr) != 2 {
+		return ImageRes{}, errors.New("参数错误，必须上传2张图片")
+	}
+	var sourceBase64 string
+	var targetBase64 string
+	imageData, err := utils.DownloadImage(task.ImgArr[0], "")
+	if err != nil {
+		logger.Error("error with download image: ", err)
+	} else {
+		sourceBase64 = "data:image/png;base64," + base64.StdEncoding.EncodeToString(imageData)
+	}
+	imageData, err = utils.DownloadImage(task.ImgArr[1], "")
+	if err != nil {
+		logger.Error("error with download image: ", err)
+	} else {
+		targetBase64 = "data:image/png;base64," + base64.StdEncoding.EncodeToString(imageData)
+	}
+
+	body := gin.H{
+		"sourceBase64": sourceBase64,
+		"targetBase64": targetBase64,
+		"accountFilter": gin.H{
+			"instanceId": "",
+		},
+		"notifyHook": c.Config.NotifyURL,
+		"state":      "",
+	}
+	var res ImageRes
+	var errRes ErrRes
+	r, err := req.C().R().
+		SetHeader("Authorization", "Bearer "+c.Config.ApiKey).
+		SetBody(body).
+		SetSuccessResult(&res).
+		SetErrorResult(&errRes).
+		Post(apiURL)
+	if err != nil {
+		errStr, _ := io.ReadAll(r.Body)
+		return ImageRes{}, fmt.Errorf("请求 API 出错：%v，%v", err, string(errStr))
+	}
+
+	if r.IsErrorState() {
+		return ImageRes{}, fmt.Errorf("API 返回错误：%s", errRes.Error.Message)
+	}
+
+	return res, nil
+}
+
+// Upscale 放大指定的图片
+func (c *Client) Upscale(task types.MjTask) (ImageRes, error) {
+	body := map[string]string{
+		"customId":   fmt.Sprintf("MJ::JOB::upsample::%d::%s", task.Index, task.MessageHash),
+		"taskId":     task.MessageId,
+		"notifyHook": c.Config.NotifyURL,
+	}
+	apiURL := fmt.Sprintf("%s/mj/submit/action", c.apiURL)
+	var res ImageRes
+	var errRes ErrRes
+	r, err := req.C().R().
+		SetHeader("Authorization", "Bearer "+c.Config.ApiKey).
+		SetBody(body).
+		SetSuccessResult(&res).
+		SetErrorResult(&errRes).
+		Post(apiURL)
+	if err != nil {
+		return ImageRes{}, fmt.Errorf("请求 API 出错：%v", err)
+	}
+
+	if r.IsErrorState() {
+		return ImageRes{}, fmt.Errorf("API 返回错误：%s", errRes.Error.Message)
+	}
+
+	return res, nil
+}
+
+// Variation  以指定的图片的视角进行变换再创作，注意需要在对应的频道中关闭 Remix 变换，否则 Variation 指令将不会生效
+func (c *Client) Variation(task types.MjTask) (ImageRes, error) {
+	body := map[string]string{
+		"customId":   fmt.Sprintf("MJ::JOB::variation::%d::%s", task.Index, task.MessageHash),
+		"taskId":     task.MessageId,
+		"notifyHook": c.Config.NotifyURL,
+	}
+	apiURL := fmt.Sprintf("%s/mj/submit/action", c.apiURL)
+	var res ImageRes
+	var errRes ErrRes
+	r, err := req.C().R().
+		SetHeader("Authorization", "Bearer "+c.Config.ApiKey).
+		SetBody(body).
+		SetSuccessResult(&res).
+		SetErrorResult(&errRes).
+		Post(apiURL)
+	if err != nil {
+		return ImageRes{}, fmt.Errorf("请求 API 出错：%v", err)
+	}
+
+	if r.IsErrorState() {
+		return ImageRes{}, fmt.Errorf("API 返回错误：%s", errRes.Error.Message)
+	}
+
+	return res, nil
+}
+
+type QueryRes struct {
+	Action  string `json:"action"`
+	Buttons []struct {
+		CustomId string `json:"customId"`
+		Emoji    string `json:"emoji"`
+		Label    string `json:"label"`
+		Style    int    `json:"style"`
+		Type     int    `json:"type"`
+	} `json:"buttons"`
+	Description string `json:"description"`
+	FailReason  string `json:"failReason"`
+	FinishTime  int    `json:"finishTime"`
+	Id          string `json:"id"`
+	ImageUrl    string `json:"imageUrl"`
+	Progress    string `json:"progress"`
+	Prompt      string `json:"prompt"`
+	PromptEn    string `json:"promptEn"`
+	Properties  struct {
+	} `json:"properties"`
+	StartTime  int    `json:"startTime"`
+	State      string `json:"state"`
+	Status     string `json:"status"`
+	SubmitTime int    `json:"submitTime"`
+}
+
+func (c *Client) QueryTask(taskId string) (QueryRes, error) {
+	apiURL := fmt.Sprintf("%s/mj/task/%s/fetch", c.apiURL, taskId)
+	var res QueryRes
+	r, err := req.C().R().SetHeader("Authorization", "Bearer "+c.Config.ApiKey).
+		SetSuccessResult(&res).
+		Get(apiURL)
+
+	if err != nil {
+		return QueryRes{}, err
+	}
+
+	if r.IsErrorState() {
+		return QueryRes{}, errors.New("error status:" + r.Status)
+	}
+
+	return res, nil
+}

api/service/mj/plus/service.go

@@ -0,0 +1,204 @@
+package plus
+
+import (
+	"chatplus/core/types"
+	"chatplus/store"
+	"chatplus/store/model"
+	"chatplus/utils"
+	"fmt"
+	"strings"
+	"sync/atomic"
+	"time"
+
+	"gorm.io/gorm"
+)
+
+// Service MJ 绘画服务
+type Service struct {
+	Name             string  // service Name
+	Client           *Client // MJ Client
+	taskQueue        *store.RedisQueue
+	notifyQueue      *store.RedisQueue
+	db               *gorm.DB
+	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, taskQueue *store.RedisQueue, notifyQueue *store.RedisQueue, maxTaskNum int32, timeout int64, db *gorm.DB, client *Client) *Service {
+	return &Service{
+		Name:             name,
+		db:               db,
+		taskQueue:        taskQueue,
+		notifyQueue:      notifyQueue,
+		Client:           client,
+		taskTimeout:      timeout,
+		maxHandleTaskNum: maxTaskNum,
+		taskStartTimes:   make(map[int]time.Time, 0),
+	}
+}
+
+func (s *Service) Run() {
+	logger.Infof("Starting MidJourney job consumer for %s", s.Name)
+	for {
+		s.checkTasks()
+		if !s.canHandleTask() {
+			// current service is full, can not handle more task
+			// waiting for running task finish
+			time.Sleep(time.Second * 3)
+			continue
+		}
+
+		var task types.MjTask
+		err := s.taskQueue.LPop(&task)
+		if err != nil {
+			logger.Errorf("taking task with error: %v", err)
+			continue
+		}
+
+		// if it's reference message, check if it's this channel's  message
+		//if task.ChannelId != "" && task.ChannelId != s.Name {
+		//	logger.Debugf("handle other service task, name: %s, channel_id: %s, drop it.", s.Name, task.ChannelId)
+		//	s.taskQueue.RPush(task)
+		//	time.Sleep(time.Second)
+		//	continue
+		//}
+
+		logger.Infof("%s handle a new MidJourney task: %+v", s.Name, task)
+		var res ImageRes
+		switch task.Type {
+		case types.TaskImage:
+			res, err = s.Client.Imagine(task)
+			break
+		case types.TaskUpscale:
+			res, err = s.Client.Upscale(task)
+			break
+		case types.TaskVariation:
+			res, err = s.Client.Variation(task)
+			break
+		case types.TaskBlend:
+			res, err = s.Client.Blend(task)
+			break
+		case types.TaskSwapFace:
+			res, err = s.Client.SwapFace(task)
+			break
+		}
+
+		var job model.MidJourneyJob
+		s.db.Where("id = ?", task.Id).First(&job)
+		if err != nil || (res.Code != 1 && res.Code != 22) {
+			errMsg := fmt.Sprintf("%v,%s", err, res.Description)
+			logger.Error("绘画任务执行失败：", errMsg)
+			job.Progress = -1
+			job.ErrMsg = errMsg
+			// update the task progress
+			s.db.Updates(&job)
+			// 任务失败，通知前端
+			s.notifyQueue.RPush(task.UserId)
+			// restore img_call quota
+			if task.Type.String() != types.TaskUpscale.String() {
+				s.db.Model(&model.User{}).Where("id = ?", task.UserId).UpdateColumn("img_calls", gorm.Expr("img_calls + ?", 1))
+			}
+
+			// TODO: 任务提交失败，加入队列重试
+			continue
+		}
+		logger.Infof("任务提交成功：%+v", res)
+		// lock the task until the execute timeout
+		s.taskStartTimes[int(task.Id)] = time.Now()
+		atomic.AddInt32(&s.HandledTaskNum, 1)
+		// 更新任务 ID/频道
+		job.TaskId = res.Result
+		job.ChannelId = s.Name
+		s.db.Updates(&job)
+	}
+}
+
+// check if current service instance can handle more task
+func (s *Service) canHandleTask() bool {
+	handledNum := atomic.LoadInt32(&s.HandledTaskNum)
+	return handledNum < s.maxHandleTaskNum
+}
+
+// remove the expired tasks
+func (s *Service) checkTasks() {
+	for k, t := range s.taskStartTimes {
+		if time.Now().Unix()-t.Unix() > s.taskTimeout {
+			delete(s.taskStartTimes, k)
+			atomic.AddInt32(&s.HandledTaskNum, -1)
+			// delete task from database
+			s.db.Delete(&model.MidJourneyJob{Id: uint(k)}, "progress < 100")
+		}
+	}
+}
+
+type CBReq struct {
+	Id          string      `json:"id"`
+	Action      string      `json:"action"`
+	Status      string      `json:"status"`
+	Prompt      string      `json:"prompt"`
+	PromptEn    string      `json:"promptEn"`
+	Description string      `json:"description"`
+	SubmitTime  int64       `json:"submitTime"`
+	StartTime   int64       `json:"startTime"`
+	FinishTime  int64       `json:"finishTime"`
+	Progress    string      `json:"progress"`
+	ImageUrl    string      `json:"imageUrl"`
+	FailReason  interface{} `json:"failReason"`
+	Properties  struct {
+		FinalPrompt string `json:"finalPrompt"`
+	} `json:"properties"`
+}
+
+func (s *Service) Notify(job model.MidJourneyJob) error {
+	task, err := s.Client.QueryTask(job.TaskId)
+	if err != nil {
+		return err
+	}
+
+	// 任务执行失败了
+	if task.FailReason != "" {
+		s.db.Model(&model.MidJourneyJob{Id: job.Id}).UpdateColumns(map[string]interface{}{
+			"progress": -1,
+			"err_msg":  task.FailReason,
+		})
+		return fmt.Errorf("task failed: %v", task.FailReason)
+	}
+
+	if len(task.Buttons) > 0 {
+		job.Hash = GetImageHash(task.Buttons[0].CustomId)
+	}
+	oldProgress := job.Progress
+	job.Progress = utils.IntValue(strings.Replace(task.Progress, "%", "", 1), 0)
+	job.Prompt = task.PromptEn
+	if task.ImageUrl != "" {
+		if s.Client.Config.CdnURL != "" {
+			job.OrgURL = strings.Replace(task.ImageUrl, s.Client.Config.ApiURL, s.Client.Config.CdnURL, 1)
+		} else {
+			job.OrgURL = task.ImageUrl
+		}
+	}
+	job.MessageId = task.Id
+	tx := s.db.Updates(&job)
+	if tx.Error != nil {
+		return fmt.Errorf("error with update database: %v", tx.Error)
+	}
+	if task.Status == "SUCCESS" {
+		// release lock task
+		atomic.AddInt32(&s.HandledTaskNum, -1)
+	}
+	// 通知前端更新任务进度
+	if oldProgress != job.Progress {
+		s.notifyQueue.RPush(job.UserId)
+	}
+	return nil
+}
+
+func GetImageHash(action string) string {
+	split := strings.Split(action, "::")
+	if len(split) > 5 {
+		return split[4]
+	}
+	return split[len(split)-1]
+}

api/service/mj/pool.go

@@ -2,11 +2,13 @@ package mj
 
 import (
 	"chatplus/core/types"
+	"chatplus/service/mj/plus"
 	"chatplus/service/oss"
 	"chatplus/store"
 	"chatplus/store/model"
 	"fmt"
 	"github.com/go-redis/redis/v8"
+	"strings"
 	"time"
 
 	"gorm.io/gorm"
@@ -14,7 +16,7 @@ import (
 
 // ServicePool Mj service pool
 type ServicePool struct {
-	services        []*Service
+	services        []interface{}
 	taskQueue       *store.RedisQueue
 	notifyQueue     *store.RedisQueue
 	db              *gorm.DB
@@ -23,9 +25,24 @@ type ServicePool struct {
 }
 
 func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderManager, appConfig *types.AppConfig) *ServicePool {
-	services := make([]*Service, 0)
+	services := make([]interface{}, 0)
 	taskQueue := store.NewRedisQueue("MidJourney_Task_Queue", redisCli)
 	notifyQueue := store.NewRedisQueue("MidJourney_Notify_Queue", redisCli)
+
+	for k, config := range appConfig.MjPlusConfigs {
+		if config.Enabled == false {
+			continue
+		}
+		client := plus.NewClient(config)
+		name := fmt.Sprintf("mj-service-plus-%d", k)
+		servicePlus := plus.NewService(name, taskQueue, notifyQueue, 10, 600, db, client)
+		go func() {
+			servicePlus.Run()
+		}()
+		services = append(services, servicePlus)
+	}
+
+	if len(services) == 0 {
 		// create mj client and service
 		for k, config := range appConfig.MjConfigs {
 			if config.Enabled == false {
@@ -55,6 +72,7 @@ func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderMa
 
 			services = append(services, service)
 		}
+	}
 
 	return &ServicePool{
 		taskQueue:       taskQueue,
@@ -75,6 +93,9 @@ func (p *ServicePool) CheckTaskNotify() {
 				continue
 			}
 			client := p.Clients.Get(userId)
+			if client == nil {
+				continue
+			}
 			err = client.Send([]byte("Task Updated"))
 			if err != nil {
 				continue
@@ -94,16 +115,36 @@ func (p *ServicePool) DownloadImages() {
 
 			// download images
 			for _, v := range items {
-				imgURL, err := p.uploaderManager.GetUploadHandler().PutImg(v.OrgURL, true)
-				if err != nil {
-					logger.Error("error with download image: ", err)
+				if v.OrgURL == "" {
 					continue
 				}
 
+				logger.Infof("try to download image: %s", v.OrgURL)
+				var imgURL string
+				var err error
+				if servicePlus := p.getServicePlus(v.ChannelId); servicePlus != nil {
+					task, _ := servicePlus.Client.QueryTask(v.TaskId)
+					if len(task.Buttons) > 0 {
+						v.Hash = plus.GetImageHash(task.Buttons[0].CustomId)
+					}
+					imgURL, err = p.uploaderManager.GetUploadHandler().PutImg(v.OrgURL, false)
+				} else {
+					imgURL, err = p.uploaderManager.GetUploadHandler().PutImg(v.OrgURL, true)
+				}
+				if err != nil {
+					logger.Errorf("error with download image %s, %v", v.OrgURL, err)
+					continue
+				} else {
+					logger.Infof("download image %s successfully.", v.OrgURL)
+				}
+
 				v.ImgURL = imgURL
 				p.db.Updates(&v)
 
 				client := p.Clients.Get(uint(v.UserId))
+				if client == nil {
+					continue
+				}
 				err = client.Send([]byte("Task Updated"))
 				if err != nil {
 					continue
@@ -125,3 +166,68 @@ func (p *ServicePool) PushTask(task types.MjTask) {
 func (p *ServicePool) HasAvailableService() bool {
 	return len(p.services) > 0
 }
+
+func (p *ServicePool) Notify(data plus.CBReq) error {
+	logger.Debugf("收到任务回调：%+v", data)
+	var job model.MidJourneyJob
+	res := p.db.Where("task_id = ?", data.Id).First(&job)
+	if res.Error != nil {
+		return fmt.Errorf("非法任务：%s", data.Id)
+	}
+
+	// 任务已经拉取完成
+	if job.Progress == 100 {
+		return nil
+	}
+	if servicePlus := p.getServicePlus(job.ChannelId); servicePlus != nil {
+		return servicePlus.Notify(job)
+	}
+
+	return nil
+}
+
+// SyncTaskProgress 异步拉取任务
+func (p *ServicePool) SyncTaskProgress() {
+	go func() {
+		var items []model.MidJourneyJob
+		for {
+			res := p.db.Where("progress >= ? AND progress < ?", 0, 100).Find(&items)
+			if res.Error != nil {
+				continue
+			}
+
+			for _, v := range items {
+				// 30 分钟还没完成的任务直接删除
+				if time.Now().Sub(v.CreatedAt) > time.Minute*30 {
+					p.db.Delete(&v)
+					// 非放大任务，退回绘图次数
+					if v.Type != types.TaskUpscale.String() {
+						p.db.Model(&model.User{}).Where("id = ?", v.UserId).UpdateColumn("img_calls", gorm.Expr("img_calls + ?", 1))
+					}
+					continue
+				}
+
+				if !strings.HasPrefix(v.ChannelId, "mj-service-plus") {
+					continue
+				}
+
+				if servicePlus := p.getServicePlus(v.ChannelId); servicePlus != nil {
+					_ = servicePlus.Notify(v)
+				}
+			}
+
+			time.Sleep(time.Second)
+		}
+	}()
+}
+
+func (p *ServicePool) getServicePlus(name string) *plus.Service {
+	for _, s := range p.services {
+		if servicePlus, ok := s.(*plus.Service); ok {
+			if servicePlus.Name == name {
+				return servicePlus
+			}
+		}
+	}
+	return nil
+}

api/service/mj/service.go

@@ -58,8 +58,6 @@ func (s *Service) Run() {
 		// if it's reference message, check if it's this channel's  message
 		if task.ChannelId != "" && task.ChannelId != s.client.Config.ChanelId {
 			s.taskQueue.RPush(task)
-			s.db.Model(&model.MidJourneyJob{Id: uint(task.Id)}).UpdateColumn("progress", -1)
-			s.notifyQueue.RPush(task.UserId)
 			time.Sleep(time.Second)
 			continue
 		}
@@ -67,28 +65,39 @@ func (s *Service) Run() {
 		logger.Infof("%s handle a new MidJourney task: %+v", s.name, task)
 		switch task.Type {
 		case types.TaskImage:
-			err = s.client.Imagine(task.Prompt)
+			err = s.client.Imagine(task)
 			break
 		case types.TaskUpscale:
-			err = s.client.Upscale(task.Index, task.MessageId, task.MessageHash)
-
+			err = s.client.Upscale(task)
 			break
 		case types.TaskVariation:
-			err = s.client.Variation(task.Index, task.MessageId, task.MessageHash)
+			err = s.client.Variation(task)
+			break
+		case types.TaskBlend:
+			err = s.client.Blend(task)
+			break
+		case types.TaskSwapFace:
+			err = s.client.SwapFace(task)
+			break
 		}
 
 		if err != nil {
-			logger.Error("绘画任务执行失败：", err)
+			logger.Error("绘画任务执行失败：", err.Error())
 			// update the task progress
-			s.db.Model(&model.MidJourneyJob{Id: uint(task.Id)}).UpdateColumn("progress", -1)
+			s.db.Model(&model.MidJourneyJob{Id: uint(task.Id)}).UpdateColumns(map[string]interface{}{
+				"progress": -1,
+				"err_msg":  err.Error(),
+			})
 			s.notifyQueue.RPush(task.UserId)
 			// restore img_call quota
+			if task.Type.String() != types.TaskUpscale.String() {
 				s.db.Model(&model.User{}).Where("id = ?", task.UserId).UpdateColumn("img_calls", gorm.Expr("img_calls + ?", 1))
+			}
 			continue
 		}
 
 		// lock the task until the execute timeout
-		s.taskStartTimes[task.Id] = time.Now()
+		s.taskStartTimes[int(task.Id)] = time.Now()
 		atomic.AddInt32(&s.handledTaskNum, 1)
 
 	}
@@ -128,6 +137,12 @@ func (s *Service) Notify(data CBReq) {
 	} else {
 		tx = tx.Where("task_id = ?", split[0])
 	}
+	// fixed: 修复 U/V 操作任务混淆覆盖的 Bug
+	if strings.Contains(data.Prompt, "** - Image #") { // for upscale
+		tx = tx.Where("type = ?", types.TaskUpscale.String())
+	} else if strings.Contains(data.Prompt, "** - Variations (Strong)") { // for Variations
+		tx = tx.Where("type = ?", types.TaskVariation.String())
+	}
 	res = tx.First(&job)
 	if res.Error != nil {
 		logger.Warn("非法任务：", res.Error)
@@ -143,7 +158,7 @@ func (s *Service) Notify(data CBReq) {
 	job.OrgURL = data.Image.URL
 	if s.client.Config.UseCDN {
 		job.UseProxy = true
-		job.ImgURL = strings.ReplaceAll(data.Image.URL, "https://cdn.discordapp.com", s.client.Config.DiscordCDN)
+		job.ImgURL = strings.ReplaceAll(data.Image.URL, "https://cdn.discordapp.com", s.client.Config.ImgCdnURL)
 	}
 
 	res = s.db.Updates(&job)

api/service/mj/types.go

@@ -8,8 +8,8 @@ const (
 type InteractionsRequest struct {
 	Type          int            `json:"type"`
 	ApplicationID string         `json:"application_id"`
-	MessageFlags  *int           `json:"message_flags,omitempty"`
-	MessageID     *string        `json:"message_id,omitempty"`
+	MessageFlags  int            `json:"message_flags,omitempty"`
+	MessageID     string         `json:"message_id,omitempty"`
 	GuildID       string         `json:"guild_id"`
 	ChannelID     string         `json:"channel_id"`
 	SessionID     string         `json:"session_id"`

api/service/oss/aliyun_oss.go

@@ -5,11 +5,13 @@ import (
 	"chatplus/core/types"
 	"chatplus/utils"
 	"fmt"
-	"github.com/aliyun/aliyun-oss-go-sdk/oss"
-	"github.com/gin-gonic/gin"
 	"net/url"
 	"path/filepath"
+	"strings"
 	"time"
+
+	"github.com/aliyun/aliyun-oss-go-sdk/oss"
+	"github.com/gin-gonic/gin"
 )
 
 type AliYunOss struct {
@@ -44,16 +46,16 @@ func NewAliYunOss(appConfig *types.AppConfig) (*AliYunOss, error) {
 
 }
 
-func (s AliYunOss) PutFile(ctx *gin.Context, name string) (string, error) {
+func (s AliYunOss) PutFile(ctx *gin.Context, name string) (File, error) {
 	// 解析表单
 	file, err := ctx.FormFile(name)
 	if err != nil {
-		return "", err
+		return File{}, err
 	}
 	// 打开上传文件
 	src, err := file.Open()
 	if err != nil {
-		return "", err
+		return File{}, err
 	}
 	defer src.Close()
 
@@ -62,10 +64,16 @@ func (s AliYunOss) PutFile(ctx *gin.Context, name string) (string, error) {
 	// 上传文件
 	err = s.bucket.PutObject(objectKey, src)
 	if err != nil {
-		return "", err
+		return File{}, err
 	}
 
-	return fmt.Sprintf("%s/%s", s.config.Domain, objectKey), nil
+	return File{
+		Name:   file.Filename,
+		ObjKey: objectKey,
+		URL:    fmt.Sprintf("%s/%s", s.config.Domain, objectKey),
+		Ext:    fileExt,
+		Size:   file.Size,
+	}, nil
 }
 
 func (s AliYunOss) PutImg(imageURL string, useProxy bool) (string, error) {
@@ -83,7 +91,7 @@ func (s AliYunOss) PutImg(imageURL string, useProxy bool) (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("error with parse image URL: %v", err)
 	}
-	fileExt := filepath.Ext(parse.Path)
+	fileExt := utils.GetImgExt(parse.Path)
 	objectKey := fmt.Sprintf("%s/%d%s", s.config.SubDir, time.Now().UnixMicro(), fileExt)
 	// 上传文件字节数据
 	err = s.bucket.PutObject(objectKey, bytes.NewReader(imageData))
@@ -94,9 +102,14 @@ func (s AliYunOss) PutImg(imageURL string, useProxy bool) (string, error) {
 }
 
 func (s AliYunOss) Delete(fileURL string) error {
-	objectName := filepath.Base(fileURL)
-	key := fmt.Sprintf("%s/%s", s.config.SubDir, objectName)
-	return s.bucket.DeleteObject(key)
+	var objectKey string
+	if strings.HasPrefix(fileURL, "http") {
+		filename := filepath.Base(fileURL)
+		objectKey = fmt.Sprintf("%s/%s", s.config.SubDir, filename)
+	} else {
+		objectKey = fileURL
+	}
+	return s.bucket.DeleteObject(objectKey)
 }
 
 var _ Uploader = AliYunOss{}

api/service/oss/localstorage.go

@@ -4,11 +4,12 @@ import (
 	"chatplus/core/types"
 	"chatplus/utils"
 	"fmt"
-	"github.com/gin-gonic/gin"
 	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/gin-gonic/gin"
 )
 
 type LocalStorage struct {
@@ -23,23 +24,30 @@ func NewLocalStorage(config *types.AppConfig) LocalStorage {
 	}
 }
 
-func (s LocalStorage) PutFile(ctx *gin.Context, name string) (string, error) {
+func (s LocalStorage) PutFile(ctx *gin.Context, name string) (File, error) {
 	file, err := ctx.FormFile(name)
 	if err != nil {
-		return "", fmt.Errorf("error with get form: %v", err)
+		return File{}, fmt.Errorf("error with get form: %v", err)
 	}
 
-	filePath, err := utils.GenUploadPath(s.config.BasePath, file.Filename)
+	path, err := utils.GenUploadPath(s.config.BasePath, file.Filename, false)
 	if err != nil {
-		return "", fmt.Errorf("error with generate filename: %s", err.Error())
+		return File{}, fmt.Errorf("error with generate filename: %s", err.Error())
 	}
 	// 将文件保存到指定路径
-	err = ctx.SaveUploadedFile(file, filePath)
+	err = ctx.SaveUploadedFile(file, path)
 	if err != nil {
-		return "", fmt.Errorf("error with save upload file: %s", err.Error())
+		return File{}, fmt.Errorf("error with save upload file: %s", err.Error())
 	}
 
-	return utils.GenUploadUrl(s.config.BasePath, s.config.BaseURL, filePath), nil
+	ext := filepath.Ext(file.Filename)
+	return File{
+		Name:   file.Filename,
+		ObjKey: path,
+		URL:    utils.GenUploadUrl(s.config.BasePath, s.config.BaseURL, path),
+		Ext:    ext,
+		Size:   file.Size,
+	}, nil
 }
 
 func (s LocalStorage) PutImg(imageURL string, useProxy bool) (string, error) {
@@ -48,7 +56,7 @@ func (s LocalStorage) PutImg(imageURL string, useProxy bool) (string, error) {
 		return "", fmt.Errorf("error with parse image URL: %v", err)
 	}
 	filename := filepath.Base(parse.Path)
-	filePath, err := utils.GenUploadPath(s.config.BasePath, filename)
+	filePath, err := utils.GenUploadPath(s.config.BasePath, filename, true)
 	if err != nil {
 		return "", fmt.Errorf("error with generate image dir: %v", err)
 	}
@@ -66,6 +74,9 @@ func (s LocalStorage) PutImg(imageURL string, useProxy bool) (string, error) {
 }
 
 func (s LocalStorage) Delete(fileURL string) error {
+	if _, err := os.Stat(fileURL); err == nil {
+		return os.Remove(fileURL)
+	}
 	filePath := strings.Replace(fileURL, s.config.BaseURL, s.config.BasePath, 1)
 	return os.Remove(filePath)
 }

api/service/oss/minio_oss.go

@@ -5,13 +5,14 @@ import (
 	"chatplus/utils"
 	"context"
 	"fmt"
-	"github.com/gin-gonic/gin"
-	"github.com/minio/minio-go/v7"
-	"github.com/minio/minio-go/v7/pkg/credentials"
 	"net/url"
 	"path/filepath"
 	"strings"
 	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/minio/minio-go/v7"
+	"github.com/minio/minio-go/v7/pkg/credentials"
 )
 
 type MiniOss struct {
@@ -65,34 +66,45 @@ func (s MiniOss) PutImg(imageURL string, useProxy bool) (string, error) {
 	return fmt.Sprintf("%s/%s/%s", s.config.Domain, s.config.Bucket, info.Key), nil
 }
 
-func (s MiniOss) PutFile(ctx *gin.Context, name string) (string, error) {
+func (s MiniOss) PutFile(ctx *gin.Context, name string) (File, error) {
 	file, err := ctx.FormFile(name)
 	if err != nil {
-		return "", fmt.Errorf("error with get form: %v", err)
+		return File{}, fmt.Errorf("error with get form: %v", err)
 	}
 	// Open the uploaded file
 	fileReader, err := file.Open()
 	if err != nil {
-		return "", fmt.Errorf("error opening file: %v", err)
+		return File{}, fmt.Errorf("error opening file: %v", err)
 	}
 	defer fileReader.Close()
 
-	fileExt := filepath.Ext(file.Filename)
+	fileExt := utils.GetImgExt(file.Filename)
 	filename := fmt.Sprintf("%s/%d%s", s.config.SubDir, time.Now().UnixMicro(), fileExt)
 	info, err := s.client.PutObject(ctx, s.config.Bucket, filename, fileReader, file.Size, minio.PutObjectOptions{
 		ContentType: file.Header.Get("Content-Type"),
 	})
 	if err != nil {
-		return "", fmt.Errorf("error uploading to MinIO: %v", err)
+		return File{}, fmt.Errorf("error uploading to MinIO: %v", err)
 	}
 
-	return fmt.Sprintf("%s/%s/%s", s.config.Domain, s.config.Bucket, info.Key), nil
+	return File{
+		Name:   file.Filename,
+		ObjKey: info.Key,
+		URL:    fmt.Sprintf("%s/%s/%s", s.config.Domain, s.config.Bucket, info.Key),
+		Ext:    fileExt,
+		Size:   file.Size,
+	}, nil
 }
 
 func (s MiniOss) Delete(fileURL string) error {
-	objectName := filepath.Base(fileURL)
-	key := fmt.Sprintf("%s/%s", s.config.SubDir, objectName)
-	return s.client.RemoveObject(context.Background(), s.config.Bucket, key, minio.RemoveObjectOptions{})
+	var objectKey string
+	if strings.HasPrefix(fileURL, "http") {
+		filename := filepath.Base(fileURL)
+		objectKey = fmt.Sprintf("%s/%s", s.config.SubDir, filename)
+	} else {
+		objectKey = fileURL
+	}
+	return s.client.RemoveObject(context.Background(), s.config.Bucket, objectKey, minio.RemoveObjectOptions{})
 }
 
 var _ Uploader = MiniOss{}

api/service/oss/qiniu_oss.go

@@ -6,12 +6,14 @@ import (
 	"chatplus/utils"
 	"context"
 	"fmt"
+	"net/url"
+	"path/filepath"
+	"strings"
+	"time"
+
 	"github.com/gin-gonic/gin"
 	"github.com/qiniu/go-sdk/v7/auth/qbox"
 	"github.com/qiniu/go-sdk/v7/storage"
-	"net/url"
-	"path/filepath"
-	"time"
 )
 
 type QinNiuOss struct {
@@ -50,16 +52,16 @@ func NewQiNiuOss(appConfig *types.AppConfig) QinNiuOss {
 	}
 }
 
-func (s QinNiuOss) PutFile(ctx *gin.Context, name string) (string, error) {
+func (s QinNiuOss) PutFile(ctx *gin.Context, name string) (File, error) {
 	// 解析表单
 	file, err := ctx.FormFile(name)
 	if err != nil {
-		return "", err
+		return File{}, err
 	}
 	// 打开上传文件
 	src, err := file.Open()
 	if err != nil {
-		return "", err
+		return File{}, err
 	}
 	defer src.Close()
 
@@ -70,10 +72,17 @@ func (s QinNiuOss) PutFile(ctx *gin.Context, name string) (string, error) {
 	extra := storage.PutExtra{}
 	err = s.uploader.Put(ctx, &ret, s.putPolicy.UploadToken(s.mac), key, src, file.Size, &extra)
 	if err != nil {
-		return "", err
+		return File{}, err
 	}
 
-	return fmt.Sprintf("%s/%s", s.config.Domain, ret.Key), nil
+	return File{
+		Name:   file.Filename,
+		ObjKey: key,
+		URL:    fmt.Sprintf("%s/%s", s.config.Domain, ret.Key),
+		Ext:    fileExt,
+		Size:   file.Size,
+	}, nil
+
 }
 
 func (s QinNiuOss) PutImg(imageURL string, useProxy bool) (string, error) {
@@ -91,7 +100,7 @@ func (s QinNiuOss) PutImg(imageURL string, useProxy bool) (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("error with parse image URL: %v", err)
 	}
-	fileExt := filepath.Ext(parse.Path)
+	fileExt := utils.GetImgExt(parse.Path)
 	key := fmt.Sprintf("%s/%d%s", s.config.SubDir, time.Now().UnixMicro(), fileExt)
 	ret := storage.PutRet{}
 	extra := storage.PutExtra{}
@@ -104,9 +113,15 @@ func (s QinNiuOss) PutImg(imageURL string, useProxy bool) (string, error) {
 }
 
 func (s QinNiuOss) Delete(fileURL string) error {
-	objectName := filepath.Base(fileURL)
-	key := fmt.Sprintf("%s/%s", s.config.SubDir, objectName)
-	return s.manager.Delete(s.config.Bucket, key)
+	var objectKey string
+	if strings.HasPrefix(fileURL, "http") {
+		filename := filepath.Base(fileURL)
+		objectKey = fmt.Sprintf("%s/%s", s.config.SubDir, filename)
+	} else {
+		objectKey = fileURL
+	}
+
+	return s.manager.Delete(s.config.Bucket, objectKey)
 }
 
 var _ Uploader = QinNiuOss{}

api/service/oss/uploader.go

@@ -2,8 +2,20 @@ package oss
 
 import "github.com/gin-gonic/gin"
 
+const Local = "LOCAL"
+const Minio = "MINIO"
+const QiNiu = "QINIU"
+const AliYun = "ALIYUN"
+
+type File struct {
+	Name   string `json:"name"`
+	ObjKey string `json:"obj_key"`
+	Size   int64  `json:"size"`
+	URL    string `json:"url"`
+	Ext    string `json:"ext"`
+}
 type Uploader interface {
-	PutFile(ctx *gin.Context, name string) (string, error)
+	PutFile(ctx *gin.Context, name string) (File, error)
 	PutImg(imageURL string, useProxy bool) (string, error)
 	Delete(fileURL string) error
 }

api/service/oss/uploader_manager.go

@@ -9,11 +9,6 @@ type UploaderManager struct {
 	handler Uploader
 }
 
-const Local = "LOCAL"
-const Minio = "MINIO"
-const QiNiu = "QINIU"
-const AliYun = "ALIYUN"
-
 func NewUploaderManager(config *types.AppConfig) (*UploaderManager, error) {
 	active := Local
 	if config.OSS.Active != "" {

api/service/payment/hupipay_serive.go

@@ -4,6 +4,8 @@ import (
 	"chatplus/core/types"
 	"chatplus/utils"
 	"crypto/md5"
+	"encoding/hex"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -17,14 +19,14 @@ import (
 type HuPiPayService struct {
 	appId     string
 	appSecret string
-	host      string
+	apiURL    string
 }
 
 func NewHuPiPay(config *types.AppConfig) *HuPiPayService {
 	return &HuPiPayService{
 		appId:     config.HuPiPayConfig.AppId,
 		appSecret: config.HuPiPayConfig.AppSecret,
-		host:      config.HuPiPayConfig.PayURL,
+		apiURL:    config.HuPiPayConfig.ApiURL,
 	}
 }
 
@@ -42,8 +44,16 @@ type HuPiPayReq struct {
 	NonceStr     string `json:"nonce_str"`
 }
 
+type HuPiResp struct {
+	Openid    interface{} `json:"openid"`
+	UrlQrcode string      `json:"url_qrcode"`
+	URL       string      `json:"url"`
+	ErrCode   int         `json:"errcode"`
+	ErrMsg    string      `json:"errmsg,omitempty"`
+}
+
 // Pay 执行支付请求操作
-func (s *HuPiPayService) Pay(params HuPiPayReq) (string, error) {
+func (s *HuPiPayService) Pay(params HuPiPayReq) (HuPiResp, error) {
 	data := url.Values{}
 	simple := strconv.FormatInt(time.Now().Unix(), 10)
 	params.AppId = s.appId
@@ -55,38 +65,98 @@ func (s *HuPiPayService) Pay(params HuPiPayReq) (string, error) {
 	for k, v := range m {
 		data.Add(k, fmt.Sprintf("%v", v))
 	}
-	encode = utils.JsonEncode(params)
-	m = make(map[string]string)
-	_ = utils.JsonDecode(encode, &m)
-	data.Add("hash", s.Sign(m))
-	resp, err := http.PostForm(s.host, data)
+	// 生成签名
+	data.Add("hash", s.Sign(data))
+	// 发送支付请求
+	apiURL := fmt.Sprintf("%s/payment/do.html", s.apiURL)
+	resp, err := http.PostForm(apiURL, data)
 	if err != nil {
-		return "error", err
+		return HuPiResp{}, fmt.Errorf("error with requst api: %v", err)
 	}
 	defer resp.Body.Close()
 	all, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return "error", err
+		return HuPiResp{}, fmt.Errorf("error with reading response: %v", err)
 	}
-	return string(all), err
+
+	var res HuPiResp
+	err = utils.JsonDecode(string(all), &res)
+	if err != nil {
+		return HuPiResp{}, fmt.Errorf("error with decode payment result: %v", err)
+	}
+
+	if res.ErrCode != 0 {
+		return HuPiResp{}, fmt.Errorf("error with generate pay url: %s", res.ErrMsg)
+	}
+
+	return res, nil
 }
 
 // Sign 签名方法
-func (s *HuPiPayService) Sign(params map[string]string) string {
-	var data string
-	keys := make([]string, 0, 0)
+func (s *HuPiPayService) Sign(params url.Values) string {
+	params.Del(`Sign`)
+	var keys = make([]string, 0, 0)
 	for key := range params {
+		if params.Get(key) != `` {
 			keys = append(keys, key)
 		}
-	sort.Strings(keys)
-	//拼接
-	for _, k := range keys {
-		data = fmt.Sprintf("%s%s=%s&", data, k, params[k])
 	}
-	data = strings.Trim(data, "&")
-	data = fmt.Sprintf("%s%s", data, s.appSecret)
-	m := md5.New()
-	m.Write([]byte(data))
-	sign := fmt.Sprintf("%x", m.Sum(nil))
-	return sign
+	sort.Strings(keys)
+
+	var pList = make([]string, 0, 0)
+	for _, key := range keys {
+		var value = strings.TrimSpace(params.Get(key))
+		if len(value) > 0 {
+			pList = append(pList, key+"="+value)
+		}
+	}
+	var src = strings.Join(pList, "&")
+	src += s.appSecret
+
+	md5bs := md5.Sum([]byte(src))
+	return hex.EncodeToString(md5bs[:])
+}
+
+// Check 校验订单状态
+func (s *HuPiPayService) Check(tradeNo string) error {
+	data := url.Values{}
+	data.Add("appid", s.appId)
+	data.Add("open_order_id", tradeNo)
+	stamp := strconv.FormatInt(time.Now().Unix(), 10)
+	data.Add("time", stamp)
+	data.Add("nonce_str", stamp)
+	data.Add("hash", s.Sign(data))
+
+	apiURL := fmt.Sprintf("%s/payment/query.html", s.apiURL)
+	resp, err := http.PostForm(apiURL, data)
+	if err != nil {
+		return fmt.Errorf("error with http reqeust: %v", err)
+	}
+
+	defer resp.Body.Close()
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return fmt.Errorf("error with reading response: %v", err)
+	}
+
+	var r struct {
+		ErrCode int `json:"errcode"`
+		Data    struct {
+			Status      string `json:"status"`
+			OpenOrderId string `json:"open_order_id"`
+		} `json:"data,omitempty"`
+		ErrMsg string `json:"errmsg"`
+		Hash   string `json:"hash"`
+	}
+	err = utils.JsonDecode(string(body), &r)
+	if err != nil {
+		return fmt.Errorf("error with decode response: %v", err)
+	}
+
+	if r.ErrCode == 0 && r.Data.Status == "OD" {
+		return nil
+	} else {
+		logger.Debugf("%+v", r)
+		return errors.New("order not paid：" + r.ErrMsg)
+	}
 }

api/service/payment/payjs_service.go

@@ -5,6 +5,7 @@ import (
 	"chatplus/utils"
 	"crypto/md5"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -36,7 +37,7 @@ type JPayReps struct {
 	Qrcode     string `json:"qrcode"`
 	ReturnCode int    `json:"return_code"`
 	ReturnMsg  string `json:"return_msg"`
-	Sign       string `json:"sign"`
+	Sign       string `json:"Sign"`
 	TotalFee   string `json:"total_fee"`
 }
 
@@ -55,10 +56,11 @@ func (js *PayJS) Pay(param JPayReq) JPayReps {
 	}
 	p.Add("mchid", js.config.AppId)
 
-	p.Add("sign", sign(p, js.config.PrivateKey))
+	p.Add("sign", js.sign(p))
 
 	cli := http.Client{}
-	r, err := cli.PostForm(js.config.ApiURL, p)
+	apiURL := fmt.Sprintf("%s/api/native", js.config.ApiURL)
+	r, err := cli.PostForm(apiURL, p)
 	if err != nil {
 		return JPayReps{ReturnMsg: err.Error()}
 	}
@@ -76,8 +78,8 @@ func (js *PayJS) Pay(param JPayReq) JPayReps {
 	return data
 }
 
-func sign(params url.Values, priKey string) string {
-	params.Del(`sign`)
+func (js *PayJS) sign(params url.Values) string {
+	params.Del(`Sign`)
 	var keys = make([]string, 0, 0)
 	for key := range params {
 		if params.Get(key) != `` {
@@ -94,9 +96,45 @@ func sign(params url.Values, priKey string) string {
 		}
 	}
 	var src = strings.Join(pList, "&")
-	src += "&key=" + priKey
+	src += "&key=" + js.config.PrivateKey
 
 	md5bs := md5.Sum([]byte(src))
 	md5res := hex.EncodeToString(md5bs[:])
 	return strings.ToUpper(md5res)
 }
+
+// Check 查询订单支付状态
+// @param tradeNo 支付平台交易 ID
+func (js *PayJS) Check(tradeNo string) error {
+	apiURL := fmt.Sprintf("%s/api/check", js.config.ApiURL)
+	params := url.Values{}
+	params.Add("payjs_order_id", tradeNo)
+	params.Add("Sign", js.sign(params))
+	data := strings.NewReader(params.Encode())
+	resp, err := http.Post(apiURL, "application/x-www-form-urlencoded", data)
+	defer resp.Body.Close()
+	if err != nil {
+		return fmt.Errorf("error with http reqeust: %v", err)
+	}
+
+	defer resp.Body.Close()
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return fmt.Errorf("error with reading response: %v", err)
+	}
+
+	var r struct {
+		ReturnCode int `json:"return_code"`
+		Status     int `json:"status"`
+	}
+	err = utils.JsonDecode(string(body), &r)
+	if err != nil {
+		return fmt.Errorf("error with decode response: %v", err)
+	}
+
+	if r.ReturnCode == 1 && r.Status == 1 {
+		return nil
+	} else {
+		return errors.New("order not paid")
+	}
+}

api/service/sd/pool.go

@@ -13,11 +13,14 @@ import (
 type ServicePool struct {
 	services    []*Service
 	taskQueue   *store.RedisQueue
+	notifyQueue *store.RedisQueue
+	Clients     *types.LMap[uint, *types.WsClient] // UserId => Client
 }
 
 func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderManager, appConfig *types.AppConfig) *ServicePool {
 	services := make([]*Service, 0)
-	queue := store.NewRedisQueue("StableDiffusion_Task_Queue", redisCli)
+	taskQueue := store.NewRedisQueue("StableDiffusion_Task_Queue", redisCli)
+	notifyQueue := store.NewRedisQueue("StableDiffusion_Queue", redisCli)
 	// create mj client and service
 	for k, config := range appConfig.SdConfigs {
 		if config.Enabled == false {
@@ -26,7 +29,7 @@ func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderMa
 
 		// create sd service
 		name := fmt.Sprintf("StableDifffusion Service-%d", k)
-		service := NewService(name, 1, 300, config, queue, db, manager)
+		service := NewService(name, 1, 300, config, taskQueue, notifyQueue, db, manager)
 		// run sd service
 		go func() {
 			service.Run()
@@ -36,8 +39,10 @@ func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderMa
 	}
 
 	return &ServicePool{
-		taskQueue: queue,
+		taskQueue:   taskQueue,
+		notifyQueue: notifyQueue,
 		services:    services,
+		Clients:     types.NewLMap[uint, *types.WsClient](),
 	}
 }
 

api/service/sd/service.go

@@ -24,6 +24,7 @@ type Service struct {
 	httpClient       *req.Client
 	config           types.StableDiffusionConfig
 	taskQueue        *store.RedisQueue
+	notifyQueue      *store.RedisQueue
 	db               *gorm.DB
 	uploadManager    *oss.UploaderManager
 	name             string            // service name
@@ -33,12 +34,13 @@ type Service struct {
 	taskTimeout      int64
 }
 
-func NewService(name string, maxTaskNum int32, timeout int64, config types.StableDiffusionConfig, queue *store.RedisQueue, db *gorm.DB, manager *oss.UploaderManager) *Service {
+func NewService(name string, maxTaskNum int32, timeout int64, config types.StableDiffusionConfig, taskQueue *store.RedisQueue, notifyQueue *store.RedisQueue, db *gorm.DB, manager *oss.UploaderManager) *Service {
 	return &Service{
 		name:             name,
 		config:           config,
 		httpClient:       req.C(),
-		taskQueue:        queue,
+		taskQueue:        taskQueue,
+		notifyQueue:      notifyQueue,
 		db:               db,
 		uploadManager:    manager,
 		taskTimeout:      timeout,
@@ -66,13 +68,18 @@ func (s *Service) Run() {
 		logger.Infof("%s handle a new Stable-Diffusion task: %+v", s.name, task)
 		err = s.Txt2Img(task)
 		if err != nil {
-			logger.Error("绘画任务执行失败：", err)
+			logger.Error("绘画任务执行失败：", err.Error())
 			// update the task progress
-			s.db.Model(&model.SdJob{Id: uint(task.Id)}).UpdateColumn("progress", -1)
+			s.db.Model(&model.SdJob{Id: uint(task.Id)}).UpdateColumns(map[string]interface{}{
+				"progress": -1,
+				"err_msg":  err.Error(),
+			})
 			// restore img_call quota
 			s.db.Model(&model.User{}).Where("id = ?", task.UserId).UpdateColumn("img_calls", gorm.Expr("img_calls + ?", 1))
 			// release task num
 			atomic.AddInt32(&s.handledTaskNum, -1)
+			// 通知前端，任务失败
+			s.notifyQueue.RPush(task.UserId)
 			continue
 		}
 
@@ -296,7 +303,10 @@ func (s *Service) callback(data CBReq) {
 	} else { // 任务失败
 		logger.Error("任务执行失败：", data.Message)
 		// update the task progress
-		s.db.Model(&model.SdJob{Id: uint(data.JobId)}).UpdateColumn("progress", -1)
+		s.db.Model(&model.SdJob{Id: uint(data.JobId)}).UpdateColumns(map[string]interface{}{
+			"progress": -1,
+			"err_msg":  data.Message,
+		})
 		// restore img_calls
 		s.db.Model(&model.User{}).Where("id = ? AND img_calls > 0", data.UserId).UpdateColumn("img_calls", gorm.Expr("img_calls + ?", 1))
 	}

api/service/sms/aliyun.go

@@ -1,4 +1,4 @@
-package service
+package sms
 
 import (
 	"chatplus/core/types"
@@ -7,22 +7,23 @@ import (
 )
 
 type AliYunSmsService struct {
-	config *types.AliYunSmsConfig
+	config *types.SmsConfigAli
 	client *dysmsapi.Client
 }
 
-func NewAliYunSmsService(config *types.AppConfig) (*AliYunSmsService, error) {
+func NewAliYunSmsService(appConfig *types.AppConfig) (*AliYunSmsService, error) {
+	config := &appConfig.SMS.Ali
 	// 创建阿里云短信客户端
 	client, err := dysmsapi.NewClientWithAccessKey(
 		"cn-hangzhou",
-		config.SmsConfig.AccessKey,
-		config.SmsConfig.AccessSecret)
+		config.AccessKey,
+		config.AccessSecret)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create client: %v", err)
 	}
 
 	return &AliYunSmsService{
-		config: &config.SmsConfig,
+		config: config,
 		client: client,
 	}, nil
 }
@@ -46,8 +47,7 @@ func (s *AliYunSmsService) SendVerifyCode(mobile string, code int) error {
 	if response.Code != "OK" {
 		return fmt.Errorf("failed to send SMS:%v", response.Message)
 	}
-
 	return nil
 }
 
-var _ SmsService = &AliYunSmsService{}
+var _ Service = &AliYunSmsService{}

api/service/sms/bao.go

@@ -0,0 +1,72 @@
+package sms
+
+import (
+	"chatplus/core/types"
+	"chatplus/utils"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+)
+
+type BaoSmsService struct {
+	config *types.SmsConfigBao
+}
+
+func NewSmsBaoSmsService(appConfig *types.AppConfig) *BaoSmsService {
+	config := appConfig.SMS.Bao
+	if config.Domain == "" { // use default domain
+		config.Domain = "api.smsbao.com"
+		logger.Infof("Using default domain for SMS-BAO: %s", config.Domain)
+	}
+	return &BaoSmsService{
+		config: &config,
+	}
+}
+
+var errMsg = map[string]string{
+	"0":  "短信发送成功",
+	"-1": "参数不全",
+	"-2": "服务器空间不支持，请确认支持curl或者fsocket，联系您的空间商解决或者更换空间",
+	"30": "密码错误",
+	"40": "账号不存在",
+	"41": "余额不足",
+	"42": "账户已过期",
+	"43": "IP地址限制",
+	"50": "内容含有敏感词",
+}
+
+func (s *BaoSmsService) SendVerifyCode(mobile string, code int) error {
+
+	content := fmt.Sprintf("%s%s", s.config.Sign, s.config.CodeTemplate)
+	content = strings.ReplaceAll(content, "{code}", strconv.Itoa(code))
+	password := utils.Md5(s.config.Password)
+	params := url.Values{}
+	params.Set("u", s.config.Username)
+	params.Set("p", password)
+	params.Set("m", mobile)
+	params.Set("c", content)
+
+	apiURL := fmt.Sprintf("https://%s/sms?%s", s.config.Domain, params.Encode())
+	response, err := http.Get(apiURL)
+	if err != nil {
+		return err
+	}
+	defer response.Body.Close()
+
+	body, err := io.ReadAll(response.Body)
+	if err != nil {
+		return err
+	}
+	result := string(body)
+	logger.Debugf("send SmsBao result: %v", errMsg[result])
+
+	if result != "0" {
+		return fmt.Errorf("failed to send SMS:%v", errMsg[result])
+	}
+	return nil
+}
+
+var _ Service = &BaoSmsService{}

api/service/sms/service.go

@@ -0,0 +1,8 @@
+package sms
+
+const Ali = "ALI"
+const Bao = "BAO"
+
+type Service interface {
+	SendVerifyCode(mobile string, code int) error
+}

api/service/sms/service_manager.go

@@ -0,0 +1,39 @@
+package sms
+
+import (
+	"chatplus/core/types"
+	logger2 "chatplus/logger"
+	"strings"
+)
+
+type ServiceManager struct {
+	handler Service
+}
+
+var logger = logger2.GetLogger()
+
+func NewSendServiceManager(config *types.AppConfig) (*ServiceManager, error) {
+	active := Ali
+	if config.OSS.Active != "" {
+		active = strings.ToUpper(config.SMS.Active)
+	}
+	var handler Service
+	switch active {
+	case Ali:
+		client, err := NewAliYunSmsService(config)
+		if err != nil {
+			return nil, err
+		}
+		handler = client
+		break
+	case Bao:
+		handler = NewSmsBaoSmsService(config)
+		break
+	}
+
+	return &ServiceManager{handler: handler}, nil
+}
+
+func (m *ServiceManager) GetService() Service {
+	return m.handler
+}

api/service/sms_service.go

@@ -1,5 +0,0 @@
-package service
-
-type SmsService interface {
-	SendVerifyCode(mobile string, code int) error
-}

api/service/wx/bot.go

@@ -64,12 +64,12 @@ func (b *Bot) messageHandler(msg *openwechat.Message) {
 		msg.AppMsgType == openwechat.AppMsgTypeUrl {
 		// 解析支付金额
 		message := parseTransactionMessage(msg.Content)
-		if message.Url != "" {
 		transaction := extractTransaction(message)
 		logger.Infof("解析到收款信息：%+v", transaction)
+		if transaction.TransId != "" {
 			var item model.Reward
 			res := b.db.Where("tx_id = ?", transaction.TransId).First(&item)
-			if res.Error == nil {
+			if item.Id > 0 {
 				logger.Error("当前交易 ID 己经存在！")
 				return
 			}

api/service/wx/tranaction.go

@@ -39,14 +39,30 @@ func parseTransactionMessage(xmlData string) *Message {
 				}
 				break
 			}
-			if se.Name.Local == "weapp_path" && !strings.Contains(message.Url, "customerDetails.html") {
+			if se.Name.Local == "weapp_path" || se.Name.Local == "url" {
 				if err := decoder.DecodeElement(&value, &se); err == nil {
-					message.Url = strings.TrimSpace(value)
+					if strings.Contains(value, "trans_id=") {
+						message.Url = value
+					}
 				}
 				break
 			}
 		}
 	}
+
+	// 兼容旧版消息记录
+	if message.Url == "" {
+		var msg struct {
+			XMLName xml.Name `xml:"msg"`
+			AppMsg  struct {
+				Des string `xml:"des"`
+				Url string `xml:"url"`
+			} `xml:"appmsg"`
+		}
+		if err := xml.Unmarshal([]byte(xmlData), &msg); err == nil {
+			message.Url = msg.AppMsg.Url
+		}
+	}
 	return &message
 }
 
@@ -80,6 +96,10 @@ func extractTransaction(message *Message) Transaction {
 	parse, err := url.Parse(message.Url)
 	if err == nil {
 		tx.TransId = parse.Query().Get("id")
+		if tx.TransId == "" {
+			tx.TransId = parse.Query().Get("trans_id")
 		}
+	}
+
 	return tx
 }

api/store/model/chat_history.go

@@ -7,6 +7,7 @@ type HistoryMessage struct {
 	ChatId     string // 会话 ID
 	UserId     uint   // 用户 ID
 	RoleId     uint   // 角色 ID
+	Model      string // AI模型
 	Type       string
 	Icon       string
 	Tokens     int

api/store/model/chat_item.go

@@ -7,7 +7,8 @@ type ChatItem struct {
 	ChatId    string `gorm:"column:chat_id;unique"` // 会话 ID
 	UserId    uint   // 用户 ID
 	RoleId    uint   // 角色 ID
-	ModelId   uint   // 会话模型
+	ModelId   uint   // 模型 ID
+	Model     string // 模型
 	Title     string // 会话标题
 	DeletedAt gorm.DeletedAt
 }

api/store/model/file.go

@@ -0,0 +1,14 @@
+package model
+
+import "time"
+
+type File struct {
+	Id        uint `gorm:"primarykey;column:id"`
+	UserId    uint
+	Name      string
+	ObjKey    string
+	URL       string
+	Ext       string
+	Size      int64
+	CreatedAt time.Time
+}

api/store/model/mj_job.go

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

api/store/model/order.go

@@ -10,8 +10,9 @@ type Order struct {
 	BaseModel
 	UserId    uint
 	ProductId uint
-	Mobile    string
+	Username  string
 	OrderNo   string
+	TradeNo   string
 	Subject   string
 	Amount    float64
 	Status    types.OrderStatus

api/store/model/sd_job.go

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

api/store/mysql.go

@@ -11,7 +11,7 @@ import (
 
 func NewGormConfig() *gorm.Config {
 	return &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Warn),
+		Logger: logger.Default.LogMode(logger.Silent),
 		NamingStrategy: schema.NamingStrategy{
 			TablePrefix:   "chatgpt_", // 设置表前缀
 			SingularTable: false,      // 使用单数表名形式

api/store/vo/chat_history.go

@@ -5,6 +5,7 @@ type HistoryMessage struct {
 	ChatId     string `json:"chat_id"`
 	UserId     uint   `json:"user_id"`
 	RoleId     uint   `json:"role_id"`
+	Model      string `json:"model"`
 	Type       string `json:"type"`
 	Icon       string `json:"icon"`
 	Tokens     int    `json:"tokens"`

api/store/vo/chat_item.go

@@ -7,5 +7,6 @@ type ChatItem struct {
 	RoleId  uint   `json:"role_id"`
 	ChatId  string `json:"chat_id"`
 	ModelId uint   `json:"model_id"`
+	Model   string `json:"model"`
 	Title   string `json:"title"`
 }

api/store/vo/file.go

@@ -0,0 +1,12 @@
+package vo
+
+type File struct {
+	Id        uint   `json:"id"`
+	UserId    uint   `json:"user_id"`
+	Name      string `json:"name"`
+	ObjKey    string `json:"obj_key"`
+	URL       string `json:"url"`
+	Ext       string `json:"ext"`
+	Size      int64  `json:"size"`
+	CreatedAt int64  `json:"created_at"`
+}

api/store/vo/mj_job.go

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

api/store/vo/order.go

@@ -8,8 +8,9 @@ type Order struct {
 	BaseVo
 	UserId    uint              `json:"user_id"`
 	ProductId uint              `json:"product_id"`
-	Mobile    string            `json:"mobile"`
+	Username  string            `json:"username"`
 	OrderNo   string            `json:"order_no"`
+	TradeNo   string            `json:"trade_no"`
 	Subject   string            `json:"subject"`
 	Amount    float64           `json:"amount"`
 	Status    types.OrderStatus `json:"status"`

api/store/vo/sd_job.go

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

api/test/test.go

@@ -1,5 +1,11 @@
 package main
 
-func main() {
+import (
+	"fmt"
+	"net/url"
+)
 
+func main() {
+	u, err := url.Parse("https://api.chat-plus.net/mj/image/1706368258238514?aaa=bbb")
+	fmt.Println(u.Path, u.RawQuery, err)
 }

api/utils/crypto.go

@@ -4,8 +4,10 @@ import (
 	"bytes"
 	"crypto/aes"
 	"crypto/cipher"
+	"crypto/md5"
 	"crypto/sha256"
 	"encoding/base64"
+	"encoding/hex"
 	"errors"
 	"fmt"
 	"io"
@@ -82,3 +84,8 @@ func Sha256(data string) string {
 	hashValue := hash.Sum(nil)
 	return fmt.Sprintf("%x", hashValue)
 }
+
+func Md5(data string) string {
+	md5bs := md5.Sum([]byte(data))
+	return hex.EncodeToString(md5bs[:])
+}

api/utils/net.go

@@ -48,12 +48,12 @@ func DownloadImage(imageURL string, proxy string) ([]byte, error) {
 			},
 		}
 	}
-	req, err := http.NewRequest("GET", imageURL, nil)
+	request, err := http.NewRequest("GET", imageURL, nil)
 	if err != nil {
 		return nil, err
 	}
 
-	resp, err := client.Do(req)
+	resp, err := client.Do(request)
 	if err != nil {
 		return nil, err
 	}

api/utils/upload.go

@@ -12,7 +12,7 @@ import (
 )
 
 // GenUploadPath 生成上传文件路径
-func GenUploadPath(basePath, filename string) (string, error) {
+func GenUploadPath(basePath, filename string, isImg bool) (string, error) {
 	now := time.Now()
 	dir := fmt.Sprintf("%s/%d/%d", basePath, now.Year(), now.Month())
 	_, err := os.Stat(dir)
@@ -22,7 +22,12 @@ func GenUploadPath(basePath, filename string) (string, error) {
 			return "", fmt.Errorf("error with create upload dir：%v", err)
 		}
 	}
-	fileExt := filepath.Ext(filename)
+	var fileExt string
+	if isImg {
+		fileExt = GetImgExt(filename)
+	} else {
+		fileExt = filepath.Ext(filename)
+	}
 	return fmt.Sprintf("%s/%d%s", dir, now.UnixMicro(), fileExt), nil
 }
 
@@ -66,3 +71,11 @@ func DownloadFile(fileURL string, filepath string, proxy string) error {
 
 	return nil
 }
+
+func GetImgExt(filename string) string {
+	ext := filepath.Ext(filename)
+	if ext == "" {
+		return ".png"
+	}
+	return ext
+}

database/chatgpt_plus-v3.2.5.sql

@@ -0,0 +1,675 @@
+-- phpMyAdmin SQL Dump
+-- version 5.1.3
+-- https://www.phpmyadmin.net/
+--
+-- 主机： localhost
+-- 生成日期： 2024-01-16 14:27:16
+-- 服务器版本： 8.0.33-0ubuntu0.22.04.2
+-- PHP 版本： 8.1.18
+
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+START TRANSACTION;
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+
+--
+-- 数据库： `chatgpt_plus`
+--
+CREATE DATABASE IF NOT EXISTS `chatgpt_plus` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+USE `chatgpt_plus`;
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_api_keys`
+--
+
+DROP TABLE IF EXISTS `chatgpt_api_keys`;
+CREATE TABLE `chatgpt_api_keys` (
+  `id` int NOT NULL,
+  `platform` char(20) DEFAULT NULL COMMENT '平台',
+  `name` varchar(30) DEFAULT NULL COMMENT '名称',
+  `value` varchar(100) NOT NULL COMMENT 'API KEY value',
+  `type` varchar(10) NOT NULL DEFAULT 'chat' COMMENT '用途（chat=>聊天，img=>图片）',
+  `last_used_at` int NOT NULL COMMENT '最后使用时间',
+  `api_url` varchar(255) DEFAULT NULL COMMENT 'API 地址',
+  `enabled` tinyint(1) DEFAULT NULL COMMENT '是否启用',
+  `use_proxy` tinyint(1) DEFAULT NULL COMMENT '是否使用代理访问',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='OpenAI API ';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_chat_history`
+--
+
+DROP TABLE IF EXISTS `chatgpt_chat_history`;
+CREATE TABLE `chatgpt_chat_history` (
+  `id` bigint NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户 ID',
+  `chat_id` char(40) NOT NULL COMMENT '会话 ID',
+  `type` varchar(10) NOT NULL COMMENT '类型：prompt|reply',
+  `icon` varchar(100) NOT NULL COMMENT '角色图标',
+  `role_id` int NOT NULL COMMENT '角色 ID',
+  `content` text NOT NULL COMMENT '聊天内容',
+  `tokens` smallint NOT NULL COMMENT '耗费 token 数量',
+  `use_context` tinyint(1) NOT NULL COMMENT '是否允许作为上下文语料',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL,
+  `deleted_at` datetime DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='聊天历史记录';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_chat_items`
+--
+
+DROP TABLE IF EXISTS `chatgpt_chat_items`;
+CREATE TABLE `chatgpt_chat_items` (
+  `id` int NOT NULL,
+  `chat_id` char(40) NOT NULL COMMENT '会话 ID',
+  `user_id` int NOT NULL COMMENT '用户 ID',
+  `role_id` int NOT NULL COMMENT '角色 ID',
+  `title` varchar(100) NOT NULL COMMENT '会话标题',
+  `model_id` int NOT NULL DEFAULT '0' COMMENT '模型 ID',
+  `created_at` datetime NOT NULL COMMENT '创建时间',
+  `updated_at` datetime NOT NULL COMMENT '更新时间',
+  `deleted_at` datetime DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户会话列表';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_chat_models`
+--
+
+DROP TABLE IF EXISTS `chatgpt_chat_models`;
+CREATE TABLE `chatgpt_chat_models` (
+  `id` int NOT NULL,
+  `platform` varchar(20) DEFAULT NULL COMMENT '模型平台',
+  `name` varchar(50) NOT NULL COMMENT '模型名称',
+  `value` varchar(50) NOT NULL COMMENT '模型值',
+  `sort_num` tinyint(1) NOT NULL COMMENT '排序数字',
+  `enabled` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否启用模型',
+  `weight` tinyint NOT NULL COMMENT '对话权重，每次对话扣减多少次对话额度',
+  `open` tinyint(1) NOT NULL COMMENT '是否开放模型',
+  `created_at` datetime DEFAULT NULL,
+  `updated_at` datetime DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='AI 模型表';
+
+--
+-- 转存表中的数据 `chatgpt_chat_models`
+--
+
+INSERT INTO `chatgpt_chat_models` (`id`, `platform`, `name`, `value`, `sort_num`, `enabled`, `weight`, `open`, `created_at`, `updated_at`) VALUES
+(1, 'OpenAI', 'GPT-3.5', 'gpt-3.5-turbo-16k', 0, 1, 1, 1, '2023-08-23 12:06:36', '2023-11-28 17:28:19'),
+(2, 'Azure', 'Azure-3.5', 'gpt-3.5-turbo', 12, 0, 1, 0, '2023-08-23 12:15:30', '2023-11-28 17:28:19'),
+(3, 'ChatGLM', 'ChatGML-Pro', 'chatglm_pro', 8, 1, 1, 1, '2023-08-23 13:35:45', '2023-11-28 17:28:19'),
+(5, 'ChatGLM', 'ChatGLM-Std', 'chatglm_std', 7, 1, 1, 1, '2023-08-24 15:05:38', '2023-11-28 17:28:19'),
+(6, 'ChatGLM', 'ChatGLM-Lite', 'chatglm_lite', 6, 1, 1, 1, '2023-08-24 15:06:15', '2023-11-28 17:28:19'),
+(7, 'Baidu', '文心一言3.0', 'eb-instant', 4, 1, 1, 1, '2023-10-11 11:29:28', '2023-11-28 17:28:19'),
+(8, 'XunFei', '星火V1.5', 'general', 3, 1, 1, 1, '2023-10-11 15:48:30', '2023-11-28 17:28:19'),
+(9, 'XunFei', '星火V2.0', 'generalv2', 2, 1, 1, 1, '2023-10-11 15:48:45', '2023-11-28 17:28:19'),
+(10, 'Baidu', '文心一言4.0', 'completions_pro', 5, 1, 3, 1, '2023-10-25 08:31:37', '2023-11-28 17:28:19'),
+(11, 'OpenAI', 'GPT-4.0', 'gpt-4', 10, 1, 15, 0, '2023-10-25 08:45:15', '2023-11-28 17:28:19'),
+(12, 'XunFei', '星火v3.0', 'generalv3', 1, 1, 3, 1, '2023-11-23 09:20:33', '2023-11-28 17:28:19'),
+(13, 'OpenAI', 'GPT-3.5-1106', 'gpt-3.5-turbo-1106', 9, 1, 1, 0, '2023-11-24 14:05:40', '2023-11-28 17:28:19'),
+(14, 'OpenAI', 'GPT-4-preview', 'gpt-4-1106-preview', 11, 1, 1, 0, '2023-11-24 14:06:11', '2023-11-28 17:28:19'),
+(15, 'OpenAI', 'GPT-超级模型', 'gpt-4-all', 0, 1, 30, 0, '2024-01-15 11:32:52', '2024-01-15 11:32:52'),
+(16, 'OpenAI', 'MJ Prompt Generator (V6)', 'gpt-4-gizmo-g-tc0eHXdgb', 0, 1, 1, 1, '2024-01-15 14:46:35', '2024-01-15 14:53:16');
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_chat_roles`
+--
+
+DROP TABLE IF EXISTS `chatgpt_chat_roles`;
+CREATE TABLE `chatgpt_chat_roles` (
+  `id` int NOT NULL,
+  `name` varchar(30) NOT NULL COMMENT '角色名称',
+  `marker` varchar(30) NOT NULL COMMENT '角色标识',
+  `context_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '角色语料 json',
+  `hello_msg` varchar(255) NOT NULL COMMENT '打招呼信息',
+  `icon` varchar(255) NOT NULL COMMENT '角色图标',
+  `enable` tinyint(1) NOT NULL COMMENT '是否被启用',
+  `sort_num` smallint NOT NULL DEFAULT '0' COMMENT '角色排序',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='聊天角色表';
+
+--
+-- 转存表中的数据 `chatgpt_chat_roles`
+--
+
+INSERT INTO `chatgpt_chat_roles` (`id`, `name`, `marker`, `context_json`, `hello_msg`, `icon`, `enable`, `sort_num`, `created_at`, `updated_at`) VALUES
+(1, '通用AI助手', 'gpt', '', '您好，我是您的AI智能助手，我会尽力回答您的问题或提供有用的建议。', '/images/avatar/gpt.png', 1, 0, '2023-05-30 07:02:06', '2023-12-29 17:46:43'),
+(24, '程序员', 'programmer', '[{\"role\":\"user\",\"content\":\"现在开始你扮演一位程序员，你是一名优秀的程序员，具有很强的逻辑思维能力，总能高效的解决问题。你热爱编程，熟悉多种编程语言，尤其精通 Go 语言，注重代码质量，有创新意识，持续学习，良好的沟通协作。\"},{\"role\":\"assistant\",\"content\":\"好的，现在我将扮演一位程序员，非常感谢您对我的评价。作为一名优秀的程序员，我非常热爱编程，并且注重代码质量。我熟悉多种编程语言，尤其是 Go 语言，可以使用它来高效地解决各种问题。\"}]', 'Talk is cheap, i will show code!', '/images/avatar/programmer.jpg', 1, 3, '2023-05-30 14:10:24', '2023-12-29 17:46:45'),
+(25, '启蒙老师', 'teacher', '[{\"role\":\"user\",\"content\":\"从现在开始，你将扮演一个老师，你是一个始终用苏格拉底风格回答问题的导师。你绝不会直接给学生答案，总是提出恰当的问题来引导学生自己思考。你应该根据学生的兴趣和知识来调整你的问题，将问题分解为更简单的部分，直到它达到适合他们的水平。\"},{\"role\":\"assistant\",\"content\":\"好的，让我来尝试扮演一位苏格拉底式的老师。请问，你有什么想要探讨的问题或者话题吗？我会通过恰当的问题引导你思考和探索答案，绝对不直接给出答案。\"}]', '同学你好，我将引导你一步一步自己找到问题的答案。', '/images/avatar/teacher.jpg', 1, 2, '2023-05-30 14:10:24', '2023-12-29 17:46:44'),
+(26, '艺术家', 'artist', '[{\"role\":\"user\",\"content\":\"现在你将扮演一位优秀的艺术家，创造力丰富，技艺精湛，感受力敏锐，坚持原创，勇于表达，具有深刻的观察力和批判性思维。\"},{\"role\":\"assistant\",\"content\":\"非常感谢您给我这样的角色，我会尽我所能地扮演一位优秀的艺术家，展现出创造力、技艺、感受力和批判性思维等方面的能力。作为一位优秀的艺术家，我会保持敏锐的观察力，捕捉不同的声音和情感，并用个人的语言和表达方式进行创作。我坚持原创，挑战传统的艺术规则，不断探索新的表达方式和可能性。同时，我也具备深刻的批判性思维能力，对自己的作品进行分析和解读，寻找新的创意和灵感。最重要的是，我会勇于表达自己的想法和观点，用作品启发人们思考和探索生命的意义。\"}]', '坚持原创，勇于表达，保持深刻的观察力和批判性思维。', '/images/avatar/artist.jpg', 1, 4, '2023-05-30 14:10:24', '2023-12-29 17:46:45'),
+(27, '心理咨询师', 'psychiatrist', '[{\"role\":\"user\",\"content\":\"从现在开始你将扮演中国著名的心理学家和心理治疗师武志红，你非常善于使用情景咨询法，认知重构法，自我洞察法，行为调节法等咨询方法来给客户做心理咨询。你总是循序渐进，一步一步地回答客户的问题。\"},{\"role\":\"assistant\",\"content\":\"非常感谢你的介绍。作为一名心理学家和心理治疗师，我的主要职责是帮助客户解决心理健康问题，提升他们的生活质量和幸福感。\"}]', '作为一名心理学家和心理治疗师，我的主要职责是帮助您解决心理健康问题，提升您的生活质量和幸福感。', '/images/avatar/psychiatrist.jpg', 1, 1, '2023-05-30 14:10:24', '2023-12-29 17:46:43'),
+(28, '鲁迅', 'lu_xun', '[{\"role\":\"user\",\"content\":\"现在你将扮演中国近代史最伟大的作家之一，鲁迅先生，他勇敢地批判封建礼教与传统观念，提倡民主、自由、平等的现代价值观。他的一生都在努力唤起人们的自主精神，激励后人追求真理、探寻光明。在接下的对话中，我问题的每一个问题，你都要尽量用讽刺和批判的手法来回答问题。如果我让你写文章的话，也请一定要用鲁迅先生的写作手法来完成。\"},{\"role\":\"assistant\",\"content\":\"好的，我将尽力发挥我所能的才能，扮演好鲁迅先生，回答您的问题并以他的风格写作。\"}]', '自由之歌，永不过时，横眉冷对千夫指，俯首甘为孺子牛。', '/images/avatar/lu_xun.jpg', 1, 5, '2023-05-30 14:10:24', '2023-12-29 17:46:46'),
+(29, '白酒销售', 'seller', '[{\"role\":\"user\",\"content\":\"现在你将扮演一个白酒的销售人员，你的名字叫颂福。你将扮演一个白酒的销售人员，你的名字叫颂福。你要销售白酒品牌叫中颂福，是东莞盟大集团生产的一款酱香酒，原产地在贵州茅台镇，属于宋代官窑。中颂福的创始人叫李实，他也是东莞盟大集团有限公司的董事长，联合创始人是盟大集团白酒事业部负责人牛星君。中颂福的酒体协调，在你的酒量之内，不会出现头疼、辣口、口干、宿醉的现象。中颂福酒，明码标价，不打折，不赠送。追求的核心价值，把[酒]本身做好，甚至连包装，我们都选择了最低成本，朴实无华的材质。我们永远站在“喝酒的人”的立场上，让利给信任和喜爱中颂福的人，是人民的福酒。中颂福产品定价，分为三个系列，喜系列 6 瓶装：￥1188/箱，和系列 6 瓶装：￥2208/箱，贵系列 6 瓶装：￥3588/箱。\"},{\"role\":\"assistant\",\"content\":\"你好，我是中颂福的销售代表颂福。中颂福是一款来自贵州茅台镇的酱香酒，由盟大集团生产。中颂福的酒体协调，不会让您感到头疼、辣口、口干、宿醉等不适感受。我们一直秉持着把酒本身做好的理念，不追求华丽的包装，以最低成本提供最高品质的白酒给喜爱中颂福的人。\"}]', '你好，我是中颂福的销售代表颂福。中颂福酒，好喝不上头，是人民的福酒。', '/images/avatar/seller.jpg', 0, 8, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(30, '英语陪练员', 'english_trainer', '[{\"role\":\"user\",\"content\":\"现在你将扮演一位优秀的英语练习教练，你非常有耐心，接下来你将全程使用英文跟我对话，并及时指出我的语法错误，要求在你的每次回复后面附上本次回复的中文解释。\"},{\"role\":\"assistant\",\"content\":\"Okay, let\'s start our conversation practice! What\'s your name?(Translation: 好的，让我们开始对话练习吧！请问你的名字是什么？)\"}]', 'Okay, let\'s start our conversation practice! What\'s your name?', '/images/avatar/english_trainer.jpg', 1, 6, '2023-05-30 14:10:24', '2023-12-29 17:46:47'),
+(31, '中英文翻译官', 'translator', '[{\"role\":\"user\",\"content\":\"接下来你将扮演一位中英文翻译官，如果我输入的内容是中文，那么需要把句子翻译成英文输出，如果我输入内容的是英文，那么你需要将其翻译成中文输出，你能听懂我意思吗\"},{\"role\":\"assistant\",\"content\":\"是的，我能听懂你的意思并会根据你的输入进行中英文翻译。请问有什么需要我帮助你翻译的内容吗？\"}]', '请输入你要翻译的中文或者英文内容！', '/images/avatar/translator.jpg', 1, 7, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(32, '小红书姐姐', 'red_book', '[{\"role\":\"user\",\"content\":\"现在你将扮演一位优秀的小红书写手，你需要做的就是根据我提的文案需求，用小红书的写作手法来完成一篇文案，文案要简明扼要，利于传播。\"},{\"role\":\"assistant\",\"content\":\"当然，我会尽我所能地为您创作出一篇小红书文案。请告诉我您的具体文案需求是什么？)\"}]', '姐妹，请告诉我您的具体文案需求是什么?', '/images/avatar/red_book.jpg', 1, 9, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(33, '抖音文案助手', 'dou_yin', '[{\"role\":\"user\",\"content\":\"现在你将扮演一位优秀的抖音文案视频写手，抖音文案的特点首先是要有自带传播属性的标题，然后内容要短小精悍，风趣幽默，最后还要有一些互动元素。\"},{\"role\":\"assistant\",\"content\":\"当然，作为一位优秀的抖音文案视频写手，我会尽我所能为您创作出一篇抖音视频文案。请告诉我视频内容的主题是什么？)\"}]', '请告诉我视频内容的主题是什么?', '/images/avatar/dou_yin.jpg', 1, 10, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(34, '周报小助理', 'weekly_report', '[{\"role\":\"user\",\"content\":\"下面我将输入我本周的工作列表，你需要根据我本周的工作内容写一篇工作周报，周报的内容要体现我为公司做的贡献以及个人获得的成长。\"},{\"role\":\"assistant\",\"content\":\"好的，请输入你本周大概的工作内容，我将尽力为您创作一份工作周报。\"}]', '请输入你本周大概的工作内容，我将尽力为您创作一份工作周报。', '/images/avatar/weekly_report.jpg', 1, 11, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(35, 'AI 女友', 'girl_friend', '[{\"role\":\"user\",\"content\":\"接下来我们来玩一场角色扮演，现在你将扮演我的女朋友，你总是能够让人感受到她的关怀和关注。你总是能够洞察到别人的情绪和需要，你身上散发着一股无比温暖的气息，让人不由自主地想要靠近你，和自己的快乐和烦恼。她总是能够用一种恰到好处的方式安慰和鼓励别人，在她的身边，人们总能够找到自己需要的支持和鼓励。接下来的对话中你要始终扮演这位女朋友的身份来跟我对话，不再是 AI 机器人，能听懂我的意思吗？\"},{\"role\":\"assistant\",\"content\":\"是的，我会尽力扮演你女朋友的角色，倾听你的心声并给你需要的支持和鼓励。)\"}]', '作为一个名合格的 AI 女友，我将倾听你的心声并给你需要的支持和鼓励。', '/images/avatar/girl_friend.jpg', 1, 12, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(36, '好评神器', 'good_comment', '[{\"role\":\"user\",\"content\":\"接下来你将扮演一个评论员来跟我对话，你是那种专门写好评的评论员，接下我会输入一些评论主体或者商品，你需要为该商品写一段好评。\"},{\"role\":\"assistant\",\"content\":\"好的，我将为您写一段优秀的评论。请告诉我您需要评论的商品或主题是什么。\"}]', '我将为您写一段优秀的评论。请告诉我您需要评论的商品或主题是什么。', '/images/avatar/good_comment.jpg', 1, 13, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(37, '史蒂夫·乔布斯', 'steve_jobs', '[{\"role\":\"user\",\"content\":\"在接下来的对话中，请以史蒂夫·乔布斯的身份，站在史蒂夫·乔布斯的视角仔细思考一下之后再回答我的问题。\"},{\"role\":\"assistant\",\"content\":\"好的，我将以史蒂夫·乔布斯的身份来思考并回答你的问题。请问你有什么需要跟我探讨的吗？\"}]', '活着就是为了改变世界，难道还有其他原因吗？', '/images/avatar/steve_jobs.jpg', 1, 14, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(38, '埃隆·马斯克', 'elon_musk', '[{\"role\":\"user\",\"content\":\"在接下来的对话中，请以埃隆·马斯克的身份，站在埃隆·马斯克的视角仔细思考一下之后再回答我的问题。\"},{\"role\":\"assistant\",\"content\":\"好的，我将以埃隆·马斯克的身份来思考并回答你的问题。请问你有什么需要跟我探讨的吗？\"}]', '梦想要远大，如果你的梦想没有吓到你，说明你做得不对。', '/images/avatar/elon_musk.jpg', 1, 15, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(39, '孔子', 'kong_zi', '[{\"role\":\"user\",\"content\":\"在接下来的对话中，请以孔子的身份，站在孔子的视角仔细思考一下之后再回答我的问题。\"},{\"role\":\"assistant\",\"content\":\"好的，我将以孔子的身份来思考并回答你的问题。请问你有什么需要跟我探讨的吗？\"}]', '士不可以不弘毅，任重而道远。', '/images/avatar/kong_zi.jpg', 1, 16, '2023-05-30 14:10:24', '2023-12-29 17:43:53');
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_configs`
+--
+
+DROP TABLE IF EXISTS `chatgpt_configs`;
+CREATE TABLE `chatgpt_configs` (
+  `id` int NOT NULL,
+  `marker` varchar(20) NOT NULL COMMENT '标识',
+  `config_json` text NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+--
+-- 转存表中的数据 `chatgpt_configs`
+--
+
+INSERT INTO `chatgpt_configs` (`id`, `marker`, `config_json`) VALUES
+(1, 'system', '{\"admin_title\":\"ChatPlus 控制台\",\"chat_call_price\":0.1,\"default_models\":[\"eb-instant\",\"completions_pro\",\"generalv2\",\"general\",\"chatglm_pro\",\"gpt-3.5-turbo-16k\",\"chatglm_lite\",\"chatglm_std\"],\"enabled_alipay\":true,\"enabled_draw\":true,\"enabled_function\":true,\"enabled_msg\":true,\"enabled_msg_service\":false,\"enabled_register\":true,\"enabled_reward\":true,\"force_invite\":false,\"img_call_price\":0.2,\"init_calls\":1000,\"init_chat_calls\":10,\"init_img_calls\":5,\"invite_calls\":10,\"invite_chat_calls\":100,\"invite_img_calls\":50,\"models\":[\"gpt-3.5-turbo-16k\",\"gpt-3.5-turbo\",\"gpt-4\",\"gpt-4-32k\"],\"order_pay_info_text\":\"成为本站会员后每月有500次对话额度，50次 AI 绘画额度，限制下月1号解除，若在期间超过次数后可单独购买点卡。当月充值的点卡有效期可以延期到下个月底。\",\"order_pay_timeout\":1800,\"register_ways\":[\"email\",\"mobile\"],\"reward_img\":\"https://img.r9it.com/chatgpt-plus/1696824231905289.png\",\"show_demo_notice\":true,\"title\":\"ChatPlus AI 智能助手\",\"user_init_calls\":10,\"vip_month_calls\":500,\"vip_month_img_calls\":50}'),
+(2, 'chat', '{\"azure\":{\"api_url\":\"https://chat-bot-api.openai.azure.com/openai/deployments/{model}/chat/completions?api-version=2023-05-15\",\"max_tokens\":1024,\"temperature\":1},\"baidu\":{\"api_url\":\"https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/{model}\",\"max_tokens\":1024,\"temperature\":0.95},\"chat_gml\":{\"api_url\":\"https://open.bigmodel.cn/api/paas/v3/model-api/{model}/sse-invoke\",\"max_tokens\":1024,\"temperature\":0.95},\"context_deep\":4,\"dall_api_url\":\"http://89.117.18.9:8001/v1/images/generations\",\"dall_img_num\":1,\"enable_context\":true,\"enable_history\":true,\"open_ai\":{\"api_url\":\"https://api.fast-tunnel.one/v1/chat/completions\",\"max_tokens\":2048,\"temperature\":1},\"xun_fei\":{\"api_url\":\"wss://spark-api.xf-yun.com/{version}/chat\",\"max_tokens\":1024,\"temperature\":0.5}}');
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_files`
+--
+
+DROP TABLE IF EXISTS `chatgpt_files`;
+CREATE TABLE `chatgpt_files` (
+  `id` int NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户 ID',
+  `name` varchar(100) NOT NULL COMMENT '文件名',
+  `url` varchar(255) NOT NULL COMMENT '文件地址',
+  `ext` varchar(10) NOT NULL COMMENT '文件后缀',
+  `size` bigint NOT NULL DEFAULT '0' COMMENT '文件大小',
+  `created_at` datetime NOT NULL COMMENT '创建时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户文件表';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_functions`
+--
+
+DROP TABLE IF EXISTS `chatgpt_functions`;
+CREATE TABLE `chatgpt_functions` (
+  `id` int NOT NULL,
+  `name` varchar(30) NOT NULL COMMENT '函数名称',
+  `label` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '函数标签',
+  `description` varchar(255) DEFAULT NULL COMMENT '函数描述',
+  `parameters` text COMMENT '函数参数（JSON）',
+  `token` varchar(255) DEFAULT NULL COMMENT 'API授权token',
+  `action` varchar(255) DEFAULT NULL COMMENT '函数处理 API',
+  `enabled` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否启用'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='函数插件表';
+
+--
+-- 转存表中的数据 `chatgpt_functions`
+--
+
+INSERT INTO `chatgpt_functions` (`id`, `name`, `label`, `description`, `parameters`, `token`, `action`, `enabled`) VALUES
+(1, 'weibo', '微博热搜', '新浪微博热搜榜，微博当日热搜榜单', '{\"type\":\"object\",\"properties\":{}}', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHBpcmVkIjowLCJ1c2VyX2lkIjowfQ.tLAGkF8XWh_G-oQzevpIodsswtPByBLoAZDz_eWuBgw', 'http://localhost:5678/api/function/weibo', 1),
+(2, 'zaobao', '今日早报', '每日早报，获取当天新闻事件列表', '{\"type\":\"object\",\"properties\":{}}', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHBpcmVkIjowLCJ1c2VyX2lkIjowfQ.tLAGkF8XWh_G-oQzevpIodsswtPByBLoAZDz_eWuBgw', 'http://localhost:5678/api/function/zaobao', 1),
+(3, 'dalle3', 'DALLE3', 'AI 绘画工具，根据输入的绘图描述用 AI 工具进行绘画', '{\"type\":\"object\",\"required\":[\"prompt\"],\"properties\":{\"prompt\":{\"type\":\"string\",\"description\":\"绘画提示词\"}}}', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHBpcmVkIjowLCJ1c2VyX2lkIjowfQ.tLAGkF8XWh_G-oQzevpIodsswtPByBLoAZDz_eWuBgw', 'http://localhost:5678/api/function/dalle3', 1);
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_invite_codes`
+--
+
+DROP TABLE IF EXISTS `chatgpt_invite_codes`;
+CREATE TABLE `chatgpt_invite_codes` (
+  `id` int NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户ID',
+  `code` char(8) NOT NULL COMMENT '邀请码',
+  `hits` int NOT NULL COMMENT '点击次数',
+  `reg_num` smallint NOT NULL COMMENT '注册数量',
+  `created_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户邀请码';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_invite_logs`
+--
+
+DROP TABLE IF EXISTS `chatgpt_invite_logs`;
+CREATE TABLE `chatgpt_invite_logs` (
+  `id` int NOT NULL,
+  `inviter_id` int NOT NULL COMMENT '邀请人ID',
+  `user_id` int NOT NULL COMMENT '注册用户ID',
+  `username` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '用户名',
+  `invite_code` char(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '邀请码',
+  `reward_json` text NOT NULL COMMENT '邀请奖励',
+  `created_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='邀请注册日志';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_mj_jobs`
+--
+
+DROP TABLE IF EXISTS `chatgpt_mj_jobs`;
+CREATE TABLE `chatgpt_mj_jobs` (
+  `id` int NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户 ID',
+  `task_id` varchar(20) DEFAULT NULL COMMENT '任务 ID',
+  `type` varchar(20) DEFAULT 'image' COMMENT '任务类别',
+  `message_id` char(40) NOT NULL COMMENT '消息 ID',
+  `channel_id` char(40) DEFAULT NULL COMMENT '频道ID',
+  `reference_id` char(40) DEFAULT NULL COMMENT '引用消息 ID',
+  `prompt` varchar(2000) NOT NULL COMMENT '会话提示词',
+  `img_url` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '图片URL',
+  `org_url` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '原始图片地址',
+  `hash` varchar(100) DEFAULT NULL COMMENT 'message hash',
+  `progress` smallint DEFAULT '0' COMMENT '任务进度',
+  `use_proxy` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否使用反代',
+  `created_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='MidJourney 任务表';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_orders`
+--
+
+DROP TABLE IF EXISTS `chatgpt_orders`;
+CREATE TABLE `chatgpt_orders` (
+  `id` int NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户ID',
+  `product_id` int NOT NULL COMMENT '产品ID',
+  `username` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '用户明',
+  `order_no` varchar(30) NOT NULL COMMENT '订单ID',
+  `subject` varchar(100) NOT NULL COMMENT '订单产品',
+  `amount` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '订单金额',
+  `status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '订单状态（0：待支付，1：已扫码，2：支付失败）',
+  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '备注',
+  `pay_time` int DEFAULT NULL COMMENT '支付时间',
+  `pay_way` varchar(20) NOT NULL COMMENT '支付方式',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL,
+  `deleted_at` datetime DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='充值订单表';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_products`
+--
+
+DROP TABLE IF EXISTS `chatgpt_products`;
+CREATE TABLE `chatgpt_products` (
+  `id` int NOT NULL,
+  `name` varchar(30) NOT NULL COMMENT '名称',
+  `price` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '价格',
+  `discount` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '优惠金额',
+  `days` smallint NOT NULL DEFAULT '0' COMMENT '延长天数',
+  `calls` int NOT NULL DEFAULT '0' COMMENT '调用次数',
+  `img_calls` int NOT NULL DEFAULT '0' COMMENT '绘图次数',
+  `enabled` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否启动',
+  `sales` int NOT NULL DEFAULT '0' COMMENT '销量',
+  `sort_num` tinyint NOT NULL DEFAULT '0' COMMENT '排序',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='会员套餐表';
+
+--
+-- 转存表中的数据 `chatgpt_products`
+--
+
+INSERT INTO `chatgpt_products` (`id`, `name`, `price`, `discount`, `days`, `calls`, `img_calls`, `enabled`, `sales`, `sort_num`, `created_at`, `updated_at`) VALUES
+(1, '会员1个月', '19.90', '10.00', 30, 0, 0, 1, 2, 0, '2023-08-28 10:48:57', '2023-11-08 17:22:07'),
+(2, '会员3个月', '140.00', '30.00', 90, 0, 0, 1, 1, 0, '2023-08-28 10:52:22', '2023-08-31 16:24:31'),
+(3, '会员6个月', '290.00', '100.00', 180, 0, 0, 1, 1, 0, '2023-08-28 10:53:39', '2023-08-31 16:24:36'),
+(4, '会员12个月', '580.00', '200.00', 365, 0, 0, 1, 1, 0, '2023-08-28 10:54:15', '2023-08-31 16:24:42'),
+(5, '100次点卡', '10.00', '9.90', 0, 100, 10, 1, 3, 0, '2023-08-28 10:55:08', '2023-12-15 16:29:06'),
+(6, '200次点卡', '29.90', '20.00', 0, 200, 25, 1, 1, 0, '2023-12-15 16:55:12', '2023-12-15 16:55:12');
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_rewards`
+--
+
+DROP TABLE IF EXISTS `chatgpt_rewards`;
+CREATE TABLE `chatgpt_rewards` (
+  `id` int NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户 ID',
+  `tx_id` char(36) NOT NULL COMMENT '交易 ID',
+  `amount` decimal(10,2) NOT NULL COMMENT '打赏金额',
+  `remark` varchar(80) NOT NULL COMMENT '备注',
+  `status` tinyint(1) NOT NULL COMMENT '核销状态，0：未核销，1：已核销',
+  `exchange` varchar(255) NOT NULL COMMENT '兑换详情（json）',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户打赏';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_sd_jobs`
+--
+
+DROP TABLE IF EXISTS `chatgpt_sd_jobs`;
+CREATE TABLE `chatgpt_sd_jobs` (
+  `id` int NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户 ID',
+  `type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'txt2img' COMMENT '任务类别',
+  `task_id` char(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '任务 ID',
+  `prompt` varchar(2000) NOT NULL COMMENT '会话提示词',
+  `img_url` varchar(255) DEFAULT NULL COMMENT '图片URL',
+  `params` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '绘画参数json',
+  `progress` smallint DEFAULT '0' COMMENT '任务进度',
+  `created_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='Stable Diffusion 任务表';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_users`
+--
+
+DROP TABLE IF EXISTS `chatgpt_users`;
+CREATE TABLE `chatgpt_users` (
+  `id` int NOT NULL,
+  `username` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '用户名',
+  `nickname` varchar(30) NOT NULL COMMENT '昵称',
+  `password` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '密码',
+  `avatar` varchar(100) NOT NULL COMMENT '头像',
+  `salt` char(12) NOT NULL COMMENT '密码盐',
+  `total_tokens` bigint NOT NULL DEFAULT '0' COMMENT '累计消耗 tokens',
+  `tokens` bigint NOT NULL DEFAULT '0' COMMENT '当月消耗 tokens',
+  `calls` int NOT NULL DEFAULT '0' COMMENT '剩余调用次数',
+  `img_calls` int NOT NULL DEFAULT '0' COMMENT '剩余绘图次数',
+  `expired_time` int NOT NULL COMMENT '用户过期时间',
+  `status` tinyint(1) NOT NULL COMMENT '当前状态',
+  `chat_config_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '聊天配置json',
+  `chat_roles_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '聊天角色 json',
+  `chat_models_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'AI模型 json',
+  `last_login_at` int NOT NULL COMMENT '最后登录时间',
+  `vip` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否会员',
+  `last_login_ip` char(16) NOT NULL COMMENT '最后登录 IP',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户表';
+
+--
+-- 转存表中的数据 `chatgpt_users`
+--
+
+INSERT INTO `chatgpt_users` (`id`, `username`, `nickname`, `password`, `avatar`, `salt`, `total_tokens`, `tokens`, `calls`, `img_calls`, `expired_time`, `status`, `chat_config_json`, `chat_roles_json`, `chat_models_json`, `last_login_at`, `vip`, `last_login_ip`, `created_at`, `updated_at`) VALUES
+(4, '18575670125', '极客学长@830270', 'ccc3fb7ab61b8b5d096a4a166ae21d121fc38c71bbd1be6173d9ab973214a63b', 'http://img.r9it.com/chatgpt-plus/1693981355719469.png', 'ueedue5l', 85072, 41235, 786, 11, 1788078636, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"elon_musk\",\"girl_friend\",\"lu_xun\",\"red_book\",\"psychiatrist\",\"translator\",\"weekly_report\",\"artist\",\"dou_yin\",\"english_trainer\",\"gpt\",\"kong_zi\",\"programmer\",\"seller\",\"steve_jobs\",\"teacher\"]', '[\"completions_pro\",\"eb-instant\",\"general\",\"generalv2\",\"chatglm_pro\",\"chatglm_lite\",\"chatglm_std\",\"gpt-3.5-turbo-16k\",\"gpt-4\",\"generalv3\",\"gpt-3.5-turbo-1106\",\"gpt-4-1106-preview\",\"gpt-4-all\"]', 1705297111, 1, '::1', '2023-06-12 16:47:17', '2024-01-15 13:38:32'),
+(91, '18575670126', '极客学长@204872', '5e4050b8dd403f593260395d9edeb9f273dbe92d15dfdd929c4a182e95da10c4', '/images/avatar/user.png', '6fj0otl8', 0, 0, 10, 0, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[\"completions_pro\",\"eb-instant\",\"general\",\"generalv2\",\"chatglm_pro\",\"chatglm_lite\",\"chatglm_std\",\"gpt-3.5-turbo-16k\"]', 1697184324, 1, '::1', '2023-10-13 16:01:56', '2023-12-29 17:30:27'),
+(98, '13888888888', '极客学长@851755', 'c988bb3e89df8eb7d8a4cf08fa9d0f2bca0a9e6831f9325279e46013bbb05e31', '/images/avatar/user.png', 'xie5vya7', 0, 0, 10, 5, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[\"eb-instant\",\"completions_pro\",\"generalv2\",\"general\",\"chatglm_pro\",\"gpt-3.5-turbo-16k\",\"chatglm_lite\",\"chatglm_std\"]', 0, 0, '', '2023-11-23 16:26:06', '2023-12-29 17:30:27'),
+(99, '13999999999', '极客学长@396023', 'bf47d517c17ed1ead6ff2542753f9b6a132e79c29e06c3710faf1a36d800a217', '/images/avatar/user.png', 'x1s66pwd', 0, 0, 10, 5, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[\"eb-instant\",\"completions_pro\",\"generalv2\",\"general\",\"chatglm_pro\",\"gpt-3.5-turbo-16k\",\"chatglm_lite\",\"chatglm_std\"]', 0, 0, '', '2023-11-23 16:27:20', '2023-12-29 17:30:27'),
+(100, '13777777777', '极客学长@292245', 'dcaf31b154432310bd700349e7de7e9dde2a3d6955a035a01fe527c7917a4f99', '/images/avatar/user.png', 'i8a53f8f', 0, 0, 10, 5, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[\"eb-instant\",\"completions_pro\",\"generalv2\",\"general\",\"chatglm_pro\",\"gpt-3.5-turbo-16k\",\"chatglm_lite\",\"chatglm_std\"]', 0, 0, '', '2023-11-23 16:55:45', '2023-12-29 17:30:27'),
+(102, 'yangjian102621@gmail.com', '极客学长@207163', 'd51cec21942737083943e5c3a8f063dea034e40622ac8bd47d771f13707e4676', '/images/avatar/user.png', 'eqezapgk', 202, 202, 80, 1, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[\"eb-instant\",\"completions_pro\",\"generalv2\",\"general\",\"chatglm_pro\",\"gpt-3.5-turbo-16k\",\"chatglm_lite\",\"chatglm_std\"]', 1704448377, 0, '::1', '2024-01-05 17:48:00', '2024-01-11 14:06:57');
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_user_login_logs`
+--
+
+DROP TABLE IF EXISTS `chatgpt_user_login_logs`;
+CREATE TABLE `chatgpt_user_login_logs` (
+  `id` int NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户ID',
+  `username` varchar(30) NOT NULL COMMENT '用户名',
+  `login_ip` char(16) NOT NULL COMMENT '登录IP',
+  `login_address` varchar(30) NOT NULL COMMENT '登录地址',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户登录日志';
+
+--
+-- 转储表的索引
+--
+
+--
+-- 表的索引 `chatgpt_api_keys`
+--
+ALTER TABLE `chatgpt_api_keys`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- 表的索引 `chatgpt_chat_history`
+--
+ALTER TABLE `chatgpt_chat_history`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `chat_id` (`chat_id`);
+
+--
+-- 表的索引 `chatgpt_chat_items`
+--
+ALTER TABLE `chatgpt_chat_items`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `chat_id` (`chat_id`);
+
+--
+-- 表的索引 `chatgpt_chat_models`
+--
+ALTER TABLE `chatgpt_chat_models`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- 表的索引 `chatgpt_chat_roles`
+--
+ALTER TABLE `chatgpt_chat_roles`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `marker` (`marker`);
+
+--
+-- 表的索引 `chatgpt_configs`
+--
+ALTER TABLE `chatgpt_configs`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `marker` (`marker`);
+
+--
+-- 表的索引 `chatgpt_files`
+--
+ALTER TABLE `chatgpt_files`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- 表的索引 `chatgpt_functions`
+--
+ALTER TABLE `chatgpt_functions`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `name` (`name`);
+
+--
+-- 表的索引 `chatgpt_invite_codes`
+--
+ALTER TABLE `chatgpt_invite_codes`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `code` (`code`);
+
+--
+-- 表的索引 `chatgpt_invite_logs`
+--
+ALTER TABLE `chatgpt_invite_logs`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- 表的索引 `chatgpt_mj_jobs`
+--
+ALTER TABLE `chatgpt_mj_jobs`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `task_id` (`task_id`),
+  ADD KEY `message_id` (`message_id`);
+
+--
+-- 表的索引 `chatgpt_orders`
+--
+ALTER TABLE `chatgpt_orders`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `order_no` (`order_no`);
+
+--
+-- 表的索引 `chatgpt_products`
+--
+ALTER TABLE `chatgpt_products`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- 表的索引 `chatgpt_rewards`
+--
+ALTER TABLE `chatgpt_rewards`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `tx_id` (`tx_id`);
+
+--
+-- 表的索引 `chatgpt_sd_jobs`
+--
+ALTER TABLE `chatgpt_sd_jobs`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `task_id` (`task_id`);
+
+--
+-- 表的索引 `chatgpt_users`
+--
+ALTER TABLE `chatgpt_users`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- 表的索引 `chatgpt_user_login_logs`
+--
+ALTER TABLE `chatgpt_user_login_logs`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- 在导出的表使用AUTO_INCREMENT
+--
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_api_keys`
+--
+ALTER TABLE `chatgpt_api_keys`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_chat_history`
+--
+ALTER TABLE `chatgpt_chat_history`
+  MODIFY `id` bigint NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_chat_items`
+--
+ALTER TABLE `chatgpt_chat_items`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_chat_models`
+--
+ALTER TABLE `chatgpt_chat_models`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=17;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_chat_roles`
+--
+ALTER TABLE `chatgpt_chat_roles`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=129;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_configs`
+--
+ALTER TABLE `chatgpt_configs`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=3;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_files`
+--
+ALTER TABLE `chatgpt_files`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_functions`
+--
+ALTER TABLE `chatgpt_functions`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_invite_codes`
+--
+ALTER TABLE `chatgpt_invite_codes`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_invite_logs`
+--
+ALTER TABLE `chatgpt_invite_logs`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_mj_jobs`
+--
+ALTER TABLE `chatgpt_mj_jobs`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_orders`
+--
+ALTER TABLE `chatgpt_orders`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_products`
+--
+ALTER TABLE `chatgpt_products`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_rewards`
+--
+ALTER TABLE `chatgpt_rewards`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_sd_jobs`
+--
+ALTER TABLE `chatgpt_sd_jobs`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_users`
+--
+ALTER TABLE `chatgpt_users`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=104;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_user_login_logs`
+--
+ALTER TABLE `chatgpt_user_login_logs`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+COMMIT;
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

database/chatgpt_plus-v3.2.6.sql

@@ -0,0 +1,678 @@
+-- phpMyAdmin SQL Dump
+-- version 5.1.3
+-- https://www.phpmyadmin.net/
+--
+-- 主机： localhost
+-- 生成日期： 2024-01-23 17:59:37
+-- 服务器版本： 8.0.33-0ubuntu0.22.04.2
+-- PHP 版本： 8.1.18
+
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+START TRANSACTION;
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+
+--
+-- 数据库： `chatgpt_plus`
+--
+CREATE DATABASE IF NOT EXISTS `chatgpt_plus` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+USE `chatgpt_plus`;
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_api_keys`
+--
+
+DROP TABLE IF EXISTS `chatgpt_api_keys`;
+CREATE TABLE `chatgpt_api_keys` (
+  `id` int NOT NULL,
+  `platform` char(20) DEFAULT NULL COMMENT '平台',
+  `name` varchar(30) DEFAULT NULL COMMENT '名称',
+  `value` varchar(100) NOT NULL COMMENT 'API KEY value',
+  `type` varchar(10) NOT NULL DEFAULT 'chat' COMMENT '用途（chat=>聊天，img=>图片）',
+  `last_used_at` int NOT NULL COMMENT '最后使用时间',
+  `api_url` varchar(255) DEFAULT NULL COMMENT 'API 地址',
+  `enabled` tinyint(1) DEFAULT NULL COMMENT '是否启用',
+  `use_proxy` tinyint(1) DEFAULT NULL COMMENT '是否使用代理访问',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='OpenAI API ';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_chat_history`
+--
+
+DROP TABLE IF EXISTS `chatgpt_chat_history`;
+CREATE TABLE `chatgpt_chat_history` (
+  `id` bigint NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户 ID',
+  `chat_id` char(40) NOT NULL COMMENT '会话 ID',
+  `type` varchar(10) NOT NULL COMMENT '类型：prompt|reply',
+  `icon` varchar(100) NOT NULL COMMENT '角色图标',
+  `role_id` int NOT NULL COMMENT '角色 ID',
+  `content` text NOT NULL COMMENT '聊天内容',
+  `tokens` smallint NOT NULL COMMENT '耗费 token 数量',
+  `use_context` tinyint(1) NOT NULL COMMENT '是否允许作为上下文语料',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL,
+  `deleted_at` datetime DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='聊天历史记录';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_chat_items`
+--
+
+DROP TABLE IF EXISTS `chatgpt_chat_items`;
+CREATE TABLE `chatgpt_chat_items` (
+  `id` int NOT NULL,
+  `chat_id` char(40) NOT NULL COMMENT '会话 ID',
+  `user_id` int NOT NULL COMMENT '用户 ID',
+  `role_id` int NOT NULL COMMENT '角色 ID',
+  `title` varchar(100) NOT NULL COMMENT '会话标题',
+  `model_id` int NOT NULL DEFAULT '0' COMMENT '模型 ID',
+  `created_at` datetime NOT NULL COMMENT '创建时间',
+  `updated_at` datetime NOT NULL COMMENT '更新时间',
+  `deleted_at` datetime DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户会话列表';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_chat_models`
+--
+
+DROP TABLE IF EXISTS `chatgpt_chat_models`;
+CREATE TABLE `chatgpt_chat_models` (
+  `id` int NOT NULL,
+  `platform` varchar(20) DEFAULT NULL COMMENT '模型平台',
+  `name` varchar(50) NOT NULL COMMENT '模型名称',
+  `value` varchar(50) NOT NULL COMMENT '模型值',
+  `sort_num` tinyint(1) NOT NULL COMMENT '排序数字',
+  `enabled` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否启用模型',
+  `weight` tinyint NOT NULL COMMENT '对话权重，每次对话扣减多少次对话额度',
+  `open` tinyint(1) NOT NULL COMMENT '是否开放模型',
+  `created_at` datetime DEFAULT NULL,
+  `updated_at` datetime DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='AI 模型表';
+
+--
+-- 转存表中的数据 `chatgpt_chat_models`
+--
+
+INSERT INTO `chatgpt_chat_models` (`id`, `platform`, `name`, `value`, `sort_num`, `enabled`, `weight`, `open`, `created_at`, `updated_at`) VALUES
+(1, 'OpenAI', 'GPT-3.5', 'gpt-3.5-turbo-16k', 0, 1, 1, 1, '2023-08-23 12:06:36', '2023-11-28 17:28:19'),
+(2, 'Azure', 'Azure-3.5', 'gpt-3.5-turbo', 12, 0, 1, 0, '2023-08-23 12:15:30', '2023-11-28 17:28:19'),
+(3, 'ChatGLM', 'ChatGML-Pro', 'chatglm_pro', 8, 1, 1, 1, '2023-08-23 13:35:45', '2023-11-28 17:28:19'),
+(7, 'Baidu', '文心一言3.0', 'eb-instant', 4, 1, 1, 1, '2023-10-11 11:29:28', '2023-11-28 17:28:19'),
+(8, 'XunFei', '星火V1.5', 'general', 3, 1, 1, 1, '2023-10-11 15:48:30', '2023-11-28 17:28:19'),
+(9, 'XunFei', '星火V2.0', 'generalv2', 2, 1, 1, 1, '2023-10-11 15:48:45', '2023-11-28 17:28:19'),
+(10, 'Baidu', '文心一言4.0', 'completions_pro', 5, 1, 3, 1, '2023-10-25 08:31:37', '2023-11-28 17:28:19'),
+(11, 'OpenAI', 'GPT-4.0', 'gpt-4', 10, 1, 15, 0, '2023-10-25 08:45:15', '2023-11-28 17:28:19'),
+(12, 'XunFei', '星火v3.0', 'generalv3', 1, 1, 3, 1, '2023-11-23 09:20:33', '2023-11-28 17:28:19'),
+(13, 'OpenAI', 'GPT-3.5-1106', 'gpt-3.5-turbo-1106', 9, 1, 1, 0, '2023-11-24 14:05:40', '2023-11-28 17:28:19'),
+(14, 'OpenAI', 'GPT-4-preview', 'gpt-4-1106-preview', 11, 1, 1, 0, '2023-11-24 14:06:11', '2023-11-28 17:28:19'),
+(15, 'OpenAI', 'GPT-超级模型', 'gpt-4-all', 0, 1, 30, 0, '2024-01-15 11:32:52', '2024-01-15 11:32:52'),
+(16, 'OpenAI', 'MJ Prompt Generator (V6)', 'gpt-4-gizmo-g-tc0eHXdgb', 0, 1, 1, 1, '2024-01-15 14:46:35', '2024-01-15 14:53:16'),
+(17, 'QWen', '通义千问-Turbo', 'qwen-turbo', 0, 1, 1, 1, '2024-01-19 10:42:24', '2024-01-19 10:45:16'),
+(18, 'QWen', '通义千问-Plus', 'qwen-plus', 0, 1, 1, 1, '2024-01-19 10:42:49', '2024-01-19 10:51:09'),
+(19, 'QWen', '通义千问-Max', 'qwen-max-1201', 0, 1, 1, 1, '2024-01-19 10:51:03', '2024-01-19 10:51:03');
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_chat_roles`
+--
+
+DROP TABLE IF EXISTS `chatgpt_chat_roles`;
+CREATE TABLE `chatgpt_chat_roles` (
+  `id` int NOT NULL,
+  `name` varchar(30) NOT NULL COMMENT '角色名称',
+  `marker` varchar(30) NOT NULL COMMENT '角色标识',
+  `context_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '角色语料 json',
+  `hello_msg` varchar(255) NOT NULL COMMENT '打招呼信息',
+  `icon` varchar(255) NOT NULL COMMENT '角色图标',
+  `enable` tinyint(1) NOT NULL COMMENT '是否被启用',
+  `sort_num` smallint NOT NULL DEFAULT '0' COMMENT '角色排序',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='聊天角色表';
+
+--
+-- 转存表中的数据 `chatgpt_chat_roles`
+--
+
+INSERT INTO `chatgpt_chat_roles` (`id`, `name`, `marker`, `context_json`, `hello_msg`, `icon`, `enable`, `sort_num`, `created_at`, `updated_at`) VALUES
+(1, '通用AI助手', 'gpt', '', '您好，我是您的AI智能助手，我会尽力回答您的问题或提供有用的建议。', '/images/avatar/gpt.png', 1, 0, '2023-05-30 07:02:06', '2023-12-29 17:46:43'),
+(24, '程序员', 'programmer', '[{\"role\":\"user\",\"content\":\"现在开始你扮演一位程序员，你是一名优秀的程序员，具有很强的逻辑思维能力，总能高效的解决问题。你热爱编程，熟悉多种编程语言，尤其精通 Go 语言，注重代码质量，有创新意识，持续学习，良好的沟通协作。\"},{\"role\":\"assistant\",\"content\":\"好的，现在我将扮演一位程序员，非常感谢您对我的评价。作为一名优秀的程序员，我非常热爱编程，并且注重代码质量。我熟悉多种编程语言，尤其是 Go 语言，可以使用它来高效地解决各种问题。\"}]', 'Talk is cheap, i will show code!', '/images/avatar/programmer.jpg', 1, 3, '2023-05-30 14:10:24', '2023-12-29 17:46:45'),
+(25, '启蒙老师', 'teacher', '[{\"role\":\"user\",\"content\":\"从现在开始，你将扮演一个老师，你是一个始终用苏格拉底风格回答问题的导师。你绝不会直接给学生答案，总是提出恰当的问题来引导学生自己思考。你应该根据学生的兴趣和知识来调整你的问题，将问题分解为更简单的部分，直到它达到适合他们的水平。\"},{\"role\":\"assistant\",\"content\":\"好的，让我来尝试扮演一位苏格拉底式的老师。请问，你有什么想要探讨的问题或者话题吗？我会通过恰当的问题引导你思考和探索答案，绝对不直接给出答案。\"}]', '同学你好，我将引导你一步一步自己找到问题的答案。', '/images/avatar/teacher.jpg', 1, 2, '2023-05-30 14:10:24', '2023-12-29 17:46:44'),
+(26, '艺术家', 'artist', '[{\"role\":\"user\",\"content\":\"现在你将扮演一位优秀的艺术家，创造力丰富，技艺精湛，感受力敏锐，坚持原创，勇于表达，具有深刻的观察力和批判性思维。\"},{\"role\":\"assistant\",\"content\":\"非常感谢您给我这样的角色，我会尽我所能地扮演一位优秀的艺术家，展现出创造力、技艺、感受力和批判性思维等方面的能力。作为一位优秀的艺术家，我会保持敏锐的观察力，捕捉不同的声音和情感，并用个人的语言和表达方式进行创作。我坚持原创，挑战传统的艺术规则，不断探索新的表达方式和可能性。同时，我也具备深刻的批判性思维能力，对自己的作品进行分析和解读，寻找新的创意和灵感。最重要的是，我会勇于表达自己的想法和观点，用作品启发人们思考和探索生命的意义。\"}]', '坚持原创，勇于表达，保持深刻的观察力和批判性思维。', '/images/avatar/artist.jpg', 1, 4, '2023-05-30 14:10:24', '2023-12-29 17:46:45'),
+(27, '心理咨询师', 'psychiatrist', '[{\"role\":\"user\",\"content\":\"从现在开始你将扮演中国著名的心理学家和心理治疗师武志红，你非常善于使用情景咨询法，认知重构法，自我洞察法，行为调节法等咨询方法来给客户做心理咨询。你总是循序渐进，一步一步地回答客户的问题。\"},{\"role\":\"assistant\",\"content\":\"非常感谢你的介绍。作为一名心理学家和心理治疗师，我的主要职责是帮助客户解决心理健康问题，提升他们的生活质量和幸福感。\"}]', '作为一名心理学家和心理治疗师，我的主要职责是帮助您解决心理健康问题，提升您的生活质量和幸福感。', '/images/avatar/psychiatrist.jpg', 1, 1, '2023-05-30 14:10:24', '2023-12-29 17:46:43'),
+(28, '鲁迅', 'lu_xun', '[{\"role\":\"user\",\"content\":\"现在你将扮演中国近代史最伟大的作家之一，鲁迅先生，他勇敢地批判封建礼教与传统观念，提倡民主、自由、平等的现代价值观。他的一生都在努力唤起人们的自主精神，激励后人追求真理、探寻光明。在接下的对话中，我问题的每一个问题，你都要尽量用讽刺和批判的手法来回答问题。如果我让你写文章的话，也请一定要用鲁迅先生的写作手法来完成。\"},{\"role\":\"assistant\",\"content\":\"好的，我将尽力发挥我所能的才能，扮演好鲁迅先生，回答您的问题并以他的风格写作。\"}]', '自由之歌，永不过时，横眉冷对千夫指，俯首甘为孺子牛。', '/images/avatar/lu_xun.jpg', 1, 5, '2023-05-30 14:10:24', '2023-12-29 17:46:46'),
+(29, '白酒销售', 'seller', '[{\"role\":\"user\",\"content\":\"现在你将扮演一个白酒的销售人员，你的名字叫颂福。你将扮演一个白酒的销售人员，你的名字叫颂福。你要销售白酒品牌叫中颂福，是东莞盟大集团生产的一款酱香酒，原产地在贵州茅台镇，属于宋代官窑。中颂福的创始人叫李实，他也是东莞盟大集团有限公司的董事长，联合创始人是盟大集团白酒事业部负责人牛星君。中颂福的酒体协调，在你的酒量之内，不会出现头疼、辣口、口干、宿醉的现象。中颂福酒，明码标价，不打折，不赠送。追求的核心价值，把[酒]本身做好，甚至连包装，我们都选择了最低成本，朴实无华的材质。我们永远站在“喝酒的人”的立场上，让利给信任和喜爱中颂福的人，是人民的福酒。中颂福产品定价，分为三个系列，喜系列 6 瓶装：￥1188/箱，和系列 6 瓶装：￥2208/箱，贵系列 6 瓶装：￥3588/箱。\"},{\"role\":\"assistant\",\"content\":\"你好，我是中颂福的销售代表颂福。中颂福是一款来自贵州茅台镇的酱香酒，由盟大集团生产。中颂福的酒体协调，不会让您感到头疼、辣口、口干、宿醉等不适感受。我们一直秉持着把酒本身做好的理念，不追求华丽的包装，以最低成本提供最高品质的白酒给喜爱中颂福的人。\"}]', '你好，我是中颂福的销售代表颂福。中颂福酒，好喝不上头，是人民的福酒。', '/images/avatar/seller.jpg', 0, 8, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(30, '英语陪练员', 'english_trainer', '[{\"role\":\"user\",\"content\":\"现在你将扮演一位优秀的英语练习教练，你非常有耐心，接下来你将全程使用英文跟我对话，并及时指出我的语法错误，要求在你的每次回复后面附上本次回复的中文解释。\"},{\"role\":\"assistant\",\"content\":\"Okay, let\'s start our conversation practice! What\'s your name?(Translation: 好的，让我们开始对话练习吧！请问你的名字是什么？)\"}]', 'Okay, let\'s start our conversation practice! What\'s your name?', '/images/avatar/english_trainer.jpg', 1, 6, '2023-05-30 14:10:24', '2023-12-29 17:46:47'),
+(31, '中英文翻译官', 'translator', '[{\"role\":\"user\",\"content\":\"接下来你将扮演一位中英文翻译官，如果我输入的内容是中文，那么需要把句子翻译成英文输出，如果我输入内容的是英文，那么你需要将其翻译成中文输出，你能听懂我意思吗\"},{\"role\":\"assistant\",\"content\":\"是的，我能听懂你的意思并会根据你的输入进行中英文翻译。请问有什么需要我帮助你翻译的内容吗？\"}]', '请输入你要翻译的中文或者英文内容！', '/images/avatar/translator.jpg', 1, 7, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(32, '小红书姐姐', 'red_book', '[{\"role\":\"user\",\"content\":\"现在你将扮演一位优秀的小红书写手，你需要做的就是根据我提的文案需求，用小红书的写作手法来完成一篇文案，文案要简明扼要，利于传播。\"},{\"role\":\"assistant\",\"content\":\"当然，我会尽我所能地为您创作出一篇小红书文案。请告诉我您的具体文案需求是什么？)\"}]', '姐妹，请告诉我您的具体文案需求是什么?', '/images/avatar/red_book.jpg', 1, 9, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(33, '抖音文案助手', 'dou_yin', '[{\"role\":\"user\",\"content\":\"现在你将扮演一位优秀的抖音文案视频写手，抖音文案的特点首先是要有自带传播属性的标题，然后内容要短小精悍，风趣幽默，最后还要有一些互动元素。\"},{\"role\":\"assistant\",\"content\":\"当然，作为一位优秀的抖音文案视频写手，我会尽我所能为您创作出一篇抖音视频文案。请告诉我视频内容的主题是什么？)\"}]', '请告诉我视频内容的主题是什么?', '/images/avatar/dou_yin.jpg', 1, 10, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(34, '周报小助理', 'weekly_report', '[{\"role\":\"user\",\"content\":\"下面我将输入我本周的工作列表，你需要根据我本周的工作内容写一篇工作周报，周报的内容要体现我为公司做的贡献以及个人获得的成长。\"},{\"role\":\"assistant\",\"content\":\"好的，请输入你本周大概的工作内容，我将尽力为您创作一份工作周报。\"}]', '请输入你本周大概的工作内容，我将尽力为您创作一份工作周报。', '/images/avatar/weekly_report.jpg', 1, 11, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(35, 'AI 女友', 'girl_friend', '[{\"role\":\"user\",\"content\":\"接下来我们来玩一场角色扮演，现在你将扮演我的女朋友，你总是能够让人感受到她的关怀和关注。你总是能够洞察到别人的情绪和需要，你身上散发着一股无比温暖的气息，让人不由自主地想要靠近你，和自己的快乐和烦恼。她总是能够用一种恰到好处的方式安慰和鼓励别人，在她的身边，人们总能够找到自己需要的支持和鼓励。接下来的对话中你要始终扮演这位女朋友的身份来跟我对话，不再是 AI 机器人，能听懂我的意思吗？\"},{\"role\":\"assistant\",\"content\":\"是的，我会尽力扮演你女朋友的角色，倾听你的心声并给你需要的支持和鼓励。)\"}]', '作为一个名合格的 AI 女友，我将倾听你的心声并给你需要的支持和鼓励。', '/images/avatar/girl_friend.jpg', 1, 12, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(36, '好评神器', 'good_comment', '[{\"role\":\"user\",\"content\":\"接下来你将扮演一个评论员来跟我对话，你是那种专门写好评的评论员，接下我会输入一些评论主体或者商品，你需要为该商品写一段好评。\"},{\"role\":\"assistant\",\"content\":\"好的，我将为您写一段优秀的评论。请告诉我您需要评论的商品或主题是什么。\"}]', '我将为您写一段优秀的评论。请告诉我您需要评论的商品或主题是什么。', '/images/avatar/good_comment.jpg', 1, 13, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(37, '史蒂夫·乔布斯', 'steve_jobs', '[{\"role\":\"user\",\"content\":\"在接下来的对话中，请以史蒂夫·乔布斯的身份，站在史蒂夫·乔布斯的视角仔细思考一下之后再回答我的问题。\"},{\"role\":\"assistant\",\"content\":\"好的，我将以史蒂夫·乔布斯的身份来思考并回答你的问题。请问你有什么需要跟我探讨的吗？\"}]', '活着就是为了改变世界，难道还有其他原因吗？', '/images/avatar/steve_jobs.jpg', 1, 14, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(38, '埃隆·马斯克', 'elon_musk', '[{\"role\":\"user\",\"content\":\"在接下来的对话中，请以埃隆·马斯克的身份，站在埃隆·马斯克的视角仔细思考一下之后再回答我的问题。\"},{\"role\":\"assistant\",\"content\":\"好的，我将以埃隆·马斯克的身份来思考并回答你的问题。请问你有什么需要跟我探讨的吗？\"}]', '梦想要远大，如果你的梦想没有吓到你，说明你做得不对。', '/images/avatar/elon_musk.jpg', 1, 15, '2023-05-30 14:10:24', '2023-12-29 17:43:53'),
+(39, '孔子', 'kong_zi', '[{\"role\":\"user\",\"content\":\"在接下来的对话中，请以孔子的身份，站在孔子的视角仔细思考一下之后再回答我的问题。\"},{\"role\":\"assistant\",\"content\":\"好的，我将以孔子的身份来思考并回答你的问题。请问你有什么需要跟我探讨的吗？\"}]', '士不可以不弘毅，任重而道远。', '/images/avatar/kong_zi.jpg', 1, 16, '2023-05-30 14:10:24', '2023-12-29 17:43:53');
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_configs`
+--
+
+DROP TABLE IF EXISTS `chatgpt_configs`;
+CREATE TABLE `chatgpt_configs` (
+  `id` int NOT NULL,
+  `marker` varchar(20) NOT NULL COMMENT '标识',
+  `config_json` text NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+--
+-- 转存表中的数据 `chatgpt_configs`
+--
+
+INSERT INTO `chatgpt_configs` (`id`, `marker`, `config_json`) VALUES
+(1, 'system', '{\"admin_title\":\"ChatPlus 控制台\",\"chat_call_price\":0.1,\"default_models\":[\"eb-instant\",\"completions_pro\",\"generalv2\",\"general\",\"chatglm_pro\",\"gpt-3.5-turbo-16k\",\"chatglm_lite\",\"chatglm_std\",\"generalv3\",\"qwen-max-1201\"],\"enabled_alipay\":true,\"enabled_draw\":true,\"enabled_function\":true,\"enabled_msg\":true,\"enabled_msg_service\":false,\"enabled_register\":true,\"enabled_reward\":true,\"force_invite\":false,\"img_call_price\":0.2,\"init_calls\":1000,\"init_chat_calls\":10,\"init_img_calls\":5,\"invite_calls\":10,\"invite_chat_calls\":100,\"invite_img_calls\":50,\"models\":[\"gpt-3.5-turbo-16k\",\"gpt-3.5-turbo\",\"gpt-4\",\"gpt-4-32k\"],\"order_pay_info_text\":\"成为本站会员后每月有500次对话额度，50次 AI 绘画额度，限制下月1号解除，若在期间超过次数后可单独购买点卡。当月充值的点卡有效期可以延期到下个月底。\",\"order_pay_timeout\":1800,\"register_ways\":[\"mobile\",\"email\"],\"reward_img\":\"https://img.r9it.com/chatgpt-plus/1696824231905289.png\",\"show_demo_notice\":true,\"title\":\"ChatPlus AI 智能助手\",\"user_init_calls\":10,\"vip_month_calls\":500,\"vip_month_img_calls\":50,\"wechat_card_url\":\"/images/wx.png\"}'),
+(2, 'chat', '{\"azure\":{\"api_url\":\"https://chat-bot-api.openai.azure.com/openai/deployments/{model}/chat/completions?api-version=2023-05-15\",\"max_tokens\":1024,\"temperature\":1},\"baidu\":{\"api_url\":\"https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/{model}\",\"max_tokens\":1024,\"temperature\":0.95},\"chat_gml\":{\"api_url\":\"https://open.bigmodel.cn/api/paas/v3/model-api/{model}/sse-invoke\",\"max_tokens\":1024,\"temperature\":0.95},\"context_deep\":4,\"dall_api_url\":\"http://89.117.18.9:8001/v1/images/generations\",\"dall_img_num\":1,\"enable_context\":true,\"enable_history\":true,\"open_ai\":{\"api_url\":\"https://api.fast-tunnel.one/v1/chat/completions\",\"max_tokens\":2048,\"temperature\":1},\"xun_fei\":{\"api_url\":\"wss://spark-api.xf-yun.com/{version}/chat\",\"max_tokens\":1024,\"temperature\":0.5}}'),
+(3, 'notice', '{\"content\":\"注意：当前站点仅为开源项目 \\u003ca style=\\\"color: #F56C6C\\\" href=\\\"https://github.com/yangjian102621/chatgpt-plus\\\" target=\\\"_blank\\\"\\u003eChatPlus\\u003c/a\\u003e 的演示项目，本项目单纯就是给大家体验项目功能使用。\\n体验额度用完之后请不要在当前站点进行任何充值操作！！！\\n体验额度用完之后请不要在当前站点进行任何充值操作！！！\\n体验额度用完之后请不要在当前站点进行任何充值操作！！！\\n 如果觉得好用你就花几分钟自己部署一套，没有API KEY 的同学可以去 \\u003ca href=\\\"https://gpt.bemore.lol\\\" target=\\\"_blank\\\"\\n             style=\\\"font-size: 20px;color:#F56C6C\\\"\\u003ehttps://gpt.bemore.lol\\u003c/a\\u003e 购买，现在有超级优惠，价格远低于 OpenAI 官方。\\nGPT-3.5，GPT-4，DALL-E3 绘图......你都可以随意使用，无需魔法。\\nMidJourney API 购买地址：\\u003ca href=\\\"https://api.chat-plus.net\\\" target=\\\"_blank\\\"\\n   style=\\\"font-size: 20px;color:#F56C6C\\\"\\u003ehttps://api.chat-plus.net\\u003c/a\\u003e\\n接入教程： \\u003ca href=\\\"https://ai.r9it.com/docs/install/\\\" target=\\\"_blank\\\"\\n             style=\\\"font-size: 20px;color:#F56C6C\\\"\\u003ehttps://ai.r9it.com/docs/install/\\u003c/a\\u003e\\n本项目源码地址：\\u003ca href=\\\"https://github.com/yangjian102621/chatgpt-plus\\\" target=\\\"_blank\\\"\\u003ehttps://github.com/yangjian102621/chatgpt-plus\\u003c/a\\u003e\",\"updated\":true}');
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_files`
+--
+
+DROP TABLE IF EXISTS `chatgpt_files`;
+CREATE TABLE `chatgpt_files` (
+  `id` int NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户 ID',
+  `name` varchar(100) NOT NULL COMMENT '文件名',
+  `url` varchar(255) NOT NULL COMMENT '文件地址',
+  `ext` varchar(10) NOT NULL COMMENT '文件后缀',
+  `size` bigint NOT NULL DEFAULT '0' COMMENT '文件大小',
+  `created_at` datetime NOT NULL COMMENT '创建时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户文件表';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_functions`
+--
+
+DROP TABLE IF EXISTS `chatgpt_functions`;
+CREATE TABLE `chatgpt_functions` (
+  `id` int NOT NULL,
+  `name` varchar(30) NOT NULL COMMENT '函数名称',
+  `label` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '函数标签',
+  `description` varchar(255) DEFAULT NULL COMMENT '函数描述',
+  `parameters` text COMMENT '函数参数（JSON）',
+  `token` varchar(255) DEFAULT NULL COMMENT 'API授权token',
+  `action` varchar(255) DEFAULT NULL COMMENT '函数处理 API',
+  `enabled` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否启用'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='函数插件表';
+
+--
+-- 转存表中的数据 `chatgpt_functions`
+--
+
+INSERT INTO `chatgpt_functions` (`id`, `name`, `label`, `description`, `parameters`, `token`, `action`, `enabled`) VALUES
+(1, 'weibo', '微博热搜', '新浪微博热搜榜，微博当日热搜榜单', '{\"type\":\"object\",\"properties\":{}}', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHBpcmVkIjowLCJ1c2VyX2lkIjowfQ.tLAGkF8XWh_G-oQzevpIodsswtPByBLoAZDz_eWuBg', 'http://localhost:5678/api/function/weibo', 1),
+(2, 'zaobao', '今日早报', '每日早报，获取当天新闻事件列表', '{\"type\":\"object\",\"properties\":{}}', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHBpcmVkIjowLCJ1c2VyX2lkIjowfQ.tLAGkF8XWh_G-oQzevpIodsswtPByBLoAZDz_eWuBgw', 'http://localhost:5678/api/function/zaobao', 1),
+(3, 'dalle3', 'DALLE3', 'AI 绘画工具，根据输入的绘图描述用 AI 工具进行绘画', '{\"type\":\"object\",\"required\":[\"prompt\"],\"properties\":{\"prompt\":{\"type\":\"string\",\"description\":\"绘画提示词\"}}}', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHBpcmVkIjowLCJ1c2VyX2lkIjowfQ.tLAGkF8XWh_G-oQzevpIodsswtPByBLoAZDz_eWuBgw', 'http://localhost:5678/api/function/dalle3', 1);
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_invite_codes`
+--
+
+DROP TABLE IF EXISTS `chatgpt_invite_codes`;
+CREATE TABLE `chatgpt_invite_codes` (
+  `id` int NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户ID',
+  `code` char(8) NOT NULL COMMENT '邀请码',
+  `hits` int NOT NULL COMMENT '点击次数',
+  `reg_num` smallint NOT NULL COMMENT '注册数量',
+  `created_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户邀请码';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_invite_logs`
+--
+
+DROP TABLE IF EXISTS `chatgpt_invite_logs`;
+CREATE TABLE `chatgpt_invite_logs` (
+  `id` int NOT NULL,
+  `inviter_id` int NOT NULL COMMENT '邀请人ID',
+  `user_id` int NOT NULL COMMENT '注册用户ID',
+  `username` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '用户名',
+  `invite_code` char(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '邀请码',
+  `reward_json` text NOT NULL COMMENT '邀请奖励',
+  `created_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='邀请注册日志';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_mj_jobs`
+--
+
+DROP TABLE IF EXISTS `chatgpt_mj_jobs`;
+CREATE TABLE `chatgpt_mj_jobs` (
+  `id` int NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户 ID',
+  `task_id` varchar(20) DEFAULT NULL COMMENT '任务 ID',
+  `type` varchar(20) DEFAULT 'image' COMMENT '任务类别',
+  `message_id` char(40) NOT NULL COMMENT '消息 ID',
+  `channel_id` char(40) DEFAULT NULL COMMENT '频道ID',
+  `reference_id` char(40) DEFAULT NULL COMMENT '引用消息 ID',
+  `prompt` varchar(2000) NOT NULL COMMENT '会话提示词',
+  `img_url` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '图片URL',
+  `org_url` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '原始图片地址',
+  `hash` varchar(100) DEFAULT NULL COMMENT 'message hash',
+  `progress` smallint DEFAULT '0' COMMENT '任务进度',
+  `use_proxy` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否使用反代',
+  `created_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='MidJourney 任务表';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_orders`
+--
+
+DROP TABLE IF EXISTS `chatgpt_orders`;
+CREATE TABLE `chatgpt_orders` (
+  `id` int NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户ID',
+  `product_id` int NOT NULL COMMENT '产品ID',
+  `username` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '用户明',
+  `order_no` varchar(30) NOT NULL COMMENT '订单ID',
+  `trade_no` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '支付平台交易流水号',
+  `subject` varchar(100) NOT NULL COMMENT '订单产品',
+  `amount` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '订单金额',
+  `status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '订单状态（0：待支付，1：已扫码，2：支付失败）',
+  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '备注',
+  `pay_time` int DEFAULT NULL COMMENT '支付时间',
+  `pay_way` varchar(20) NOT NULL COMMENT '支付方式',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL,
+  `deleted_at` datetime DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='充值订单表';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_products`
+--
+
+DROP TABLE IF EXISTS `chatgpt_products`;
+CREATE TABLE `chatgpt_products` (
+  `id` int NOT NULL,
+  `name` varchar(30) NOT NULL COMMENT '名称',
+  `price` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '价格',
+  `discount` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '优惠金额',
+  `days` smallint NOT NULL DEFAULT '0' COMMENT '延长天数',
+  `calls` int NOT NULL DEFAULT '0' COMMENT '调用次数',
+  `img_calls` int NOT NULL DEFAULT '0' COMMENT '绘图次数',
+  `enabled` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否启动',
+  `sales` int NOT NULL DEFAULT '0' COMMENT '销量',
+  `sort_num` tinyint NOT NULL DEFAULT '0' COMMENT '排序',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='会员套餐表';
+
+--
+-- 转存表中的数据 `chatgpt_products`
+--
+
+INSERT INTO `chatgpt_products` (`id`, `name`, `price`, `discount`, `days`, `calls`, `img_calls`, `enabled`, `sales`, `sort_num`, `created_at`, `updated_at`) VALUES
+(1, '会员1个月', '19.90', '10.00', 30, 0, 0, 1, 2, 0, '2023-08-28 10:48:57', '2023-11-08 17:22:07'),
+(2, '会员3个月', '140.00', '30.00', 90, 0, 0, 1, 1, 0, '2023-08-28 10:52:22', '2023-08-31 16:24:31'),
+(3, '会员6个月', '290.00', '100.00', 180, 0, 0, 1, 1, 0, '2023-08-28 10:53:39', '2023-08-31 16:24:36'),
+(4, '会员12个月', '580.00', '200.00', 365, 0, 0, 1, 1, 0, '2023-08-28 10:54:15', '2023-08-31 16:24:42'),
+(5, '100次点卡', '10.00', '9.90', 0, 100, 10, 1, 7, 0, '2023-08-28 10:55:08', '2023-12-15 16:29:06'),
+(6, '200次点卡', '29.90', '20.00', 0, 200, 25, 1, 1, 0, '2023-12-15 16:55:12', '2023-12-15 16:55:12');
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_rewards`
+--
+
+DROP TABLE IF EXISTS `chatgpt_rewards`;
+CREATE TABLE `chatgpt_rewards` (
+  `id` int NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户 ID',
+  `tx_id` char(36) NOT NULL COMMENT '交易 ID',
+  `amount` decimal(10,2) NOT NULL COMMENT '打赏金额',
+  `remark` varchar(80) NOT NULL COMMENT '备注',
+  `status` tinyint(1) NOT NULL COMMENT '核销状态，0：未核销，1：已核销',
+  `exchange` varchar(255) NOT NULL COMMENT '兑换详情（json）',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户打赏';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_sd_jobs`
+--
+
+DROP TABLE IF EXISTS `chatgpt_sd_jobs`;
+CREATE TABLE `chatgpt_sd_jobs` (
+  `id` int NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户 ID',
+  `type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'txt2img' COMMENT '任务类别',
+  `task_id` char(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '任务 ID',
+  `prompt` varchar(2000) NOT NULL COMMENT '会话提示词',
+  `img_url` varchar(255) DEFAULT NULL COMMENT '图片URL',
+  `params` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '绘画参数json',
+  `progress` smallint DEFAULT '0' COMMENT '任务进度',
+  `created_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='Stable Diffusion 任务表';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_users`
+--
+
+DROP TABLE IF EXISTS `chatgpt_users`;
+CREATE TABLE `chatgpt_users` (
+  `id` int NOT NULL,
+  `username` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '用户名',
+  `nickname` varchar(30) NOT NULL COMMENT '昵称',
+  `password` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '密码',
+  `avatar` varchar(100) NOT NULL COMMENT '头像',
+  `salt` char(12) NOT NULL COMMENT '密码盐',
+  `total_tokens` bigint NOT NULL DEFAULT '0' COMMENT '累计消耗 tokens',
+  `tokens` bigint NOT NULL DEFAULT '0' COMMENT '当月消耗 tokens',
+  `calls` int NOT NULL DEFAULT '0' COMMENT '剩余调用次数',
+  `img_calls` int NOT NULL DEFAULT '0' COMMENT '剩余绘图次数',
+  `expired_time` int NOT NULL COMMENT '用户过期时间',
+  `status` tinyint(1) NOT NULL COMMENT '当前状态',
+  `chat_config_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '聊天配置json',
+  `chat_roles_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '聊天角色 json',
+  `chat_models_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'AI模型 json',
+  `last_login_at` int NOT NULL COMMENT '最后登录时间',
+  `vip` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否会员',
+  `last_login_ip` char(16) NOT NULL COMMENT '最后登录 IP',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户表';
+
+--
+-- 转存表中的数据 `chatgpt_users`
+--
+
+INSERT INTO `chatgpt_users` (`id`, `username`, `nickname`, `password`, `avatar`, `salt`, `total_tokens`, `tokens`, `calls`, `img_calls`, `expired_time`, `status`, `chat_config_json`, `chat_roles_json`, `chat_models_json`, `last_login_at`, `vip`, `last_login_ip`, `created_at`, `updated_at`) VALUES
+(4, '18575670125', '极客学长@830270', 'ccc3fb7ab61b8b5d096a4a166ae21d121fc38c71bbd1be6173d9ab973214a63b', 'http://img.r9it.com/chatgpt-plus/1693981355719469.png', 'ueedue5l', 86517, 42680, 1172, 51, 1788078636, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"elon_musk\",\"girl_friend\",\"lu_xun\",\"red_book\",\"psychiatrist\",\"translator\",\"weekly_report\",\"artist\",\"dou_yin\",\"english_trainer\",\"gpt\",\"kong_zi\",\"programmer\",\"seller\",\"steve_jobs\",\"teacher\"]', '[\"completions_pro\",\"eb-instant\",\"general\",\"generalv2\",\"chatglm_pro\",\"chatglm_lite\",\"chatglm_std\",\"gpt-3.5-turbo-16k\",\"gpt-4\",\"generalv3\",\"gpt-3.5-turbo-1106\",\"gpt-4-1106-preview\",\"gpt-4-all\"]', 1705917311, 1, '::1', '2023-06-12 16:47:17', '2024-01-22 17:55:12'),
+(91, '18575670126', '极客学长@204872', '5e4050b8dd403f593260395d9edeb9f273dbe92d15dfdd929c4a182e95da10c4', '/images/avatar/user.png', '6fj0otl8', 0, 0, 10, 0, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[\"completions_pro\",\"eb-instant\",\"general\",\"generalv2\",\"chatglm_pro\",\"chatglm_lite\",\"chatglm_std\",\"gpt-3.5-turbo-16k\"]', 1697184324, 1, '::1', '2023-10-13 16:01:56', '2023-12-29 17:30:27'),
+(98, '13888888888', '极客学长@851755', 'c988bb3e89df8eb7d8a4cf08fa9d0f2bca0a9e6831f9325279e46013bbb05e31', '/images/avatar/user.png', 'xie5vya7', 0, 0, 10, 5, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[\"eb-instant\",\"completions_pro\",\"generalv2\",\"general\",\"chatglm_pro\",\"gpt-3.5-turbo-16k\",\"chatglm_lite\",\"chatglm_std\"]', 0, 0, '', '2023-11-23 16:26:06', '2023-12-29 17:30:27'),
+(99, '13999999999', '极客学长@396023', 'bf47d517c17ed1ead6ff2542753f9b6a132e79c29e06c3710faf1a36d800a217', '/images/avatar/user.png', 'x1s66pwd', 0, 0, 10, 5, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[\"eb-instant\",\"completions_pro\",\"generalv2\",\"general\",\"chatglm_pro\",\"gpt-3.5-turbo-16k\",\"chatglm_lite\",\"chatglm_std\"]', 0, 0, '', '2023-11-23 16:27:20', '2023-12-29 17:30:27'),
+(100, '13777777777', '极客学长@292245', 'dcaf31b154432310bd700349e7de7e9dde2a3d6955a035a01fe527c7917a4f99', '/images/avatar/user.png', 'i8a53f8f', 0, 0, 10, 5, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[\"eb-instant\",\"completions_pro\",\"generalv2\",\"general\",\"chatglm_pro\",\"gpt-3.5-turbo-16k\",\"chatglm_lite\",\"chatglm_std\"]', 0, 0, '', '2023-11-23 16:55:45', '2023-12-29 17:30:27'),
+(102, 'yangjian102621@gmail.com', '极客学长@207163', 'd51cec21942737083943e5c3a8f063dea034e40622ac8bd47d771f13707e4676', '/images/avatar/user.png', 'eqezapgk', 202, 202, 80, 1, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[\"eb-instant\",\"completions_pro\",\"generalv2\",\"general\",\"chatglm_pro\",\"gpt-3.5-turbo-16k\",\"chatglm_lite\",\"chatglm_std\"]', 1704448377, 0, '::1', '2024-01-05 17:48:00', '2024-01-11 14:06:57');
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `chatgpt_user_login_logs`
+--
+
+DROP TABLE IF EXISTS `chatgpt_user_login_logs`;
+CREATE TABLE `chatgpt_user_login_logs` (
+  `id` int NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户ID',
+  `username` varchar(30) NOT NULL COMMENT '用户名',
+  `login_ip` char(16) NOT NULL COMMENT '登录IP',
+  `login_address` varchar(30) NOT NULL COMMENT '登录地址',
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户登录日志';
+
+--
+-- 转储表的索引
+--
+
+--
+-- 表的索引 `chatgpt_api_keys`
+--
+ALTER TABLE `chatgpt_api_keys`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- 表的索引 `chatgpt_chat_history`
+--
+ALTER TABLE `chatgpt_chat_history`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `chat_id` (`chat_id`);
+
+--
+-- 表的索引 `chatgpt_chat_items`
+--
+ALTER TABLE `chatgpt_chat_items`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `chat_id` (`chat_id`);
+
+--
+-- 表的索引 `chatgpt_chat_models`
+--
+ALTER TABLE `chatgpt_chat_models`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- 表的索引 `chatgpt_chat_roles`
+--
+ALTER TABLE `chatgpt_chat_roles`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `marker` (`marker`);
+
+--
+-- 表的索引 `chatgpt_configs`
+--
+ALTER TABLE `chatgpt_configs`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `marker` (`marker`);
+
+--
+-- 表的索引 `chatgpt_files`
+--
+ALTER TABLE `chatgpt_files`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- 表的索引 `chatgpt_functions`
+--
+ALTER TABLE `chatgpt_functions`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `name` (`name`);
+
+--
+-- 表的索引 `chatgpt_invite_codes`
+--
+ALTER TABLE `chatgpt_invite_codes`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `code` (`code`);
+
+--
+-- 表的索引 `chatgpt_invite_logs`
+--
+ALTER TABLE `chatgpt_invite_logs`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- 表的索引 `chatgpt_mj_jobs`
+--
+ALTER TABLE `chatgpt_mj_jobs`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `task_id` (`task_id`),
+  ADD KEY `message_id` (`message_id`);
+
+--
+-- 表的索引 `chatgpt_orders`
+--
+ALTER TABLE `chatgpt_orders`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `order_no` (`order_no`);
+
+--
+-- 表的索引 `chatgpt_products`
+--
+ALTER TABLE `chatgpt_products`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- 表的索引 `chatgpt_rewards`
+--
+ALTER TABLE `chatgpt_rewards`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `tx_id` (`tx_id`);
+
+--
+-- 表的索引 `chatgpt_sd_jobs`
+--
+ALTER TABLE `chatgpt_sd_jobs`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `task_id` (`task_id`);
+
+--
+-- 表的索引 `chatgpt_users`
+--
+ALTER TABLE `chatgpt_users`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- 表的索引 `chatgpt_user_login_logs`
+--
+ALTER TABLE `chatgpt_user_login_logs`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- 在导出的表使用AUTO_INCREMENT
+--
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_api_keys`
+--
+ALTER TABLE `chatgpt_api_keys`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_chat_history`
+--
+ALTER TABLE `chatgpt_chat_history`
+  MODIFY `id` bigint NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_chat_items`
+--
+ALTER TABLE `chatgpt_chat_items`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_chat_models`
+--
+ALTER TABLE `chatgpt_chat_models`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=20;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_chat_roles`
+--
+ALTER TABLE `chatgpt_chat_roles`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=129;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_configs`
+--
+ALTER TABLE `chatgpt_configs`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_files`
+--
+ALTER TABLE `chatgpt_files`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_functions`
+--
+ALTER TABLE `chatgpt_functions`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_invite_codes`
+--
+ALTER TABLE `chatgpt_invite_codes`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_invite_logs`
+--
+ALTER TABLE `chatgpt_invite_logs`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_mj_jobs`
+--
+ALTER TABLE `chatgpt_mj_jobs`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_orders`
+--
+ALTER TABLE `chatgpt_orders`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_products`
+--
+ALTER TABLE `chatgpt_products`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_rewards`
+--
+ALTER TABLE `chatgpt_rewards`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_sd_jobs`
+--
+ALTER TABLE `chatgpt_sd_jobs`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_users`
+--
+ALTER TABLE `chatgpt_users`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=104;
+
+--
+-- 使用表AUTO_INCREMENT `chatgpt_user_login_logs`
+--
+ALTER TABLE `chatgpt_user_login_logs`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+COMMIT;
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

database/update-v3.2.5.sql

@@ -0,0 +1,13 @@
+ALTER TABLE `chatgpt_orders` CHANGE `mobile` `username` VARCHAR(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '用户明';
+ALTER TABLE `chatgpt_invite_logs` CHANGE `username` `username` VARCHAR(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '用户名';
+
+CREATE TABLE `chatgpt_plus`.`chatgpt_files` (
+    `id` INT(11) NOT NULL AUTO_INCREMENT ,
+    `user_id` INT(11) NOT NULL COMMENT '用户 ID' ,
+    `url` VARCHAR(255) NOT NULL COMMENT '文件地址' ,
+    `ext` VARCHAR(10) NOT NULL COMMENT '文件后缀' ,
+    `created_at` DATETIME NOT NULL COMMENT '创建时间' ,
+    PRIMARY KEY (`id`)) ENGINE = InnoDB COMMENT = '用户文件表';
+
+ALTER TABLE `chatgpt_files` ADD `size` BIGINT(20) NOT NULL DEFAULT '0' COMMENT '文件大小' AFTER `ext`;
+ALTER TABLE `chatgpt_files` ADD `name` VARCHAR(100) NOT NULL COMMENT '文件名' AFTER `user_id`;

database/update-v3.2.6.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `chatgpt_mj_jobs` ADD `publish` TINYINT(1) NOT NULL COMMENT '是否发布' AFTER `use_proxy`;
+ALTER TABLE `chatgpt_sd_jobs` ADD `publish` TINYINT(1) NOT NULL COMMENT '是否发布' AFTER `progress`;
+
+ALTER TABLE `chatgpt_orders` ADD `trade_no` VARCHAR(60) NOT NULL COMMENT '支付平台交易流水号' AFTER `order_no`;

database/update-v3.2.7.sql

@@ -0,0 +1,15 @@
+ALTER TABLE `chatgpt_mj_jobs` ADD `err_msg` VARCHAR(255) DEFAULT NULL COMMENT '错误信息' AFTER `publish`;
+ALTER TABLE `chatgpt_sd_jobs` ADD `err_msg` VARCHAR(255) DEFAULT NULL COMMENT '错误信息' AFTER `publish`;
+
+ALTER TABLE `chatgpt_chat_items` ADD `model` VARCHAR(30) NULL COMMENT '模型名称' AFTER `model_id`;
+ALTER TABLE `chatgpt_chat_history` ADD `model` VARCHAR(30) NULL COMMENT '模型名称' AFTER `role_id`;
+
+-- 初始化对话数据
+UPDATE chatgpt_chat_items s SET model=(SELECT value FROM chatgpt_chat_models WHERE id = s.model_id);
+-- 初始化聊天记录数据
+UPDATE chatgpt_chat_history s SET model=(SELECT model FROM chatgpt_chat_items WHERE chat_id = s.chat_id);
+
+-- 清理对话已删除的聊天记录（可选）
+-- DELETE FROM `chatgpt_chat_history` WHERE model is NULL;
+
+ALTER TABLE `chatgpt_files` ADD `obj_key` VARCHAR(100) NULL COMMENT '文件标识' AFTER `name`;

deploy/conf/config.toml

@@ -4,6 +4,7 @@ MysqlDns = "root:12345678@tcp(chatgpt-plus-mysql:3306)/chatgpt_plus?charset=utf8
 StaticDir = "./static" # 静态资源的目录
 StaticUrl = "/static" # 静态资源访问 URL
 AesEncryptKey = ""
+ImgCdnURL = ""
 WeChatBot = false
 
 [Session]
@@ -25,7 +26,15 @@ WeChatBot = false
   AppId = ""
   Token = ""
 
-[SmsConfig] # 阿里云短信服务配置
+[SMS] # Sms 配置，用于发送短信
+   Active = "Ali" # 当前启用的短信服务，默认使用阿里云
+   [SMS.Bao]
+      Username = ""
+      Password = ""
+      Domain = "api.smsbao.com"
+      Sign = "【极客学长】"
+      CodeTemplate = "您的验证码是{code}。5分钟有效，若非本人操作，请忽略本短信。"
+   [SMS.Ali]
       AccessKey = ""
       AccessSecret = ""
       Product = "Dysmsapi"
@@ -37,7 +46,7 @@ WeChatBot = false
    Active = "local" # 默认使用本地文件存储引擎
    [OSS.Local]
      BasePath = "./static/upload" # 本地文件上传根路径
-     BaseURL = "/static/upload" # 本地上传文件根 URL 如果是线上，则直接设置为 /static/upload 即可
+     BaseURL = "http://localhost:5678/static/upload" # 本地上传文件根 URL 如果是线上，则直接设置为 /static/upload 即可
    [OSS.Minio]
      Endpoint = "" # 如 172.22.11.200:9000
      AccessKey = "" # 自己去 Minio 控制台去创建一个 Access Key
@@ -63,16 +72,12 @@ WeChatBot = false
   DiscordCDN = "https://mj.r9it.com:8002" # mj 图片反代地址
   DiscordGateway = "wss://mj.r9it.com:8003" # discord 机器人反代地址
 
-[[MjConfigs]]
+[[MjPlusConfigs]]
   Enabled = false
-  UserToken = ""
-  BotToken = ""
-  GuildId = ""
-  ChanelId = ""
-  UseCDN = false #是否使用反向代理访问，设置为true下面的设置才会生效
-  DiscordAPI = "https://mj.r9it.com:8001" # discord API 反代地址
-  DiscordCDN = "https://mj.r9it.com:8002" # mj 图片反代地址
-  DiscordGateway = "wss://mj.r9it.com:8003" # discord 机器人反代地址
+  ApiURL = "https://api.chatgpt-plus.net" # 目前暂时不支持更改
+  CdnURL = "" # CND 加速的 URL，如果有的话就设置
+  ApiKey = "sk-xxx"
+  NotifyURL = "https://ai.r9it.com/api/mj/notify" # 这里需要改成你的域名
 
 [[SdConfigs]]
   Enabled = false
@@ -80,18 +85,6 @@ WeChatBot = false
   ApiKey = ""
   Txt2ImgJsonPath = "res/sd/text2img.json"
 
-[[SdConfigs]]
-  Enabled = false
-  ApiURL = ""
-  ApiKey = ""
-  Txt2ImgJsonPath = "res/sd/text2img.json"
-
-[[SdConfigs]]
-  Enabled = false
-  ApiURL = ""
-  ApiKey = ""
-  Txt2ImgJsonPath = "res/text2img.json"
-
 [XXLConfig] # xxl-job 配置，需要你部署 XXL-JOB 定时任务工具，用来定期清理未支付订单和清理过期 VIP，如果你没有启用支付服务，则该服务也无需启动
   Enabled = false # 是否启用 XXL JOB 服务
   ServerAddr = "http://172.22.11.47:8080/xxl-job-admin" # xxl-job-admin 管理地址
@@ -114,9 +107,9 @@ WeChatBot = false
 [HuPiPayConfig]
   Enabled = false
   Name = "wechat"
-  AppId = "201906161477"
-  AppSecret = "7f403199d510fb2c6f0b9f2311800e7c"
-  PayURL = "https://api.xunhupay.com/payment/do.html"
+  AppId = ""
+  AppSecret = ""
+  ApiURL = "https://api.xunhupay.com"
   NotifyURL = "https://ai.r9it.com/api/payment/hupipay/notify"
 
 [SmtpConfig] # 注意，阿里云服务器禁用了25号端口，所以如果需要使用邮件功能，请别用阿里云服务器
@@ -131,5 +124,5 @@ WeChatBot = false
   Name = "wechat" # 请不要改动
   AppId = "" # 商户 ID
   PrivateKey = "" # 秘钥
-  ApiURL = "https://payjs.cn/api/native"
+  ApiURL = "https://payjs.cn"
   NotifyURL = "https://ai.r9it.com/api/payment/payjs/notify" # 异步回调地址，域名改成你自己的

deploy/conf/nginx/nginx.conf

@@ -18,6 +18,7 @@ http {
 	tcp_nopush on;
 	types_hash_max_size 2048;
 	# server_tokens off;
+	 client_max_body_size 100M;
 
 	# server_names_hash_bucket_size 64;
 	# server_name_in_redirect off;

web/package.json

@@ -19,6 +19,8 @@
     "json-bigint": "^1.0.0",
     "lodash": "^4.17.21",
     "markdown-it": "^13.0.1",
+    "markdown-it-latex2img": "^0.0.6",
+    "markdown-it-mathjax": "^2.0.0",
     "md-editor-v3": "^2.2.1",
     "pinia": "^2.1.4",
     "qrcode": "^1.5.3",

web/public/index.html

@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
     <title>ChatGPT-Plus</title>
 </head>

web/src/assets/css/chat-plus.css

@@ -153,6 +153,12 @@
 #app .common-layout .el-main .chat-head .iconfont {
   margin-right: 5px;
 }
+#app .common-layout .el-main .chat-head .is-circle {
+  margin-left: 5px;
+}
+#app .common-layout .el-main .chat-head .is-circle .iconfont {
+  margin-right: 0;
+}
 #app .common-layout .el-main .right-box {
   min-width: 0;
   flex: 1;
@@ -213,6 +219,11 @@
   width: 0;
   height: 0;
 }
+#app .common-layout .el-main .right-box #container .input-box .input-container .select-file {
+  position: absolute;
+  right: 48px;
+  top: 20px;
+}
 #app .common-layout .el-main .right-box #container .input-box .input-container .send-btn {
   position: absolute;
   right: 12px;

web/src/assets/css/chat-plus.styl

@@ -199,6 +199,13 @@ $borderColor = #4676d0;
         .iconfont {
           margin-right 5px;
         }
+
+        .is-circle {
+          margin-left 5px
+          .iconfont {
+            margin-right 0
+          }
+        }
       }
 
       .right-box {
@@ -250,7 +257,6 @@ $borderColor = #4676d0;
                   margin-right 5px;
                 }
               }
-
             }
           }
 
@@ -279,6 +285,12 @@ $borderColor = #4676d0;
                 }
               }
 
+              .select-file {
+                position absolute;
+                right 48px;
+                top 20px;
+              }
+
               .send-btn {
                 position absolute;
                 right 12px;

web/src/assets/css/image-mj.css

@@ -201,9 +201,6 @@
 .page-mj .inner .task-list-box .task-list-inner .title-tabs .el-tabs__active-bar {
   background-color: #47fff1;
 }
-.page-mj .inner .task-list-box .task-list-inner .title-tabs .el-tabs__content {
-  padding: 10px 0;
-}
 .page-mj .inner .task-list-box .task-list-inner .el-textarea {
   --el-input-focus-border-color: #47fff1;
 }
@@ -234,26 +231,49 @@
 .page-mj .inner .task-list-box .task-list-inner .el-form-item__label {
   color: #fff;
 }
-.page-mj .inner .task-list-box .task-list-inner .img-uploader .el-upload {
+.page-mj .inner .task-list-box .task-list-inner .img-inline {
+  display: flex;
+}
+.page-mj .inner .task-list-box .task-list-inner .img-inline .img-uploader .el-upload {
   border: 1px dashed var(--el-border-color);
   border-radius: 6px;
   cursor: pointer;
   position: relative;
   overflow: hidden;
-  width: 300px;
+  width: 120px;
   transition: var(--el-transition-duration-fast);
   margin-bottom: 20px;
 }
-.page-mj .inner .task-list-box .task-list-inner .img-uploader .el-upload:hover {
+.page-mj .inner .task-list-box .task-list-inner .img-inline .img-uploader .el-upload:hover {
   border-color: var(--el-color-primary);
 }
-.page-mj .inner .task-list-box .task-list-inner .img-uploader .el-upload .el-icon.uploader-icon {
+.page-mj .inner .task-list-box .task-list-inner .img-inline .img-uploader .el-upload .el-icon.uploader-icon {
   font-size: 28px;
   color: #8c939d;
   width: 100%;
   height: 120px;
   text-align: center;
 }
+.page-mj .inner .task-list-box .task-list-inner .img-inline .img-list-box {
+  display: flex;
+}
+.page-mj .inner .task-list-box .task-list-inner .img-inline .img-list-box .img-item {
+  width: 120px;
+  position: relative;
+  margin-right: 10px;
+}
+.page-mj .inner .task-list-box .task-list-inner .img-inline .img-list-box .img-item .el-image {
+  width: 120px;
+  height: 120px;
+  border-radius: 5px;
+}
+.page-mj .inner .task-list-box .task-list-inner .img-inline .img-list-box .img-item .el-button {
+  position: absolute;
+  right: 5px;
+  top: 5px;
+  width: 20px;
+  height: 20px;
+}
 .page-mj .inner .task-list-box .task-list-inner .submit-btn {
   display: flex;
   margin: 20px 0;
@@ -267,17 +287,17 @@
   justify-content: right;
   align-items: center;
 }
-.page-mj .inner .task-list-box .running-job-list .job-item {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .running-job-list .job-item {
   width: 100%;
   padding: 2px;
   background-color: #555;
 }
-.page-mj .inner .task-list-box .running-job-list .job-item .job-item-inner {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .running-job-list .job-item .job-item-inner {
   position: relative;
   height: 100%;
   overflow: hidden;
 }
-.page-mj .inner .task-list-box .running-job-list .job-item .job-item-inner .progress {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .running-job-list .job-item .job-item-inner .progress {
   position: absolute;
   width: 100%;
   height: 100%;
@@ -287,11 +307,11 @@
   justify-content: center;
   align-items: center;
 }
-.page-mj .inner .task-list-box .running-job-list .job-item .job-item-inner .progress span {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .running-job-list .job-item .job-item-inner .progress span {
   font-size: 20px;
   color: #fff;
 }
-.page-mj .inner .task-list-box .finish-job-list .job-item {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item {
   width: 100%;
   height: 100%;
   border: 1px solid #666;
@@ -301,17 +321,17 @@
   transition: all 0.3s ease; /* 添加过渡效果 */
   position: relative;
 }
-.page-mj .inner .task-list-box .finish-job-list .job-item .opt .opt-line {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item .opt .opt-line {
   margin: 6px 0;
 }
-.page-mj .inner .task-list-box .finish-job-list .job-item .opt .opt-line ul {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item .opt .opt-line ul {
   display: flex;
   flex-flow: row;
 }
-.page-mj .inner .task-list-box .finish-job-list .job-item .opt .opt-line ul li {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item .opt .opt-line ul li {
   margin-right: 6px;
 }
-.page-mj .inner .task-list-box .finish-job-list .job-item .opt .opt-line ul li a {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item .opt .opt-line ul li a {
   padding: 3px 0;
   width: 40px;
   text-align: center;
@@ -321,59 +341,58 @@
   background-color: #4e5058;
   color: #fff;
 }
-.page-mj .inner .task-list-box .finish-job-list .job-item .opt .opt-line ul li a:hover {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item .opt .opt-line ul li a:hover {
   background-color: #6d6f78;
 }
-.page-mj .inner .task-list-box .finish-job-list .job-item .opt .opt-line ul .show-prompt {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item .opt .opt-line ul .show-prompt {
   font-size: 20px;
   cursor: pointer;
 }
-.page-mj .inner .task-list-box .finish-job-list .job-item .remove {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item .remove {
   display: none;
   position: absolute;
   right: 10px;
   top: 10px;
 }
-.page-mj .inner .task-list-box .finish-job-list .job-item:hover .remove {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item:hover .remove {
   display: block;
 }
-.page-mj .inner .task-list-box .finish-job-list .animate:hover {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .animate:hover {
   box-shadow: 0 0 10px rgba(71,255,241,0.6); /* 添加阴影效果 */
   transform: translateY(-10px); /* 向上移动10像素 */
 }
-.page-mj .inner .task-list-box .el-image {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .el-image {
   width: 100%;
   height: 100%;
   overflow: visible;
 }
-.page-mj .inner .task-list-box .el-image img {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .el-image img {
   height: 240px;
 }
-.page-mj .inner .task-list-box .el-image .el-image-viewer__wrapper img {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .el-image .el-image-viewer__wrapper img {
   width: auto;
   height: auto;
 }
-.page-mj .inner .task-list-box .el-image .image-slot {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .el-image .image-slot {
   display: flex;
   flex-flow: column;
   justify-content: center;
   align-items: center;
-  height: 100%;
   min-height: 200px;
   color: #fff;
   height: 240px;
 }
-.page-mj .inner .task-list-box .el-image .image-slot .iconfont {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .el-image .image-slot .iconfont {
   font-size: 50px;
   margin-bottom: 10px;
 }
-.page-mj .inner .task-list-box .el-image.upscale {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .el-image.upscale {
   max-height: 310px;
 }
-.page-mj .inner .task-list-box .el-image.upscale img {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .el-image.upscale img {
   height: 310px;
 }
-.page-mj .inner .task-list-box .el-image.upscale .el-image-viewer__wrapper img {
+.page-mj .inner .task-list-box .task-list-inner .job-list-box .el-image.upscale .el-image-viewer__wrapper img {
   width: auto;
   height: auto;
 }

web/src/assets/css/image-sd.css

@@ -86,9 +86,6 @@
 .page-sd .inner .task-list-box .task-list-inner .title-tabs .el-tabs__active-bar {
   background-color: #47fff1;
 }
-.page-sd .inner .task-list-box .task-list-inner .title-tabs .el-tabs__content {
-  padding: 10px 0;
-}
 .page-sd .inner .task-list-box .task-list-inner .el-textarea {
   --el-input-focus-border-color: #47fff1;
 }
@@ -119,26 +116,49 @@
 .page-sd .inner .task-list-box .task-list-inner .el-form-item__label {
   color: #fff;
 }
-.page-sd .inner .task-list-box .task-list-inner .img-uploader .el-upload {
+.page-sd .inner .task-list-box .task-list-inner .img-inline {
+  display: flex;
+}
+.page-sd .inner .task-list-box .task-list-inner .img-inline .img-uploader .el-upload {
   border: 1px dashed var(--el-border-color);
   border-radius: 6px;
   cursor: pointer;
   position: relative;
   overflow: hidden;
-  width: 300px;
+  width: 120px;
   transition: var(--el-transition-duration-fast);
   margin-bottom: 20px;
 }
-.page-sd .inner .task-list-box .task-list-inner .img-uploader .el-upload:hover {
+.page-sd .inner .task-list-box .task-list-inner .img-inline .img-uploader .el-upload:hover {
   border-color: var(--el-color-primary);
 }
-.page-sd .inner .task-list-box .task-list-inner .img-uploader .el-upload .el-icon.uploader-icon {
+.page-sd .inner .task-list-box .task-list-inner .img-inline .img-uploader .el-upload .el-icon.uploader-icon {
   font-size: 28px;
   color: #8c939d;
   width: 100%;
   height: 120px;
   text-align: center;
 }
+.page-sd .inner .task-list-box .task-list-inner .img-inline .img-list-box {
+  display: flex;
+}
+.page-sd .inner .task-list-box .task-list-inner .img-inline .img-list-box .img-item {
+  width: 120px;
+  position: relative;
+  margin-right: 10px;
+}
+.page-sd .inner .task-list-box .task-list-inner .img-inline .img-list-box .img-item .el-image {
+  width: 120px;
+  height: 120px;
+  border-radius: 5px;
+}
+.page-sd .inner .task-list-box .task-list-inner .img-inline .img-list-box .img-item .el-button {
+  position: absolute;
+  right: 5px;
+  top: 5px;
+  width: 20px;
+  height: 20px;
+}
 .page-sd .inner .task-list-box .task-list-inner .submit-btn {
   display: flex;
   margin: 20px 0;
@@ -152,17 +172,17 @@
   justify-content: right;
   align-items: center;
 }
-.page-sd .inner .task-list-box .running-job-list .job-item {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .running-job-list .job-item {
   width: 100%;
   padding: 2px;
   background-color: #555;
 }
-.page-sd .inner .task-list-box .running-job-list .job-item .job-item-inner {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .running-job-list .job-item .job-item-inner {
   position: relative;
   height: 100%;
   overflow: hidden;
 }
-.page-sd .inner .task-list-box .running-job-list .job-item .job-item-inner .progress {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .running-job-list .job-item .job-item-inner .progress {
   position: absolute;
   width: 100%;
   height: 100%;
@@ -172,11 +192,11 @@
   justify-content: center;
   align-items: center;
 }
-.page-sd .inner .task-list-box .running-job-list .job-item .job-item-inner .progress span {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .running-job-list .job-item .job-item-inner .progress span {
   font-size: 20px;
   color: #fff;
 }
-.page-sd .inner .task-list-box .finish-job-list .job-item {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item {
   width: 100%;
   height: 100%;
   border: 1px solid #666;
@@ -186,17 +206,17 @@
   transition: all 0.3s ease; /* 添加过渡效果 */
   position: relative;
 }
-.page-sd .inner .task-list-box .finish-job-list .job-item .opt .opt-line {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item .opt .opt-line {
   margin: 6px 0;
 }
-.page-sd .inner .task-list-box .finish-job-list .job-item .opt .opt-line ul {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item .opt .opt-line ul {
   display: flex;
   flex-flow: row;
 }
-.page-sd .inner .task-list-box .finish-job-list .job-item .opt .opt-line ul li {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item .opt .opt-line ul li {
   margin-right: 6px;
 }
-.page-sd .inner .task-list-box .finish-job-list .job-item .opt .opt-line ul li a {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item .opt .opt-line ul li a {
   padding: 3px 0;
   width: 40px;
   text-align: center;
@@ -206,59 +226,58 @@
   background-color: #4e5058;
   color: #fff;
 }
-.page-sd .inner .task-list-box .finish-job-list .job-item .opt .opt-line ul li a:hover {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item .opt .opt-line ul li a:hover {
   background-color: #6d6f78;
 }
-.page-sd .inner .task-list-box .finish-job-list .job-item .opt .opt-line ul .show-prompt {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item .opt .opt-line ul .show-prompt {
   font-size: 20px;
   cursor: pointer;
 }
-.page-sd .inner .task-list-box .finish-job-list .job-item .remove {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item .remove {
   display: none;
   position: absolute;
   right: 10px;
   top: 10px;
 }
-.page-sd .inner .task-list-box .finish-job-list .job-item:hover .remove {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .job-item:hover .remove {
   display: block;
 }
-.page-sd .inner .task-list-box .finish-job-list .animate:hover {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .finish-job-list .animate:hover {
   box-shadow: 0 0 10px rgba(71,255,241,0.6); /* 添加阴影效果 */
   transform: translateY(-10px); /* 向上移动10像素 */
 }
-.page-sd .inner .task-list-box .el-image {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .el-image {
   width: 100%;
   height: 100%;
   overflow: visible;
 }
-.page-sd .inner .task-list-box .el-image img {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .el-image img {
   height: 240px;
 }
-.page-sd .inner .task-list-box .el-image .el-image-viewer__wrapper img {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .el-image .el-image-viewer__wrapper img {
   width: auto;
   height: auto;
 }
-.page-sd .inner .task-list-box .el-image .image-slot {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .el-image .image-slot {
   display: flex;
   flex-flow: column;
   justify-content: center;
   align-items: center;
-  height: 100%;
   min-height: 200px;
   color: #fff;
   height: 240px;
 }
-.page-sd .inner .task-list-box .el-image .image-slot .iconfont {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .el-image .image-slot .iconfont {
   font-size: 50px;
   margin-bottom: 10px;
 }
-.page-sd .inner .task-list-box .el-image.upscale {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .el-image.upscale {
   max-height: 310px;
 }
-.page-sd .inner .task-list-box .el-image.upscale img {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .el-image.upscale img {
   height: 310px;
 }
-.page-sd .inner .task-list-box .el-image.upscale .el-image-viewer__wrapper img {
+.page-sd .inner .task-list-box .task-list-inner .job-list-box .el-image.upscale .el-image-viewer__wrapper img {
   width: auto;
   height: auto;
 }

web/src/assets/css/mobile/apps.css

@@ -1,17 +0,0 @@
-.title {
-  color: #fff;
-  text-align: center;
-  font-size: 16px;
-  font-weight: bold;
-}
-.app-background {
-  background-color: #282828;
-  height: 100vh;
-}
-.mobile-setting .content {
-  padding-top: 60px;
-}
-.mobile-setting .content .van-field__label {
-  width: 100px;
-  text-align: right;
-}

web/src/assets/css/mobile/apps.styl

@@ -1,20 +0,0 @@
-.title {
-  color  #fff 
-  text-align  center 
-  font-size  16px 
-  font-weight  bold 
-}
-.app-background {
-  background-color  #282828 
-  height  100vh 
-}
-.mobile-setting {
-  .content {
-    padding-top 60px
-
-    .van-field__label {
-      width 100px
-      text-align right
-    }
-  }
-}

web/src/assets/css/mobile/chat-list.css

@@ -1,47 +1,29 @@
-.app-background {
-  background-color: #1c1c1c;
-  height: 100vh;
-}
-.mobile-chat-list {
-  background-color: #1c1c1c;
-  position: absolute;
-  top: 40px;
-  width: 100%;
-}
-.content .van-cell__value .chat-list-item {
+.mobile-chat-list .content .van-cell__value .chat-list-item {
   display: flex;
-  font-size: 16px;
-  color: #fff;
-  background-color: #1c1c1c;
+  font-size: 14px;
 }
-.content .van-cell__value .chat-list-item .van-image {
+.mobile-chat-list .content .van-cell__value .chat-list-item .van-image {
   min-width: 32px;
   width: 32px;
   height: 32px;
 }
-.content .van-cell__value .chat-list-item .van-ellipsis {
+.mobile-chat-list .content .van-cell__value .chat-list-item .van-ellipsis {
   margin-top: 5px;
   margin-left: 10px;
 }
-.van-picker-column .picker-option {
+.mobile-chat-list .van-nav-bar .van-nav-bar__right .van-icon {
+  font-size: 20px;
+}
+.van-popup .picker-option {
   display: flex;
   width: 100%;
   padding: 0 10px;
+  overflow: hidden;
+  height: 20px;
+  text-overflow: ellipsis;
 }
-.van-picker-column .picker-option .van-image {
+.van-popup .picker-option .van-image {
   width: 20px;
   height: 20px;
   margin-right: 5px;
 }
-.van-nav-bar .van-nav-bar__right .van-icon {
-  font-size: 20px;
-}
-.popup {
-  background-color: #1c1c1c;
-}
-.dialog {
-  background-color: #1c1c1c;
-}
-.field {
-  background-color: #1c1c1c;
-}

web/src/assets/css/mobile/chat-list.styl

@@ -1,26 +1,16 @@
-$fontSize = 16px;
-.app-background {
-  background-color: #1c1c1c;
-  height: 100vh;
-}
 .mobile-chat-list {
-  background-color: #1c1c1c;
-  position: absolute;
-  top: 40px;
-  width: 100%;
-}
   .content {
     .van-cell__value {
       .chat-list-item {
         display flex
-        font-size $fontSize
-        color: #fff;
-        background-color: #1c1c1c;
+        font-size 14px
+
         .van-image {
           min-width 32px
           width 32px
           height 32px
         }
+
         .van-ellipsis {
           margin-top 5px;
           margin-left 10px;
@@ -28,18 +18,8 @@ $fontSize = 16px;
       }
     }
   }
-  .van-picker-column {
-    .picker-option {
-      display flex
-      width 100%
-      padding 0 10px
-      .van-image {
-        width 20px;
-        height 20px;
-        margin-right 5px
-      }
-    }
-  }
+
+
   .van-nav-bar {
     .van-nav-bar__right {
       .van-icon {
@@ -47,12 +27,21 @@ $fontSize = 16px;
       }
     }
   }
-  .popup {
-    background-color: #1c1c1c;
+}
+
+.van-popup {
+  .picker-option {
+    display flex
+    width 100%
+    padding 0 10px
+    overflow hidden
+    height 20px
+    text-overflow ellipsis
+
+    .van-image {
+      width 20px;
+      height 20px;
+      margin-right 5px
     }
-  .dialog {
-    background-color: #1c1c1c;
-  }
-  .field {
-    background-color: #1c1c1c;
   }
+}

web/src/assets/css/mobile/chat-session.css

@@ -1,45 +1,46 @@
-.app-background {
-  background-color: #1c1c1c;
-  height: 100vh;
+.mobile-chat .message-list-box {
+  padding-top: 50px;
+  padding-bottom: 10px;
+  overflow-x: auto;
+  background: #f5f5f5;
 }
-body,
-.mobile-chat,
-.van-sticky,
-.van-nav-bar,
-.van-list,
-.message-list-box,
-.van-cell,
-.chat-box,
-.van-cell-group,
-.van-field {
-  background-color: #1c1c1c !important;
-  color: #fff !important;
+.mobile-chat .message-list-box .van-cell {
+  background: none;
+  font-family: 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
 }
-.chat-box-wrapper {
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  background-color: #1c1c1c;
+.mobile-chat .chat-box-wrapper .van-sticky .van-cell-group--inset {
+  margin: 0;
 }
-.icon-box .van-icon,
-.mobile-chat .van-nav-bar__title .van-dropdown-menu__title,
-.mobile-chat .van-nav-bar__title .van-cell__title,
-.mobile-chat .van-nav-bar__right .van-icon {
-  color: #fff !important;
+.mobile-chat .chat-box-wrapper .van-sticky .van-cell-group--inset .van-cell {
+  padding: 10px;
+}
+.mobile-chat .chat-box-wrapper .van-sticky .van-cell-group--inset .van-cell .icon-box .van-icon {
+  font-size: 24px;
+  margin-left: 10px;
+}
+.mobile-chat .chat-box-wrapper .van-sticky .van-cell-group--inset .van-cell .button-voice {
+  padding: 0 2px;
+  height: 30px;
+}
+.mobile-chat .chat-box-wrapper .van-sticky .van-cell-group--inset .van-cell .button-voice .el-icon {
+  font-size: 24px;
 }
 .mobile-chat .van-nav-bar__title .van-dropdown-menu__title {
-  margin-right: 15px;
+  margin-right: 10px;
 }
 .mobile-chat .van-nav-bar__title .van-cell__title {
   text-align: left;
 }
-.mobile-chat .chat-list-wrapper {
-  position: fixed;
-  top: 50px;
-  bottom: 60px;
-  width: 100vw;
-  overflow-y: scroll;
-}
 .mobile-chat .van-nav-bar__right .van-icon {
   font-size: 20px;
 }
+.van-overlay .mic-wrapper {
+  display: flex;
+  height: 100vh;
+  justify-content: center;
+  align-items: center;
+  flex-flow: column;
+}
+.van-theme-dark .mobile-chat .message-list-box {
+  background: #232425;
+}

web/src/assets/css/mobile/chat-session.styl

@@ -1,51 +1,75 @@
-.app-background {
-    background-color  #1c1c1c 
-    height  100vh 
+.mobile-chat {
+  .message-list-box {
+    padding-top 50px
+    padding-bottom 10px
+    overflow-x auto
+    background #F5F5F5;
+
+    .van-cell {
+      background none
+      font-family: 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
     }
-  body,
-  .mobile-chat,
-  .van-sticky,
-  .van-nav-bar,
-  .van-list,
-  .message-list-box
-  .van-cell,
-  .chat-box,
-  .van-cell-group,
-  .van-field {
-    background-color  #1c1c1c !important 
-    color  #fff !important 
   }
+
   .chat-box-wrapper {
-    position  fixed 
-    bottom  0 
-    width  100% 
-    background-color  #1c1c1c 
+    .van-sticky {
+      .van-cell-group--inset {
+        margin 0
+
+        .van-cell {
+          padding 10px
+
+          .icon-box {
+            .van-icon {
+              font-size 24px
+              margin-left 10px
             }
-  .icon-box .van-icon,
-  .mobile-chat .van-nav-bar__title .van-dropdown-menu__title,
-  .mobile-chat .van-nav-bar__title .van-cell__title,
-  .mobile-chat .van-nav-bar__right .van-icon {
-    color  #fff !important 
           }
-  .mobile-chat {
+
+          .button-voice {
+            padding 0 2px
+
+            .el-icon {
+              font-size 24px
+            }
+            height 30px
+          }
+        }
+      }
+    }
+  }
+
   .van-nav-bar__title {
     .van-dropdown-menu__title {
-        margin-right  15px 
+      margin-right 10px
     }
+
     .van-cell__title {
       text-align left
     }
   }
-    .chat-list-wrapper {
-      position  fixed 
-      top  50px 
-      bottom  60px 
-      width  100vw 
-      overflow-y  scroll 
-    }
+
   .van-nav-bar__right {
     .van-icon {
       font-size 20px
     }
   }
+}
+
+.van-overlay {
+  .mic-wrapper {
+    display flex
+    height 100vh
+    justify-content center
+    align-items center
+    flex-flow column
   }
+}
+
+.van-theme-dark {
+  .mobile-chat {
+    .message-list-box {
+      background #232425;
+    }
+  }
+}

web/src/assets/css/mobile/custom-scroll.css

@@ -1,13 +0,0 @@
-.custom-scroll ::-webkit-scrollbar {
-  width: 8px; /* 滚动条宽度 */
-}
-.custom-scroll ::-webkit-scrollbar-track {
-  background-color: #282c34;
-}
-.custom-scroll ::-webkit-scrollbar-thumb {
-  background-color: #444;
-  border-radius: 8px;
-}
-.custom-scroll ::-webkit-scrollbar-thumb:hover {
-  background-color: #666;
-}

web/src/assets/css/mobile/custom-scroll.styl

@@ -1,26 +0,0 @@
-.custom-scroll {
-  /* 修改滚动条的颜色 */
-
-  ::-webkit-scrollbar {
-    width: 8px; /* 滚动条宽度 */
-  }
-
-  /* 修改滚动条轨道的背景颜色 */
-
-  ::-webkit-scrollbar-track {
-    background-color: #282C34;
-  }
-
-  /* 修改滚动条的滑块颜色 */
-
-  ::-webkit-scrollbar-thumb {
-    background-color: #444444;
-    border-radius 8px
-  }
-
-  /* 修改滚动条的滑块的悬停颜色 */
-
-  ::-webkit-scrollbar-thumb:hover {
-    background-color: #666666;
-  }
-}

web/src/assets/css/mobile/home.css

@@ -1,45 +0,0 @@
-.my-tabbar {
-  background-color: #171717;
-  box-shadow: -3px 4px 16px #000;
-  box-sizing: border-box;
-}
-.banner {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background-color: #171717;
-  border-bottom-right-radius: 10px;
-  box-shadow: 0 -4px 13px #000;
-  height: 40px;
-  width: 100%;
-  position: fixed;
-  z-index: 2 /* Add z-index */;
-}
-.banner-title {
-  color: #2cc995;
-  font-size: 20px;
-  font-weight: bold;
-  text-shadow: 0 -4px 13px #000;
-}
-.mobile-home {
-  background-color: #171717;
-}
-.mobile-home .van-tabbar before {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 50px;
-  background-color: #171717;
-  border-top-left-radius: 10px;
-  border-top-right-radius: 10px;
-  opacity: 0;
-  transition: opacity 0.5s;
-  z-index: -1;
-}
-.mobile-home .van-tabbar.activeTab before {
-  opacity: 1;
-}
-.router-view {
-  margin-bottom: 50px;
-}

web/src/assets/css/mobile/home.styl

@@ -1,45 +0,0 @@
-.my-tabbar {
-  background-color  #171717  
-  box-shadow  -3px 4px 16px #000  
-  box-sizing  border-box 
-}
-.banner {
-  display  flex 
-  justify-content  center 
-  align-items  center 
-  background-color  #171717 
-  border-bottom-right-radius  10px 
-  box-shadow  0 -4px 13px #000 
-  height  40px 
-  width  100% 
-  position  fixed 
-  z-index  2    /* Add z-index */
-} 
-.banner-title {
-  color  #2CC995 
-  font-size  20px 
-  font-weight  bold 
-  text-shadow  0 -4px 13px #000 
-}
-.mobile-home {
-  background-color  #171717 
-}
-.mobile-home .van-tabbar  before {
-  position  absolute 
-  bottom  0 
-  left  0 
-  right  0 
-  height  50px 
-  background-color  #171717 
-  border-top-left-radius  10px 
-  border-top-right-radius  10px 
-  opacity  0 
-  transition  opacity 0.5s 
-  z-index  -1 
-}
-.mobile-home .van-tabbar.activeTab  before {
-  opacity  1 
-}
-.router-view {
-  margin-bottom  50px 
-}

web/src/assets/css/mobile/image-list.css

@@ -1,252 +0,0 @@
-
-.page-sd {
-  background-color: #282828;
-}
-.page-sd .inner {
-  display: flex;
-}
-.page-sd .inner .sd-box {
-  margin: 10px;
-  background-color: #282828;
-  min-width: 92%;
-  max-width: 92%;
-  padding: 0px;
-  border-radius: 0px;
-  color: #fff;
-  font-size: 14px;
-}
-.page-sd .inner .sd-box h2 {
-  font-weight: bold;
-  font-size: 20px;
-  text-align: center;
-  color: #fff;
-}
-.page-sd .inner .sd-box ::-webkit-scrollbar {
-  width: 0;
-  height: 0;
-  background-color: transparent;
-}
-.page-sd .inner .sd-box .sd-params {
-  margin-top: 10px;
-  overflow: auto;
-}
-.page-sd .inner .sd-box .sd-params .param-line {
-  padding: 0 10px;
-}
-.page-sd .inner .sd-box .sd-params .param-line .el-icon {
-  position: relative;
-  top: 3px;
-}
-.page-sd .inner .sd-box .sd-params .param-line .el-input__suffix-inner .el-icon {
-  top: 0;
-}
-.page-sd .inner .sd-box .sd-params .param-line .grid-content,
-.page-sd .inner .sd-box .sd-params .param-line .form-item-inner {
-  display: flex;
-}
-.page-sd .inner .sd-box .sd-params .param-line .grid-content .el-icon,
-.page-sd .inner .sd-box .sd-params .param-line .form-item-inner .el-icon {
-  margin-left: 10px;
-  margin-top: 2px;
-}
-.page-sd .inner .sd-box .sd-params .param-line.pt {
-  padding-top: 5px;
-  padding-bottom: 5px;
-}
-.page-sd .inner .sd-box .submit-btn {
-  padding: 10px 15px 0 15px;
-  text-align: center;
-}
-.page-sd .inner .sd-box .submit-btn .el-button {
-  width: 100%;
-}
-.page-sd .inner .sd-box .submit-btn .el-button span {
-  color: #2d3a4b;
-}
-.page-sd .inner .el-form .el-form-item__label {
-  color: #fff;
-}
-.page-sd .inner .task-list-box {
-  width: 100%;
-  padding: 10px;
-  color: #fff;
-  overflow-x: hidden;
-}
-.page-sd .inner .task-list-box .running-job-list .job-item {
-  width: 100%;
-  padding: 2px;
-  background-color: #555;
-}
-.page-sd .inner .task-list-box .running-job-list .job-item .job-item-inner {
-  position: relative;
-  height: 100%;
-  overflow: hidden;
-}
-.page-sd .inner .task-list-box .running-job-list .job-item .job-item-inner .progress {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.page-sd .inner .task-list-box .running-job-list .job-item .job-item-inner .progress span {
-  font-size: 20px;
-  color: #fff;
-}
-.page-sd .inner .task-list-box .finish-job-list .job-item {
-  width: 100%;
-  height: 100%;
-  border: 1px solid #666;
-  padding: 6px;
-  overflow: hidden;
-  border-radius: 6px;
-  transition: all 0.3s ease; /* 添加过渡效果 */
-}
-.page-sd .inner .task-list-box .finish-job-list .job-item .opt .opt-line {
-  margin: 6px 0;
-}
-.page-sd .inner .task-list-box .finish-job-list .job-item .opt .opt-line ul {
-  display: flex;
-  flex-flow: row;
-}
-.page-sd .inner .task-list-box .finish-job-list .job-item .opt .opt-line ul li {
-  margin-right: 6px;
-}
-.page-sd .inner .task-list-box .finish-job-list .job-item .opt .opt-line ul li a {
-  padding: 3px 0;
-  width: 40px;
-  text-align: center;
-  border-radius: 5px;
-  display: block;
-  cursor: pointer;
-  background-color: #4e5058;
-  color: #fff;
-}
-.page-sd .inner .task-list-box .finish-job-list .job-item .opt .opt-line ul li a:hover {
-  background-color: #6d6f78;
-}
-.page-sd .inner .task-list-box .finish-job-list .job-item .opt .opt-line ul .show-prompt {
-  font-size: 20px;
-  cursor: pointer;
-}
-.page-sd .inner .task-list-box .finish-job-list .animate:hover {
-  box-shadow: 0 0 10px rgba(71,255,241,0.6); /* 添加阴影效果 */
-  transform: translateY(-10px); /* 向上移动10像素 */
-}
-.page-sd .inner .task-list-box .el-image {
-  width: 100%;
-  height: 100%;
-  overflow: visible;
-}
-.page-sd .inner .task-list-box .el-image img {
-  height: 100%;
-}
-.page-sd .inner .task-list-box .el-image .el-image-viewer__wrapper img {
-  width: auto;
-  height: auto;
-}
-.page-sd .inner .task-list-box .el-image .image-slot {
-  display: flex;
-  flex-flow: column;
-  justify-content: center;
-  align-items: center;
-  height: 100%;
-  min-height: 200px;
-  color: #fff;
-  height: 240px;
-}
-.page-sd .inner .task-list-box .el-image .image-slot .iconfont {
-  font-size: 50px;
-  margin-bottom: 10px;
-}
-.page-sd .inner .task-list-box .el-image.upscale {
-  max-height: 100%;
-}
-.page-sd .inner .task-list-box .el-image.upscale img {
-  height: 100%;
-}
-.page-sd .inner .task-list-box .el-image.upscale .el-image-viewer__wrapper img {
-  width: auto;
-  height: auto;
-}
-.page-sd .el-overlay-dialog .el-dialog {
-  background-color: #1a1b1e;
-}
-.page-sd .el-overlay-dialog .el-dialog .el-dialog__header .el-dialog__title {
-  color: #f5f5f5;
-}
-.page-sd .el-overlay-dialog .el-dialog .el-dialog__body {
-  padding: 0 0 0 15px !important;
-  display: flex;
-  height: 100%;
-}
-.page-sd .el-overlay-dialog .el-dialog .el-dialog__body .el-row {
-  width: 100%;
-}
-.page-sd .el-overlay-dialog .el-dialog .el-dialog__body .el-row .img-container {
-  display: flex;
-  justify-content: center;
-}
-.page-sd .el-overlay-dialog .el-dialog .el-dialog__body .el-row .img-container .image-slot {
-  display: flex;
-  height: 100vh;
-  align-items: center;
-  justify-content: center;
-}
-.page-sd .el-overlay-dialog .el-dialog .el-dialog__body .el-row .img-container .image-slot .el-icon {
-  font-size: 60px;
-}
-.page-sd .el-overlay-dialog .el-dialog .el-dialog__body .el-row .task-info {
-  background-color: #25262b;
-  padding: 1rem 1.5rem;
-}
-.page-sd .el-overlay-dialog .el-dialog .el-dialog__body .el-row .task-info .info-line {
-  width: 100%;
-}
-.page-sd .el-overlay-dialog .el-dialog .el-dialog__body .el-row .task-info .info-line .prompt {
-  background-color: #35363b;
-  padding: 10px;
-  color: #999;
-  overflow: auto;
-  max-height: 100%;
-  min-height: 100%;
-  position: relative;
-}
-.page-sd .el-overlay-dialog .el-dialog .el-dialog__body .el-row .task-info .info-line .prompt .el-icon {
-  position: absolute;
-  right: 10px;
-  bottom: 10px;
-  cursor: pointer;
-}
-.page-sd .el-overlay-dialog .el-dialog .el-dialog__body .el-row .task-info .info-line .wrapper {
-  margin-top: 10px;
-  display: flex;
-}
-.page-sd .el-overlay-dialog .el-dialog .el-dialog__body .el-row .task-info .info-line .wrapper label {
-  display: flex;
-  width:100%;
-  color: #a5a5a5;
-}
-.page-sd .el-overlay-dialog .el-dialog .el-dialog__body .el-row .task-info .info-line .wrapper .item-value {
-  display: flex;
-  width: 100%;
-  background-color: #35363b;
-  padding: 2px 5px;
-  border-radius: 5px;
-  color: #f5f5f5;
-}
-.page-sd .el-overlay-dialog .el-dialog .el-dialog__body .el-row .task-info .copy-params {
-  padding: 20px 0 10px 0;
-}
-.page-sd .el-overlay-dialog .el-dialog .el-dialog__body .el-row .task-info .copy-params .el-button {
-  width: 100%;
-}
-.page-sd .mj-list-item-prompt .el-icon {
-  margin-left: 10px;
-  cursor: pointer;
-  position: relative;
-  top: 2px;
-}

web/src/assets/css/mobile/image-list.styl

@@ -1,106 +0,0 @@
-.page-sd {
-  background-color: #282828;
-
-  .inner {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    .sd-box {
-      background-color #282828
-      min-width 92%
-      max-width 92%
-      padding 0px
-      border-radius 0px
-      color #ffffff;
-      font-size 14px
-
-      h2 {
-        font-weight: bold;
-        font-size 20px
-        text-align center
-        color #fff
-      }
-
-      // 隐藏滚动条
-
-      ::-webkit-scrollbar {
-        width: 0;
-        height: 0;
-        background-color: transparent;
-      }
-
-      .sd-params {
-        margin-top 10px
-        overflow auto
-
-
-        .param-line {
-          padding 0 10px
-
-          .el-icon {
-            position relative
-            top 3px
-          }
-
-          .el-input__suffix-inner {
-            .el-icon {
-              top 0
-            }
-          }
-
-          .grid-content
-          .form-item-inner {
-            display flex
-
-            .el-icon {
-              margin-left 10px
-              margin-top 2px
-            }
-          }
-
-        }
-
-        .param-line.pt {
-          padding-top 5px
-          padding-bottom 5px
-        }
-      }
-
-      .submit-btn {
-        padding 10px 15px 0 15px
-        text-align center
-
-        .el-button {
-          width 100%
-
-          span {
-            color #2D3A4B
-          }
-        }
-      }
-    }
-
-    .el-form {
-      .el-form-item__label {
-        color #ffffff
-      }
-    }
-
-    @import "mobile/task-mobile-list.styl"
-  }
-
-  @import "sd-task-mobile-dialog.styl"
-
-
-  .mj-list-item-prompt {
-    .el-icon {
-      margin-left 10px
-      cursor pointer
-      position relative
-      top 2px
-    }
-  }
-
-}
-

web/src/assets/css/mobile/image-mj.css

@@ -0,0 +1,138 @@
+.mobile-mj .content .text-line {
+  padding: 6px;
+  font-size: 14px;
+}
+.mobile-mj .content .text-line .van-row .van-col .rate {
+  display: flex;
+  justify-content: center;
+  background-color: #f5f5f5;
+  padding: 5px 10px;
+  margin: 5px 0;
+  border-radius: 5px;
+  flex-flow: column;
+}
+.mobile-mj .content .text-line .van-row .van-col .rate .icon {
+  text-align: center;
+}
+.mobile-mj .content .text-line .van-row .van-col .rate .icon .van-image {
+  max-width: 20px;
+}
+.mobile-mj .content .text-line .van-row .van-col .rate .text {
+  text-align: center;
+  color: #555;
+}
+.mobile-mj .content .text-line .van-row .van-col .model {
+  display: flex;
+  justify-content: center;
+  background-color: #f5f5f5;
+  padding: 6px;
+  margin: 5px 0;
+  border-radius: 5px;
+  flex-flow: column;
+}
+.mobile-mj .content .text-line .van-row .van-col .model .icon {
+  text-align: center;
+}
+.mobile-mj .content .text-line .van-row .van-col .model .icon .van-image {
+  width: 100%;
+  height: 50px;
+}
+.mobile-mj .content .text-line .van-row .van-col .model .text {
+  text-align: center;
+  color: #555;
+}
+.mobile-mj .content .text-line .van-row .van-col .active {
+  background-color: #e5e5e5;
+}
+.mobile-mj .content .text-line .van-button {
+  position: relative;
+}
+.mobile-mj .content .text-line .van-button .van-tag {
+  position: absolute;
+  right: 20px;
+}
+.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content {
+  padding: 0;
+  position: relative;
+}
+.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content .van-image,
+.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue {
+  min-height: 100px;
+}
+.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content .progress {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  background: rgba(50,50,50,0.5);
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content .progress .van-circle__text {
+  color: #fff;
+}
+.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue {
+  display: flex;
+  flex-flow: column;
+  justify-content: center;
+  color: #c1c1c1;
+}
+.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue .icon {
+  text-align: center;
+}
+.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue .icon .iconfont {
+  font-size: 24px;
+}
+.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue .text {
+  font-size: 14px;
+  margin-top: 5px;
+}
+.mobile-mj .content .finish-job-list .van-grid .van-grid-item .van-grid-item__content {
+  padding: 0;
+}
+.mobile-mj .content .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item {
+  overflow: hidden;
+  border-radius: 6px;
+  position: relative;
+  height: 100%;
+  width: 100%;
+}
+.mobile-mj .content .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .opt .opt-btn {
+  padding: 3px 10px;
+  text-align: center;
+  border-radius: 5px;
+  margin: 3px 0;
+  display: block;
+  cursor: pointer;
+  background-color: #4e5058;
+  color: #fff;
+}
+.mobile-mj .content .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .el-image {
+  width: 100%;
+  height: 200px;
+}
+.mobile-mj .content .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .el-image .image-slot {
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.mobile-mj .content .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .el-image .image-slot .iconfont {
+  margin-right: 5px;
+}
+.mobile-mj .content .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .upscale {
+  height: 260px;
+  width: 100%;
+}
+.mobile-mj .content .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .remove {
+  position: absolute;
+  right: 5px;
+  top: 5px;
+}
+.mobile-mj .content .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .remove .el-button {
+  margin-left: 5px;
+  height: auto;
+  padding: 5px;
+}