feat: integrate xxl-job-admin to implements automatic task scheduling

2025-09-18 01:06:39 +08:00 · 2024-03-22 13:47:16 +08:00 · 2024-03-22 13:47:16 +08:00 · f7a565bb80
commit f7a565bb80
parent bf5e72b7e0
15 changed files with 2267 additions and 132 deletions
--- a/api/core/types/chat.go
+++ b/api/core/types/chat.go
@ -85,6 +85,7 @@ const (
 	PowerRefund   = PowerType(3) // 任务（SD,MJ）执行失败，退款
 	PowerInvite   = PowerType(4) // 邀请奖励
 	PowerReward   = PowerType(5) // 众筹
+	PowerGift     = PowerType(6) // 系统赠送
 )

 func (t PowerType) String() string {
--- a/api/handler/chatimpl/chat_handler.go
+++ b/api/handler/chatimpl/chat_handler.go
@ -181,7 +181,7 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
 	var user model.User
 	res := h.DB.Model(&model.User{}).First(&user, session.UserId)
 	if res.Error != nil {
-		utils.ReplyMessage(ws, "非法用户，请联系管理员！")
+		utils.ReplyMessage(ws, "未授权用户，您正在进行非法操作！")
 		return res.Error
 	}
 	var userVo vo.User
@ -203,12 +203,6 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
 		return nil
 	}

-	if userVo.Power <= 0 {
-		utils.ReplyMessage(ws, "您的对话次数已经用尽，请联系管理员或者充值点卡继续对话！")
-		utils.ReplyMessage(ws, ErrImg)
-		return nil
-	}
-
 	if userVo.ExpiredTime > 0 && userVo.ExpiredTime <= time.Now().Unix() {
 		utils.ReplyMessage(ws, "您的账号已经过期，请联系管理员！")
 		utils.ReplyMessage(ws, ErrImg)
--- a/api/handler/reward_handler.go
+++ b/api/handler/reward_handler.go
@ -89,7 +89,7 @@ func (h *RewardHandler) Verify(c *gin.Context) {
 		Amount:    exchange.Power,
 		Balance:   user.Power + exchange.Power,
 		Mark:      types.PowerAdd,
-		Model:     "",
+		Model:     "众筹支付",
 		Remark:    fmt.Sprintf("众筹充值算力，金额：%f，价格：%f", item.Amount, h.App.SysConfig.PowerPrice),
 		CreatedAt: time.Now(),
 	})
--- a/api/handler/user_handler.go
+++ b/api/handler/user_handler.go
@ -55,7 +55,7 @@ func (h *UserHandler) Register(c *gin.Context) {

 	// 检查验证码
 	var key string
-	if data.RegWay == "email" || data.RegWay == "mobile" {
+	if data.RegWay == "email" || data.RegWay == "mobile" || data.Code != "" {
 		key = CodeStorePrefix + data.Username
 		code, err := h.redis.Get(c, key).Result()
 		if err != nil || code != data.Code {
--- a/api/service/xxl_job_service.go
+++ b/api/service/xxl_job_service.go
@ -40,12 +40,13 @@ func NewXXLJobExecutor(config *types.AppConfig, db *gorm.DB) *XXLJobExecutor {
 func (e *XXLJobExecutor) Run() error {
 	e.executor.RegTask("ClearOrders", e.ClearOrders)
 	e.executor.RegTask("ResetVipPower", e.ResetVipPower)
+	e.executor.RegTask("ResetUserPower", e.ResetUserPower)
 	return e.executor.Run()
 }

 // ClearOrders 清理未支付的订单，如果没有抛出异常则表示执行成功
 func (e *XXLJobExecutor) ClearOrders(cxt context.Context, param *xxl.RunReq) (msg string) {
-	logger.Debug("执行清理未支付订单...")
+	logger.Info("执行清理未支付订单...")
 	var sysConfig model.Config
 	res := e.db.Where("marker", "system").First(&sysConfig)
 	if res.Error != nil {
@ -64,15 +65,17 @@ func (e *XXLJobExecutor) ClearOrders(cxt context.Context, param *xxl.RunReq) (ms
 	timeout := time.Now().Unix() - int64(config.OrderPayTimeout)
 	start := utils.Stamp2str(timeout)
 	// 这里不是用软删除，而是永久删除订单
-	res = e.db.Unscoped().Where("status != ? AND created_at < ?", types.OrderPaidSuccess, start).Delete(&model.Order{})
-	return fmt.Sprintf("Clear order successfully, affect rows: %d", res.RowsAffected)
+	res = e.db.Unscoped().Where("status IN ? AND created_at < ?", []types.OrderStatus{types.OrderNotPaid, types.OrderScanned}, start).Delete(&model.Order{})
+	logger.Infof("Clear order successfully, affect rows: %d", res.RowsAffected)
+	return "success"
 }

-// ResetVipPower 清理过期的 VIP 会员
+// ResetVipPower 重置VIP会员算力
+// 自动将 VIP 会员的算力补充到每月赠送的最大值
 func (e *XXLJobExecutor) ResetVipPower(cxt context.Context, param *xxl.RunReq) (msg string) {
 	logger.Info("开始进行月底账号盘点...")
 	var users []model.User
-	res := e.db.Where("vip = ?", 1).Find(&users)
+	res := e.db.Where("vip", 1).Where("status", 1).Find(&users)
 	if res.Error != nil {
 		return "No vip users found"
 	}
@ -90,23 +93,27 @@ func (e *XXLJobExecutor) ResetVipPower(cxt context.Context, param *xxl.RunReq) (
 	}

 	for _, u := range users {
-		if u.Power <= 0 {
-			u.Power = 0
+		// 处理过期的 VIP
+		if u.ExpiredTime > 0 && u.ExpiredTime <= time.Now().Unix() {
+			u.Vip = false
+			e.db.Model(&model.User{}).Where("id", u.Id).UpdateColumn("vip", false)
+			continue
 		}
-		u.Power += config.VipMonthPower
 		// update user
-		tx := e.db.Updates(&u)
-		// 记录算力充值日志
+		tx := e.db.Model(&model.User{}).Where("id", u.Id).UpdateColumn("power", gorm.Expr("power + ?", config.VipMonthPower))
+		// 记录算力变动日志
 		if tx.Error == nil {
+			var user model.User
+			e.db.Where("id", u.Id).First(&user)
 			e.db.Create(&model.PowerLog{
 				UserId:    u.Id,
 				Username:  u.Username,
 				Type:      types.PowerRecharge,
 				Amount:    config.VipMonthPower,
 				Mark:      types.PowerAdd,
-				Balance:   u.Power + config.VipMonthPower,
-				Model:     "",
-				Remark:    fmt.Sprintf("月底盘点，会员每月赠送算力：%d", config.VipMonthPower),
+				Balance:   user.Power,
+				Model:     "系统盘点",
+				Remark:    fmt.Sprintf("VIP会员每月算力派发，：%d", config.VipMonthPower),
 				CreatedAt: time.Now(),
 			})
 		}
@ -115,6 +122,58 @@ func (e *XXLJobExecutor) ResetVipPower(cxt context.Context, param *xxl.RunReq) (
 	return "success"
 }

+func (e *XXLJobExecutor) ResetUserPower(cxt context.Context, param *xxl.RunReq) (msg string) {
+	logger.Info("今日算力派发开始：", time.Now())
+	var users []model.User
+	res := e.db.Where("status", 1).Find(&users)
+	if res.Error != nil {
+		return "No matching users"
+	}
+
+	var sysConfig model.Config
+	res = e.db.Where("marker", "system").First(&sysConfig)
+	if res.Error != nil {
+		return "error with get system config: " + res.Error.Error()
+	}
+
+	var config types.SystemConfig
+	err := utils.JsonDecode(sysConfig.Config, &config)
+	if err != nil {
+		return "error with decode system config: " + err.Error()
+	}
+
+	var counter = 0
+	var totalPower = 0
+	for _, u := range users {
+		if u.Power >= config.DailyPower {
+			continue
+		}
+		var power = config.DailyPower - u.Power
+		// update user
+		tx := e.db.Model(&model.User{}).Where("id", u.Id).UpdateColumn("power", gorm.Expr("power + ?", power))
+		// 记录算力充值日志
+		if tx.Error == nil {
+			var user model.User
+			e.db.Where("id", u.Id).First(&user)
+			e.db.Create(&model.PowerLog{
+				UserId:    u.Id,
+				Username:  u.Username,
+				Type:      types.PowerGift,
+				Amount:    power,
+				Mark:      types.PowerAdd,
+				Balance:   user.Power,
+				Model:     "系统赠送",
+				Remark:    fmt.Sprintf("系统每日算力派发，今日额度：%d", config.VipMonthPower),
+				CreatedAt: time.Now(),
+			})
+		}
+		counter++
+		totalPower += power
+	}
+	logger.Infof("今日派发算力结束！累计派发 %d 人，累计派发算力：%d", counter, totalPower)
+	return "success"
+}
+
 type customLogger struct{}

 func (l *customLogger) Info(format string, a ...interface{}) {
--- a/api/test/test.go
+++ b/api/test/test.go
@ -1,9 +1,8 @@
 package main

 import (
+	"chatplus/utils"
 	"fmt"
-	"regexp"
-	"strings"
 )

 type Person struct {
@ -18,27 +17,8 @@ type Student struct {

 func main() {

-	text := `
-开始创作您的LOGO了！基于您提供的描述，我将设计一个主题内容为一个小人推着一个购物车的卡通风格LOGO。稍等片刻，您的创意即将变为现实。
-	{"prompt":"Create a cartoon-style logo featuring a character pushing a shopping cart. The design should be colorful, vibrant, and engaging, showcasing the character in a dynamic and cheerful pose. The shopping cart should be noticeable but not overpower the character. Use bright and welcoming colors to make the logo inviting and fun. The character can be stylized in a cute and approachable manner, suitable for a wide range of audiences. Ensure the logo is clear and easily recognizable at small sizes.","size":"1024x1024"}
+	text := "2024-06-01 08:34:46"
+	fmt.Println(utils.Str2stamp(text))

-
-![image1](https://filesystem.site/cdn/20240320/JQIliW99JMPZRjMkgS2PlWNlfUtqDu.webp)
-
-[下载1](https://filesystem.site/cdn/download/20240320/JQIliW99JMPZRjMkgS2PlWNlfUtqDu.webp)
-
-这是为您设计的卡通风格LOGO，主题是一个小人推着购物车。请查看图像，看它是否满足您的需求。如果您对这个设计满意，请访问 [Vectorizer.ai](https://vectorizer.ai/) 将其转换为矢量图，以便在不同大小和格式下保持清晰度。如果您觉得需要进一步的调整或改进，请告诉我，我们可以继续优化设计。`
-	pattern := `!\[([^\]]*)]\(([^)]+)\)`
-	re := regexp.MustCompile(pattern)
-	matches := re.FindAllStringSubmatch(text, -1)
-
-	// 下载图片并替换链接地址
-	for _, match := range matches {
-		imageURL := match[2]
-		fmt.Println(imageURL)
-		// 对于相同地址的图片，已经被替换了，就不再重复下载了
-		if !strings.Contains(text, imageURL) {
-			continue
-		}
-	}
+	fmt.Println(utils.Stamp2str(utils.Str2stamp(text)))
 }
--- a/api/utils/strings.go
+++ b/api/utils/strings.go
@ -62,7 +62,7 @@ func Str2stamp(str string) int64 {
 	}

 	layout := "2006-01-02 15:04:05"
-	t, err := time.Parse(layout, str)
+	t, err := time.ParseInLocation(layout, str, time.Local)
 	if err != nil {
 		return 0
 	}
--- a/database/update-v4.0.0.sql
+++ b/database/update-v4.0.0.sql
@ -20,7 +20,7 @@ WHERE username IN (
 );

 -- 给 username 字段建立唯一索引
-ALTER TABLE `chatgpt_users` ADD UNIQUE(`username`)
+ALTER TABLE `chatgpt_users` ADD UNIQUE(`username`);

 -- 当前用户剩余算力
 ALTER TABLE `chatgpt_users` CHANGE `calls` `power` INT NOT NULL DEFAULT '0' COMMENT '剩余算力';
@ -64,4 +64,7 @@ INSERT INTO `chatgpt_admin_users` VALUES (1, 'admin', '6d17e80c87d209efb84ca4b2e

 ALTER TABLE `chatgpt_api_keys` CHANGE `use_proxy` `proxy_url` VARCHAR(100) NULL DEFAULT NULL COMMENT '代理地址';
 -- 重置 proxy_url
-UPDATE chatgpt_api_keys  set proxy_url=''
+UPDATE chatgpt_api_keys  set proxy_url='';
+
+-- 重置系统配置，系统配置的数据结构变了，旧数据解析会失败。
+UPDATE `chatgpt_configs` SET `config_json` = '{\"title\":\"ChatPlus AI 智能助手\",\"admin_title\":\"ChatPlus 控制台\",\"logo\":\"http://localhost:5678/static/upload/2024/3/1710732653645531.png\",\"init_power\":100,\"daily_power\":10,\"invite_power\":10,\"vip_month_power\":1000,\"register_ways\":[\"mobile\",\"username\",\"email\"],\"enabled_register\":true,\"reward_img\":\"http://localhost:5678/static/upload/2024/3/1710753716309668.jpg\",\"enabled_reward\":true,\"power_price\":0.1,\"order_pay_timeout\":1800,\"default_models\":[11,7,1,10,12,19,18,17],\"mj_power\":20,\"sd_power\":5,\"dall_power\":15,\"wechat_card_url\":\"/images/wx.png\",\"enable_context\":true,\"context_deep\":4}' WHERE `chatgpt_configs`.`id` = 1;
--- a/deploy/.gitignore
+++ b/deploy/.gitignore
@ -1,5 +1,4 @@
-mysql/data/*
-mysql/logs/*
+data/mysql/data
 logs
 static/*
-redis/data/*
+redis/redis
--- a/deploy/conf/config.toml
+++ b/deploy/conf/config.toml
@ -1,23 +1,26 @@
 Listen = "0.0.0.0:5678"
 ProxyURL = "" # 如 http://127.0.0.1:7777
-MysqlDns = "root:12345678@tcp(172.22.11.200:3307)/chatgpt_plus?charset=utf8&parseTime=True&loc=Local"
+MysqlDns = "root:12345678@tcp(chatgpt-plus-mysql:3306)/chatgpt_plus?charset=utf8&parseTime=True&loc=Local"
 StaticDir = "./static" # 静态资源的目录
 StaticUrl = "/static" # 静态资源访问 URL
-AesEncryptKey = ""
 WeChatBot = false

 [Session]
  SecretKey = "azyehq3ivunjhbntz78isj00i4hz2mt9xtddysfucxakadq4qbfrt0b7q3lnvg80" # 注意：这个是 JWT Token 授权密钥，生产环境请务必更换
  MaxAge = 86400

+[AdminSession]
+  SecretKey = "wr1uzwz2meai4z9j0e0tsyf6x523ui6zpnyaim4x2x37meakv13349llqpipyk40"
+  MaxAge = 8640000
+
 [Redis] # redis 配置信息
-  Host = "localhost"
+  Host = "chatgpt-plus-redis"
  Port = 6379
-  Password = ""
+  Password = "12345678"
  DB = 0

 [ApiConfig] # 微博热搜，今日头条等函数服务 API 配置，此为第三方插件服务，如需使用请联系作者开通
-  ApiURL = ""
+  ApiURL = "http://service.r9it.com:9001"
  AppId = ""
  Token = ""

@ -63,18 +66,17 @@ WeChatBot = false
  BotToken = ""
  GuildId = ""
  ChanelId = ""
-  UseCDN = false #是否使用反向代理访问，设置为true下面的设置才会生效
-  DiscordAPI = "" # discord API 反代地址
-  DiscordCDN = "" # mj 图片反代地址
-  DiscordGateway = "" # discord 机器人反代地址
+  UseCDN = false
+  ImgCdnURL = ""
+  DiscordAPI = ""
+  DiscordGateway = ""

 [[MjPlusConfigs]]
   Enabled = false
   ApiURL = "https://api.chat-plus.net"
-  CdnURL = "" # CND 加速的 URL，如果有的话就设置
-  Mode = "fast" # MJ 绘画模式，可选值 relax/fast/turbo
+   Mode = "fast"
   ApiKey = "sk-xxx"
-  NotifyURL = "https://ai.r9it.com/api/mj/notify" # 这里需要改成你的域名
+  NotifyURL = "https://ai.r9it.com/api/mj/notify" # 这里需要把 ai.r9it.com 改成你自己的域名或者 IP:端口

 [[SdConfigs]]
  Enabled = false
@ -83,11 +85,11 @@ WeChatBot = false
  Txt2ImgJsonPath = "res/sd/text2img.json"

 [XXLConfig] # xxl-job 配置，需要你部署 XXL-JOB 定时任务工具，用来定期清理未支付订单和清理过期 VIP，如果你没有启用支付服务，则该服务也无需启动
-  Enabled = false # 是否启用 XXL JOB 服务
-  ServerAddr = "http://172.22.11.47:8080/xxl-job-admin" # xxl-job-admin 管理地址
-  ExecutorIp = "172.22.11.47" # 执行器 IP 地址
+  Enabled = true # 是否启用 XXL JOB 服务
+  ServerAddr = "http://xxl-job-admin:8080/xxl-job-admin" # xxl-job-admin 管理地址
+  ExecutorIp = "chatgpt-plus-api" # 执行器 IP 地址
  ExecutorPort = "9999" # 执行器服务端口
-  AccessToken = "xxl-job-api-token" # 执行器 API 通信 token
+  AccessToken = "GeekMaster" # 执行器 API 通信 token
  RegistryKey = "chatgpt-plus" # 任务注册 key

 [AlipayConfig]
--- a/deploy/conf/mysql/my.cnf
+++ b/deploy/conf/mysql/my.cnf
--- a/deploy/conf/xxl-job/application.properties
+++ b/deploy/conf/xxl-job/application.properties
@ -0,0 +1,66 @@
+### web
+server.port=8080
+server.servlet.context-path=/xxl-job-admin
+
+### actuator
+management.server.servlet.context-path=/actuator
+management.health.mail.enabled=false
+
+### resources
+spring.mvc.servlet.load-on-startup=0
+spring.mvc.static-path-pattern=/static/**
+spring.resources.static-locations=classpath:/static/
+
+### freemarker
+spring.freemarker.templateLoaderPath=classpath:/templates/
+spring.freemarker.suffix=.ftl
+spring.freemarker.charset=UTF-8
+spring.freemarker.request-context-attribute=request
+spring.freemarker.settings.number_format=0.##########
+
+### mybatis
+mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
+#mybatis.type-aliases-package=com.xxl.job.admin.core.model
+
+### xxl-job, datasource
+spring.datasource.url=jdbc:mysql://172.22.11.200:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
+spring.datasource.username=root
+spring.datasource.password=mysql_pass
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
+### datasource-pool
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=30
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=HikariCP
+spring.datasource.hikari.max-lifetime=900000
+spring.datasource.hikari.connection-timeout=10000
+spring.datasource.hikari.connection-test-query=SELECT 1
+spring.datasource.hikari.validation-timeout=1000
+
+### xxl-job, email
+spring.mail.host=smtp.qq.com
+spring.mail.port=25
+spring.mail.username=xxx@qq.com
+spring.mail.from=xxx@qq.com
+spring.mail.password=xxx
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
+spring.mail.properties.mail.smtp.starttls.required=true
+spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
+
+### xxl-job, access token
+xxl.job.accessToken=GeekMaster
+
+### xxl-job, i18n (default is zh_CN, and you can choose "zh_CN", "zh_TC" and "en")
+xxl.job.i18n=zh_CN
+
+## xxl-job, triggerpool max size
+xxl.job.triggerpool.fast.max=200
+xxl.job.triggerpool.slow.max=100
+
+### xxl-job, log retention days
+xxl.job.logretentiondays=3
+
--- a/deploy/data/mysql/init.d/chatgpt_plu-v4.0.0.sql
+++ b/deploy/data/mysql/init.d/chatgpt_plu-v4.0.0.sql
@ -2,9 +2,9 @@
 -- version 5.1.3
 -- https://www.phpmyadmin.net/
 --
-- 主机： localhost
-- 生成日期： 2024-02-22 17:27:02
-- 服务器版本： 8.0.33-0ubuntu0.22.04.2
+-- 主机： localhost:3307
+-- 生成日期： 2024-03-22 11:20:17
+-- 服务器版本： 8.0.33
 -- PHP 版本： 8.1.18

 SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
@ -25,6 +25,33 @@ USE `chatgpt_plus`;

 -- --------------------------------------------------------

+--
+-- 表的结构 `chatgpt_admin_users`
+--
+
+DROP TABLE IF EXISTS `chatgpt_admin_users`;
+CREATE TABLE `chatgpt_admin_users` (
+  `id` int NOT NULL,
+  `username` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '用户名',
+  `password` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '密码',
+  `salt` char(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '密码盐',
+  `status` tinyint(1) NOT NULL COMMENT '当前状态',
+  `last_login_at` int NOT NULL COMMENT '最后登录时间',
+  `last_login_ip` char(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '最后登录 IP',
+  `created_at` datetime NOT NULL COMMENT '创建时间',
+  `updated_at` datetime NOT NULL COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='系统用户' ROW_FORMAT=DYNAMIC;
+
+--
+-- 转存表中的数据 `chatgpt_admin_users`
+--
+
+INSERT INTO `chatgpt_admin_users` (`id`, `username`, `password`, `salt`, `status`, `last_login_at`, `last_login_ip`, `created_at`, `updated_at`) VALUES
+(1, 'admin', '6d17e80c87d209efb84ca4b2e0824f549d09fac8b2e1cc698de5bb5e1d75dfd0', 'mmrql75o', 1, 1711000963, '172.22.11.200', '2024-03-11 16:30:20', '2024-03-21 14:02:44'),
+(108, 'test', '9ed720ce03e0a69885455271b4b3e1710bff79434f2a95d0de6406dd88cc9f79', '4b9orqjh', 0, 1710396975, '::1', '2024-03-13 16:06:43', '2024-03-21 15:15:04');
+
+-- --------------------------------------------------------
+
 --
 -- 表的结构 `chatgpt_api_keys`
 --
@ -39,7 +66,7 @@ CREATE TABLE `chatgpt_api_keys` (
  `last_used_at` int NOT NULL COMMENT '最后使用时间',
  `api_url` varchar(255) DEFAULT NULL COMMENT 'API 地址',
  `enabled` tinyint(1) DEFAULT NULL COMMENT '是否启用',
-  `use_proxy` tinyint(1) DEFAULT NULL COMMENT '是否使用代理访问',
+  `proxy_url` varchar(100) DEFAULT NULL COMMENT '代理地址',
  `created_at` datetime NOT NULL,
  `updated_at` datetime NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='OpenAI API ';
@ -101,7 +128,10 @@ CREATE TABLE `chatgpt_chat_models` (
  `value` varchar(50) NOT NULL COMMENT '模型值',
  `sort_num` tinyint(1) NOT NULL COMMENT '排序数字',
  `enabled` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否启用模型',
-  `weight` tinyint NOT NULL COMMENT '对话权重，每次对话扣减多少次对话额度',
+  `power` tinyint NOT NULL COMMENT '消耗算力点数',
+  `temperature` float(3,1) NOT NULL DEFAULT '1.0' COMMENT '模型创意度',
+  `max_tokens` int NOT NULL DEFAULT '1024' COMMENT '最大响应长度',
+  `max_context` int NOT NULL DEFAULT '4096' COMMENT '最大上下文长度',
  `open` tinyint(1) NOT NULL COMMENT '是否开放模型',
  `created_at` datetime DEFAULT NULL,
  `updated_at` datetime DEFAULT NULL
@ -111,23 +141,23 @@ CREATE TABLE `chatgpt_chat_models` (
 -- 转存表中的数据 `chatgpt_chat_models`
 --

-INSERT INTO `chatgpt_chat_models` (`id`, `platform`, `name`, `value`, `sort_num`, `enabled`, `weight`, `open`, `created_at`, `updated_at`) VALUES
-(1, 'OpenAI', 'GPT-3.5', 'gpt-3.5-turbo-16k', 0, 1, 1, 1, '2023-08-23 12:06:36', '2023-11-28 17:28:19'),
-(2, 'Azure', 'Azure-3.5', 'gpt-3.5-turbo', 12, 0, 1, 0, '2023-08-23 12:15:30', '2023-11-28 17:28:19'),
-(3, 'ChatGLM', 'ChatGML-Pro', 'chatglm_pro', 8, 1, 1, 1, '2023-08-23 13:35:45', '2023-11-28 17:28:19'),
-(7, 'Baidu', '文心一言3.0', 'eb-instant', 4, 1, 1, 1, '2023-10-11 11:29:28', '2023-11-28 17:28:19'),
-(8, 'XunFei', '星火V1.5', 'general', 3, 1, 1, 1, '2023-10-11 15:48:30', '2023-11-28 17:28:19'),
-(9, 'XunFei', '星火V2.0', 'generalv2', 2, 1, 1, 1, '2023-10-11 15:48:45', '2023-11-28 17:28:19'),
-(10, 'Baidu', '文心一言4.0', 'completions_pro', 5, 1, 3, 1, '2023-10-25 08:31:37', '2023-11-28 17:28:19'),
-(11, 'OpenAI', 'GPT-4.0', 'gpt-4', 10, 1, 15, 0, '2023-10-25 08:45:15', '2023-11-28 17:28:19'),
-(12, 'XunFei', '星火v3.0', 'generalv3', 1, 1, 3, 1, '2023-11-23 09:20:33', '2023-11-28 17:28:19'),
-(13, 'OpenAI', 'GPT-3.5-1106', 'gpt-3.5-turbo-1106', 9, 1, 1, 0, '2023-11-24 14:05:40', '2023-11-28 17:28:19'),
-(14, 'OpenAI', 'GPT-4-preview', 'gpt-4-1106-preview', 11, 1, 1, 0, '2023-11-24 14:06:11', '2023-11-28 17:28:19'),
-(15, 'OpenAI', 'GPT-超级模型', 'gpt-4-all', 0, 1, 30, 0, '2024-01-15 11:32:52', '2024-01-15 11:32:52'),
-(16, 'OpenAI', 'MJ Prompt Generator (V6)', 'gpt-4-gizmo-g-tc0eHXdgb', 0, 1, 1, 1, '2024-01-15 14:46:35', '2024-01-15 14:53:16'),
-(17, 'QWen', '通义千问-Turbo', 'qwen-turbo', 0, 1, 1, 1, '2024-01-19 10:42:24', '2024-01-19 10:45:16'),
-(18, 'QWen', '通义千问-Plus', 'qwen-plus', 0, 1, 1, 1, '2024-01-19 10:42:49', '2024-01-19 10:51:09'),
-(19, 'QWen', '通义千问-Max', 'qwen-max-1201', 0, 1, 1, 1, '2024-01-19 10:51:03', '2024-01-19 10:51:03');
+INSERT INTO `chatgpt_chat_models` (`id`, `platform`, `name`, `value`, `sort_num`, `enabled`, `power`, `temperature`, `max_tokens`, `max_context`, `open`, `created_at`, `updated_at`) VALUES
+(1, 'OpenAI', 'GPT-3.5', 'gpt-3.5-turbo-0125', 0, 1, 1, 1.0, 1024, 4096, 1, '2023-08-23 12:06:36', '2024-03-18 15:43:51'),
+(2, 'Azure', 'Azure-3.5', 'gpt-3.5-turbo', 14, 1, 1, 1.0, 1024, 4096, 0, '2023-08-23 12:15:30', '2024-03-18 14:27:19'),
+(3, 'ChatGLM', 'ChatGML-Pro', 'chatglm_pro', 3, 1, 1, 1.0, 2048, 32768, 1, '2023-08-23 13:35:45', '2024-03-18 14:27:19'),
+(7, 'Baidu', '文心一言3.0', 'eb-instant', 12, 1, 1, 1.0, 1024, 4096, 1, '2023-10-11 11:29:28', '2024-03-18 14:27:19'),
+(8, 'XunFei', '星火V3.5', 'generalv3.5', 2, 1, 5, 0.8, 1024, 8192, 1, '2023-10-11 15:48:30', '2024-03-18 14:27:19'),
+(9, 'XunFei', '星火V2.0', 'generalv2', 11, 1, 1, 1.0, 1024, 8192, 1, '2023-10-11 15:48:45', '2024-03-18 14:27:19'),
+(10, 'Baidu', '文心一言4.0', 'completions_pro', 13, 1, 3, 1.0, 1024, 8192, 1, '2023-10-25 08:31:37', '2024-03-18 14:27:19'),
+(11, 'OpenAI', 'GPT-4.0', 'gpt-4-0125-preview', 1, 1, 15, 1.0, 1024, 8192, 1, '2023-10-25 08:45:15', '2024-03-18 15:46:58'),
+(12, 'XunFei', '星火v3.0', 'generalv3', 10, 1, 3, 1.0, 1024, 8192, 1, '2023-11-23 09:20:33', '2024-03-18 14:27:19'),
+(15, 'OpenAI', 'GPT-超级模型', 'gpt-4-all', 4, 1, 30, 1.0, 4096, 32768, 0, '2024-01-15 11:32:52', '2024-03-18 14:27:19'),
+(16, 'OpenAI', '视频号导师', 'gpt-4-gizmo-g-QXXEBTXl7', 5, 1, 30, 1.0, 4096, 32768, 0, '2024-01-15 14:46:35', '2024-03-18 14:29:39'),
+(17, 'QWen', '通义千问-Turbo', 'qwen-turbo', 7, 1, 1, 1.0, 1024, 8192, 1, '2024-01-19 10:42:24', '2024-03-18 14:27:19'),
+(18, 'QWen', '通义千问-Plus', 'qwen-plus', 8, 1, 1, 1.0, 1024, 32768, 1, '2024-01-19 10:42:49', '2024-03-18 14:27:19'),
+(19, 'QWen', '通义千问-Max', 'qwen-max-1201', 9, 1, 1, 1.0, 1024, 32768, 1, '2024-01-19 10:51:03', '2024-03-18 14:27:19'),
+(21, 'OpenAI', '董宇辉小作文助手', 'gpt-4-gizmo-g-dse9iXvor', 6, 1, 30, 1.0, 8192, 32768, 0, '2024-03-18 14:24:20', '2024-03-18 14:27:19'),
+(22, 'OpenAI', 'LOGO生成神器', 'gpt-4-gizmo-g-YL87j8C7S', 0, 1, 30, 1.0, 1024, 4096, 1, '2024-03-20 14:02:11', '2024-03-20 14:02:18');

 -- --------------------------------------------------------

@ -154,7 +184,7 @@ CREATE TABLE `chatgpt_chat_roles` (
 --

 INSERT INTO `chatgpt_chat_roles` (`id`, `name`, `marker`, `context_json`, `hello_msg`, `icon`, `enable`, `sort_num`, `created_at`, `updated_at`) VALUES
-(1, '通用AI助手', 'gpt', '', '您好，我是您的AI智能助手，我会尽力回答您的问题或提供有用的建议。', '/images/avatar/gpt.png', 1, 0, '2023-05-30 07:02:06', '2023-12-29 17:46:43'),
+(1, '通用AI助手', 'gpt', '', '您好，我是您的AI智能助手，我会尽力回答您的问题或提供有用的建议。', '/images/avatar/gpt.png', 1, 0, '2023-05-30 07:02:06', '2024-03-15 09:15:42'),
 (24, '程序员', 'programmer', '[{\"role\":\"user\",\"content\":\"现在开始你扮演一位程序员，你是一名优秀的程序员，具有很强的逻辑思维能力，总能高效的解决问题。你热爱编程，熟悉多种编程语言，尤其精通 Go 语言，注重代码质量，有创新意识，持续学习，良好的沟通协作。\"},{\"role\":\"assistant\",\"content\":\"好的，现在我将扮演一位程序员，非常感谢您对我的评价。作为一名优秀的程序员，我非常热爱编程，并且注重代码质量。我熟悉多种编程语言，尤其是 Go 语言，可以使用它来高效地解决各种问题。\"}]', 'Talk is cheap, i will show code!', '/images/avatar/programmer.jpg', 1, 3, '2023-05-30 14:10:24', '2023-12-29 17:46:45'),
 (25, '启蒙老师', 'teacher', '[{\"role\":\"user\",\"content\":\"从现在开始，你将扮演一个老师，你是一个始终用苏格拉底风格回答问题的导师。你绝不会直接给学生答案，总是提出恰当的问题来引导学生自己思考。你应该根据学生的兴趣和知识来调整你的问题，将问题分解为更简单的部分，直到它达到适合他们的水平。\"},{\"role\":\"assistant\",\"content\":\"好的，让我来尝试扮演一位苏格拉底式的老师。请问，你有什么想要探讨的问题或者话题吗？我会通过恰当的问题引导你思考和探索答案，绝对不直接给出答案。\"}]', '同学你好，我将引导你一步一步自己找到问题的答案。', '/images/avatar/teacher.jpg', 1, 2, '2023-05-30 14:10:24', '2023-12-29 17:46:44'),
 (26, '艺术家', 'artist', '[{\"role\":\"user\",\"content\":\"现在你将扮演一位优秀的艺术家，创造力丰富，技艺精湛，感受力敏锐，坚持原创，勇于表达，具有深刻的观察力和批判性思维。\"},{\"role\":\"assistant\",\"content\":\"非常感谢您给我这样的角色，我会尽我所能地扮演一位优秀的艺术家，展现出创造力、技艺、感受力和批判性思维等方面的能力。作为一位优秀的艺术家，我会保持敏锐的观察力，捕捉不同的声音和情感，并用个人的语言和表达方式进行创作。我坚持原创，挑战传统的艺术规则，不断探索新的表达方式和可能性。同时，我也具备深刻的批判性思维能力，对自己的作品进行分析和解读，寻找新的创意和灵感。最重要的是，我会勇于表达自己的想法和观点，用作品启发人们思考和探索生命的意义。\"}]', '坚持原创，勇于表达，保持深刻的观察力和批判性思维。', '/images/avatar/artist.jpg', 1, 4, '2023-05-30 14:10:24', '2023-12-29 17:46:45'),
@ -190,8 +220,7 @@ CREATE TABLE `chatgpt_configs` (
 --

 INSERT INTO `chatgpt_configs` (`id`, `marker`, `config_json`) VALUES
-(1, 'system', '{\"admin_title\":\"ChatPlus 控制台\",\"chat_call_price\":0.1,\"default_models\":[\"eb-instant\",\"completions_pro\",\"generalv2\",\"general\",\"chatglm_pro\",\"gpt-3.5-turbo-16k\",\"chatglm_lite\",\"chatglm_std\",\"generalv3\",\"qwen-max-1201\"],\"enabled_alipay\":true,\"enabled_draw\":true,\"enabled_function\":true,\"enabled_msg\":true,\"enabled_msg_service\":false,\"enabled_register\":true,\"enabled_reward\":true,\"force_invite\":false,\"img_call_price\":0.2,\"init_calls\":1000,\"init_chat_calls\":10,\"init_img_calls\":5,\"invite_calls\":10,\"invite_chat_calls\":100,\"invite_img_calls\":50,\"models\":[\"gpt-3.5-turbo-16k\",\"gpt-3.5-turbo\",\"gpt-4\",\"gpt-4-32k\"],\"order_pay_info_text\":\"成为本站会员后每月有500次对话额度，50次 AI 绘画额度，限制下月1号解除，若在期间超过次数后可单独购买点卡。当月充值的点卡有效期可以延期到下个月底。\",\"order_pay_timeout\":1800,\"register_ways\":[],\"reward_img\":\"https://img.r9it.com/chatgpt-plus/1696824231905289.png\",\"show_demo_notice\":true,\"title\":\"ChatPlus AI 智能助手\",\"user_init_calls\":10,\"vip_month_calls\":500,\"vip_month_img_calls\":50,\"wechat_card_url\":\"/images/wx.png\"}'),
-(2, 'chat', '{\"azure\":{\"api_url\":\"https://chat-bot-api.openai.azure.com/openai/deployments/{model}/chat/completions?api-version=2023-05-15\",\"max_tokens\":1024,\"temperature\":1},\"baidu\":{\"api_url\":\"https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/{model}\",\"max_tokens\":1024,\"temperature\":0.95},\"chat_gml\":{\"api_url\":\"https://open.bigmodel.cn/api/paas/v3/model-api/{model}/sse-invoke\",\"max_tokens\":1024,\"temperature\":0.95},\"context_deep\":4,\"dall_api_url\":\"http://89.117.18.9:8001/v1/images/generations\",\"dall_img_num\":1,\"enable_context\":true,\"enable_history\":true,\"open_ai\":{\"api_url\":\"https://api.fast-tunnel.one/v1/chat/completions\",\"max_tokens\":2048,\"temperature\":1},\"xun_fei\":{\"api_url\":\"wss://spark-api.xf-yun.com/{version}/chat\",\"max_tokens\":1024,\"temperature\":0.5}}'),
+(1, 'system', '{\"title\":\"ChatPlus AI 智能助手\",\"admin_title\":\"ChatPlus 控制台\",\"logo\":\"http://localhost:5678/static/upload/2024/3/1710732653645531.png\",\"init_power\":100,\"daily_power\":99,\"invite_power\":10,\"vip_month_power\":1000,\"register_ways\":[\"mobile\",\"username\",\"email\"],\"enabled_register\":true,\"reward_img\":\"http://localhost:5678/static/upload/2024/3/1710753716309668.jpg\",\"enabled_reward\":true,\"power_price\":0.1,\"order_pay_timeout\":1800,\"default_models\":[11,7,1,10,12,19,18,17,3],\"mj_power\":20,\"sd_power\":5,\"dall_power\":15,\"wechat_card_url\":\"/images/wx.png\",\"enable_context\":true,\"context_deep\":4}'),
 (3, 'notice', '{\"content\":\"注意：当前站点仅为开源项目 \\u003ca style=\\\"color: #F56C6C\\\" href=\\\"https://github.com/yangjian102621/chatgpt-plus\\\" target=\\\"_blank\\\"\\u003eChatPlus\\u003c/a\\u003e 的演示项目，本项目单纯就是给大家体验项目功能使用。\\n体验额度用完之后请不要在当前站点进行任何充值操作！！！\\n体验额度用完之后请不要在当前站点进行任何充值操作！！！\\n体验额度用完之后请不要在当前站点进行任何充值操作！！！\\n 如果觉得好用你就花几分钟自己部署一套，没有API KEY 的同学可以去 \\u003ca href=\\\"https://gpt.bemore.lol\\\" target=\\\"_blank\\\"\\n             style=\\\"font-size: 20px;color:#F56C6C\\\"\\u003ehttps://gpt.bemore.lol\\u003c/a\\u003e 购买，现在有超级优惠，价格远低于 OpenAI 官方。\\nGPT-3.5，GPT-4，DALL-E3 绘图......你都可以随意使用，无需魔法。\\nMidJourney API 购买地址：\\u003ca href=\\\"https://api.chat-plus.net\\\" target=\\\"_blank\\\"\\n   style=\\\"font-size: 20px;color:#F56C6C\\\"\\u003ehttps://api.chat-plus.net\\u003c/a\\u003e\\n接入教程： \\u003ca href=\\\"https://ai.r9it.com/docs/install/\\\" target=\\\"_blank\\\"\\n             style=\\\"font-size: 20px;color:#F56C6C\\\"\\u003ehttps://ai.r9it.com/docs/install/\\u003c/a\\u003e\\n本项目源码地址：\\u003ca href=\\\"https://github.com/yangjian102621/chatgpt-plus\\\" target=\\\"_blank\\\"\\u003ehttps://github.com/yangjian102621/chatgpt-plus\\u003c/a\\u003e\",\"updated\":true}');

 -- --------------------------------------------------------
@ -235,7 +264,7 @@ CREATE TABLE `chatgpt_functions` (
 --

 INSERT INTO `chatgpt_functions` (`id`, `name`, `label`, `description`, `parameters`, `token`, `action`, `enabled`) VALUES
-(1, 'weibo', '微博热搜', '新浪微博热搜榜，微博当日热搜榜单', '{\"type\":\"object\",\"properties\":{}}', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHBpcmVkIjowLCJ1c2VyX2lkIjowfQ.tLAGkF8XWh_G-oQzevpIodsswtPByBLoAZDz_eWuBg', 'http://localhost:5678/api/function/weibo', 1),
+(1, '', '', '', '{\"type\":\"\",\"properties\":null}', '', '', 0),
 (2, 'zaobao', '今日早报', '每日早报，获取当天新闻事件列表', '{\"type\":\"object\",\"properties\":{}}', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHBpcmVkIjowLCJ1c2VyX2lkIjowfQ.tLAGkF8XWh_G-oQzevpIodsswtPByBLoAZDz_eWuBgw', 'http://localhost:5678/api/function/zaobao', 1),
 (3, 'dalle3', 'DALLE3', 'AI 绘画工具，根据输入的绘图描述用 AI 工具进行绘画', '{\"type\":\"object\",\"required\":[\"prompt\"],\"properties\":{\"prompt\":{\"type\":\"string\",\"description\":\"绘画提示词\"}}}', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHBpcmVkIjowLCJ1c2VyX2lkIjowfQ.tLAGkF8XWh_G-oQzevpIodsswtPByBLoAZDz_eWuBgw', 'http://localhost:5678/api/function/dalle3', 1);

@ -268,7 +297,7 @@ CREATE TABLE `chatgpt_invite_logs` (
  `user_id` int NOT NULL COMMENT '注册用户ID',
  `username` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '用户名',
  `invite_code` char(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '邀请码',
-  `reward_json` text NOT NULL COMMENT '邀请奖励',
+  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '备注',
  `created_at` datetime NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='邀请注册日志';

@ -295,6 +324,7 @@ CREATE TABLE `chatgpt_mj_jobs` (
  `use_proxy` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否使用反代',
  `publish` tinyint(1) NOT NULL COMMENT '是否发布',
  `err_msg` varchar(255) DEFAULT NULL COMMENT '错误信息',
+  `power` smallint NOT NULL DEFAULT '0' COMMENT '消耗算力',
  `created_at` datetime NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='MidJourney 任务表';

@ -325,6 +355,26 @@ CREATE TABLE `chatgpt_orders` (

 -- --------------------------------------------------------

+--
+-- 表的结构 `chatgpt_power_logs`
+--
+
+DROP TABLE IF EXISTS `chatgpt_power_logs`;
+CREATE TABLE `chatgpt_power_logs` (
+  `id` int NOT NULL,
+  `user_id` int NOT NULL COMMENT '用户ID',
+  `username` varchar(30) NOT NULL COMMENT '用户名',
+  `type` tinyint(1) NOT NULL COMMENT '类型（1：充值，2：消费，3：退费）',
+  `amount` smallint NOT NULL COMMENT '算力数值',
+  `balance` int NOT NULL COMMENT '余额',
+  `model` varchar(30) NOT NULL COMMENT '模型',
+  `remark` varchar(255) NOT NULL COMMENT '备注',
+  `mark` tinyint(1) NOT NULL COMMENT '资金类型（0：支出，1：收入）',
+  `created_at` datetime NOT NULL COMMENT '创建时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户算力消费日志';
+
+-- --------------------------------------------------------
+
 --
 -- 表的结构 `chatgpt_products`
 --
@ -336,26 +386,27 @@ CREATE TABLE `chatgpt_products` (
  `price` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '价格',
  `discount` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '优惠金额',
  `days` smallint NOT NULL DEFAULT '0' COMMENT '延长天数',
-  `calls` int NOT NULL DEFAULT '0' COMMENT '调用次数',
-  `img_calls` int NOT NULL DEFAULT '0' COMMENT '绘图次数',
+  `power` int NOT NULL DEFAULT '0' COMMENT '增加算力值',
  `enabled` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否启动',
  `sales` int NOT NULL DEFAULT '0' COMMENT '销量',
  `sort_num` tinyint NOT NULL DEFAULT '0' COMMENT '排序',
  `created_at` datetime NOT NULL,
-  `updated_at` datetime NOT NULL
+  `updated_at` datetime NOT NULL,
+  `app_url` varchar(255) DEFAULT NULL COMMENT 'App跳转地址',
+  `url` varchar(255) DEFAULT NULL COMMENT '跳转地址'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='会员套餐表';

 --
 -- 转存表中的数据 `chatgpt_products`
 --

-INSERT INTO `chatgpt_products` (`id`, `name`, `price`, `discount`, `days`, `calls`, `img_calls`, `enabled`, `sales`, `sort_num`, `created_at`, `updated_at`) VALUES
-(1, '会员1个月', '19.90', '10.00', 30, 0, 0, 1, 2, 0, '2023-08-28 10:48:57', '2023-11-08 17:22:07'),
-(2, '会员3个月', '140.00', '30.00', 90, 0, 0, 1, 1, 0, '2023-08-28 10:52:22', '2023-08-31 16:24:31'),
-(3, '会员6个月', '290.00', '100.00', 180, 0, 0, 1, 1, 0, '2023-08-28 10:53:39', '2023-08-31 16:24:36'),
-(4, '会员12个月', '580.00', '200.00', 365, 0, 0, 1, 1, 0, '2023-08-28 10:54:15', '2023-08-31 16:24:42'),
-(5, '100次点卡', '10.00', '9.90', 0, 100, 10, 1, 7, 0, '2023-08-28 10:55:08', '2023-12-15 16:29:06'),
-(6, '200次点卡', '29.90', '20.00', 0, 200, 25, 1, 1, 0, '2023-12-15 16:55:12', '2023-12-15 16:55:12');
+INSERT INTO `chatgpt_products` (`id`, `name`, `price`, `discount`, `days`, `power`, `enabled`, `sales`, `sort_num`, `created_at`, `updated_at`, `app_url`, `url`) VALUES
+(1, '会员1个月', '19.90', '10.00', 30, 0, 1, 2, 0, '2023-08-28 10:48:57', '2024-03-15 15:19:52', 'snssdk1128://ec_goods_detail?promotion_id=3668220199204683930', 'snssdk1128://ec_goods_detail?promotion_id=3668220199204683930'),
+(2, '会员3个月', '140.00', '30.00', 90, 0, 1, 1, 0, '2023-08-28 10:52:22', '2024-02-27 11:34:26', NULL, NULL),
+(3, '会员6个月', '290.00', '100.00', 180, 0, 1, 1, 0, '2023-08-28 10:53:39', '2023-08-31 16:24:36', NULL, NULL),
+(4, '会员12个月', '580.00', '200.00', 365, 0, 1, 1, 0, '2023-08-28 10:54:15', '2023-08-31 16:24:42', NULL, NULL),
+(5, '100算力', '10.00', '9.90', 0, 100, 1, 10, 0, '2023-08-28 10:55:08', '2024-03-15 15:20:29', NULL, 'snssdk1128://ec_goods_detail?promotion_id=3668220199204683930'),
+(6, '200算力', '29.90', '20.00', 0, 200, 1, 1, 0, '2023-12-15 16:55:12', '2024-03-15 15:20:37', NULL, NULL);

 -- --------------------------------------------------------

@ -394,6 +445,7 @@ CREATE TABLE `chatgpt_sd_jobs` (
  `progress` smallint DEFAULT '0' COMMENT '任务进度',
  `publish` tinyint(1) NOT NULL COMMENT '是否发布',
  `err_msg` varchar(255) DEFAULT NULL COMMENT '错误信息',
+  `power` smallint NOT NULL DEFAULT '0' COMMENT '消耗算力',
  `created_at` datetime NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='Stable Diffusion 任务表';

@ -411,10 +463,7 @@ CREATE TABLE `chatgpt_users` (
  `password` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '密码',
  `avatar` varchar(100) NOT NULL COMMENT '头像',
  `salt` char(12) NOT NULL COMMENT '密码盐',
-  `total_tokens` bigint NOT NULL DEFAULT '0' COMMENT '累计消耗 tokens',
-  `tokens` bigint NOT NULL DEFAULT '0' COMMENT '当月消耗 tokens',
-  `calls` int NOT NULL DEFAULT '0' COMMENT '剩余调用次数',
-  `img_calls` int NOT NULL DEFAULT '0' COMMENT '剩余绘图次数',
+  `power` int NOT NULL DEFAULT '0' COMMENT '剩余算力',
  `expired_time` int NOT NULL COMMENT '用户过期时间',
  `status` tinyint(1) NOT NULL COMMENT '当前状态',
  `chat_config_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '聊天配置json',
@ -431,13 +480,15 @@ CREATE TABLE `chatgpt_users` (
 -- 转存表中的数据 `chatgpt_users`
 --

-INSERT INTO `chatgpt_users` (`id`, `username`, `nickname`, `password`, `avatar`, `salt`, `total_tokens`, `tokens`, `calls`, `img_calls`, `expired_time`, `status`, `chat_config_json`, `chat_roles_json`, `chat_models_json`, `last_login_at`, `vip`, `last_login_ip`, `created_at`, `updated_at`) VALUES
-(4, '18575670125', '极客学长@830270', 'ccc3fb7ab61b8b5d096a4a166ae21d121fc38c71bbd1be6173d9ab973214a63b', 'http://img.r9it.com/chatgpt-plus/1693981355719469.png', 'ueedue5l', 98538, 54701, 1055, 43666, 1788078636, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"elon_musk\",\"girl_friend\",\"lu_xun\",\"red_book\",\"psychiatrist\",\"translator\",\"weekly_report\",\"artist\",\"dou_yin\",\"english_trainer\",\"gpt\",\"kong_zi\",\"programmer\",\"seller\",\"steve_jobs\",\"teacher\"]', '[\"completions_pro\",\"eb-instant\",\"general\",\"generalv2\",\"chatglm_pro\",\"chatglm_lite\",\"chatglm_std\",\"gpt-3.5-turbo-16k\",\"gpt-4\",\"generalv3\",\"gpt-3.5-turbo-1106\",\"gpt-4-1106-preview\",\"gpt-4-all\"]', 1706602652, 1, '::1', '2023-06-12 16:47:17', '2024-01-30 16:17:32'),
-(91, '18575670126', '极客学长@204872', '5e4050b8dd403f593260395d9edeb9f273dbe92d15dfdd929c4a182e95da10c4', '/images/avatar/user.png', '6fj0otl8', 0, 0, 10, 0, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[\"completions_pro\",\"eb-instant\",\"general\",\"generalv2\",\"chatglm_pro\",\"chatglm_lite\",\"chatglm_std\",\"gpt-3.5-turbo-16k\"]', 1697184324, 1, '::1', '2023-10-13 16:01:56', '2023-12-29 17:30:27'),
-(99, '13999999999', '极客学长@396023', 'bf47d517c17ed1ead6ff2542753f9b6a132e79c29e06c3710faf1a36d800a217', '/images/avatar/user.png', 'x1s66pwd', 0, 0, 10, 5, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[\"eb-instant\",\"completions_pro\",\"generalv2\",\"general\",\"chatglm_pro\",\"gpt-3.5-turbo-16k\",\"chatglm_lite\",\"chatglm_std\"]', 0, 0, '', '2023-11-23 16:27:20', '2023-12-29 17:30:27'),
-(100, '13777777777', '极客学长@292245', 'dcaf31b154432310bd700349e7de7e9dde2a3d6955a035a01fe527c7917a4f99', '/images/avatar/user.png', 'i8a53f8f', 0, 0, 10, 5, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[\"eb-instant\",\"completions_pro\",\"generalv2\",\"general\",\"chatglm_pro\",\"gpt-3.5-turbo-16k\",\"chatglm_lite\",\"chatglm_std\"]', 0, 0, '', '2023-11-23 16:55:45', '2023-12-29 17:30:27'),
-(102, 'yangjian102621@gmail.com', '极客学长@207163', 'd51cec21942737083943e5c3a8f063dea034e40622ac8bd47d771f13707e4676', '/images/avatar/user.png', 'eqezapgk', 202, 202, 80, 1, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[\"eb-instant\",\"completions_pro\",\"generalv2\",\"general\",\"chatglm_pro\",\"gpt-3.5-turbo-16k\",\"chatglm_lite\",\"chatglm_std\"]', 1704448377, 0, '::1', '2024-01-05 17:48:00', '2024-01-11 14:06:57'),
-(105, '13888888888', '极客学长@551903', '4f893cc6b6d47b42fd0fcaddc55fd4a351cad74ba81ebabb4d7785f9675814da', '/images/avatar/user.png', 'cotpzi3q', 10, 10, 9, 5, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[\"eb-instant\",\"completions_pro\",\"generalv2\",\"general\",\"chatglm_pro\",\"gpt-3.5-turbo-16k\",\"chatglm_lite\",\"chatglm_std\",\"generalv3\",\"qwen-max-1201\"]', 0, 0, '', '2024-01-30 15:37:43', '2024-01-30 15:37:43');
+INSERT INTO `chatgpt_users` (`id`, `username`, `nickname`, `password`, `avatar`, `salt`, `power`, `expired_time`, `status`, `chat_config_json`, `chat_roles_json`, `chat_models_json`, `last_login_at`, `vip`, `last_login_ip`, `created_at`, `updated_at`) VALUES
+(4, '18575670125', '极客学长@830270', 'ccc3fb7ab61b8b5d096a4a166ae21d121fc38c71bbd1be6173d9ab973214a63b', 'http://localhost:5678/static/upload/2024/2/1708682650912429.png', 'ueedue5l', 3082, 1717292086, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"red_book\",\"gpt\",\"programmer\",\"seller\"]', '[1,11]', 1710990060, 1, '172.22.11.200', '2023-06-12 16:47:17', '2024-03-22 08:53:00'),
+(91, '18575670126', '极客学长@204872', '5e4050b8dd403f593260395d9edeb9f273dbe92d15dfdd929c4a182e95da10c4', '/images/avatar/user.png', '6fj0otl8', 99, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[1,11]', 1697184324, 1, '::1', '2023-10-13 16:01:56', '2024-03-18 14:49:44'),
+(99, '13999999999', '极客学长@396023', 'bf47d517c17ed1ead6ff2542753f9b6a132e79c29e06c3710faf1a36d800a217', '/images/avatar/user.png', 'x1s66pwd', 99, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[1,11]', 0, 0, '', '2023-11-23 16:27:20', '2024-03-18 15:08:17'),
+(100, '13777777777', '极客学长@292245', 'dcaf31b154432310bd700349e7de7e9dde2a3d6955a035a01fe527c7917a4f99', '/images/avatar/user.png', 'i8a53f8f', 99, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[1,11]', 0, 0, '', '2023-11-23 16:55:45', '2024-03-18 15:08:12'),
+(102, 'yangjian102621@gmail.com', '极客学长@207163', 'd51cec21942737083943e5c3a8f063dea034e40622ac8bd47d771f13707e4676', '/images/avatar/user.png', 'eqezapgk', 99, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[1,11]', 1704448377, 0, '::1', '2024-01-05 17:48:00', '2024-03-18 15:08:41'),
+(105, '13888888888', '极客学长@551903', '4f893cc6b6d47b42fd0fcaddc55fd4a351cad74ba81ebabb4d7785f9675814da', '/images/avatar/user.png', 'cotpzi3q', 99, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\"]', '[1,11]', 0, 0, '', '2024-01-30 15:37:43', '2024-03-18 15:08:01'),
+(107, '15899615465', '极客学长@792493', '4717349769bfeed3fecfa387618f617d8e2809edfd134ac42a18a80d79386150', '/images/avatar/user.png', 'shhm4ypl', 99, 0, 1, '{\"api_keys\":{\"Azure\":\"\",\"ChatGLM\":\"\",\"OpenAI\":\"\"}}', '[\"gpt\",\"psychiatrist\",\"teacher\",\"programmer\",\"artist\"]', '[1,11]', 1710467940, 0, '172.22.11.3', '2024-03-15 09:34:40', '2024-03-18 14:49:27'),
+(112, '13575670125', '极客学长@676773', '93da6fc1008fd096f786db2fb43cfd378bbc9000c544fb596947fdcd434aba72', '/images/avatar/user.png', 'g5sq8f7n', 100, 0, 1, '', '[\"gpt\"]', '[11,7,1,10,12,19,18,17,3]', 0, 0, '', '2024-03-22 10:00:49', '2024-03-22 10:00:49');

 -- --------------------------------------------------------

@ -460,6 +511,13 @@ CREATE TABLE `chatgpt_user_login_logs` (
 -- 转储表的索引
 --

+--
+-- 表的索引 `chatgpt_admin_users`
+--
+ALTER TABLE `chatgpt_admin_users`
+  ADD PRIMARY KEY (`id`) USING BTREE,
+  ADD UNIQUE KEY `username` (`username`) USING BTREE;
+
 --
 -- 表的索引 `chatgpt_api_keys`
 --
@ -541,6 +599,12 @@ ALTER TABLE `chatgpt_orders`
  ADD PRIMARY KEY (`id`),
  ADD UNIQUE KEY `order_no` (`order_no`);

+--
+-- 表的索引 `chatgpt_power_logs`
+--
+ALTER TABLE `chatgpt_power_logs`
+  ADD PRIMARY KEY (`id`);
+
 --
 -- 表的索引 `chatgpt_products`
 --
@ -565,7 +629,9 @@ ALTER TABLE `chatgpt_sd_jobs`
 -- 表的索引 `chatgpt_users`
 --
 ALTER TABLE `chatgpt_users`
-  ADD PRIMARY KEY (`id`);
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `username` (`username`),
+  ADD UNIQUE KEY `username_2` (`username`);

 --
 -- 表的索引 `chatgpt_user_login_logs`
@ -577,6 +643,12 @@ ALTER TABLE `chatgpt_user_login_logs`
 -- 在导出的表使用AUTO_INCREMENT
 --

+--
+-- 使用表AUTO_INCREMENT `chatgpt_admin_users`
+--
+ALTER TABLE `chatgpt_admin_users`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=113;
+
 --
 -- 使用表AUTO_INCREMENT `chatgpt_api_keys`
 --
@ -599,13 +671,13 @@ ALTER TABLE `chatgpt_chat_items`
 -- 使用表AUTO_INCREMENT `chatgpt_chat_models`
 --
 ALTER TABLE `chatgpt_chat_models`
-  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=20;
+  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=23;

 --
 -- 使用表AUTO_INCREMENT `chatgpt_chat_roles`
 --
 ALTER TABLE `chatgpt_chat_roles`
-  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=129;
+  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=130;

 --
 -- 使用表AUTO_INCREMENT `chatgpt_configs`
@ -649,6 +721,12 @@ ALTER TABLE `chatgpt_mj_jobs`
 ALTER TABLE `chatgpt_orders`
  MODIFY `id` int NOT NULL AUTO_INCREMENT;

+--
+-- 使用表AUTO_INCREMENT `chatgpt_power_logs`
+--
+ALTER TABLE `chatgpt_power_logs`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
+
 --
 -- 使用表AUTO_INCREMENT `chatgpt_products`
 --
@ -671,7 +749,7 @@ ALTER TABLE `chatgpt_sd_jobs`
 -- 使用表AUTO_INCREMENT `chatgpt_users`
 --
 ALTER TABLE `chatgpt_users`
-  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=106;
+  MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=113;

 --
 -- 使用表AUTO_INCREMENT `chatgpt_user_login_logs`
--- a/deploy/data/mysql/init.d/xxl_job.sql
+++ b/deploy/data/mysql/init.d/xxl_job.sql
--- a/deploy/docker-compose.yaml
+++ b/deploy/docker-compose.yaml
@ -11,10 +11,10 @@ services:
    ports:
      - "3307:3306"
    volumes :
-      - ./mysql/conf/my.cnf:/etc/mysql/my.cnf
-      - ./mysql/data:/var/lib/mysql
-      - ./mysql/logs:/var/log/mysql
-      - ./mysql/init.d:/docker-entrypoint-initdb.d/
+      - ./conf/mysql/my.cnf:/etc/mysql/my.cnf
+      - ./data/mysql/data:/var/lib/mysql
+      - ./logs/mysql:/var/log/mysql
+      - ./data/mysql/init.d:/docker-entrypoint-initdb.d/
  
  # redis 
  chatgpt-plus-redis:
@ -23,18 +23,31 @@ services:
    container_name: chatgpt-plus-redis
    command: redis-server --requirepass 12345678
    volumes :
-      - ./redis/data:/data
+      - ./data/redis:/data
    ports:
      - "6380:6379"

+  xxl-job-admin:
+    container_name: xxl-job-admin
+    image: xuxueli/xxl-job-admin:2.4.0
+    restart: always
+    ports:
+      - "8081:8080"
+    environment:
+      - PARAMS=--spring.config.location=/application.properties
+    volumes:
+      - ./logs/xxl-job:/data/applogs
+      - ./conf/xxl-job/application.properties:/application.properties
+
  # 后端 API 程序
  chatgpt-plus-api:
-    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-api:v3.1.8.1
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-api:v4.0.0-amd64
    container_name: chatgpt-plus-api
    restart: always
    depends_on:
      - chatgpt-plus-mysql
      - chatgpt-plus-redis
+      - xxl-job-admin
    environment:
      - DEBUG=false
      - LOG_LEVEL=info
@ -45,12 +58,12 @@ services:
    volumes:
      - /usr/share/zoneinfo/Asia/Shanghai:/etc/localtime
      - ./conf/config.toml:/var/www/app/config.toml
-      - ./logs:/var/www/app/logs
+      - ./logs/app:/var/www/app/logs
      - ./static:/var/www/app/static

  # 前端应用
  chatgpt-plus-web:
-    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-web:v3.1.8.1
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-web:v4.0.0-amd64
    container_name: chatgpt-plus-web
    restart: always
    depends_on:
@ -61,5 +74,5 @@ services:
      - ./logs/nginx:/var/log/nginx
      - ./conf/nginx/conf.d:/etc/nginx/conf.d
      - ./conf/nginx/nginx.conf:/etc/nginx/nginx.conf
-      - ./ssl:/etc/nginx/ssl
+      - ./conf/nginx/ssl:/etc/nginx/ssl