merge v4.1.0 and fixed conflicts

2025-12-25 17:45:58 +08:00 · 2024-10-08 17:51:14 +08:00
parent 8144fada25 44798f89ba
commit 4c2dba1004
91 changed files with 3266 additions and 3202 deletions
--- a/api/config.sample.toml
+++ b/api/config.sample.toml
@@ -5,6 +5,7 @@ StaticDir = "./static" # 静态资源的目录
 StaticUrl = "/static" # 静态资源访问 URL
 AesEncryptKey = ""
 WeChatBot = false
+TikaHost = "http://tika:9998"

 [Session]
  SecretKey = "azyehq3ivunjhbntz78isj00i4hz2mt9xtddysfucxakadq4qbfrt0b7q3lnvg80" # 注意：这个是 JWT Token 授权密钥，生产环境请务必更换
@@ -122,4 +123,16 @@ WeChatBot = false
  AppId = "" # 商户 ID
  PrivateKey = "" # 秘钥
  ApiURL = "https://payjs.cn"
-  NotifyURL = "https://ai.r9it.com/api/payment/payjs/notify" # 异步回调地址，域名改成你自己的
+  NotifyURL = "https://ai.r9it.com/api/payment/payjs/notify" # 异步回调地址，域名改成你自己的
+
+# 微信商户支付
+[WechatPayConfig]
+  Enabled = false
+  AppId = "" # 商户应用ID
+  MchId = "" # 商户号
+  SerialNo = "" # API 证书序列号
+  PrivateKey = "certs/alipay/privateKey.txt" # API 证书私钥文件路径，跟支付宝一样，把私钥文件拷贝到对应的路径，证书路径要映射到容器内
+  ApiV3Key = "" # APIV3 私钥，这个是你自己在微信支付平台设置的
+  NotifyURL = "https://ai.r9it.com/api/payment/wechat/notify" # 支付成功异步回调地址，域名改成自己的
+  ReturnURL = "" # 支付成功同步回调地址
+
--- a/api/core/app_server.go
+++ b/api/core/app_server.go
@@ -32,31 +32,19 @@ import (
 )

 type AppServer struct {
-	Debug        bool
-	Config       *types.AppConfig
-	Engine       *gin.Engine
-	ChatContexts *types.LMap[string, []types.Message] // 聊天上下文 Map [chatId] => []Message
-
+	Debug     bool
+	Config    *types.AppConfig
+	Engine    *gin.Engine
 	SysConfig *types.SystemConfig // system config cache
-
-	// 保存 Websocket 会话 UserId, 每个 UserId 只能连接一次
-	// 防止第三方直接连接 socket 调用 OpenAI API
-	ChatSession   *types.LMap[string, *types.ChatSession] //map[sessionId]UserId
-	ChatClients   *types.LMap[string, *types.WsClient]    // map[sessionId]Websocket 连接集合
-	ReqCancelFunc *types.LMap[string, context.CancelFunc] // HttpClient 请求取消 handle function
 }

 func NewServer(appConfig *types.AppConfig) *AppServer {
 	gin.SetMode(gin.ReleaseMode)
 	gin.DefaultWriter = io.Discard
 	return &AppServer{
-		Debug:         false,
-		Config:        appConfig,
-		Engine:        gin.Default(),
-		ChatContexts:  types.NewLMap[string, []types.Message](),
-		ChatSession:   types.NewLMap[string, *types.ChatSession](),
-		ChatClients:   types.NewLMap[string, *types.WsClient](),
-		ReqCancelFunc: types.NewLMap[string, context.CancelFunc](),
+		Debug:  false,
+		Config: appConfig,
+		Engine: gin.Default(),
 	}
 }

@@ -237,6 +225,7 @@ func needLogin(c *gin.Context) bool {
 		c.Request.URL.Path == "/api/payment/doPay" ||
 		c.Request.URL.Path == "/api/payment/payWays" ||
 		strings.HasPrefix(c.Request.URL.Path, "/api/test") ||
+		strings.HasPrefix(c.Request.URL.Path, "/api/user/clogin") ||
 		strings.HasPrefix(c.Request.URL.Path, "/api/config/") ||
 		strings.HasPrefix(c.Request.URL.Path, "/api/function/") ||
 		strings.HasPrefix(c.Request.URL.Path, "/api/sms/") ||
--- a/api/core/types/chat.go
+++ b/api/core/types/chat.go
@@ -53,9 +53,8 @@ type Delta struct {
 // ChatSession 聊天会话对象
 type ChatSession struct {
 	SessionId string    `json:"session_id"`
+	UserId    uint      `json:"user_id"`
 	ClientIP  string    `json:"client_ip"` // 客户端 IP
-	Username  string    `json:"username"`  // 当前登录的 username
-	UserId    uint      `json:"user_id"`   // 当前登录的 user ID
 	ChatId    string    `json:"chat_id"`   // 客户端聊天会话 ID, 多会话模式专用字段
 	Model     ChatModel `json:"model"`     // GPT 模型
 }
--- a/api/core/types/config.go
+++ b/api/core/types/config.go
@@ -35,6 +35,7 @@ type AppConfig struct {
 	SmtpConfig      SmtpConfig      // 邮件发送配置
 	JPayConfig      JPayConfig      // payjs 支付配置
 	WechatPayConfig WechatPayConfig // 微信支付渠道配置
+	TikaHost        string          // TiKa 服务器地址
 }

 type SmtpConfig struct {
@@ -226,5 +227,5 @@ type SystemConfig struct {

 	SdNegPrompt string `json:"sd_neg_prompt"` // SD 默认反向提示词

-	RandBg bool `json:"rand_bg"` // 前端首页是否启用随机背景
+	IndexBgURL string `json:"index_bg_url"` // 前端首页背景图片
 }
--- a/api/core/types/task.go
+++ b/api/core/types/task.go
@@ -53,10 +53,10 @@ type SdTaskParams struct {
 	NegPrompt    string  `json:"neg_prompt"` // 反向提示词
 	Steps        int     `json:"steps"`      // 迭代步数，默认20
 	Sampler      string  `json:"sampler"`    // 采样器
-	Scheduler    string  `json:"scheduler"`
-	FaceFix      bool    `json:"face_fix"`  // 面部修复
-	CfgScale     float32 `json:"cfg_scale"` //引导系数，默认 7
-	Seed         int64   `json:"seed"`      // 随机数种子
+	Scheduler    string  `json:"scheduler"`  // 采样调度
+	FaceFix      bool    `json:"face_fix"`   // 面部修复
+	CfgScale     float32 `json:"cfg_scale"`  //引导系数，默认 7
+	Seed         int64   `json:"seed"`       // 随机数种子
 	Height       int     `json:"height"`
 	Width        int     `json:"width"`
 	HdFix        bool    `json:"hd_fix"`         // 启用高清修复
--- a/api/core/types/web.go
+++ b/api/core/types/web.go
@@ -22,6 +22,7 @@ type WsMessage struct {
 	Type    WsMsgType   `json:"type"` // 消息类别，start, end, img
 	Content interface{} `json:"content"`
 }
+
 type WsMsgType string

 const (
@@ -36,11 +37,9 @@ type BizCode int
 const (
 	Success       = BizCode(0)
 	Failed        = BizCode(1)
-	NotAuthorized = BizCode(400) // 未授权
-	NotPermission = BizCode(403) // 没有权限
+	NotAuthorized = BizCode(401) // 未授权

 	OkMsg       = "Success"
 	ErrorMsg    = "系统开小差了"
 	InvalidArgs = "非法参数或参数解析失败"
-	NoData      = "No Data"
 )
--- a/api/go.mod
+++ b/api/go.mod
@@ -28,14 +28,17 @@ require github.com/xxl-job/xxl-job-executor-go v1.2.0

 require (
 	github.com/go-pay/gopay v1.5.101
-	github.com/mojocn/base64Captcha v1.3.1
+	github.com/google/go-tika v0.3.1
+	github.com/microcosm-cc/bluemonday v1.0.26
+	github.com/mojocn/base64Captcha v1.3.6
 	github.com/shirou/gopsutil v3.21.11+incompatible
 	github.com/shopspring/decimal v1.3.1
 	github.com/syndtr/goleveldb v1.0.0
-	golang.org/x/image v0.0.0-20211028202545-6944b10bf410
+	golang.org/x/image v0.15.0
 )

 require (
+	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-pay/crypto v0.0.1 // indirect
 	github.com/go-pay/errgroup v0.0.2 // indirect
@@ -44,8 +47,9 @@ require (
 	github.com/go-pay/xtime v0.0.2 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
-	github.com/tklauser/go-sysconf v0.3.14 // indirect
-	github.com/tklauser/numcpus v0.8.0 // indirect
+	github.com/gorilla/css v1.0.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.13 // indirect
+	github.com/tklauser/numcpus v0.7.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.uber.org/mock v0.4.0 // indirect
 )
--- a/api/go.sum
+++ b/api/go.sum
@@ -6,6 +6,8 @@ github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible h1:Sg/2xHwDrioHpxTN6WMiw
 github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
+github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
@@ -91,11 +93,15 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pO
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-tika v0.3.1 h1:l+jr10hDhZjcgxFRfcQChRLo1bPXQeLFluMyvDhXTTA=
+github.com/google/go-tika v0.3.1/go.mod h1:DJh5N8qxXIl85QkqmXknd+PeeRkUOTbvwyYf7ieDz6c=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 h1:hR7/MlvK23p6+lIw9SN1TigNLn9ZnF3W4SYRKq2gAHs=
 github.com/google/pprof v0.0.0-20230602150820-91b7bce49751/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
+github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -137,6 +143,8 @@ github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20230415042440-a5e3d8259
 github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20230415042440-a5e3d8259ae0/go.mod h1:C5LA5UO2ZXJrLaPLYtE1wUJMiyd/nwWaCO5cw/2pSHs=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58=
+github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
 github.com/minio/minio-go/v7 v7.0.62 h1:qNYsFZHEzl+NfH8UxW4jpmlKav1qUAgfY30YNRneVhc=
@@ -149,8 +157,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/mojocn/base64Captcha v1.3.1 h1:2Wbkt8Oc8qjmNJ5GyOfSo4tgVQPsbKMftqASnq8GlT0=
-github.com/mojocn/base64Captcha v1.3.1/go.mod h1:wAQCKEc5bDujxKRmbT6/vTnTt5CjStQ8bRfPWUuz/iY=
+github.com/mojocn/base64Captcha v1.3.6 h1:gZEKu1nsKpttuIAQgWHO+4Mhhls8cAKyiV2Ew03H+Tw=
+github.com/mojocn/base64Captcha v1.3.6/go.mod h1:i5CtHvm+oMbj1UzEPXaA8IH/xHFZ3DGY3Wh3dBpZ28E=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
@@ -212,8 +220,10 @@ github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gt
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
+github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0=
 github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
 github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
+github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY=
 github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY=
 github.com/tklauser/numcpus v0.8.0/go.mod h1:ZJZlAY+dmR4eut8epnzf0u/VwodKmryxR8txiloSqBE=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
@@ -251,14 +261,17 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
-golang.org/x/image v0.0.0-20190501045829-6d32002ffd75/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ=
-golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
+golang.org/x/image v0.13.0/go.mod h1:6mmbMOeV28HuMTgA6OSRkdXKYw/t5W9Uwn2Yv1r3Yxk=
+golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
+golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -266,11 +279,16 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -285,17 +303,28 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
@@ -303,6 +332,7 @@ golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
 golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
--- a/api/handler/admin/admin_handler.go
+++ b/api/handler/admin/admin_handler.go
@@ -8,6 +8,8 @@ package admin
 // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 import (
+	"context"
+	"fmt"
 	"geekai/core"
 	"geekai/core/types"
 	"geekai/handler"
@@ -16,11 +18,8 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
-	"context"
-	"fmt"
 	"github.com/go-redis/redis/v8"
 	"github.com/golang-jwt/jwt/v5"
-	"github.com/mojocn/base64Captcha"
 	"time"

 	"github.com/gin-gonic/gin"
@@ -56,11 +55,11 @@ func (h *ManagerHandler) Login(c *gin.Context) {
 		return
 	}

-	// add captcha
-	if !base64Captcha.DefaultMemStore.Verify(data.CaptchaId, data.Captcha, true) {
-		resp.ERROR(c, "验证码错误!")
-		return
-	}
+	//// add captcha
+	//if !base64Captcha.DefaultMemStore.Verify(data.CaptchaId, data.Captcha, true) {
+	//	resp.ERROR(c, "验证码错误!")
+	//	return
+	//}

 	var manager model.AdminUser
 	res := h.DB.Model(&model.AdminUser{}).Where("username = ?", data.Username).First(&manager)
--- a/api/handler/admin/captcha_handler.go
+++ b/api/handler/admin/captcha_handler.go
@@ -1,46 +0,0 @@
-package admin
-
-// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// * Copyright 2023 The Geek-AI Authors. All rights reserved.
-// * Use of this source code is governed by a Apache-2.0 license
-// * that can be found in the LICENSE file.
-// * @Author yangjian102621@163.com
-// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-import (
-	"geekai/core"
-	"geekai/handler"
-	"geekai/utils/resp"
-	"github.com/gin-gonic/gin"
-	"github.com/mojocn/base64Captcha"
-)
-
-type CaptchaHandler struct {
-	handler.BaseHandler
-}
-
-func NewCaptchaHandler(app *core.AppServer) *CaptchaHandler {
-	return &CaptchaHandler{BaseHandler: handler.BaseHandler{App: app}}
-}
-
-type CaptchaVo struct {
-	CaptchaId string `json:"captcha_id"`
-	PicPath   string `json:"pic_path"`
-}
-
-// GetCaptcha 获取验证码
-func (h *CaptchaHandler) GetCaptcha(c *gin.Context) {
-	var captchaVo CaptchaVo
-	driver := base64Captcha.NewDriverDigit(48, 130, 4, 0.4, 10)
-	cp := base64Captcha.NewCaptcha(driver, base64Captcha.DefaultMemStore)
-	// b64s是图片的base64编码
-	id, b64s, err := cp.Generate()
-	if err != nil {
-		resp.ERROR(c, "生成验证码错误!")
-		return
-	}
-	captchaVo.CaptchaId = id
-	captchaVo.PicPath = b64s
-
-	resp.SUCCESS(c, captchaVo)
-}
--- a/api/handler/admin/chat_model_handler.go
+++ b/api/handler/admin/chat_model_handler.go
@@ -54,7 +54,6 @@ func (h *ChatModelHandler) Save(c *gin.Context) {
 		Name:        data.Name,
 		Value:       data.Value,
 		Enabled:     data.Enabled,
-		SortNum:     data.SortNum,
 		Open:        data.Open,
 		MaxTokens:   data.MaxTokens,
 		MaxContext:  data.MaxContext,
@@ -64,6 +63,7 @@ func (h *ChatModelHandler) Save(c *gin.Context) {
 	var res *gorm.DB
 	if data.Id > 0 {
 		item.Id = data.Id
+		item.SortNum = data.SortNum
 		res = h.DB.Select("*").Omit("created_at").Updates(&item)
 	} else {
 		res = h.DB.Create(&item)
--- a/api/handler/admin/user_handler.go
+++ b/api/handler/admin/user_handler.go
@@ -139,7 +139,6 @@ func (h *UserHandler) Save(c *gin.Context) {
 		salt := utils.RandString(8)
 		u := model.User{
 			Username:    data.Username,
-			Nickname:    fmt.Sprintf("极客学长@%d", utils.RandomNumber(6)),
 			Password:    utils.GenPassword(data.Password, salt),
 			Avatar:      "/images/avatar/user.png",
 			Salt:        salt,
@@ -149,6 +148,11 @@ func (h *UserHandler) Save(c *gin.Context) {
 			ChatModels:  utils.JsonEncode(data.ChatModels),
 			ExpiredTime: utils.Str2stamp(data.ExpiredTime),
 		}
+		if h.licenseService.GetLicense().Configs.DeCopy {
+			u.Nickname = fmt.Sprintf("用户@%d", utils.RandomNumber(6))
+		} else {
+			u.Nickname = fmt.Sprintf("极客学长@%d", utils.RandomNumber(6))
+		}
 		res = h.DB.Create(&u)
 		_ = utils.CopyObject(u, &userVo)
 		userVo.Id = u.Id
--- a/api/handler/chat_role_handler.go
+++ b/api/handler/chat_role_handler.go
@@ -65,7 +65,7 @@ func (h *ChatRoleHandler) List(c *gin.Context) {
 	}

 	for _, r := range roles {
-		if !utils.ContainsStr(roleKeys, r.Key) {
+		if !utils.Contains(roleKeys, r.Key) {
 			continue
 		}
 		var v vo.ChatRole
--- a/api/handler/chatimpl/chat_handler.go
+++ b/api/handler/chatimpl/chat_handler.go
@@ -44,6 +44,8 @@ type ChatHandler struct {
 	redis          *redis.Client
 	uploadManager  *oss.UploaderManager
 	licenseService *service.LicenseService
+	ReqCancelFunc  *types.LMap[string, context.CancelFunc] // HttpClient 请求取消 handle function
+	ChatContexts   *types.LMap[string, []types.Message]    // 聊天上下文 Map [chatId] => []Message
 }

 func NewChatHandler(app *core.AppServer, db *gorm.DB, redis *redis.Client, manager *oss.UploaderManager, licenseService *service.LicenseService) *ChatHandler {
@@ -52,6 +54,8 @@ func NewChatHandler(app *core.AppServer, db *gorm.DB, redis *redis.Client, manag
 		redis:          redis,
 		uploadManager:  manager,
 		licenseService: licenseService,
+		ReqCancelFunc:  types.NewLMap[string, context.CancelFunc](),
+		ChatContexts:   types.NewLMap[string, []types.Message](),
 	}
 }

@@ -89,21 +93,10 @@ func (h *ChatHandler) ChatHandle(c *gin.Context) {
 		return
 	}

-	session := h.App.ChatSession.Get(sessionId)
-	if session == nil {
-		user, err := h.GetLoginUser(c)
-		if err != nil {
-			logger.Info("用户未登录")
-			c.Abort()
-			return
-		}
-		session = &types.ChatSession{
-			SessionId: sessionId,
-			ClientIP:  c.ClientIP(),
-			Username:  user.Username,
-			UserId:    user.Id,
-		}
-		h.App.ChatSession.Put(sessionId, session)
+	session := &types.ChatSession{
+		SessionId: sessionId,
+		ClientIP:  c.ClientIP(),
+		UserId:    h.GetLoginUserId(c),
 	}

 	// use old chat data override the chat model and role ID
@@ -125,22 +118,18 @@ func (h *ChatHandler) ChatHandle(c *gin.Context) {
 		Temperature: chatModel.Temperature,
 		KeyId:       chatModel.KeyId,
 		Platform:    chatModel.Platform}
-	logger.Infof("New websocket connected, IP: %s, Username: %s", c.ClientIP(), session.Username)
+	logger.Infof("New websocket connected, IP: %s", c.ClientIP())

-	// 保存会话连接
-	h.App.ChatClients.Put(sessionId, client)
 	go func() {
 		for {
 			_, msg, err := client.Receive()
 			if err != nil {
 				logger.Debugf("close connection: %s", client.Conn.RemoteAddr())
 				client.Close()
-				h.App.ChatClients.Delete(sessionId)
-				h.App.ChatSession.Delete(sessionId)
-				cancelFunc := h.App.ReqCancelFunc.Get(sessionId)
+				cancelFunc := h.ReqCancelFunc.Get(sessionId)
 				if cancelFunc != nil {
 					cancelFunc()
-					h.App.ReqCancelFunc.Delete(sessionId)
+					h.ReqCancelFunc.Delete(sessionId)
 				}
 				return
 			}
@@ -160,7 +149,7 @@ func (h *ChatHandler) ChatHandle(c *gin.Context) {
 			logger.Info("Receive a message: ", message.Content)

 			ctx, cancel := context.WithCancel(context.Background())
-			h.App.ReqCancelFunc.Put(sessionId, cancel)
+			h.ReqCancelFunc.Put(sessionId, cancel)
 			// 回复消息
 			err = h.sendMessage(ctx, session, chatRole, utils.InterfaceToString(message.Content), client)
 			if err != nil {
@@ -274,8 +263,8 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
 	chatCtx := make([]types.Message, 0)
 	messages := make([]types.Message, 0)
 	if h.App.SysConfig.EnableContext {
-		if h.App.ChatContexts.Has(session.ChatId) {
-			messages = h.App.ChatContexts.Get(session.ChatId)
+		if h.ChatContexts.Has(session.ChatId) {
+			messages = h.ChatContexts.Get(session.ChatId)
 		} else {
 			_ = utils.JsonDecode(role.Context, &messages)
 			if h.App.SysConfig.ContextDeep > 0 {
@@ -323,20 +312,51 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
 		reqMgs = append(reqMgs, m)
 	}

+	fullPrompt := prompt
+	text := prompt
+	// extract files in prompt
+	files := utils.ExtractFileURLs(prompt)
+	logger.Debugf("detected FILES: %+v", files)
+	// 如果不是逆向模型，则提取文件内容
+	if len(files) > 0 && !(session.Model.Value == "gpt-4-all" ||
+		strings.HasPrefix(session.Model.Value, "gpt-4-gizmo") ||
+		strings.HasSuffix(session.Model.Value, "claude-3")) {
+		contents := make([]string, 0)
+		var file model.File
+		for _, v := range files {
+			h.DB.Where("url = ?", v).First(&file)
+			content, err := utils.ReadFileContent(v, h.App.Config.TikaHost)
+			if err != nil {
+				logger.Error("error with read file: ", err)
+			} else {
+				contents = append(contents, fmt.Sprintf("%s 文件内容：%s", file.Name, content))
+			}
+			text = strings.Replace(text, v, "", 1)
+		}
+		if len(contents) > 0 {
+			fullPrompt = fmt.Sprintf("请根据提供的文件内容信息回答问题(其中Excel 已转成 HTML)：\n\n %s\n\n 问题：%s", strings.Join(contents, "\n"), text)
+		}
+
+		tokens, _ := utils.CalcTokens(fullPrompt, req.Model)
+		if tokens > session.Model.MaxContext {
+			return fmt.Errorf("文件的长度超出模型允许的最大上下文长度，请减少文件内容数量或文件大小。")
+		}
+	}
+	logger.Debug("最终Prompt：", fullPrompt)
+
 	if session.Model.Platform == types.QWen.Value {
 		req.Input = make(map[string]interface{})
 		reqMgs = append(reqMgs, types.Message{
 			Role:    "user",
-			Content: prompt,
+			Content: fullPrompt,
 		})
 		req.Input["messages"] = reqMgs
 	} else if session.Model.Platform == types.OpenAI.Value || session.Model.Platform == types.Azure.Value { // extract image for gpt-vision model
-		imgURLs := utils.ExtractImgURL(prompt)
+		imgURLs := utils.ExtractImgURLs(prompt)
 		logger.Debugf("detected IMG: %+v", imgURLs)
 		var content interface{}
 		if len(imgURLs) > 0 {
 			data := make([]interface{}, 0)
-			text := prompt
 			for _, v := range imgURLs {
 				text = strings.Replace(text, v, "", 1)
 				data = append(data, gin.H{
@@ -348,11 +368,11 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
 			}
 			data = append(data, gin.H{
 				"type": "text",
-				"text": text,
+				"text": strings.TrimSpace(text),
 			})
 			content = data
 		} else {
-			content = prompt
+			content = fullPrompt
 		}
 		req.Messages = append(reqMgs, map[string]interface{}{
 			"role":    "user",
@@ -361,7 +381,7 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
 	} else {
 		req.Messages = append(reqMgs, map[string]interface{}{
 			"role":    "user",
-			"content": prompt,
+			"content": fullPrompt,
 		})
 	}

@@ -442,9 +462,9 @@ func getTotalTokens(req types.ApiRequest) int {
 // StopGenerate 停止生成
 func (h *ChatHandler) StopGenerate(c *gin.Context) {
 	sessionId := c.Query("session_id")
-	if h.App.ReqCancelFunc.Has(sessionId) {
-		h.App.ReqCancelFunc.Get(sessionId)()
-		h.App.ReqCancelFunc.Delete(sessionId)
+	if h.ReqCancelFunc.Has(sessionId) {
+		h.ReqCancelFunc.Get(sessionId)()
+		h.ReqCancelFunc.Delete(sessionId)
 	}
 	resp.SUCCESS(c, types.OkMsg)
 }
@@ -454,7 +474,7 @@ func (h *ChatHandler) StopGenerate(c *gin.Context) {
 func (h *ChatHandler) doRequest(ctx context.Context, req types.ApiRequest, session *types.ChatSession, apiKey *model.ApiKey) (*http.Response, error) {
 	// if the chat model bind a KEY, use it directly
 	if session.Model.KeyId > 0 {
-		h.DB.Debug().Where("id", session.Model.KeyId).Where("enabled", true).Find(apiKey)
+		h.DB.Where("id", session.Model.KeyId).Find(apiKey)
 	}
 	// use the last unused key
 	if apiKey.Id == 0 {
@@ -602,7 +622,7 @@ func (h *ChatHandler) saveChatHistory(
 	if h.App.SysConfig.EnableContext {
 		chatCtx = append(chatCtx, useMsg)  // 提问消息
 		chatCtx = append(chatCtx, message) // 回复消息
-		h.App.ChatContexts.Put(session.ChatId, chatCtx)
+		h.ChatContexts.Put(session.ChatId, chatCtx)
 	}

 	// 追加聊天记录
@@ -660,7 +680,7 @@ func (h *ChatHandler) saveChatHistory(
 	res = h.DB.Where("chat_id = ?", session.ChatId).First(&chatItem)
 	if res.Error != nil {
 		chatItem.ChatId = session.ChatId
-		chatItem.UserId = session.UserId
+		chatItem.UserId = userVo.Id
 		chatItem.RoleId = role.Id
 		chatItem.ModelId = session.Model.Id
 		if utf8.RuneCountInString(prompt) > 30 {
--- a/api/handler/chatimpl/chat_item_handler.go
+++ b/api/handler/chatimpl/chat_item_handler.go
@@ -96,7 +96,7 @@ func (h *ChatHandler) Clear(c *gin.Context) {
 	for _, chat := range chats {
 		chatIds = append(chatIds, chat.ChatId)
 		// 清空会话上下文
-		h.App.ChatContexts.Delete(chat.ChatId)
+		h.ChatContexts.Delete(chat.ChatId)
 	}
 	err = h.DB.Transaction(func(tx *gorm.DB) error {
 		res := h.DB.Where("user_id =?", user.Id).Delete(&model.ChatItem{})
@@ -108,8 +108,6 @@ func (h *ChatHandler) Clear(c *gin.Context) {
 		if res.Error != nil {
 			return res.Error
 		}
-
-		// TODO: 是否要删除 MidJourney 绘画记录和图片文件？
 		return nil
 	})

@@ -175,7 +173,7 @@ func (h *ChatHandler) Remove(c *gin.Context) {
 	// TODO: 是否要删除 MidJourney 绘画记录和图片文件？

 	// 清空会话上下文
-	h.App.ChatContexts.Delete(chatId)
+	h.ChatContexts.Delete(chatId)
 	resp.SUCCESS(c, types.OkMsg)
 }

--- a/api/handler/chatimpl/openai_handler.go
+++ b/api/handler/chatimpl/openai_handler.go
@@ -74,6 +74,9 @@ func (h *ChatHandler) sendOpenAiMessage(
 			if len(responseBody.Choices) == 0 { // Fixed: 兼容 Azure API 第一个输出空行
 				continue
 			}
+			if responseBody.Choices[0].Delta.Content == nil {
+				continue
+			}

 			if responseBody.Choices[0].FinishReason == "stop" && len(contents) == 0 {
 				utils.ReplyMessage(ws, "抱歉😔😔😔，AI助手由于未知原因已经停止输出内容。")
--- a/api/handler/chatimpl/xunfei_handler.go
+++ b/api/handler/chatimpl/xunfei_handler.go
@@ -79,7 +79,7 @@ func (h *ChatHandler) sendXunFeiMessage(
 	var res *gorm.DB
 	// use the bind key
 	if session.Model.KeyId > 0 {
-		res = h.DB.Where("id", session.Model.KeyId).Where("enabled", true).Find(&apiKey)
+		res = h.DB.Where("id", session.Model.KeyId).Find(&apiKey)
 	}
 	// use the last unused key
 	if apiKey.Id == 0 {
--- a/api/handler/dalle_handler.go
+++ b/api/handler/dalle_handler.go
@@ -158,13 +158,13 @@ func (h *DallJobHandler) ImgWall(c *gin.Context) {

 // JobList 获取 SD 任务列表
 func (h *DallJobHandler) JobList(c *gin.Context) {
-	status := h.GetBool(c, "status")
+	finish := h.GetBool(c, "finish")
 	userId := h.GetLoginUserId(c)
 	page := h.GetInt(c, "page", 0)
 	pageSize := h.GetInt(c, "page_size", 0)
 	publish := h.GetBool(c, "publish")

-	err, jobs := h.getData(status, userId, page, pageSize, publish)
+	err, jobs := h.getData(finish, userId, page, pageSize, publish)
 	if err != nil {
 		resp.ERROR(c, err.Error())
 		return
@@ -214,25 +214,23 @@ func (h *DallJobHandler) getData(finish bool, userId uint, page int, pageSize in

 // Remove remove task image
 func (h *DallJobHandler) Remove(c *gin.Context) {
-	var data struct {
-		Id     uint   `json:"id"`
-		UserId uint   `json:"user_id"`
-		ImgURL string `json:"img_url"`
-	}
-	if err := c.ShouldBindJSON(&data); err != nil {
-		resp.ERROR(c, types.InvalidArgs)
+	id := h.GetInt(c, "id", 0)
+	userId := h.GetInt(c, "user_id", 0)
+	var job model.DallJob
+	if res := h.DB.Where("id = ? AND user_id = ?", id, userId).First(&job); res.Error != nil {
+		resp.ERROR(c, "记录不存在")
 		return
 	}

 	// remove job recode
-	res := h.DB.Delete(&model.DallJob{Id: data.Id})
+	res := h.DB.Delete(&model.DallJob{Id: job.Id})
 	if res.Error != nil {
 		resp.ERROR(c, res.Error.Error())
 		return
 	}

 	// remove image
-	err := h.uploader.GetUploadHandler().Delete(data.ImgURL)
+	err := h.uploader.GetUploadHandler().Delete(job.ImgURL)
 	if err != nil {
 		logger.Error("remove image failed: ", err)
 	}
@@ -242,16 +240,11 @@ func (h *DallJobHandler) Remove(c *gin.Context) {

 // Publish 发布/取消发布图片到画廊显示
 func (h *DallJobHandler) 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
-	}
+	id := h.GetInt(c, "id", 0)
+	userId := h.GetInt(c, "user_id", 0)
+	action := h.GetBool(c, "action") // 发布动作，true => 发布，false => 取消分享

-	res := h.DB.Model(&model.DallJob{Id: data.Id}).UpdateColumn("publish", true)
+	res := h.DB.Model(&model.DallJob{Id: uint(id), UserId: uint(userId)}).UpdateColumn("publish", action)
 	if res.Error != nil {
 		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败")
--- a/api/handler/markmap_handler.go
+++ b/api/handler/markmap_handler.go
@@ -215,7 +215,7 @@ func (h *MarkMapHandler) doRequest(req types.ApiRequest, chatModel model.ChatMod
 	// if the chat model bind a KEY, use it directly
 	var res *gorm.DB
 	if chatModel.KeyId > 0 {
-		res = h.DB.Where("id", chatModel.KeyId).Where("enabled", true).Find(apiKey)
+		res = h.DB.Where("id", chatModel.KeyId).Find(apiKey)
 	}
 	// use the last unused key
 	if apiKey.Id == 0 {
--- a/api/handler/mj_handler.go
+++ b/api/handler/mj_handler.go
@@ -92,19 +92,18 @@ func (h *MidJourneyHandler) Client(c *gin.Context) {
 // Image 创建一个绘画任务
 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"`
-		Model     string   `json:"model"`
-		Chaos     int      `json:"chaos"`
-		Raw       bool     `json:"raw"`
-		Seed      int64    `json:"seed"`
-		Stylize   int      `json:"stylize"`
+		Model     string   `json:"model"`   // 模型
+		Chaos     int      `json:"chaos"`   // 创意度取值范围: 0-100
+		Raw       bool     `json:"raw"`     // 是否开启原始模型
+		Seed      int64    `json:"seed"`    // 随机数
+		Stylize   int      `json:"stylize"` // 风格化
 		ImgArr    []string `json:"img_arr"`
-		Tile      bool     `json:"tile"`
-		Quality   float32  `json:"quality"`
+		Tile      bool     `json:"tile"`    // 重复平铺
+		Quality   float32  `json:"quality"` // 画质
 		Iw        float32  `json:"iw"`
 		CRef      string   `json:"cref"` //生成角色一致的图像
 		SRef      string   `json:"sref"` //生成风格一致的图像
@@ -243,17 +242,12 @@ type reqVo struct {
 	ChannelId   string `json:"channel_id"`
 	MessageId   string `json:"message_id"`
 	MessageHash string `json:"message_hash"`
-	SessionId   string `json:"session_id"`
-	Prompt      string `json:"prompt"`
-	ChatId      string `json:"chat_id"`
-	RoleId      int    `json:"role_id"`
-	Icon        string `json:"icon"`
 }

 // Upscale send upscale command to MidJourney Bot
 func (h *MidJourneyHandler) Upscale(c *gin.Context) {
 	var data reqVo
-	if err := c.ShouldBindJSON(&data); err != nil || data.SessionId == "" {
+	if err := c.ShouldBindJSON(&data); err != nil {
 		resp.ERROR(c, types.InvalidArgs)
 		return
 	}
@@ -271,7 +265,6 @@ func (h *MidJourneyHandler) Upscale(c *gin.Context) {
 		UserId:      userId,
 		TaskId:      taskId,
 		Progress:    0,
-		Prompt:      data.Prompt,
 		Power:       h.App.SysConfig.MjActionPower,
 		CreatedAt:   time.Now(),
 	}
@@ -283,7 +276,6 @@ func (h *MidJourneyHandler) Upscale(c *gin.Context) {
 	h.pool.PushTask(types.MjTask{
 		Id:          job.Id,
 		Type:        types.TaskUpscale,
-		Prompt:      data.Prompt,
 		UserId:      userId,
 		ChannelId:   data.ChannelId,
 		Index:       data.Index,
@@ -318,7 +310,7 @@ func (h *MidJourneyHandler) Upscale(c *gin.Context) {
 // Variation send variation command to MidJourney Bot
 func (h *MidJourneyHandler) Variation(c *gin.Context) {
 	var data reqVo
-	if err := c.ShouldBindJSON(&data); err != nil || data.SessionId == "" {
+	if err := c.ShouldBindJSON(&data); err != nil {
 		resp.ERROR(c, types.InvalidArgs)
 		return
 	}
@@ -337,7 +329,6 @@ func (h *MidJourneyHandler) Variation(c *gin.Context) {
 		UserId:      userId,
 		TaskId:      taskId,
 		Progress:    0,
-		Prompt:      data.Prompt,
 		Power:       h.App.SysConfig.MjActionPower,
 		CreatedAt:   time.Now(),
 	}
@@ -349,7 +340,6 @@ func (h *MidJourneyHandler) Variation(c *gin.Context) {
 	h.pool.PushTask(types.MjTask{
 		Id:          job.Id,
 		Type:        types.TaskVariation,
-		Prompt:      data.Prompt,
 		UserId:      userId,
 		Index:       data.Index,
 		ChannelId:   data.ChannelId,
@@ -397,13 +387,13 @@ func (h *MidJourneyHandler) ImgWall(c *gin.Context) {

 // JobList 获取 MJ 任务列表
 func (h *MidJourneyHandler) JobList(c *gin.Context) {
-	status := h.GetBool(c, "status")
+	finish := h.GetBool(c, "finish")
 	userId := h.GetLoginUserId(c)
 	page := h.GetInt(c, "page", 0)
 	pageSize := h.GetInt(c, "page_size", 0)
 	publish := h.GetBool(c, "publish")

-	err, jobs := h.getData(status, userId, page, pageSize, publish)
+	err, jobs := h.getData(finish, userId, page, pageSize, publish)
 	if err != nil {
 		resp.ERROR(c, err.Error())
 		return
@@ -446,14 +436,9 @@ func (h *MidJourneyHandler) getData(finish bool, userId uint, page int, pageSize
 		}

 		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
+			image, err := utils.DownloadImage(item.OrgURL, h.App.Config.ProxyURL)
+			if err == nil {
+				job.ImgURL = "data:image/png;base64," + base64.StdEncoding.EncodeToString(image)
 			}
 		}

@@ -464,30 +449,27 @@ func (h *MidJourneyHandler) getData(finish bool, userId uint, page int, pageSize

 // Remove remove task image
 func (h *MidJourneyHandler) Remove(c *gin.Context) {
-	var data struct {
-		Id     uint   `json:"id"`
-		UserId uint   `json:"user_id"`
-		ImgURL string `json:"img_url"`
-	}
-	if err := c.ShouldBindJSON(&data); err != nil {
-		resp.ERROR(c, types.InvalidArgs)
+	id := h.GetInt(c, "id", 0)
+	userId := h.GetInt(c, "user_id", 0)
+	var job model.MidJourneyJob
+	if res := h.DB.Where("id = ? AND user_id = ?", id, userId).First(&job); res.Error != nil {
+		resp.ERROR(c, "记录不存在")
 		return
 	}
-
 	// remove job recode
-	res := h.DB.Delete(&model.MidJourneyJob{Id: data.Id})
+	res := h.DB.Delete(&job)
 	if res.Error != nil {
 		resp.ERROR(c, res.Error.Error())
 		return
 	}

 	// remove image
-	err := h.uploader.GetUploadHandler().Delete(data.ImgURL)
+	err := h.uploader.GetUploadHandler().Delete(job.ImgURL)
 	if err != nil {
 		logger.Error("remove image failed: ", err)
 	}

-	client := h.pool.Clients.Get(data.UserId)
+	client := h.pool.Clients.Get(uint(job.UserId))
 	if client != nil {
 		_ = client.Send([]byte("Task Updated"))
 	}
@@ -497,16 +479,10 @@ func (h *MidJourneyHandler) Remove(c *gin.Context) {

 // 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)
+	id := h.GetInt(c, "id", 0)
+	userId := h.GetInt(c, "user_id", 0)
+	action := h.GetBool(c, "action") // 发布动作，true => 发布，false => 取消分享
+	res := h.DB.Model(&model.MidJourneyJob{Id: uint(id), UserId: userId}).UpdateColumn("publish", action)
 	if res.Error != nil {
 		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败")
--- a/api/handler/order_handler.go
+++ b/api/handler/order_handler.go
@@ -14,6 +14,7 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
+	"time"

 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
@@ -27,23 +28,18 @@ func NewOrderHandler(app *core.AppServer, db *gorm.DB) *OrderHandler {
 	return &OrderHandler{BaseHandler: BaseHandler{App: app, DB: db}}
 }

+// List 订单列表
 func (h *OrderHandler) List(c *gin.Context) {
-	var data struct {
-		Page     int `json:"page"`
-		PageSize int `json:"page_size"`
-	}
-	if err := c.ShouldBindJSON(&data); err != nil {
-		resp.ERROR(c, types.InvalidArgs)
-		return
-	}
+	page := h.GetInt(c, "page", 1)
+	pageSize := h.GetInt(c, "page_size", 20)
 	userId := h.GetLoginUserId(c)
 	session := h.DB.Session(&gorm.Session{}).Where("user_id = ? AND status = ?", userId, types.OrderPaidSuccess)
 	var total int64
 	session.Model(&model.Order{}).Count(&total)
 	var items []model.Order
 	var list = make([]vo.Order, 0)
-	offset := (data.Page - 1) * data.PageSize
-	res := session.Order("id DESC").Offset(offset).Limit(data.PageSize).Find(&items)
+	offset := (page - 1) * pageSize
+	res := session.Order("id DESC").Offset(offset).Limit(pageSize).Find(&items)
 	if res.Error == nil {
 		for _, item := range items {
 			var order vo.Order
@@ -58,5 +54,35 @@ func (h *OrderHandler) List(c *gin.Context) {
 			}
 		}
 	}
-	resp.SUCCESS(c, vo.NewPage(total, data.Page, data.PageSize, list))
+	resp.SUCCESS(c, vo.NewPage(total, page, pageSize, list))
+}
+
+// Query 查询订单状态
+func (h *OrderHandler) Query(c *gin.Context) {
+	orderNo := h.GetTrim(c, "order_no")
+	var order model.Order
+	res := h.DB.Where("order_no = ?", orderNo).First(&order)
+	if res.Error != nil {
+		resp.ERROR(c, "Order not found")
+		return
+	}
+
+	if order.Status == types.OrderPaidSuccess {
+		resp.SUCCESS(c, gin.H{"status": order.Status})
+		return
+	}
+
+	counter := 0
+	for {
+		time.Sleep(time.Second)
+		var item model.Order
+		h.DB.Where("order_no = ?", orderNo).First(&item)
+		if counter >= 15 || item.Status == types.OrderPaidSuccess || item.Status != order.Status {
+			order.Status = item.Status
+			break
+		}
+		counter++
+	}
+
+	resp.SUCCESS(c, gin.H{"status": order.Status})
 }
--- a/api/handler/payment_handler.go
+++ b/api/handler/payment_handler.go
@@ -111,7 +111,7 @@ func (h *PaymentHandler) DoPay(c *gin.Context) {

 	// fix: 这里先检查一下订单状态，如果已经支付了，就直接返回
 	if order.Status == types.OrderPaidSuccess {
-		resp.ERROR(c, "This order had been paid, please do not pay twice")
+		resp.ERROR(c, "订单已支付成功，无需重复支付！")
 		return
 	}

@@ -148,49 +148,11 @@ func (h *PaymentHandler) DoPay(c *gin.Context) {
 	resp.ERROR(c, "Invalid operations")
 }

-// OrderQuery 查询订单状态
-func (h *PaymentHandler) OrderQuery(c *gin.Context) {
-	var data struct {
-		OrderNo string `json:"order_no"`
-	}
-	if err := c.ShouldBindJSON(&data); err != nil {
-		resp.ERROR(c, types.InvalidArgs)
-		return
-	}
-
-	var order model.Order
-	res := h.DB.Where("order_no = ?", data.OrderNo).First(&order)
-	if res.Error != nil {
-		resp.ERROR(c, "Order not found")
-		return
-	}
-
-	if order.Status == types.OrderPaidSuccess {
-		resp.SUCCESS(c, gin.H{"status": order.Status})
-		return
-	}
-
-	counter := 0
-	for {
-		time.Sleep(time.Second)
-		var item model.Order
-		h.DB.Where("order_no = ?", data.OrderNo).First(&item)
-		if counter >= 15 || item.Status == types.OrderPaidSuccess || item.Status != order.Status {
-			order.Status = item.Status
-			break
-		}
-		counter++
-	}
-
-	resp.SUCCESS(c, gin.H{"status": order.Status})
-}
-
 // PayQrcode 生成支付 URL 二维码
 func (h *PaymentHandler) PayQrcode(c *gin.Context) {
 	var data struct {
 		PayWay    string `json:"pay_way"` // 支付方式
 		ProductId uint   `json:"product_id"`
-		UserId    int    `json:"user_id"`
 	}
 	if err := c.ShouldBindJSON(&data); err != nil {
 		resp.ERROR(c, types.InvalidArgs)
@@ -209,10 +171,9 @@ func (h *PaymentHandler) PayQrcode(c *gin.Context) {
 		resp.ERROR(c, "error with generate trade no: "+err.Error())
 		return
 	}
-	var user model.User
-	res = h.DB.First(&user, data.UserId)
-	if res.Error != nil {
-		resp.ERROR(c, "Invalid user ID")
+	user, err := h.GetLoginUser(c)
+	if err != nil {
+		resp.NotAuth(c)
 		return
 	}

@@ -333,7 +294,6 @@ func (h *PaymentHandler) Mobile(c *gin.Context) {
 	var data struct {
 		PayWay    string `json:"pay_way"` // 支付方式
 		ProductId uint   `json:"product_id"`
-		UserId    int    `json:"user_id"`
 	}
 	if err := c.ShouldBindJSON(&data); err != nil {
 		resp.ERROR(c, types.InvalidArgs)
@@ -352,10 +312,9 @@ func (h *PaymentHandler) Mobile(c *gin.Context) {
 		resp.ERROR(c, "error with generate trade no: "+err.Error())
 		return
 	}
-	var user model.User
-	res = h.DB.First(&user, data.UserId)
-	if res.Error != nil {
-		resp.ERROR(c, "Invalid user ID")
+	user, err := h.GetLoginUser(c)
+	if err != nil {
+		resp.NotAuth(c)
 		return
 	}

@@ -449,7 +408,7 @@ func (h *PaymentHandler) Mobile(c *gin.Context) {
 		return
 	}

-	resp.SUCCESS(c, payURL)
+	resp.SUCCESS(c, gin.H{"url": payURL, "order_no": orderNo})
 }

 // 异步通知回调公共逻辑
--- a/api/handler/sd_handler.go
+++ b/api/handler/sd_handler.go
@@ -99,10 +99,7 @@ func (h *SdJobHandler) Image(c *gin.Context) {
 		return
 	}

-	var data struct {
-		SessionId string `json:"session_id"`
-		types.SdTaskParams
-	}
+	var data types.SdTaskParams
 	if err := c.ShouldBindJSON(&data); err != nil || data.Prompt == "" {
 		resp.ERROR(c, types.InvalidArgs)
 		return
@@ -215,13 +212,13 @@ func (h *SdJobHandler) ImgWall(c *gin.Context) {

 // JobList 获取 SD 任务列表
 func (h *SdJobHandler) JobList(c *gin.Context) {
-	status := h.GetBool(c, "status")
+	finish := h.GetBool(c, "finish")
 	userId := h.GetLoginUserId(c)
 	page := h.GetInt(c, "page", 0)
 	pageSize := h.GetInt(c, "page_size", 0)
 	publish := h.GetBool(c, "publish")

-	err, jobs := h.getData(status, userId, page, pageSize, publish)
+	err, jobs := h.getData(finish, userId, page, pageSize, publish)
 	if err != nil {
 		resp.ERROR(c, err.Error())
 		return
@@ -280,30 +277,28 @@ func (h *SdJobHandler) getData(finish bool, userId uint, page int, pageSize int,

 // Remove remove task image
 func (h *SdJobHandler) Remove(c *gin.Context) {
-	var data struct {
-		Id     uint   `json:"id"`
-		UserId uint   `json:"user_id"`
-		ImgURL string `json:"img_url"`
-	}
-	if err := c.ShouldBindJSON(&data); err != nil {
-		resp.ERROR(c, types.InvalidArgs)
+	id := h.GetInt(c, "id", 0)
+	userId := h.GetInt(c, "user_id", 0)
+	var job model.SdJob
+	if res := h.DB.Where("id = ? AND user_id = ?", id, userId).First(&job); res.Error != nil {
+		resp.ERROR(c, "记录不存在")
 		return
 	}

 	// remove job recode
-	res := h.DB.Delete(&model.SdJob{Id: data.Id})
+	res := h.DB.Delete(&model.SdJob{Id: job.Id})
 	if res.Error != nil {
 		resp.ERROR(c, res.Error.Error())
 		return
 	}

 	// remove image
-	err := h.uploader.GetUploadHandler().Delete(data.ImgURL)
+	err := h.uploader.GetUploadHandler().Delete(job.ImgURL)
 	if err != nil {
 		logger.Error("remove image failed: ", err)
 	}

-	client := h.pool.Clients.Get(data.UserId)
+	client := h.pool.Clients.Get(uint(job.UserId))
 	if client != nil {
 		_ = client.Send([]byte(sd.Finished))
 	}
@@ -313,16 +308,11 @@ func (h *SdJobHandler) Remove(c *gin.Context) {

 // 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
-	}
+	id := h.GetInt(c, "id", 0)
+	userId := h.GetInt(c, "user_id", 0)
+	action := h.GetBool(c, "action") // 发布动作，true => 发布，false => 取消分享

-	res := h.DB.Model(&model.SdJob{Id: data.Id}).UpdateColumn("publish", true)
+	res := h.DB.Model(&model.SdJob{Id: uint(id), UserId: userId}).UpdateColumn("publish", action)
 	if res.Error != nil {
 		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败")
--- a/api/handler/sms_handler.go
+++ b/api/handler/sms_handler.go
@@ -49,14 +49,20 @@ func (h *SmsHandler) SendCode(c *gin.Context) {
 	var data struct {
 		Receiver string `json:"receiver"` // 接收者
 		Key      string `json:"key"`
-		Dots     string `json:"dots"`
+		Dots     string `json:"dots,omitempty"`
+		X        int    `json:"x,omitempty"`
 	}
 	if err := c.ShouldBindJSON(&data); err != nil {
 		resp.ERROR(c, types.InvalidArgs)
 		return
 	}
-
-	if !h.captcha.Check(data) {
+	var check bool
+	if data.X != 0 {
+		check = h.captcha.SlideCheck(data)
+	} else {
+		check = h.captcha.Check(data)
+	}
+	if !check {
 		resp.ERROR(c, "验证码错误，请先完人机验证")
 		return
 	}
@@ -64,13 +70,13 @@ func (h *SmsHandler) SendCode(c *gin.Context) {
 	code := utils.RandomNumber(6)
 	var err error
 	if strings.Contains(data.Receiver, "@") { // email
-		if !utils.ContainsStr(h.App.SysConfig.RegisterWays, "email") {
+		if !utils.Contains(h.App.SysConfig.RegisterWays, "email") {
 			resp.ERROR(c, "系统已禁用邮箱注册！")
 			return
 		}
 		err = h.smtp.SendVerifyCode(data.Receiver, code)
 	} else {
-		if !utils.ContainsStr(h.App.SysConfig.RegisterWays, "mobile") {
+		if !utils.Contains(h.App.SysConfig.RegisterWays, "mobile") {
 			resp.ERROR(c, "系统已禁用手机号注册！")
 			return
 		}
@@ -89,5 +95,9 @@ func (h *SmsHandler) SendCode(c *gin.Context) {
 		return
 	}

-	resp.SUCCESS(c)
+	if h.App.Debug {
+		resp.SUCCESS(c, code)
+	} else {
+		resp.SUCCESS(c)
+	}
 }
--- a/api/handler/upload_handler.go
+++ b/api/handler/upload_handler.go
@@ -9,6 +9,7 @@ package handler

 import (
 	"geekai/core"
+	"geekai/core/types"
 	"geekai/service/oss"
 	"geekai/store/model"
 	"geekai/store/vo"
@@ -35,6 +36,12 @@ func (h *UploadHandler) Upload(c *gin.Context) {
 		return
 	}

+	logger.Info("upload file: ", file.Name)
+	// cut the file name if it's too long
+	if len(file.Name) > 100 {
+		file.Name = file.Name[:90] + file.Ext
+	}
+
 	userId := h.GetLoginUserId(c)
 	res := h.DB.Create(&model.File{
 		UserId:    int(userId),
@@ -54,10 +61,23 @@ func (h *UploadHandler) Upload(c *gin.Context) {
 }

 func (h *UploadHandler) List(c *gin.Context) {
+	var data struct {
+		Urls []string `json:"urls,omitempty"`
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
 	userId := h.GetLoginUserId(c)
 	var items []model.File
 	var files = make([]vo.File, 0)
-	h.DB.Where("user_id = ?", userId).Find(&items)
+	session := h.DB.Session(&gorm.Session{})
+	session = session.Where("user_id = ?", userId)
+	if len(data.Urls) > 0 {
+		session = session.Where("url IN ?", data.Urls)
+	}
+	session.Find(&items)
 	if len(items) > 0 {
 		for _, v := range items {
 			var file vo.File
--- a/api/handler/user_handler.go
+++ b/api/handler/user_handler.go
@@ -16,6 +16,7 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
+	"github.com/imroc/req/v3"
 	"strings"
 	"time"

@@ -97,7 +98,7 @@ func (h *UserHandler) Register(c *gin.Context) {
 		}
 	}

-	// check if the username is exists
+	// check if the username is existing
 	var item model.User
 	res := h.DB.Where("username = ?", data.Username).First(&item)
 	if item.Id > 0 {
@@ -122,7 +123,7 @@ func (h *UserHandler) Register(c *gin.Context) {
 		user.Power += h.App.SysConfig.InvitePower
 	}
 	if h.licenseService.GetLicense().Configs.DeCopy {
-		user.Username = fmt.Sprintf("用户@%d", utils.RandomNumber(6))
+		user.Nickname = fmt.Sprintf("用户@%d", utils.RandomNumber(6))
 	} else {
 		user.Nickname = fmt.Sprintf("极客学长@%d", utils.RandomNumber(6))
 	}
@@ -184,7 +185,7 @@ func (h *UserHandler) Register(c *gin.Context) {
 		resp.ERROR(c, "error with save token: "+err.Error())
 		return
 	}
-	resp.SUCCESS(c, tokenString)
+	resp.SUCCESS(c, gin.H{"token": tokenString, "user_id": user.Id, "username": user.Username})
 }

 // Login 用户登录
@@ -243,7 +244,7 @@ func (h *UserHandler) Login(c *gin.Context) {
 		resp.ERROR(c, "error with save token: "+err.Error())
 		return
 	}
-	resp.SUCCESS(c, tokenString)
+	resp.SUCCESS(c, gin.H{"token": tokenString, "user_id": user.Id, "username": user.Username})
 }

 // Logout 注 销
@@ -255,6 +256,130 @@ func (h *UserHandler) Logout(c *gin.Context) {
 	resp.SUCCESS(c)
 }

+// CLogin 第三方登录请求二维码
+func (h *UserHandler) CLogin(c *gin.Context) {
+	returnURL := h.GetTrim(c, "return_url")
+	var res types.BizVo
+	apiURL := fmt.Sprintf("%s/api/clogin/request", h.App.Config.ApiConfig.ApiURL)
+	r, err := req.C().R().SetBody(gin.H{"login_type": "wx", "return_url": returnURL}).
+		SetHeader("AppId", h.App.Config.ApiConfig.AppId).
+		SetHeader("Authorization", fmt.Sprintf("Bearer %s", h.App.Config.ApiConfig.Token)).
+		SetSuccessResult(&res).
+		Post(apiURL)
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+	if r.IsErrorState() {
+		resp.ERROR(c, "error with login http status: "+r.Status)
+		return
+	}
+
+	if res.Code != types.Success {
+		resp.ERROR(c, "error with http response: "+res.Message)
+		return
+	}
+
+	resp.SUCCESS(c, res.Data)
+}
+
+// CLoginCallback 第三方登录回调
+func (h *UserHandler) CLoginCallback(c *gin.Context) {
+	loginType := h.GetTrim(c, "login_type")
+	code := h.GetTrim(c, "code")
+
+	var res types.BizVo
+	apiURL := fmt.Sprintf("%s/api/clogin/info", h.App.Config.ApiConfig.ApiURL)
+	r, err := req.C().R().SetBody(gin.H{"login_type": loginType, "code": code}).
+		SetHeader("AppId", h.App.Config.ApiConfig.AppId).
+		SetHeader("Authorization", fmt.Sprintf("Bearer %s", h.App.Config.ApiConfig.Token)).
+		SetSuccessResult(&res).
+		Post(apiURL)
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+	if r.IsErrorState() {
+		resp.ERROR(c, "error with login http status: "+r.Status)
+		return
+	}
+
+	if res.Code != types.Success {
+		resp.ERROR(c, "error with http response: "+res.Message)
+		return
+	}
+
+	// login successfully
+	data := res.Data.(map[string]interface{})
+	session := gin.H{}
+	var user model.User
+	tx := h.DB.Debug().Where("openid", data["openid"]).First(&user)
+	if tx.Error != nil { // user not exist, create new user
+		// 检测最大注册人数
+		var totalUser int64
+		h.DB.Model(&model.User{}).Count(&totalUser)
+		if h.licenseService.GetLicense().Configs.UserNum > 0 && int(totalUser) >= h.licenseService.GetLicense().Configs.UserNum {
+			resp.ERROR(c, "当前注册用户数已达上限，请请升级 License")
+			return
+		}
+
+		salt := utils.RandString(8)
+		password := fmt.Sprintf("%d", utils.RandomNumber(8))
+		user = model.User{
+			Username:   fmt.Sprintf("%s@%d", loginType, utils.RandomNumber(10)),
+			Password:   utils.GenPassword(password, salt),
+			Avatar:     fmt.Sprintf("%s", data["avatar"]),
+			Salt:       salt,
+			Status:     true,
+			ChatRoles:  utils.JsonEncode([]string{"gpt"}),               // 默认只订阅通用助手角色
+			ChatModels: utils.JsonEncode(h.App.SysConfig.DefaultModels), // 默认开通的模型
+			Power:      h.App.SysConfig.InitPower,
+			OpenId:     fmt.Sprintf("%s", data["openid"]),
+			Nickname:   fmt.Sprintf("%s", data["nickname"]),
+		}
+
+		tx = h.DB.Create(&user)
+		if tx.Error != nil {
+			resp.ERROR(c, "保存数据失败")
+			logger.Error(tx.Error)
+			return
+		}
+		session["username"] = user.Username
+		session["password"] = password
+	} else { // login directly
+		// 更新最后登录时间和IP
+		user.LastLoginIp = c.ClientIP()
+		user.LastLoginAt = time.Now().Unix()
+		h.DB.Model(&user).Updates(user)
+
+		h.DB.Create(&model.UserLoginLog{
+			UserId:       user.Id,
+			Username:     user.Username,
+			LoginIp:      c.ClientIP(),
+			LoginAddress: utils.Ip2Region(h.searcher, c.ClientIP()),
+		})
+	}
+
+	// 创建 token
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
+		"user_id": user.Id,
+		"expired": time.Now().Add(time.Second * time.Duration(h.App.Config.Session.MaxAge)).Unix(),
+	})
+	tokenString, err := token.SignedString([]byte(h.App.Config.Session.SecretKey))
+	if err != nil {
+		resp.ERROR(c, "Failed to generate token, "+err.Error())
+		return
+	}
+	// 保存到 redis
+	key := fmt.Sprintf("users/%d", user.Id)
+	if _, err := h.redis.Set(c, key, tokenString, 0).Result(); err != nil {
+		resp.ERROR(c, "error with save token: "+err.Error())
+		return
+	}
+	session["token"] = tokenString
+	resp.SUCCESS(c, session)
+}
+
 // Session 获取/验证会话
 func (h *UserHandler) Session(c *gin.Context) {
 	user, err := h.GetLoginUser(c)
--- a/api/main.go
+++ b/api/main.go
@@ -240,6 +240,8 @@ func main() {
 			group.POST("password", h.UpdatePass)
 			group.POST("bind/username", h.BindUsername)
 			group.POST("resetPass", h.ResetPass)
+			group.GET("clogin", h.CLogin)
+			group.GET("clogin/callback", h.CLoginCallback)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *chatimpl.ChatHandler) {
 			group := s.Engine.Group("/api/chat/")
@@ -255,7 +257,7 @@ 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.POST("/api/upload/list", h.List)
 			s.Engine.GET("/api/upload/remove", h.Remove)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *handler.SmsHandler) {
@@ -281,8 +283,8 @@ func main() {
 			group.POST("variation", h.Variation)
 			group.GET("jobs", h.JobList)
 			group.GET("imgWall", h.ImgWall)
-			group.POST("remove", h.Remove)
-			group.POST("publish", h.Publish)
+			group.GET("remove", h.Remove)
+			group.GET("publish", h.Publish)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *handler.SdJobHandler) {
 			group := s.Engine.Group("/api/sd")
@@ -290,8 +292,8 @@ func main() {
 			group.POST("image", h.Image)
 			group.GET("jobs", h.JobList)
 			group.GET("imgWall", h.ImgWall)
-			group.POST("remove", h.Remove)
-			group.POST("publish", h.Publish)
+			group.GET("remove", h.Remove)
+			group.GET("publish", h.Publish)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *handler.ConfigHandler) {
 			group := s.Engine.Group("/api/config/")
@@ -368,7 +370,6 @@ func main() {
 			group := s.Engine.Group("/api/payment/")
 			group.GET("doPay", h.DoPay)
 			group.GET("payWays", h.GetPayWays)
-			group.POST("query", h.OrderQuery)
 			group.POST("qrcode", h.PayQrcode)
 			group.POST("mobile", h.Mobile)
 			group.POST("alipay/notify", h.AlipayNotify)
@@ -391,7 +392,8 @@ func main() {
 		}),
 		fx.Invoke(func(s *core.AppServer, h *handler.OrderHandler) {
 			group := s.Engine.Group("/api/order/")
-			group.POST("list", h.List)
+			group.GET("list", h.List)
+			group.GET("query", h.Query)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *handler.ProductHandler) {
 			group := s.Engine.Group("/api/product/")
@@ -416,13 +418,6 @@ func main() {
 			group.GET("token", h.GenToken)
 		}),

-		// 验证码
-		fx.Provide(admin.NewCaptchaHandler),
-		fx.Invoke(func(s *core.AppServer, h *admin.CaptchaHandler) {
-			group := s.Engine.Group("/api/admin/login/")
-			group.GET("captcha", h.GetCaptcha)
-		}),
-
 		fx.Provide(admin.NewUploadHandler),
 		fx.Invoke(func(s *core.AppServer, h *admin.UploadHandler) {
 			s.Engine.POST("/api/admin/upload", h.Upload)
@@ -477,8 +472,8 @@ func main() {
 			group.POST("image", h.Image)
 			group.GET("jobs", h.JobList)
 			group.GET("imgWall", h.ImgWall)
-			group.POST("remove", h.Remove)
-			group.POST("publish", h.Publish)
+			group.GET("remove", h.Remove)
+			group.GET("publish", h.Publish)
 		}),
 		fx.Invoke(func(s *core.AppServer, db *gorm.DB) {
 			go func() {
--- a/api/service/mj/pool.go
+++ b/api/service/mj/pool.go
@@ -16,6 +16,7 @@ import (
 	"geekai/service/sd"
 	"geekai/store"
 	"geekai/store/model"
+	"geekai/utils"
 	"github.com/go-redis/redis/v8"
 	"strings"
 	"time"
@@ -58,13 +59,13 @@ func (p *ServicePool) InitServices(plusConfigs []types.MjPlusConfig, proxyConfig
 	}
 	p.services = make([]*Service, 0)

-	for k, config := range plusConfigs {
+	for _, config := range plusConfigs {
 		if config.Enabled == false {
 			continue
 		}

 		cli := NewPlusClient(config, p.licenseService)
-		name := fmt.Sprintf("mj-plus-service-%d", k)
+		name := utils.Md5(config.ApiURL)
 		plusService := NewService(name, p.taskQueue, p.notifyQueue, p.db, cli)
 		go func() {
 			plusService.Run()
@@ -73,12 +74,12 @@ func (p *ServicePool) InitServices(plusConfigs []types.MjPlusConfig, proxyConfig
 	}

 	// for mid-journey proxy
-	for k, config := range proxyConfigs {
+	for _, config := range proxyConfigs {
 		if config.Enabled == false {
 			continue
 		}
 		cli := NewProxyClient(config)
-		name := fmt.Sprintf("mj-proxy-service-%d", k)
+		name := utils.Md5(config.ApiURL)
 		proxyService := NewService(name, p.taskQueue, p.notifyQueue, p.db, cli)
 		go func() {
 			proxyService.Run()
@@ -209,7 +210,6 @@ func (p *ServicePool) SyncTaskProgress() {
 					}
 					continue
 				}
-
 				if servicePlus := p.getService(job.ChannelId); servicePlus != nil {
 					_ = servicePlus.Notify(job)
 				}
--- a/api/store/model/user.go
+++ b/api/store/model/user.go
@@ -15,5 +15,7 @@ type User struct {
 	Status      bool   `gorm:"default:true"` // 当前状态
 	LastLoginAt int64  // 最后登录时间
 	LastLoginIp string // 最后登录 IP
+	OpenId      string `gorm:"column:openid"`
+	Platform    string `json:"platform"`
 	Vip         bool   // 是否 VIP 会员
 }
--- a/api/store/vo/user.go
+++ b/api/store/vo/user.go
@@ -14,4 +14,6 @@ type User struct {
 	LastLoginAt int64    `json:"last_login_at"` // 最后登录时间
 	LastLoginIp string   `json:"last_login_ip"` // 最后登录 IP
 	Vip         bool     `json:"vip"`
+	OpenId      string   `json:"openid"`   // 第三方登录 OpenID
+	Platform    string   `json:"platform"` // 第三方登录平台
 }
--- a/api/test/test.go
+++ b/api/test/test.go
@@ -2,8 +2,15 @@ package main

 import (
 	"fmt"
+	"geekai/utils"
 )

 func main() {
-	fmt.Println(fmt.Sprintf("%v", float64(90)/100))
+	file := "http://nk.img.r9it.com/chatgpt-plus/1719389335351828.xlsx"
+	content, err := utils.ReadFileContent(file, "http://172.22.11.69:9998")
+	if err != nil {
+		panic(err)
+	}
+
+	fmt.Println(content)
 }
--- a/api/utils/file.go
+++ b/api/utils/file.go
@@ -0,0 +1,106 @@
+package utils
+
+import (
+	"context"
+	"fmt"
+	"github.com/microcosm-cc/bluemonday"
+	"io"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/google/go-tika/tika"
+)
+
+func ReadFileContent(filePath string, tikaHost string) (string, error) {
+	// for remote file, download it first
+	if strings.HasPrefix(filePath, "http") {
+		file, err := downloadFile(filePath)
+		if err != nil {
+			return "", err
+		}
+		filePath = file
+	}
+	// 创建 Tika 客户端
+	client := tika.NewClient(nil, tikaHost)
+	// 打开 PDF 文件
+	file, err := os.Open(filePath)
+	if err != nil {
+		return "", fmt.Errorf("error with open file: %v", err)
+	}
+	defer file.Close()
+
+	// 使用 Tika 提取 PDF 文件的文本内容
+	content, err := client.Parse(context.TODO(), file)
+	if err != nil {
+		return "", fmt.Errorf("error with parse file: %v", err)
+	}
+
+	ext := filepath.Ext(filePath)
+	switch ext {
+	case ".doc", ".docx", ".pdf", ".pptx", "ppt":
+		return cleanBlankLine(cleanHtml(content, false)), nil
+	case ".xls", ".xlsx":
+		return cleanBlankLine(cleanHtml(content, true)), nil
+	default:
+		return cleanBlankLine(content), nil
+	}
+
+}
+
+// 清理文本内容
+func cleanHtml(html string, keepTable bool) string {
+	// 清理 HTML 标签
+	var policy *bluemonday.Policy
+	if keepTable {
+		policy = bluemonday.NewPolicy()
+		policy.AllowElements("table", "thead", "tbody", "tfoot", "tr", "td", "th")
+	} else {
+		policy = bluemonday.StrictPolicy()
+	}
+	return policy.Sanitize(html)
+}
+
+func cleanBlankLine(content string) string {
+	lines := strings.Split(content, "\n")
+	texts := make([]string, 0)
+	for _, line := range lines {
+		line = strings.TrimSpace(line)
+		if len(line) < 2 {
+			continue
+		}
+		// discard image
+		if strings.HasSuffix(line, ".png") ||
+			strings.HasSuffix(line, ".jpg") ||
+			strings.HasSuffix(line, ".jpeg") {
+			continue
+		}
+		texts = append(texts, line)
+	}
+
+	return strings.Join(texts, "\n")
+}
+
+// 下载文件
+func downloadFile(url string) (string, error) {
+	base := filepath.Base(url)
+	dir := os.TempDir()
+	filename := filepath.Join(dir, base)
+	out, err := os.Create(filename)
+	if err != nil {
+		return "", err
+	}
+	defer out.Close()
+
+	// 获取数据
+	resp, err := http.Get(url)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+
+	// 写入数据到文件
+	_, err = io.Copy(out, resp.Body)
+	return filename, err
+}
--- a/api/utils/resp/response.go
+++ b/api/utils/resp/response.go
@@ -24,28 +24,20 @@ func SUCCESS(c *gin.Context, values ...interface{}) {

 func ERROR(c *gin.Context, messages ...string) {
 	if messages != nil {
-		c.JSON(http.StatusOK, types.BizVo{Code: types.Failed, Message: messages[0]})
+		c.JSON(http.StatusBadRequest, types.BizVo{Code: types.Failed, Message: messages[0]})
 	} else {
-		c.JSON(http.StatusOK, types.BizVo{Code: types.Failed})
+		c.JSON(http.StatusBadRequest, types.BizVo{Code: types.Failed})
 	}
 }

 func HACKER(c *gin.Context) {
-	c.JSON(http.StatusOK, types.BizVo{Code: types.Failed, Message: "Hacker attempt!!!"})
+	c.JSON(http.StatusBadRequest, types.BizVo{Code: types.Failed, Message: "Hacker attempt!!!"})
 }

 func NotAuth(c *gin.Context, messages ...string) {
 	if messages != nil {
-		c.JSON(http.StatusOK, types.BizVo{Code: types.NotAuthorized, Message: messages[0]})
+		c.JSON(http.StatusUnauthorized, types.BizVo{Code: types.NotAuthorized, Message: messages[0]})
 	} else {
-		c.JSON(http.StatusOK, types.BizVo{Code: types.NotAuthorized, Message: "Not Authorized"})
-	}
-}
-
-func NotPermission(c *gin.Context, messages ...string) {
-	if messages != nil {
-		c.JSON(http.StatusOK, types.BizVo{Code: types.NotPermission, Message: messages[0]})
-	} else {
-		c.JSON(http.StatusOK, types.BizVo{Code: types.NotPermission, Message: "Not Permission"})
+		c.JSON(http.StatusUnauthorized, types.BizVo{Code: types.NotAuthorized, Message: "Not Authorized"})
 	}
 }
--- a/api/utils/strings.go
+++ b/api/utils/strings.go
@@ -31,11 +31,11 @@ func RandString(length int) string {
 }

 func RandomNumber(bit int) int {
-	min := intPow(10, bit-1)
-	max := intPow(10, bit) - 1
+	minNum := intPow(10, bit-1)
+	maxNum := intPow(10, bit) - 1

-	rand.Seed(time.Now().UnixNano())
-	return rand.Intn(max-min+1) + min
+	rand.NewSource(time.Now().UnixNano())
+	return rand.Intn(maxNum-minNum+1) + minNum
 }

 func intPow(x, y int) int {
@@ -46,7 +46,7 @@ func intPow(x, y int) int {
 	return result
 }

-func ContainsStr(slice []string, item string) bool {
+func Contains(slice []string, item string) bool {
 	for _, e := range slice {
 		if e == item {
 			return true
--- a/api/utils/upload.go
+++ b/api/utils/upload.go
@@ -88,7 +88,7 @@ func GetImgExt(filename string) string {
 	return ext
 }

-func ExtractImgURL(text string) []string {
+func ExtractImgURLs(text string) []string {
 	re := regexp.MustCompile(`(http[s]?:\/\/.*?\.(?:png|jpg|jpeg|gif))`)
 	matches := re.FindAllStringSubmatch(text, 10)
 	urls := make([]string, 0)
@@ -99,3 +99,15 @@ func ExtractImgURL(text string) []string {
 	}
 	return urls
 }
+
+func ExtractFileURLs(text string) []string {
+	re := regexp.MustCompile(`(http[s]?:\/\/.*?\.(?:docx?|pdf|pptx?|xlsx?|txt))`)
+	matches := re.FindAllStringSubmatch(text, 10)
+	urls := make([]string, 0)
+	if len(matches) > 0 {
+		for _, m := range matches {
+			urls = append(urls, m[1])
+		}
+	}
+	return urls
+}