merge v4.0.8

api/core/app_server.go

@@ -9,12 +9,12 @@ package core
 
 import (
 	"bytes"
+	"context"
+	"fmt"
 	"geekai/core/types"
 	"geekai/store/model"
 	"geekai/utils"
 	"geekai/utils/resp"
-	"context"
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/go-redis/redis/v8"
 	"github.com/golang-jwt/jwt/v5"
@@ -227,15 +227,19 @@ func needLogin(c *gin.Context) bool {
 		c.Request.URL.Path == "/api/sd/client" ||
 		c.Request.URL.Path == "/api/dall/imgWall" ||
 		c.Request.URL.Path == "/api/dall/client" ||
-		c.Request.URL.Path == "/api/config/get" ||
 		c.Request.URL.Path == "/api/product/list" ||
 		c.Request.URL.Path == "/api/menu/list" ||
 		c.Request.URL.Path == "/api/markMap/client" ||
+		c.Request.URL.Path == "/api/payment/alipay/notify" ||
+		c.Request.URL.Path == "/api/payment/hupipay/notify" ||
+		c.Request.URL.Path == "/api/payment/payjs/notify" ||
+		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/config/") ||
 		strings.HasPrefix(c.Request.URL.Path, "/api/function/") ||
 		strings.HasPrefix(c.Request.URL.Path, "/api/sms/") ||
 		strings.HasPrefix(c.Request.URL.Path, "/api/captcha/") ||
-		strings.HasPrefix(c.Request.URL.Path, "/api/payment/") ||
 		strings.HasPrefix(c.Request.URL.Path, "/static/") {
 		return false
 	}

api/core/types/chat.go

@@ -61,15 +61,15 @@ type ChatSession struct {
 }
 
 type ChatModel struct {
-	Id          uint     `json:"id"`
-	Platform    Platform `json:"platform"`
-	Name        string   `json:"name"`
-	Value       string   `json:"value"`
-	Power       int      `json:"power"`
-	MaxTokens   int      `json:"max_tokens"`  // 最大响应长度
-	MaxContext  int      `json:"max_context"` // 最大上下文长度
-	Temperature float32  `json:"temperature"` // 模型温度
-	KeyId       int      `json:"key_id"`      // 绑定 API KEY
+	Id          uint    `json:"id"`
+	Platform    string  `json:"platform"`
+	Name        string  `json:"name"`
+	Value       string  `json:"value"`
+	Power       int     `json:"power"`
+	MaxTokens   int     `json:"max_tokens"`  // 最大响应长度
+	MaxContext  int     `json:"max_context"` // 最大上下文长度
+	Temperature float32 `json:"temperature"` // 模型温度
+	KeyId       int     `json:"key_id"`      // 绑定 API KEY
 }
 
 type ApiError struct {

api/core/types/config.go

@@ -126,25 +126,60 @@ type RedisConfig struct {
 const LicenseKey = "Geek-AI-License"
 
 type License struct {
-	Key       string `json:"key"`        // 许可证书密钥
-	MachineId string `json:"machine_id"` // 机器码
-	UserNum   int    `json:"user_num"`   // 用户数量
-	ExpiredAt int64  `json:"expired_at"` // 过期时间
-	IsActive  bool   `json:"is_active"`  // 是否激活
+	Key       string        `json:"key"`        // 许可证书密钥
+	MachineId string        `json:"machine_id"` // 机器码
+	ExpiredAt int64         `json:"expired_at"` // 过期时间
+	IsActive  bool          `json:"is_active"`  // 是否激活
+	Configs   LicenseConfig `json:"configs"`
+}
+
+type LicenseConfig struct {
+	UserNum int  `json:"user_num"` // 用户数量
+	DeCopy  bool `json:"de_copy"`  // 去版权
 }
 
 func (c RedisConfig) Url() string {
 	return fmt.Sprintf("%s:%d", c.Host, c.Port)
 }
 
-type Platform string
+type Platform struct {
+	Name    string `json:"name"`
+	Value   string `json:"value"`
+	ChatURL string `json:"chat_url"`
+	ImgURL  string `json:"img_url"`
+}
 
-const OpenAI = Platform("OpenAI")
-const Azure = Platform("Azure")
-const ChatGLM = Platform("ChatGLM")
-const Baidu = Platform("Baidu")
-const XunFei = Platform("XunFei")
-const QWen = Platform("QWen")
+var OpenAI = Platform{
+	Name:    "OpenAI - GPT",
+	Value:   "OpenAI",
+	ChatURL: "https://api.chat-plus.net/v1/chat/completions",
+	ImgURL:  "https://api.chat-plus.net/v1/images/generations",
+}
+var Azure = Platform{
+	Name:    "微软 - Azure",
+	Value:   "Azure",
+	ChatURL: "https://chat-bot-api.openai.azure.com/openai/deployments/{model}/chat/completions?api-version=2023-05-15",
+}
+var ChatGLM = Platform{
+	Name:    "智谱 - ChatGLM",
+	Value:   "ChatGLM",
+	ChatURL: "https://open.bigmodel.cn/api/paas/v3/model-api/{model}/sse-invoke",
+}
+var Baidu = Platform{
+	Name:    "百度 - 文心大模型",
+	Value:   "Baidu",
+	ChatURL: "https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/{model}",
+}
+var XunFei = Platform{
+	Name:    "讯飞 - 星火大模型",
+	Value:   "XunFei",
+	ChatURL: "wss://spark-api.xf-yun.com/{version}/chat",
+}
+var QWen = Platform{
+	Name:    "阿里 - 通义千问",
+	Value:   "QWen",
+	ChatURL: "https://dashscope.aliyuncs.com/api/v1/services/aigc/text-generation/generation",
+}
 
 type SystemConfig struct {
 	Title         string `json:"title,omitempty"`
@@ -177,4 +212,6 @@ type SystemConfig struct {
 	ContextDeep   int  `json:"context_deep,omitempty"`
 
 	SdNegPrompt string `json:"sd_neg_prompt"` // SD 默认反向提示词
+
+	RandBg bool `json:"rand_bg"` // 前端首页是否启用随机背景
 }

api/core/types/function.go

@@ -24,5 +24,4 @@ type Function struct {
 	Name        string                 `json:"name"`
 	Description string                 `json:"description"`
 	Parameters  map[string]interface{} `json:"parameters"`
-	Required    interface{}            `json:"required,omitempty"`
 }

api/go.mod

@@ -29,14 +29,19 @@ require github.com/xxl-job/xxl-job-executor-go v1.2.0
 
 require (
 	github.com/mojocn/base64Captcha v1.3.1
+	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
 )
 
 require (
+	github.com/go-ole/go-ole v1.2.6 // 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/yusufpapurcu/wmi v1.2.4 // indirect
 	go.uber.org/mock v0.4.0 // indirect
 )
 

api/go.sum

@@ -43,6 +43,8 @@ github.com/go-basic/ipv4 v1.0.0 h1:gjyFAa1USC1hhXTkPOwBWDPfMcUaIM+tvo1XzV9EZxs=
 github.com/go-basic/ipv4 v1.0.0/go.mod h1:etLBnaxbidQfuqE6wgZQfs38nEWNmzALkxDZe4xY8Dg=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
@@ -176,6 +178,8 @@ github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUA
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
+github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
 github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
@@ -204,6 +208,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.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
+github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
+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=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
@@ -215,6 +223,8 @@ github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZ
 github.com/xxl-job/xxl-job-executor-go v1.2.0 h1:MTl2DpwrK2+hNjRRks2k7vB3oy+3onqm9OaSarneeLQ=
 github.com/xxl-job/xxl-job-executor-go v1.2.0/go.mod h1:bUFhz/5Irp9zkdYk5MxhQcDDT6LlZrI8+rv5mHtQ1mo=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
+github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -261,6 +271,7 @@ 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=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

api/handler/admin/api_key_handler.go

@@ -57,6 +57,7 @@ func (h *ApiKeyHandler) Save(c *gin.Context) {
 	apiKey.Name = data.Name
 	res := h.DB.Save(&apiKey)
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}
@@ -75,6 +76,7 @@ func (h *ApiKeyHandler) Save(c *gin.Context) {
 func (h *ApiKeyHandler) List(c *gin.Context) {
 	status := h.GetBool(c, "status")
 	t := h.GetTrim(c, "type")
+	platform := h.GetTrim(c, "platform")
 
 	session := h.DB.Session(&gorm.Session{})
 	if status {
@@ -83,7 +85,10 @@ func (h *ApiKeyHandler) List(c *gin.Context) {
 	if t != "" {
 		session = session.Where("type", t)
 	}
-	
+	if platform != "" {
+		session = session.Where("platform", platform)
+	}
+
 	var items []model.ApiKey
 	var keys = make([]vo.ApiKey, 0)
 	res := session.Find(&items)
@@ -118,6 +123,7 @@ func (h *ApiKeyHandler) Set(c *gin.Context) {
 
 	res := h.DB.Model(&model.ApiKey{}).Where("id = ?", data.Id).Update(data.Filed, data.Value)
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}
@@ -133,6 +139,7 @@ func (h *ApiKeyHandler) Remove(c *gin.Context) {
 
 	res := h.DB.Where("id", id).Delete(&model.ApiKey{})
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}

api/handler/admin/chat_handler.go

@@ -261,6 +261,7 @@ func (h *ChatHandler) RemoveMessage(c *gin.Context) {
 	id := h.GetInt(c, "id", 0)
 	tx := h.DB.Unscoped().Where("id = ?", id).Delete(&model.ChatMessage{})
 	if tx.Error != nil {
+		logger.Error("error with update database：", tx.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}

api/handler/admin/chat_model_handler.go

@@ -69,6 +69,7 @@ func (h *ChatModelHandler) Save(c *gin.Context) {
 		res = h.DB.Create(&item)
 	}
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}
@@ -88,9 +89,13 @@ func (h *ChatModelHandler) Save(c *gin.Context) {
 func (h *ChatModelHandler) List(c *gin.Context) {
 	session := h.DB.Session(&gorm.Session{})
 	enable := h.GetBool(c, "enable")
+	platform := h.GetTrim(c, "platform")
 	if enable {
 		session = session.Where("enabled", enable)
 	}
+	if platform != "" {
+		session = session.Where("platform", platform)
+	}
 	var items []model.ChatModel
 	var cms = make([]vo.ChatModel, 0)
 	res := session.Order("sort_num ASC").Find(&items)
@@ -140,6 +145,7 @@ func (h *ChatModelHandler) Set(c *gin.Context) {
 
 	res := h.DB.Model(&model.ChatModel{}).Where("id = ?", data.Id).Update(data.Filed, data.Value)
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}
@@ -160,6 +166,7 @@ func (h *ChatModelHandler) Sort(c *gin.Context) {
 	for index, id := range data.Ids {
 		res := h.DB.Model(&model.ChatModel{}).Where("id = ?", id).Update("sort_num", data.Sorts[index])
 		if res.Error != nil {
+			logger.Error("error with update database：", res.Error)
 			resp.ERROR(c, "更新数据库失败！")
 			return
 		}
@@ -177,6 +184,7 @@ func (h *ChatModelHandler) Remove(c *gin.Context) {
 
 	res := h.DB.Where("id = ?", id).Delete(&model.ChatModel{})
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}

api/handler/admin/chat_role_handler.go

@@ -48,6 +48,7 @@ func (h *ChatRoleHandler) Save(c *gin.Context) {
 	}
 	res := h.DB.Save(&role)
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}
@@ -115,6 +116,7 @@ func (h *ChatRoleHandler) Sort(c *gin.Context) {
 	for index, id := range data.Ids {
 		res := h.DB.Model(&model.ChatRole{}).Where("id = ?", id).Update("sort_num", data.Sorts[index])
 		if res.Error != nil {
+			logger.Error("error with update database：", res.Error)
 			resp.ERROR(c, "更新数据库失败！")
 			return
 		}
@@ -137,6 +139,7 @@ func (h *ChatRoleHandler) Set(c *gin.Context) {
 
 	res := h.DB.Model(&model.ChatRole{}).Where("id = ?", data.Id).Update(data.Filed, data.Value)
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}
@@ -152,6 +155,7 @@ func (h *ChatRoleHandler) Remove(c *gin.Context) {
 	}
 	res := h.DB.Where("id", id).Delete(&model.ChatRole{})
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "删除失败！")
 		return
 	}

api/handler/admin/config_handler.go

@@ -11,21 +11,35 @@ import (
 	"geekai/core"
 	"geekai/core/types"
 	"geekai/handler"
+	"geekai/service"
+	"geekai/service/mj"
+	"geekai/service/sd"
 	"geekai/store"
 	"geekai/store/model"
 	"geekai/utils"
 	"geekai/utils/resp"
+
 	"github.com/gin-gonic/gin"
+	"github.com/shirou/gopsutil/host"
 	"gorm.io/gorm"
 )
 
 type ConfigHandler struct {
 	handler.BaseHandler
-	levelDB *store.LevelDB
+	levelDB        *store.LevelDB
+	licenseService *service.LicenseService
+	mjServicePool  *mj.ServicePool
+	sdServicePool  *sd.ServicePool
 }
 
-func NewConfigHandler(app *core.AppServer, db *gorm.DB, levelDB *store.LevelDB) *ConfigHandler {
-	return &ConfigHandler{BaseHandler: handler.BaseHandler{App: app, DB: db}, levelDB: levelDB}
+func NewConfigHandler(app *core.AppServer, db *gorm.DB, levelDB *store.LevelDB, licenseService *service.LicenseService, mjPool *mj.ServicePool, sdPool *sd.ServicePool) *ConfigHandler {
+	return &ConfigHandler{
+		BaseHandler:    handler.BaseHandler{App: app, DB: db},
+		levelDB:        levelDB,
+		mjServicePool:  mjPool,
+		sdServicePool:  sdPool,
+		licenseService: licenseService,
+	}
 }
 
 func (h *ConfigHandler) Update(c *gin.Context) {
@@ -95,3 +109,89 @@ func (h *ConfigHandler) Get(c *gin.Context) {
 
 	resp.SUCCESS(c, value)
 }
+
+// Active 激活系统
+func (h *ConfigHandler) Active(c *gin.Context) {
+	var data struct {
+		License string `json:"license"`
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+	info, err := host.Info()
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	err = h.licenseService.ActiveLicense(data.License, info.HostID)
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	resp.SUCCESS(c, info.HostID)
+}
+
+// GetLicense 获取 License 信息
+func (h *ConfigHandler) GetLicense(c *gin.Context) {
+	license := h.licenseService.GetLicense()
+	resp.SUCCESS(c, license)
+}
+
+// GetAppConfig 获取内置配置
+func (h *ConfigHandler) GetAppConfig(c *gin.Context) {
+	resp.SUCCESS(c, gin.H{
+		"mj_plus":   h.App.Config.MjPlusConfigs,
+		"mj_proxy":  h.App.Config.MjProxyConfigs,
+		"sd":        h.App.Config.SdConfigs,
+		"platforms": Platforms,
+	})
+}
+
+// SaveDrawingConfig 保存AI绘画配置
+func (h *ConfigHandler) SaveDrawingConfig(c *gin.Context) {
+	var data struct {
+		Sd      []types.StableDiffusionConfig `json:"sd"`
+		MjPlus  []types.MjPlusConfig          `json:"mj_plus"`
+		MjProxy []types.MjProxyConfig         `json:"mj_proxy"`
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	changed := false
+	if configChanged(data.Sd, h.App.Config.SdConfigs) {
+		logger.Debugf("SD 配置变动了")
+		h.App.Config.SdConfigs = data.Sd
+		h.sdServicePool.InitServices(data.Sd)
+		changed = true
+	}
+
+	if configChanged(data.MjPlus, h.App.Config.MjPlusConfigs) || configChanged(data.MjProxy, h.App.Config.MjProxyConfigs) {
+		logger.Debugf("MidJourney 配置变动了")
+		h.App.Config.MjPlusConfigs = data.MjPlus
+		h.App.Config.MjProxyConfigs = data.MjProxy
+		h.mjServicePool.InitServices(data.MjPlus, data.MjProxy)
+		changed = true
+	}
+
+	if changed {
+		err := core.SaveConfig(h.App.Config)
+		if err != nil {
+			resp.ERROR(c, "更新配置文档失败！")
+			return
+		}
+	}
+
+	resp.SUCCESS(c)
+
+}
+
+func configChanged(c1 interface{}, c2 interface{}) bool {
+	encode1 := utils.JsonEncode(c1)
+	encode2 := utils.JsonEncode(c2)
+	return utils.Md5(encode1) != utils.Md5(encode2)
+}

api/handler/admin/function_handler.go

@@ -71,6 +71,7 @@ func (h *FunctionHandler) Set(c *gin.Context) {
 
 	res := h.DB.Model(&model.Function{}).Where("id = ?", data.Id).Update(data.Filed, data.Value)
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}
@@ -103,6 +104,7 @@ func (h *FunctionHandler) Remove(c *gin.Context) {
 	if id > 0 {
 		res := h.DB.Delete(&model.Function{Id: uint(id)})
 		if res.Error != nil {
+			logger.Error("error with update database：", res.Error)
 			resp.ERROR(c, "更新数据库失败！")
 			return
 		}

api/handler/admin/menu_handler.go

@@ -50,6 +50,7 @@ func (h *MenuHandler) Save(c *gin.Context) {
 		Enabled: data.Enabled,
 	})
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}
@@ -86,6 +87,7 @@ func (h *MenuHandler) Enable(c *gin.Context) {
 
 	res := h.DB.Model(&model.Menu{}).Where("id", data.Id).UpdateColumn("enabled", data.Enabled)
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}
@@ -106,6 +108,7 @@ func (h *MenuHandler) Sort(c *gin.Context) {
 	for index, id := range data.Ids {
 		res := h.DB.Model(&model.Menu{}).Where("id", id).Update("sort_num", data.Sorts[index])
 		if res.Error != nil {
+			logger.Error("error with update database：", res.Error)
 			resp.ERROR(c, "更新数据库失败！")
 			return
 		}
@@ -120,6 +123,7 @@ func (h *MenuHandler) Remove(c *gin.Context) {
 	if id > 0 {
 		res := h.DB.Where("id", id).Delete(&model.Menu{})
 		if res.Error != nil {
+			logger.Error("error with update database：", res.Error)
 			resp.ERROR(c, "更新数据库失败！")
 			return
 		}

api/handler/admin/order_handler.go

@@ -94,6 +94,7 @@ func (h *OrderHandler) Remove(c *gin.Context) {
 
 		res = h.DB.Unscoped().Where("id = ?", id).Delete(&model.Order{})
 		if res.Error != nil {
+			logger.Error("error with update database：", res.Error)
 			resp.ERROR(c, "更新数据库失败！")
 			return
 		}

api/handler/admin/product_handler.go

@@ -57,6 +57,7 @@ func (h *ProductHandler) Save(c *gin.Context) {
 	}
 	res := h.DB.Save(&item)
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}
@@ -107,6 +108,7 @@ func (h *ProductHandler) Enable(c *gin.Context) {
 
 	res := h.DB.Model(&model.Product{}).Where("id", data.Id).UpdateColumn("enabled", data.Enabled)
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}
@@ -127,6 +129,7 @@ func (h *ProductHandler) Sort(c *gin.Context) {
 	for index, id := range data.Ids {
 		res := h.DB.Model(&model.Product{}).Where("id", id).Update("sort_num", data.Sorts[index])
 		if res.Error != nil {
+			logger.Error("error with update database：", res.Error)
 			resp.ERROR(c, "更新数据库失败！")
 			return
 		}
@@ -141,6 +144,7 @@ func (h *ProductHandler) Remove(c *gin.Context) {
 	if id > 0 {
 		res := h.DB.Where("id", id).Delete(&model.Product{})
 		if res.Error != nil {
+			logger.Error("error with update database：", res.Error)
 			resp.ERROR(c, "更新数据库失败！")
 			return
 		}

api/handler/admin/reward_handler.go

@@ -72,6 +72,7 @@ func (h *RewardHandler) Remove(c *gin.Context) {
 	if data.Id > 0 {
 		res := h.DB.Where("id = ?", data.Id).Delete(&model.Reward{})
 		if res.Error != nil {
+			logger.Error("error with update database：", res.Error)
 			resp.ERROR(c, "更新数据库失败！")
 			return
 		}

api/handler/admin/types.go

@@ -0,0 +1,12 @@
+package admin
+
+import "geekai/core/types"
+
+var Platforms = []types.Platform{
+	types.OpenAI,
+	types.QWen,
+	types.XunFei,
+	types.ChatGLM,
+	types.Baidu,
+	types.Azure,
+}

api/handler/admin/user_handler.go

@@ -12,6 +12,7 @@ import (
 	"geekai/core"
 	"geekai/core/types"
 	"geekai/handler"
+	"geekai/service"
 	"geekai/store/model"
 	"geekai/store/vo"
 	"geekai/utils"
@@ -24,10 +25,11 @@ import (
 
 type UserHandler struct {
 	handler.BaseHandler
+	licenseService *service.LicenseService
 }
 
-func NewUserHandler(app *core.AppServer, db *gorm.DB) *UserHandler {
-	return &UserHandler{BaseHandler: handler.BaseHandler{App: app, DB: db}}
+func NewUserHandler(app *core.AppServer, db *gorm.DB, licenseService *service.LicenseService) *UserHandler {
+	return &UserHandler{BaseHandler: handler.BaseHandler{App: app, DB: db}, licenseService: licenseService}
 }
 
 // List 用户列表
@@ -82,7 +84,13 @@ func (h *UserHandler) Save(c *gin.Context) {
 		resp.ERROR(c, types.InvalidArgs)
 		return
 	}
-
+	// 检测最大注册人数
+	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
+	}
 	var user = model.User{}
 	var res *gorm.DB
 	var userVo vo.User
@@ -103,6 +111,7 @@ func (h *UserHandler) Save(c *gin.Context) {
 
 		res = h.DB.Select("username", "status", "vip", "power", "chat_roles_json", "chat_models_json", "expired_time").Updates(&user)
 		if res.Error != nil {
+			logger.Error("error with update database：", res.Error)
 			resp.ERROR(c, "更新数据库失败！")
 			return
 		}
@@ -148,6 +157,7 @@ func (h *UserHandler) Save(c *gin.Context) {
 	}
 
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败")
 		return
 	}

api/handler/chat_role_handler.go

@@ -96,7 +96,7 @@ func (h *ChatRoleHandler) UpdateRole(c *gin.Context) {
 
 	res := h.DB.Model(&model.User{}).Where("id = ?", user.Id).UpdateColumn("chat_roles_json", utils.JsonEncode(data.Keys))
 	if res.Error != nil {
-		logger.Error("添加应用失败：", err)
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}

api/handler/chatimpl/azure_handler.go

@@ -17,11 +17,9 @@ import (
 	"geekai/store/model"
 	"geekai/store/vo"
 	"geekai/utils"
-	"html/template"
 	"io"
 	"strings"
 	"time"
-	"unicode/utf8"
 )
 
 // 微软 Azure 模型消息发送实现
@@ -101,104 +99,12 @@ func (h *ChatHandler) sendAzureMessage(
 
 		// 消息发送成功
 		if len(contents) > 0 {
-
-			if message.Role == "" {
-				message.Role = "assistant"
-			}
-			message.Content = strings.Join(contents, "")
-			useMsg := types.Message{Role: "user", Content: prompt}
-
-			// 更新上下文消息，如果是调用函数则不需要更新上下文
-			if h.App.SysConfig.EnableContext {
-				chatCtx = append(chatCtx, useMsg)  // 提问消息
-				chatCtx = append(chatCtx, message) // 回复消息
-				h.App.ChatContexts.Put(session.ChatId, chatCtx)
-			}
-
-			// 追加聊天记录
-			// for prompt
-			promptToken, err := utils.CalcTokens(prompt, req.Model)
-			if err != nil {
-				logger.Error(err)
-			}
-			historyUserMsg := model.ChatMessage{
-				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)
-			}
-
-			// 计算本次对话消耗的总 token 数量
-			replyTokens, _ := utils.CalcTokens(message.Content, req.Model)
-			replyTokens += getTotalTokens(req)
-
-			historyReplyMsg := model.ChatMessage{
-				UserId:     userVo.Id,
-				ChatId:     session.ChatId,
-				RoleId:     role.Id,
-				Type:       types.ReplyMsg,
-				Icon:       role.Icon,
-				Content:    message.Content,
-				Tokens:     replyTokens,
-				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.subUserPower(userVo, session, promptToken, replyTokens)
-
-			// 保存当前会话
-			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)
-			}
+			h.saveChatHistory(req, prompt, contents, message, chatCtx, session, role, userVo, promptCreatedAt, replyCreatedAt)
 		}
+
 	} else {
-		body, err := io.ReadAll(response.Body)
-		if err != nil {
-			return fmt.Errorf("error with reading response: %v", err)
-		}
-		var res types.ApiError
-		err = json.Unmarshal(body, &res)
-		if err != nil {
-			return fmt.Errorf("error with decode response: %v", err)
-		}
-
-		if strings.Contains(res.Error.Message, "maximum context length") {
-			logger.Error(res.Error.Message)
-			h.App.ChatContexts.Delete(session.ChatId)
-			return h.sendMessage(ctx, session, role, prompt, ws)
-		} else {
-			return fmt.Errorf("请求 Azure API 失败：%v", res.Error)
-		}
+		body, _ := io.ReadAll(response.Body)
+		return fmt.Errorf("请求大模型 API 失败：%s", body)
 	}
 
 	return nil

api/handler/chatimpl/baidu_handler.go

@@ -17,12 +17,10 @@ import (
 	"geekai/store/model"
 	"geekai/store/vo"
 	"geekai/utils"
-	"html/template"
 	"io"
 	"net/http"
 	"strings"
 	"time"
-	"unicode/utf8"
 )
 
 type baiduResp struct {
@@ -130,99 +128,11 @@ func (h *ChatHandler) sendBaiduMessage(
 
 		// 消息发送成功
 		if len(contents) > 0 {
-			if message.Role == "" {
-				message.Role = "assistant"
-			}
-			message.Content = strings.Join(contents, "")
-			useMsg := types.Message{Role: "user", Content: prompt}
-
-			// 更新上下文消息，如果是调用函数则不需要更新上下文
-			if h.App.SysConfig.EnableContext {
-				chatCtx = append(chatCtx, useMsg)  // 提问消息
-				chatCtx = append(chatCtx, message) // 回复消息
-				h.App.ChatContexts.Put(session.ChatId, chatCtx)
-			}
-
-			// 追加聊天记录
-			// for prompt
-			promptToken, err := utils.CalcTokens(prompt, req.Model)
-			if err != nil {
-				logger.Error(err)
-			}
-			historyUserMsg := model.ChatMessage{
-				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 数量
-			replyTokens, _ := utils.CalcTokens(message.Content, req.Model)
-			totalTokens := replyTokens + getTotalTokens(req)
-			historyReplyMsg := model.ChatMessage{
-				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.subUserPower(userVo, session, promptToken, replyTokens)
-
-			// 保存当前会话
-			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)
-			}
+			h.saveChatHistory(req, prompt, contents, message, chatCtx, session, role, userVo, promptCreatedAt, replyCreatedAt)
 		}
 	} 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)
+		body, _ := io.ReadAll(response.Body)
+		return fmt.Errorf("请求大模型 API 失败：%s", body)
 	}
 
 	return nil

api/handler/chatimpl/chat_handler.go

@@ -17,16 +17,19 @@ import (
 	"geekai/core/types"
 	"geekai/handler"
 	logger2 "geekai/logger"
+	"geekai/service"
 	"geekai/service/oss"
 	"geekai/store/model"
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
+	"html/template"
 	"net/http"
 	"net/url"
 	"regexp"
 	"strings"
 	"time"
+	"unicode/utf8"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-redis/redis/v8"
@@ -38,15 +41,17 @@ var logger = logger2.GetLogger()
 
 type ChatHandler struct {
 	handler.BaseHandler
-	redis         *redis.Client
-	uploadManager *oss.UploaderManager
+	redis          *redis.Client
+	uploadManager  *oss.UploaderManager
+	licenseService *service.LicenseService
 }
 
-func NewChatHandler(app *core.AppServer, db *gorm.DB, redis *redis.Client, manager *oss.UploaderManager) *ChatHandler {
+func NewChatHandler(app *core.AppServer, db *gorm.DB, redis *redis.Client, manager *oss.UploaderManager, licenseService *service.LicenseService) *ChatHandler {
 	return &ChatHandler{
-		BaseHandler:   handler.BaseHandler{App: app, DB: db},
-		redis:         redis,
-		uploadManager: manager,
+		BaseHandler:    handler.BaseHandler{App: app, DB: db},
+		redis:          redis,
+		uploadManager:  manager,
+		licenseService: licenseService,
 	}
 }
 
@@ -119,7 +124,7 @@ func (h *ChatHandler) ChatHandle(c *gin.Context) {
 		MaxContext:  chatModel.MaxContext,
 		Temperature: chatModel.Temperature,
 		KeyId:       chatModel.KeyId,
-		Platform:    types.Platform(chatModel.Platform)}
+		Platform:    chatModel.Platform}
 	logger.Infof("New websocket connected, IP: %s, Username: %s", c.ClientIP(), session.Username)
 
 	// 保存会话连接
@@ -215,11 +220,11 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
 		Stream: true,
 	}
 	switch session.Model.Platform {
-	case types.Azure, types.ChatGLM, types.Baidu, types.XunFei:
+	case types.Azure.Value, types.ChatGLM.Value, types.Baidu.Value, types.XunFei.Value:
 		req.Temperature = session.Model.Temperature
 		req.MaxTokens = session.Model.MaxTokens
 		break
-	case types.OpenAI:
+	case types.OpenAI.Value:
 		req.Temperature = session.Model.Temperature
 		req.MaxTokens = session.Model.MaxTokens
 		// OpenAI 支持函数功能
@@ -236,8 +241,6 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
 			if err != nil {
 				continue
 			}
-			required := parameters["required"]
-			delete(parameters, "required")
 			tool := types.Tool{
 				Type: "function",
 				Function: types.Function{
@@ -246,10 +249,8 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
 					Parameters:  parameters,
 				},
 			}
-
-			// Fixed: compatible for gpt4-turbo-xxx model
-			if !strings.HasPrefix(req.Model, "gpt-4-turbo-") {
-				tool.Function.Required = required
+			if v, ok := parameters["required"]; v == nil || !ok {
+				tool.Function.Parameters["required"] = []string{}
 			}
 			tools = append(tools, tool)
 		}
@@ -258,7 +259,7 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
 			req.Tools = tools
 			req.ToolChoice = "auto"
 		}
-	case types.QWen:
+	case types.QWen.Value:
 		req.Parameters = map[string]interface{}{
 			"max_tokens":  session.Model.MaxTokens,
 			"temperature": session.Model.Temperature,
@@ -322,14 +323,14 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
 		reqMgs = append(reqMgs, m)
 	}
 
-	if session.Model.Platform == types.QWen {
+	if session.Model.Platform == types.QWen.Value {
 		req.Input = make(map[string]interface{})
 		reqMgs = append(reqMgs, types.Message{
 			Role:    "user",
 			Content: prompt,
 		})
 		req.Input["messages"] = reqMgs
-	} else if session.Model.Platform == types.OpenAI { // extract image for gpt-vision model
+	} else if session.Model.Platform == types.OpenAI.Value { // extract image for gpt-vision model
 		imgURLs := utils.ExtractImgURL(prompt)
 		logger.Debugf("detected IMG: %+v", imgURLs)
 		var content interface{}
@@ -367,17 +368,17 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
 	logger.Debugf("%+v", req.Messages)
 
 	switch session.Model.Platform {
-	case types.Azure:
+	case types.Azure.Value:
 		return h.sendAzureMessage(chatCtx, req, userVo, ctx, session, role, prompt, ws)
-	case types.OpenAI:
+	case types.OpenAI.Value:
 		return h.sendOpenAiMessage(chatCtx, req, userVo, ctx, session, role, prompt, ws)
-	case types.ChatGLM:
+	case types.ChatGLM.Value:
 		return h.sendChatGLMMessage(chatCtx, req, userVo, ctx, session, role, prompt, ws)
-	case types.Baidu:
+	case types.Baidu.Value:
 		return h.sendBaiduMessage(chatCtx, req, userVo, ctx, session, role, prompt, ws)
-	case types.XunFei:
+	case types.XunFei.Value:
 		return h.sendXunFeiMessage(chatCtx, req, userVo, ctx, session, role, prompt, ws)
-	case types.QWen:
+	case types.QWen.Value:
 		return h.sendQWenMessage(chatCtx, req, userVo, ctx, session, role, prompt, ws)
 	}
 
@@ -457,27 +458,35 @@ func (h *ChatHandler) doRequest(ctx context.Context, req types.ApiRequest, sessi
 	}
 	// use the last unused key
 	if apiKey.Id == 0 {
-		h.DB.Debug().Where("platform", session.Model.Platform).Where("type", "chat").Where("enabled", true).Order("last_used_at ASC").First(apiKey)
+		h.DB.Where("platform", session.Model.Platform).Where("type", "chat").Where("enabled", true).Order("last_used_at ASC").First(apiKey)
 	}
 	if apiKey.Id == 0 {
 		return nil, errors.New("no available key, please import key")
 	}
 
+	// ONLY allow apiURL in blank list
+	if session.Model.Platform == types.OpenAI.Value {
+		err := h.licenseService.IsValidApiURL(apiKey.ApiURL)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	var apiURL string
 	switch session.Model.Platform {
-	case types.Azure:
+	case types.Azure.Value:
 		md := strings.Replace(req.Model, ".", "", 1)
 		apiURL = strings.Replace(apiKey.ApiURL, "{model}", md, 1)
 		break
-	case types.ChatGLM:
+	case types.ChatGLM.Value:
 		apiURL = strings.Replace(apiKey.ApiURL, "{model}", req.Model, 1)
 		req.Prompt = req.Messages // 使用 prompt 字段替代 message 字段
 		req.Messages = nil
 		break
-	case types.Baidu:
+	case types.Baidu.Value:
 		apiURL = strings.Replace(apiKey.ApiURL, "{model}", req.Model, 1)
 		break
-	case types.QWen:
+	case types.QWen.Value:
 		apiURL = apiKey.ApiURL
 		req.Messages = nil
 		break
@@ -487,7 +496,7 @@ func (h *ChatHandler) doRequest(ctx context.Context, req types.ApiRequest, sessi
 	// 更新 API KEY 的最后使用时间
 	h.DB.Model(apiKey).UpdateColumn("last_used_at", time.Now().Unix())
 	// 百度文心，需要串接 access_token
-	if session.Model.Platform == types.Baidu {
+	if session.Model.Platform == types.Baidu.Value {
 		token, err := h.getBaiduToken(apiKey.Value)
 		if err != nil {
 			return nil, err
@@ -523,22 +532,22 @@ func (h *ChatHandler) doRequest(ctx context.Context, req types.ApiRequest, sessi
 	}
 	logger.Debugf("Sending %s request, ApiURL:%s, API KEY:%s, PROXY: %s, Model: %s", session.Model.Platform, apiURL, apiKey.Value, apiKey.ProxyURL, req.Model)
 	switch session.Model.Platform {
-	case types.Azure:
+	case types.Azure.Value:
 		request.Header.Set("api-key", apiKey.Value)
 		break
-	case types.ChatGLM:
+	case types.ChatGLM.Value:
 		token, err := h.getChatGLMToken(apiKey.Value)
 		if err != nil {
 			return nil, err
 		}
 		request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token))
 		break
-	case types.Baidu:
+	case types.Baidu.Value:
 		request.RequestURI = ""
-	case types.OpenAI:
+	case types.OpenAI.Value:
 		request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", apiKey.Value))
 		break
-	case types.QWen:
+	case types.QWen.Value:
 		request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", apiKey.Value))
 		request.Header.Set("X-DashScope-SSE", "enable")
 		break
@@ -572,6 +581,99 @@ func (h *ChatHandler) subUserPower(userVo vo.User, session *types.ChatSession, p
 
 }
 
+func (h *ChatHandler) saveChatHistory(
+	req types.ApiRequest,
+	prompt string,
+	contents []string,
+	message types.Message,
+	chatCtx []types.Message,
+	session *types.ChatSession,
+	role model.ChatRole,
+	userVo vo.User,
+	promptCreatedAt time.Time,
+	replyCreatedAt time.Time) {
+	if message.Role == "" {
+		message.Role = "assistant"
+	}
+	message.Content = strings.Join(contents, "")
+	useMsg := types.Message{Role: "user", Content: prompt}
+
+	// 更新上下文消息，如果是调用函数则不需要更新上下文
+	if h.App.SysConfig.EnableContext {
+		chatCtx = append(chatCtx, useMsg)  // 提问消息
+		chatCtx = append(chatCtx, message) // 回复消息
+		h.App.ChatContexts.Put(session.ChatId, chatCtx)
+	}
+
+	// 追加聊天记录
+	// for prompt
+	promptToken, err := utils.CalcTokens(prompt, req.Model)
+	if err != nil {
+		logger.Error(err)
+	}
+	historyUserMsg := model.ChatMessage{
+		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 数量
+	replyTokens, _ := utils.CalcTokens(message.Content, req.Model)
+	totalTokens := replyTokens + getTotalTokens(req)
+	historyReplyMsg := model.ChatMessage{
+		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)
+	}
+
+	if session.Model.Power > 0 {
+		// 更新用户算力
+		h.subUserPower(userVo, session, promptToken, replyTokens)
+
+		// 保存当前会话
+		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)
+		}
+	}
+}
+
 // 将AI回复消息中生成的图片链接下载到本地
 func (h *ChatHandler) extractImgUrl(text string) string {
 	pattern := `!\[([^\]]*)]\(([^)]+)\)`

api/handler/chatimpl/chatglm_handler.go

@@ -10,7 +10,6 @@ package chatimpl
 import (
 	"bufio"
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"geekai/core/types"
@@ -18,11 +17,9 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"github.com/golang-jwt/jwt/v5"
-	"html/template"
 	"io"
 	"strings"
 	"time"
-	"unicode/utf8"
 )
 
 // 清华大学 ChatGML 消息发送实现
@@ -108,103 +105,11 @@ func (h *ChatHandler) sendChatGLMMessage(
 
 		// 消息发送成功
 		if len(contents) > 0 {
-			if message.Role == "" {
-				message.Role = "assistant"
-			}
-			message.Content = strings.Join(contents, "")
-			useMsg := types.Message{Role: "user", Content: prompt}
-
-			// 更新上下文消息，如果是调用函数则不需要更新上下文
-			if h.App.SysConfig.EnableContext {
-				chatCtx = append(chatCtx, useMsg)  // 提问消息
-				chatCtx = append(chatCtx, message) // 回复消息
-				h.App.ChatContexts.Put(session.ChatId, chatCtx)
-			}
-
-			// 追加聊天记录
-			// for prompt
-			promptToken, err := utils.CalcTokens(prompt, req.Model)
-			if err != nil {
-				logger.Error(err)
-			}
-			historyUserMsg := model.ChatMessage{
-				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 数量
-			replyTokens, _ := utils.CalcTokens(message.Content, req.Model)
-			totalTokens := replyTokens + getTotalTokens(req)
-			historyReplyMsg := model.ChatMessage{
-				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.subUserPower(userVo, session, promptToken, replyTokens)
-
-			// 保存当前会话
-			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)
-			}
+			h.saveChatHistory(req, prompt, contents, message, chatCtx, session, role, userVo, promptCreatedAt, replyCreatedAt)
 		}
 	} 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:"code"`
-			Success bool   `json:"success"`
-			Msg     string `json:"msg"`
-		}
-		err = json.Unmarshal(body, &res)
-		if err != nil {
-			return fmt.Errorf("error with decode response: %v", err)
-		}
-		if !res.Success {
-			utils.ReplyMessage(ws, "请求 ChatGLM 失败："+res.Msg)
-		}
+		body, _ := io.ReadAll(response.Body)
+		return fmt.Errorf("请求大模型 API 失败：%s", body)
 	}
 
 	return nil

api/handler/chatimpl/openai_handler.go

@@ -17,13 +17,10 @@ import (
 	"geekai/store/model"
 	"geekai/store/vo"
 	"geekai/utils"
-	"html/template"
+	req2 "github.com/imroc/req/v3"
 	"io"
 	"strings"
 	"time"
-	"unicode/utf8"
-
-	req2 "github.com/imroc/req/v3"
 )
 
 // OPenAI 消息发送实现
@@ -178,126 +175,11 @@ func (h *ChatHandler) sendOpenAiMessage(
 
 		// 消息发送成功
 		if len(contents) > 0 {
-			if message.Role == "" {
-				message.Role = "assistant"
-			}
-			message.Content = strings.Join(contents, "")
-			useMsg := types.Message{Role: "user", Content: prompt}
-
-			// 更新上下文消息，如果是调用函数则不需要更新上下文
-			if h.App.SysConfig.EnableContext && toolCall == false {
-				chatCtx = append(chatCtx, useMsg)  // 提问消息
-				chatCtx = append(chatCtx, message) // 回复消息
-				h.App.ChatContexts.Put(session.ChatId, chatCtx)
-			}
-
-			// 追加聊天记录
-			useContext := true
-			if toolCall {
-				useContext = false
-			}
-
-			// for prompt
-			promptToken, err := utils.CalcTokens(prompt, req.Model)
-			if err != nil {
-				logger.Error(err)
-			}
-			historyUserMsg := model.ChatMessage{
-				UserId:     userVo.Id,
-				ChatId:     session.ChatId,
-				RoleId:     role.Id,
-				Type:       types.PromptMsg,
-				Icon:       userVo.Avatar,
-				Content:    template.HTMLEscapeString(prompt),
-				Tokens:     promptToken,
-				UseContext: useContext,
-				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)
-			}
-
-			// 计算本次对话消耗的总 token 数量
-			var replyTokens = 0
-			if toolCall { // prompt + 函数名 + 参数 token
-				tokens, _ := utils.CalcTokens(function.Name, req.Model)
-				replyTokens += tokens
-				tokens, _ = utils.CalcTokens(utils.InterfaceToString(arguments), req.Model)
-				replyTokens += tokens
-			} else {
-				replyTokens, _ = utils.CalcTokens(message.Content, req.Model)
-			}
-			replyTokens += getTotalTokens(req)
-
-			historyReplyMsg := model.ChatMessage{
-				UserId:     userVo.Id,
-				ChatId:     session.ChatId,
-				RoleId:     role.Id,
-				Type:       types.ReplyMsg,
-				Icon:       role.Icon,
-				Content:    h.extractImgUrl(message.Content),
-				Tokens:     replyTokens,
-				UseContext: useContext,
-				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.subUserPower(userVo, session, promptToken, replyTokens)
-
-			// 保存当前会话
-			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)
-			}
+			h.saveChatHistory(req, prompt, contents, message, chatCtx, session, role, userVo, promptCreatedAt, replyCreatedAt)
 		}
 	} else {
-		body, err := io.ReadAll(response.Body)
-		if err != nil {
-			utils.ReplyMessage(ws, "请求 OpenAI API 失败："+err.Error())
-			return fmt.Errorf("error with reading response: %v", err)
-		}
-		var res types.ApiError
-		err = json.Unmarshal(body, &res)
-		if err != nil {
-			utils.ReplyMessage(ws, "请求 OpenAI API 失败：\n"+"```\n"+string(body)+"```")
-			return fmt.Errorf("error with decode response: %v", err)
-		}
-
-		// OpenAI API 调用异常处理
-		if strings.Contains(res.Error.Message, "This key is associated with a deactivated account") {
-			utils.ReplyMessage(ws, "请求 OpenAI API 失败：API KEY 所关联的账户被禁用。")
-			// 移除当前 API key
-			h.DB.Where("value = ?", apiKey).Delete(&model.ApiKey{})
-		} else if strings.Contains(res.Error.Message, "You exceeded your current quota") {
-			utils.ReplyMessage(ws, "请求 OpenAI API 失败：API KEY 触发并发限制，请稍后再试。")
-		} else if strings.Contains(res.Error.Message, "This model's maximum context length") {
-			logger.Error(res.Error.Message)
-			utils.ReplyMessage(ws, "当前会话上下文长度超出限制，已为您清空会话上下文！")
-			h.App.ChatContexts.Delete(session.ChatId)
-			return h.sendMessage(ctx, session, role, prompt, ws)
-		} else {
-			utils.ReplyMessage(ws, "请求 OpenAI API 失败："+res.Error.Message)
-		}
+		body, _ := io.ReadAll(response.Body)
+		return fmt.Errorf("请求 OpenAI API 失败：%s", body)
 	}
 
 	return nil

api/handler/chatimpl/qwen_handler.go

@@ -10,18 +10,15 @@ package chatimpl
 import (
 	"bufio"
 	"context"
-	"encoding/json"
 	"fmt"
 	"geekai/core/types"
 	"geekai/store/model"
 	"geekai/store/vo"
 	"geekai/utils"
 	"github.com/syndtr/goleveldb/leveldb/errors"
-	"html/template"
 	"io"
 	"strings"
 	"time"
-	"unicode/utf8"
 )
 
 type qWenResp struct {
@@ -142,100 +139,11 @@ func (h *ChatHandler) sendQWenMessage(
 
 		// 消息发送成功
 		if len(contents) > 0 {
-			if message.Role == "" {
-				message.Role = "assistant"
-			}
-			message.Content = strings.Join(contents, "")
-			useMsg := types.Message{Role: "user", Content: prompt}
-
-			// 更新上下文消息，如果是调用函数则不需要更新上下文
-			if h.App.SysConfig.EnableContext {
-				chatCtx = append(chatCtx, useMsg)  // 提问消息
-				chatCtx = append(chatCtx, message) // 回复消息
-				h.App.ChatContexts.Put(session.ChatId, chatCtx)
-			}
-
-			// 追加聊天记录
-			// for prompt
-			promptToken, err := utils.CalcTokens(prompt, req.Model)
-			if err != nil {
-				logger.Error(err)
-			}
-			historyUserMsg := model.ChatMessage{
-				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 数量
-			replyTokens, _ := utils.CalcTokens(message.Content, req.Model)
-			totalTokens := replyTokens + getTotalTokens(req)
-			historyReplyMsg := model.ChatMessage{
-				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.subUserPower(userVo, session, promptToken, replyTokens)
-
-			// 保存当前会话
-			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)
-			}
+			h.saveChatHistory(req, prompt, contents, message, chatCtx, session, role, userVo, promptCreatedAt, replyCreatedAt)
 		}
 	} 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)
+		body, _ := io.ReadAll(response.Body)
+		return fmt.Errorf("请求大模型 API 失败：%s", body)
 	}
 
 	return nil

api/handler/chatimpl/xunfei_handler.go

@@ -21,13 +21,11 @@ import (
 	"geekai/utils"
 	"github.com/gorilla/websocket"
 	"gorm.io/gorm"
-	"html/template"
 	"io"
 	"net/http"
 	"net/url"
 	"strings"
 	"time"
-	"unicode/utf8"
 )
 
 type xunFeiResp struct {
@@ -181,89 +179,10 @@ func (h *ChatHandler) sendXunFeiMessage(
 		}
 
 	}
-
 	// 消息发送成功
 	if len(contents) > 0 {
-		if message.Role == "" {
-			message.Role = "assistant"
-		}
-		message.Content = strings.Join(contents, "")
-		useMsg := types.Message{Role: "user", Content: prompt}
-
-		// 更新上下文消息，如果是调用函数则不需要更新上下文
-		if h.App.SysConfig.EnableContext {
-			chatCtx = append(chatCtx, useMsg)  // 提问消息
-			chatCtx = append(chatCtx, message) // 回复消息
-			h.App.ChatContexts.Put(session.ChatId, chatCtx)
-		}
-
-		// 追加聊天记录
-		// for prompt
-		promptToken, err := utils.CalcTokens(prompt, req.Model)
-		if err != nil {
-			logger.Error(err)
-		}
-		historyUserMsg := model.ChatMessage{
-			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 数量
-		replyTokens, _ := utils.CalcTokens(message.Content, req.Model)
-		totalTokens := replyTokens + getTotalTokens(req)
-		historyReplyMsg := model.ChatMessage{
-			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.subUserPower(userVo, session, promptToken, replyTokens)
-
-		// 保存当前会话
-		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)
-		}
+		h.saveChatHistory(req, prompt, contents, message, chatCtx, session, role, userVo, promptCreatedAt, replyCreatedAt)
 	}
-
 	return nil
 }
 

api/handler/config_handler.go

@@ -9,6 +9,7 @@ package handler
 
 import (
 	"geekai/core"
+	"geekai/service"
 	"geekai/store/model"
 	"geekai/utils"
 	"geekai/utils/resp"
@@ -19,10 +20,11 @@ import (
 
 type ConfigHandler struct {
 	BaseHandler
+	licenseService *service.LicenseService
 }
 
-func NewConfigHandler(app *core.AppServer, db *gorm.DB) *ConfigHandler {
-	return &ConfigHandler{BaseHandler: BaseHandler{App: app, DB: db}}
+func NewConfigHandler(app *core.AppServer, db *gorm.DB, licenseService *service.LicenseService) *ConfigHandler {
+	return &ConfigHandler{BaseHandler: BaseHandler{App: app, DB: db}, licenseService: licenseService}
 }
 
 // Get 获取指定的系统配置
@@ -44,3 +46,9 @@ func (h *ConfigHandler) Get(c *gin.Context) {
 
 	resp.SUCCESS(c, value)
 }
+
+// License 获取 License 配置
+func (h *ConfigHandler) License(c *gin.Context) {
+	license := h.licenseService.GetLicense()
+	resp.SUCCESS(c, license.Configs)
+}

api/handler/dalle_handler.go

@@ -253,6 +253,7 @@ func (h *DallJobHandler) Publish(c *gin.Context) {
 
 	res := h.DB.Model(&model.DallJob{Id: data.Id}).UpdateColumn("publish", true)
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败")
 		return
 	}

api/handler/mj_handler.go

@@ -8,6 +8,8 @@ package handler
 // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 import (
+	"encoding/base64"
+	"fmt"
 	"geekai/core"
 	"geekai/core/types"
 	"geekai/service"
@@ -17,8 +19,6 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
-	"encoding/base64"
-	"fmt"
 	"net/http"
 	"strings"
 	"time"
@@ -511,6 +511,7 @@ func (h *MidJourneyHandler) Publish(c *gin.Context) {
 
 	res := h.DB.Model(&model.MidJourneyJob{Id: data.Id}).UpdateColumn("publish", data.Action)
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败")
 		return
 	}

api/handler/payment_handler.go

@@ -8,6 +8,9 @@ package handler
 // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 import (
+	"embed"
+	"encoding/base64"
+	"fmt"
 	"geekai/core"
 	"geekai/core/types"
 	"geekai/service"
@@ -15,9 +18,6 @@ import (
 	"geekai/store/model"
 	"geekai/utils"
 	"geekai/utils/resp"
-	"embed"
-	"encoding/base64"
-	"fmt"
 	"github.com/shopspring/decimal"
 	"math"
 	"net/http"
@@ -44,6 +44,7 @@ type PaymentHandler struct {
 	snowflake      *service.Snowflake
 	fs             embed.FS
 	lock           sync.Mutex
+	signKey        string // 用来签名的随机秘钥
 }
 
 func NewPaymentHandler(
@@ -65,12 +66,27 @@ func NewPaymentHandler(
 			App: server,
 			DB:  db,
 		},
+		signKey: utils.RandString(32),
 	}
 }
 
 func (h *PaymentHandler) DoPay(c *gin.Context) {
 	orderNo := h.GetTrim(c, "order_no")
 	payWay := h.GetTrim(c, "pay_way")
+	t := h.GetInt(c, "t", 0)
+	sign := h.GetTrim(c, "sign")
+	signStr := fmt.Sprintf("%s-%s-%d-%s", orderNo, payWay, t, h.signKey)
+	newSign := utils.Sha256(signStr)
+	if newSign != sign {
+		resp.ERROR(c, "订单签名错误！")
+		return
+	}
+
+	// 检查二维码是否过期
+	if time.Now().Unix()-int64(t) > int64(h.App.SysConfig.OrderPayTimeout) {
+		resp.ERROR(c, "支付二维码已过期，请重新生成！")
+		return
+	}
 
 	if orderNo == "" {
 		resp.ERROR(c, types.InvalidArgs)
@@ -273,8 +289,10 @@ func (h *PaymentHandler) PayQrcode(c *gin.Context) {
 		resp.ERROR(c, err.Error())
 		return
 	}
-
-	imageURL := fmt.Sprintf("%s://%s/api/payment/doPay?order_no=%s&pay_way=%s", parse.Scheme, parse.Host, orderNo, data.PayWay)
+	timestamp := time.Now().Unix()
+	signStr := fmt.Sprintf("%s-%s-%d-%s", orderNo, data.PayWay, timestamp, h.signKey)
+	sign := utils.Sha256(signStr)
+	imageURL := fmt.Sprintf("%s://%s/api/payment/doPay?order_no=%s&pay_way=%s&t=%d&sign=%s", parse.Scheme, parse.Host, orderNo, data.PayWay, timestamp, sign)
 	imgData, err := utils.GenQrcode(imageURL, 400, file)
 	if err != nil {
 		resp.ERROR(c, err.Error())
@@ -324,6 +342,8 @@ func (h *PaymentHandler) Mobile(c *gin.Context) {
 		payWay = PayWayXunHu
 		notifyURL = h.App.Config.HuPiPayConfig.NotifyURL
 		returnURL = h.App.Config.HuPiPayConfig.ReturnURL
+		parse, _ := url.Parse(h.App.Config.HuPiPayConfig.ReturnURL)
+		baseURL := fmt.Sprintf("%s://%s", parse.Scheme, parse.Host)
 		params := payment.HuPiPayReq{
 			Version:      "1.1",
 			TradeOrderId: orderNo,
@@ -333,6 +353,8 @@ func (h *PaymentHandler) Mobile(c *gin.Context) {
 			ReturnURL:    returnURL,
 			CallbackURL:  returnURL,
 			WapName:      "极客学长",
+			WapUrl:       baseURL,
+			Type:         "WAP",
 		}
 		r, err := h.huPiPayService.Pay(params)
 		if err != nil {

api/handler/reward_handler.go

@@ -8,13 +8,13 @@ package handler
 // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 import (
+	"fmt"
 	"geekai/core"
 	"geekai/core/types"
 	"geekai/store/model"
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
 	"math"
@@ -73,6 +73,7 @@ func (h *RewardHandler) Verify(c *gin.Context) {
 	res = tx.Model(&user).UpdateColumn("power", gorm.Expr("power + ?", exchange.Power))
 	if res.Error != nil {
 		tx.Rollback()
+		logger.Error("添加应用失败：", res.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}
@@ -84,6 +85,7 @@ func (h *RewardHandler) Verify(c *gin.Context) {
 	res = tx.Updates(&item)
 	if res.Error != nil {
 		tx.Rollback()
+		logger.Error("添加应用失败：", res.Error)
 		resp.ERROR(c, "更新数据库失败！")
 		return
 	}

api/handler/sd_handler.go

@@ -8,6 +8,7 @@ package handler
 // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 import (
+	"fmt"
 	"geekai/core"
 	"geekai/core/types"
 	"geekai/service"
@@ -18,7 +19,6 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
-	"fmt"
 	"net/http"
 	"time"
 
@@ -325,6 +325,7 @@ func (h *SdJobHandler) Publish(c *gin.Context) {
 
 	res := h.DB.Model(&model.SdJob{Id: data.Id}).UpdateColumn("publish", true)
 	if res.Error != nil {
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败")
 		return
 	}

api/handler/user_handler.go

@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"geekai/core"
 	"geekai/core/types"
+	"geekai/service"
 	"geekai/store/model"
 	"geekai/store/vo"
 	"geekai/utils"
@@ -28,19 +29,22 @@ import (
 
 type UserHandler struct {
 	BaseHandler
-	searcher *xdb.Searcher
-	redis    *redis.Client
+	searcher       *xdb.Searcher
+	redis          *redis.Client
+	licenseService *service.LicenseService
 }
 
 func NewUserHandler(
 	app *core.AppServer,
 	db *gorm.DB,
 	searcher *xdb.Searcher,
-	client *redis.Client) *UserHandler {
+	client *redis.Client,
+	licenseService *service.LicenseService) *UserHandler {
 	return &UserHandler{
-		BaseHandler: BaseHandler{DB: db, App: app},
-		searcher:    searcher,
-		redis:       client,
+		BaseHandler:    BaseHandler{DB: db, App: app},
+		searcher:       searcher,
+		redis:          client,
+		licenseService: licenseService,
 	}
 }
 
@@ -64,6 +68,14 @@ func (h *UserHandler) Register(c *gin.Context) {
 		return
 	}
 
+	// 检测最大注册人数
+	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
+	}
+
 	// 检查验证码
 	var key string
 	if data.RegWay == "email" || data.RegWay == "mobile" {
@@ -337,7 +349,7 @@ func (h *UserHandler) UpdatePass(c *gin.Context) {
 	newPass := utils.GenPassword(data.Password, user.Salt)
 	res := h.DB.Model(&user).UpdateColumn("password", newPass)
 	if res.Error != nil {
-		logger.Error("更新数据库失败: ", res.Error)
+		logger.Error("error with update database：", res.Error)
 		resp.ERROR(c, "更新数据库失败")
 		return
 	}
@@ -418,6 +430,7 @@ func (h *UserHandler) BindUsername(c *gin.Context) {
 
 	res = h.DB.Model(&user).UpdateColumn("username", data.Username)
 	if res.Error != nil {
+		logger.Error(res.Error)
 		resp.ERROR(c, "更新数据库失败")
 		return
 	}

api/main.go

@@ -171,6 +171,11 @@ func main() {
 
 		// 邮件服务
 		fx.Provide(service.NewSmtpService),
+		// License 服务
+		fx.Provide(service.NewLicenseService),
+		fx.Invoke(func(licenseService *service.LicenseService) {
+			licenseService.SyncLicense()
+		}),
 
 		// 微信机器人服务
 		fx.Provide(wx.NewWeChatBot),
@@ -290,6 +295,7 @@ func main() {
 		fx.Invoke(func(s *core.AppServer, h *handler.ConfigHandler) {
 			group := s.Engine.Group("/api/config/")
 			group.GET("get", h.Get)
+			group.GET("license", h.License)
 		}),
 
 		// 管理后台控制器
@@ -297,6 +303,10 @@ func main() {
 			group := s.Engine.Group("/api/admin/")
 			group.POST("config/update", h.Update)
 			group.GET("config/get", h.Get)
+			group.POST("active", h.Active)
+			group.GET("config/get/license", h.GetLicense)
+			group.GET("config/get/app", h.GetAppConfig)
+			group.POST("config/update/draw", h.SaveDrawingConfig)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *admin.ManagerHandler) {
 			group := s.Engine.Group("/api/admin/")

api/service/dalle/service.go

@@ -126,7 +126,7 @@ func (s *Service) Image(task types.DallTask, sync bool) (string, error) {
 
 	// get image generation API KEY
 	var apiKey model.ApiKey
-	tx := s.db.Where("platform", types.OpenAI).
+	tx := s.db.Where("platform", types.OpenAI.Value).
 		Where("type", "img").
 		Where("enabled", true).
 		Order("last_used_at ASC").First(&apiKey)
@@ -146,7 +146,7 @@ func (s *Service) Image(task types.DallTask, sync bool) (string, error) {
 			Model:   "dall-e-3",
 			Prompt:  prompt,
 			N:       1,
-			Size:    "1024x1024",
+			Size:    task.Size,
 			Style:   task.Style,
 			Quality: task.Quality,
 		}).
@@ -162,11 +162,14 @@ func (s *Service) Image(task types.DallTask, sync bool) (string, error) {
 	// update the api key last use time
 	s.db.Model(&apiKey).UpdateColumn("last_used_at", time.Now().Unix())
 	// update task progress
-	s.db.Model(&model.DallJob{Id: task.JobId}).UpdateColumns(map[string]interface{}{
+	tx = s.db.Model(&model.DallJob{Id: task.JobId}).UpdateColumns(map[string]interface{}{
 		"progress": 100,
 		"org_url":  res.Data[0].Url,
 		"prompt":   prompt,
 	})
+	if tx.Error != nil {
+		return "", fmt.Errorf("err with update database: %v", tx.Error)
+	}
 
 	s.notifyQueue.RPush(sd.NotifyMessage{UserId: int(task.UserId), JobId: int(task.JobId), Message: sd.Finished})
 	var content string

api/service/license_service.go

@@ -0,0 +1,197 @@
+package service
+
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// * 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 (
+	"fmt"
+	"geekai/core"
+	"geekai/core/types"
+	"geekai/store"
+	"time"
+
+	"github.com/imroc/req/v3"
+)
+
+type LicenseService struct {
+	config       types.ApiConfig
+	levelDB      *store.LevelDB
+	license      *types.License
+	urlWhiteList []string
+	machineId    string
+}
+
+func NewLicenseService(server *core.AppServer, levelDB *store.LevelDB) *LicenseService {
+	var license types.License
+	return &LicenseService{
+		config:    server.Config.ApiConfig,
+		levelDB:   levelDB,
+		license:   &license,
+		machineId: "",
+	}
+}
+
+type License struct {
+	Name      string              `json:"name"`
+	License   string              `json:"license"`
+	MachineId string              `json:"mid"`
+	ActiveAt  int64               `json:"active_at"`
+	ExpiredAt int64               `json:"expired_at"`
+	UserNum   int                 `json:"user_num"`
+	Configs   types.LicenseConfig `json:"configs"`
+}
+
+// ActiveLicense 激活 License
+func (s *LicenseService) ActiveLicense(license string, machineId string) error {
+	var res struct {
+		Code    types.BizCode `json:"code"`
+		Message string        `json:"message"`
+		Data    License       `json:"data"`
+	}
+	apiURL := fmt.Sprintf("%s/%s", s.config.ApiURL, "api/license/active")
+	response, err := req.C().R().
+		SetBody(map[string]string{"license": license, "machine_id": machineId}).
+		SetSuccessResult(&res).Post(apiURL)
+	if err != nil {
+		return fmt.Errorf("发送激活请求失败: %v", err)
+	}
+
+	if response.IsErrorState() {
+		return fmt.Errorf("发送激活请求失败：%v", response.Status)
+	}
+
+	if res.Code != types.Success {
+		return fmt.Errorf("激活失败：%v", res.Message)
+	}
+
+	s.license = &types.License{
+		Key:       license,
+		MachineId: machineId,
+		Configs:   res.Data.Configs,
+		ExpiredAt: res.Data.ExpiredAt,
+		IsActive:  true,
+	}
+	err = s.levelDB.Put(types.LicenseKey, s.license)
+	if err != nil {
+		return fmt.Errorf("保存许可证书失败：%v", err)
+	}
+	return nil
+}
+
+// SyncLicense 定期同步 License
+func (s *LicenseService) SyncLicense() {
+	go func() {
+		retryCounter := 0
+		for {
+			license, err := s.fetchLicense()
+			if err != nil {
+				retryCounter++
+				if retryCounter < 5 {
+					logger.Error(err)
+				}
+				s.license.IsActive = false
+			} else {
+				s.license = license
+			}
+
+			urls, err := s.fetchUrlWhiteList()
+			if err == nil {
+				s.urlWhiteList = urls
+			}
+
+			time.Sleep(time.Second * 10)
+		}
+	}()
+}
+
+func (s *LicenseService) fetchLicense() (*types.License, error) {
+	//var res struct {
+	//	Code    types.BizCode `json:"code"`
+	//	Message string        `json:"message"`
+	//	Data    License       `json:"data"`
+	//}
+	//apiURL := fmt.Sprintf("%s/%s", s.config.ApiURL, "api/license/check")
+	//response, err := req.C().R().
+	//	SetBody(map[string]string{"license": s.license.Key, "machine_id": s.machineId}).
+	//	SetSuccessResult(&res).Post(apiURL)
+	//if err != nil {
+	//	return nil, fmt.Errorf("发送激活请求失败: %v", err)
+	//}
+	//if response.IsErrorState() {
+	//	return nil, fmt.Errorf("激活失败：%v", response.Status)
+	//}
+	//if res.Code != types.Success {
+	//	return nil, fmt.Errorf("激活失败：%v", res.Message)
+	//}
+
+	return &types.License{
+		Key:       "abc",
+		MachineId: "abc",
+		Configs: types.LicenseConfig{
+			UserNum: 10000,
+			DeCopy:  false,
+		},
+		ExpiredAt: 0,
+		IsActive:  true,
+	}, nil
+}
+
+func (s *LicenseService) fetchUrlWhiteList() ([]string, error) {
+	var res struct {
+		Code    types.BizCode `json:"code"`
+		Message string        `json:"message"`
+		Data    []string      `json:"data"`
+	}
+	apiURL := fmt.Sprintf("%s/%s", s.config.ApiURL, "api/license/urls")
+	response, err := req.C().R().SetSuccessResult(&res).Get(apiURL)
+	if err != nil {
+		return nil, fmt.Errorf("发送请求失败: %v", err)
+	}
+	if response.IsErrorState() {
+		return nil, fmt.Errorf("发送请求失败：%v", response.Status)
+	}
+	if res.Code != types.Success {
+		return nil, fmt.Errorf("获取白名单失败：%v", res.Message)
+	}
+
+	return res.Data, nil
+}
+
+// GetLicense 获取许可信息
+func (s *LicenseService) GetLicense() *types.License {
+	return s.license
+}
+
+// IsValidApiURL 判断是否合法的中转 URL
+func (s *LicenseService) IsValidApiURL(uri string) error {
+	// 获得许可授权的直接放行
+	return nil
+	//if s.license.IsActive {
+	//	if s.license.MachineId != s.machineId {
+	//		return errors.New("系统使用了盗版的许可证书")
+	//	}
+	//
+	//	if time.Now().Unix() > s.license.ExpiredAt {
+	//		return errors.New("系统许可证书已经过期")
+	//	}
+	//	return nil
+	//}
+	//
+	//if len(s.urlWhiteList) == 0 {
+	//	urls, err := s.fetchUrlWhiteList()
+	//	if err == nil {
+	//		s.urlWhiteList = urls
+	//	}
+	//}
+	//
+	//for _, v := range s.urlWhiteList {
+	//	if strings.HasPrefix(uri, v) {
+	//		return nil
+	//	}
+	//}
+	//return fmt.Errorf("当前 API 地址 %s 不在白名单列表当中。", uri)
+}

api/service/mj/plus_client.go

@@ -12,6 +12,7 @@ import (
 	"errors"
 	"fmt"
 	"geekai/core/types"
+	"geekai/service"
 	"geekai/utils"
 	"github.com/imroc/req/v3"
 	"io"
@@ -22,20 +23,30 @@ import (
 
 // PlusClient MidJourney Plus ProxyClient
 type PlusClient struct {
-	Config types.MjPlusConfig
-	apiURL string
-	client *req.Client
+	Config         types.MjPlusConfig
+	apiURL         string
+	client         *req.Client
+	licenseService *service.LicenseService
 }
 
-func NewPlusClient(config types.MjPlusConfig) *PlusClient {
+func NewPlusClient(config types.MjPlusConfig, licenseService *service.LicenseService) *PlusClient {
 	return &PlusClient{
-		Config: config,
-		apiURL: config.ApiURL,
-		client: req.C().SetTimeout(time.Minute).SetUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36"),
+		Config:         config,
+		apiURL:         config.ApiURL,
+		client:         req.C().SetTimeout(time.Minute).SetUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36"),
+		licenseService: licenseService,
 	}
 }
 
+func (c *PlusClient) preCheck() error {
+	return c.licenseService.IsValidApiURL(c.Config.ApiURL)
+}
+
 func (c *PlusClient) Imagine(task types.MjTask) (ImageRes, error) {
+	if err := c.preCheck(); err != nil {
+		return ImageRes{}, err
+	}
+
 	apiURL := fmt.Sprintf("%s/mj-%s/mj/submit/imagine", c.apiURL, c.Config.Mode)
 	prompt := fmt.Sprintf("%s %s", task.Prompt, task.Params)
 	if task.NegPrompt != "" {
@@ -79,6 +90,10 @@ func (c *PlusClient) Imagine(task types.MjTask) (ImageRes, error) {
 
 // Blend 融图
 func (c *PlusClient) Blend(task types.MjTask) (ImageRes, error) {
+	if err := c.preCheck(); err != nil {
+		return ImageRes{}, err
+	}
+
 	apiURL := fmt.Sprintf("%s/mj-%s/mj/submit/blend", c.apiURL, c.Config.Mode)
 	logger.Info("API URL: ", apiURL)
 	body := ImageReq{
@@ -118,6 +133,10 @@ func (c *PlusClient) Blend(task types.MjTask) (ImageRes, error) {
 
 // SwapFace 换脸
 func (c *PlusClient) SwapFace(task types.MjTask) (ImageRes, error) {
+	if err := c.preCheck(); err != nil {
+		return ImageRes{}, err
+	}
+
 	apiURL := fmt.Sprintf("%s/mj-%s/mj/insight-face/swap", c.apiURL, c.Config.Mode)
 	// 生成图片 Base64 编码
 	if len(task.ImgArr) != 2 {
@@ -167,6 +186,10 @@ func (c *PlusClient) SwapFace(task types.MjTask) (ImageRes, error) {
 
 // Upscale 放大指定的图片
 func (c *PlusClient) Upscale(task types.MjTask) (ImageRes, error) {
+	if err := c.preCheck(); err != nil {
+		return ImageRes{}, err
+	}
+
 	body := map[string]string{
 		"customId": fmt.Sprintf("MJ::JOB::upsample::%d::%s", task.Index, task.MessageHash),
 		"taskId":   task.MessageId,
@@ -194,6 +217,10 @@ func (c *PlusClient) Upscale(task types.MjTask) (ImageRes, error) {
 
 // Variation  以指定的图片的视角进行变换再创作，注意需要在对应的频道中关闭 Remix 变换，否则 Variation 指令将不会生效
 func (c *PlusClient) Variation(task types.MjTask) (ImageRes, error) {
+	if err := c.preCheck(); err != nil {
+		return ImageRes{}, err
+	}
+
 	body := map[string]string{
 		"customId": fmt.Sprintf("MJ::JOB::variation::%d::%s", task.Index, task.MessageHash),
 		"taskId":   task.MessageId,

api/service/mj/pool.go

@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"geekai/core/types"
 	logger2 "geekai/logger"
+	"geekai/service"
 	"geekai/service/oss"
 	"geekai/service/sd"
 	"geekai/store"
@@ -30,11 +31,12 @@ type ServicePool struct {
 	db              *gorm.DB
 	uploaderManager *oss.UploaderManager
 	Clients         *types.LMap[uint, *types.WsClient] // UserId => Client
+	licenseService  *service.LicenseService
 }
 
 var logger = logger2.GetLogger()
 
-func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderManager) *ServicePool {
+func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderManager, licenseService *service.LicenseService) *ServicePool {
 	services := make([]*Service, 0)
 	taskQueue := store.NewRedisQueue("MidJourney_Task_Queue", redisCli)
 	notifyQueue := store.NewRedisQueue("MidJourney_Notify_Queue", redisCli)
@@ -45,6 +47,7 @@ func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderMa
 		uploaderManager: manager,
 		db:              db,
 		Clients:         types.NewLMap[uint, *types.WsClient](),
+		licenseService:  licenseService,
 	}
 }
 
@@ -60,7 +63,7 @@ func (p *ServicePool) InitServices(plusConfigs []types.MjPlusConfig, proxyConfig
 			continue
 		}
 
-		cli := NewPlusClient(config)
+		cli := NewPlusClient(config, p.licenseService)
 		name := fmt.Sprintf("mj-plus-service-%d", k)
 		plusService := NewService(name, p.taskQueue, p.notifyQueue, p.db, cli)
 		go func() {

api/service/mj/service.go

@@ -108,7 +108,13 @@ func (s *Service) Run() {
 		}
 
 		if err != nil || (res.Code != 1 && res.Code != 22) {
-			errMsg := fmt.Sprintf("%v,%s", err, res.Description)
+			var errMsg string
+			if err != nil {
+				errMsg = err.Error()
+			} else {
+				errMsg = fmt.Sprintf("%v,%s", err, res.Description)
+			}
+
 			logger.Error("绘画任务执行失败：", errMsg)
 			job.Progress = -1
 			job.ErrMsg = errMsg

api/service/payment/hupipay_serive.go

@@ -49,6 +49,8 @@ type HuPiPayReq struct {
 	CallbackURL  string `json:"callback_url"`
 	Time         string `json:"time"`
 	NonceStr     string `json:"nonce_str"`
+	Type         string `json:"type"`
+	WapUrl       string `json:"wap_url"`
 }
 
 type HuPiResp struct {

api/test/test.go

@@ -1,12 +1,12 @@
 package main
 
 import (
-	"geekai/utils"
 	"fmt"
+	"net/url"
 )
 
 func main() {
-	text := "https://nk.img.r9it.com/chatgpt-plus/1712709360012445.png 请简单描述一下这幅图上的内容 "
-	imgURL := utils.ExtractImgURL(text)
-	fmt.Println(imgURL)
+	text := "https://nk.img.r9it.com/chatgpt-plus/1712709360012445.png"
+	parse, _ := url.Parse(text)
+	fmt.Println(fmt.Sprintf("%s://%s", parse.Scheme, parse.Host))
 }

api/utils/openai.go

@@ -54,7 +54,7 @@ type apiErrRes struct {
 
 func OpenAIRequest(db *gorm.DB, prompt string) (string, error) {
 	var apiKey model.ApiKey
-	res := db.Where("platform = ?", types.OpenAI).Where("type = ?", "chat").Where("enabled = ?", true).First(&apiKey)
+	res := db.Where("platform = ?", types.OpenAI.Value).Where("type", "chat").Where("enabled = ?", true).First(&apiKey)
 	if res.Error != nil {
 		return "", fmt.Errorf("error with fetch OpenAI API KEY：%v", res.Error)
 	}
@@ -90,4 +90,4 @@ func OpenAIRequest(db *gorm.DB, prompt string) (string, error) {
 	db.Model(&apiKey).UpdateColumn("last_used_at", time.Now().Unix())
 
 	return response.Choices[0].Message.Content, nil
-}
+}