重构：优化认证逻辑、界面一致性和错误处理

- 移除聊天和音乐接口的冗余认证绕过配置 - 为聊天列表查询添加调试日志记录 - 在即梦和视频模块集成登录弹窗提升用户体验 - 修复模型属性映射问题（category->tag, description->desc） - 移除即梦生成按钮的禁用状态限制 - 简化即梦设置管理页面布局，去除标签页结构 - 清理控制台日志输出并改进错误处理一致性
文生视频和图生视频功能完成
2026-04-07 19:54:26 +08:00 · 2025-07-25 15:31:58 +08:00 · 2025-07-23 19:11:30 +08:00 · 2025-07-22 16:46:58 +08:00 · 2025-07-22 15:12:49 +08:00 · 2025-07-21 20:05:20 +08:00
443 changed files with 44606 additions and 51310 deletions
--- a/.github/ISSUE_TEMPLATE/1.bug.yml
+++ b/.github/ISSUE_TEMPLATE/1.bug.yml
@@ -1,5 +1,5 @@
 name: Bug 报告 🐛
-description: 为 geekai 提交错误报告
+description: 为 chatgpt-plus 提交错误报告
 labels: ['Bug']
 body:
  - type: checkboxes
--- a/.github/ISSUE_TEMPLATE/2.feature.yml
+++ b/.github/ISSUE_TEMPLATE/2.feature.yml
@@ -1,5 +1,5 @@
 name: 功能优化 🚀
-description: 为 geekai 提交优化建议
+description: 为 chatgpt-plus 提交优化建议
 labels: ['feature']
 body:
  - type: checkboxes
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,313 +1,451 @@
 # 更新日志

+## v4.2.5
+
+- 功能优化：在代码右下角增加复制代码功能按钮，增加收起和展开代码功能
+- Bug 修复：修复 Shift + Enter 不换行的 Bug
+- Bug 修复：修复管理后台菜单添加页面的文本错误
+- Bug 修复：解决聊天页面异常退出不断重连的 bug
+- 功能优化：把 Luma 和可灵视频生成页面整合成一个视频创作中心页面，统一管理视频任务
+- 功能新增：增加即梦 AI 专题页面，支持即梦官方原生 API 的图片和视频生成 🎉🎉🎉
+
+## v4.2.4
+
+- 功能优化：更改前端构建技术选型，使用 Vite 构建，提升构建速度和兼容性
+- 功能优化：使用 SSE 发送消息，替换原来的 Websocket 消息方案
+- 功能新增：管理后台支持设置默认昵称
+- 功能优化：支持 Suno v4.5 模型支持
+- 功能新增：用户注册和用户登录增加用户协议和隐私政策功能，需要用户同意协议才可注册和登录。
+- 功能优化：修改重新回答功能，撤回千面的问答内容为可编辑内容，撤回的内容不会增加额外的上下文
+- 功能优化：优化聊天记录的存储结构，增加模型名称字段，支持存储更长的模型名称
+- Bug 修复：聊天应用绑定模型后无效，还是会轮询 API KEY，导致一会成功，一会请求失败。
+- 功能优化：如果管理后台没有启用会员充值菜单，移动端也不显示充值套餐功能
+
+## v4.2.3
+
+- 功能优化：增加模型分组与模型描述，采用卡片展示模式改进模型选择功能体验
+- 功能优化：化思维导图下载图片的清晰度以及解决拖动、缩放操作后下载图片内容不全问题
+- Bug 修复：修复 MJ 画图页面已画出的图，点复制指令无效问题
+- 功能优化：MJ 画图的分辨率支持自定义，优先使用 prompt 中--ar 参数
+- Bug 修复：修复 MJ 绘画 U1-V1,拼写错误
+- 功能优化：支持自动迁移数据表结构，无需在手动执行 SQL 了
+- 功能优化：移除首页的文字动画效果
+- 功能优化：在聊天页面增加对话列表展开和隐藏功能
+- 功能优化：聊天页面增加 AI 思考中动画效果
+
+## v4.2.2
+
+- 功能优化：开启图形验证码功能的时候现检查是否配置了 API 服务，防止开启之后没法登录的 Bug。
+- 功能优化：支持原生的 DeepSeek 推理模型 API，聊天 API KEY 支持设置完整的 API 路径，比如 https://api.geekai.pro/v1/chat/completions
+- 功能优化：支持 GPT-4o 图片编辑功能。
+- 功能新增：对话页面支持 AI 输出语音播报（TTS）。
+- 功能优化：替换瀑布流组件，优化用户体验。
+- 功能优化：生成思维导图时候自动缓存上一次的结果。
+- 功能优化：优化 MJ 绘图页面，增加 MJ-V7 模型支持。
+- 功能优化：后台管理增加生成一键登录链接地址功能
+
+## v4.2.1
+
+- 功能新增：新增支持可灵生成视频，支持文生视频，图生生视频。
+- Bug 修复：修复手机端登录页面 Logo 无法修改的问题。
+- 功能新增：重构所有异步任务（绘图，音乐，视频）更新方式，使用 http pull 来替代 websocket。
+- 功能优化：优化 Luma 图生视频功能，支持本地上传图片和远程图片。
+- Bug 修复：修复移动端聊天页面新建对话时候角色没有更模型绑定的 Bug。
+- 功能优化：优化聊天页面代码块样式，优化公式的解析。
+- 功能优化：在绘图，视频相关 API 增加提示词长度的检查，防止提示词超出导致写入数据库失败。
+- Bug 修复：优化 Redis 连接池配置，增加连接池超时时间，单核服务器报错 `redis: connection pool timeout`。
+- 功能优化：优化邮件验证码发送逻辑，更新邮件发送成功提示。
+
+## v4.2.0
+
+- 功能优化：优化聊天页面 Notice 组件样式，采用 Vuepress 文档样式
+- Bug 修复：修复主题切换的组件显示异常问题
+- 功能优化：支持 DeepSeek-R1 推理模型，优化推理样式输出
+- 功能优化：优化 Suno 歌曲播放按钮样式，居中显示
+- 功能优化：后台管理新增模型的时候，可以绑定所有的 API KEY，而不只是能绑定 Chat 类型的 API KEY
+- 功能新增：新增每日签到功能，每日签到可以获得算力奖励
+- 功能优化：兼容 OpenAI o3 系列模型
+- 功能优化：API 默认开启允许跨域调用
+- 功能优化：优化 docker-compose.yaml 配置，增加各容器依赖关系
+
+## v4.1.9
+
+- 功能优化：优化系统配置，移除已废弃的配置项
+- 功能优化：GPT-O1 模型支持流式输出
+- 功能优化：优化代码引用快样式，支持主题切换
+- 功能优化：登录，注册页面允许替换用户自己的 Logo 和 Title
+- Bug 修复：修复 OpenAI 实时语音通话没有检测用户算力不足的 Bug
+- 功能新增：管理后台增加算力日志查询功能，支持按用户，按模型，按日期，按类型查询算力日志
+- 功能优化：支持为模型绑定 Dalle 和 chat 类型的 API KEY
+- 功能新增：支持管理后台设置 ICP 备案号
+
+## v4.1.8
+
+- 功能优化：**UI 全新改版，支持主题切换**。 :rocket: :rocket: :rocket:
+- 功能新增：Gitee AI API 接口接入，目前支持 Gitee 的 SD 绘图接口，支持 Gitee 的 AI 对话接口。:rocket: :rocket: :rocket:
+- Bug 修复：修复音 Luma API 更新导致任务响应解析失败的错误
+- 功能优化：支持 Suno v4.0 模型支持
+- Bug 修复：修复 Suno 已完成任务删除失败的 错误
+- 功能新增：支持 OpenAI 实时语音通话功能，目前已经支持按次收费，支持管理员设置每次实时语音通话的算力消耗
+- 功能新增：生成提示词需要消耗算力，支持管理员设置每次生成提示词的算力消耗，防止被白嫖
+- 功能新增：DALL-E-3 绘图支持 Flux 绘图模型，支持在管理后添加 Flux,SD 等绘图模型
+- 功能优化：Markdown 支持解析 emoji 表情
+- 功能优化：当管理后台禁用了某个绘图菜单的时候，移动端绘图菜单也会同步禁用（不显示该功能）
+
+## v4.1.7
+
+- Bug 修复：手机邮箱相关的注册问题 [#IB0HS5](https://gitee.com/blackfox/geekai/issues/IB0HS5)
+- Bug 修复：音乐视频无法下载，思维导图下载后看不清文字[#IB0N2E](https://gitee.com/blackfox/geekai/issues/IB0N2E)
+- 功能优化：保存所有 AIGC 任务的原始信息，程序启动之后自动将未执行的任务加入到 redis 队列
+- 功能优化：失败的任务自动退回算力，而不需要在删除的时候再退回
+- 功能新增：支持设置一个专门的模型来翻译提示词，提供 Mate 提示词生成功能
+- Bug 修复：修复图片对话的时候，上下文不起作用的 Bug
+- 功能新增：管理后台新增批量导出兑换码功能
+
+## v4.1.6
+
+- 功能新增：**支持 OpenAI 实时语音对话功能** :rocket: :rocket: :rocket:, Beta 版，目前没有做算力计费控制，目前只有 VIP 用户可以使用。
+- 功能优化：优化 MysQL 容器配置文档，解决 MysQL 容器资源占用过高问题
+- 功能新增：管理后台增加 AI 绘图任务管理，可在管理后台浏览和删除用户的绘图任务
+- 功能新增：管理后台增加 Suno 和 Luma 任务管理功能
+- Bug 修复：修复管理后台删除兑换码报 404 错误
+- 功能优化：优化充值产品定价逻辑，可以设置原价和优惠价，**升级当前版本之后请务必要到管理后台去重新设置一下产品价格，以免造成损失！！！**，**升级当前版本之后请务必要到管理后台去重新设置一下产品价格，以免造成损失！！！**，**升级当前版本之后请务必要到管理后台去重新设置一下产品价格，以免造成损失！！！**。
+
+## v4.1.5
+
+- 功能优化：重构 websocket 组件，减少 websocket 连接数，全站共享一个 websocket 连接
+- Bug 修复：兼容手机端原生微信支付和支付宝支付渠道
+- Bug 修复：修复删除绘图任务时候因为字段长度过短导致 SQL 执行失败问题
+- 功能优化：优化 Vue 组件通信代码，使用共享数据来替换之前的事件订阅模式，效率更高一些
+- 功能优化：优化思维导图生成功果页面，优化用户体验
+
+## v4.1.4
+
+- 功能优化：用户文件列表组件增加分页功能支持
+- Bug 修复：修复用户注册失败 Bug，注册操作只弹出一次行为验证码
+- 功能优化：首次登录不需要验证码，直接登录，登录失败之后才弹出验证码
+- 功能新增：给 AI 应用（角色）增加分类，前端支持分类筛选
+- 功能优化：允许用户在聊天页面设置是否使用流式输出或者一次性输出，兼容 GPT-O1 模型。
+- 功能优化：移除 PayJS 支付渠道支持，PayJs 已经关闭注册服务，请使用其他支付方式。
+- 功能新增：新增 GeeK 易支付支付渠道，支持支付宝，微信支付，QQ 钱包，京东支付，抖音支付，Paypal 支付等支付方式
+- Bug 修复：修复注册页面 tab 组件没有自动选中问题 [#6](https://github.com/yangjian102621/geekai-plus/issues/6)
+- 功能优化：Luma 生成视频任务增加自动翻译功能
+- Bug 修复：Suno 和 Luma 任务没有判断用户算力
+- 功能新增：邮箱注册增加邮箱后缀白名单，防止使用某些垃圾邮箱注册薅羊毛
+- 功能优化：清空未支付订单时，只清空超过 15 分钟未支付的订单
+
 ## v4.1.3
-* 功能优化：重构用户登录模块，给所有的登录组件增加行为验证码功能，支持用户绑定手机，邮箱和微信
-* 功能优化：重构找回密码模块，支持通过手机或者邮箱找回密码
-* 功能优化：管理后台给可以拖动排序的组件添加拖动图标
-* 功能优化：Suno 支持合成完整歌曲，和上传自己的音乐作品进行二次创作
-* Bug修复：手机端角色和模型选择不生效
-* Bug修复：用户登录过期之后聊天页面出现大量报错，需要刷新页面才能正常
-* 功能优化：优化聊天页面 Websocket 断线重连代码，提高用户体验
-* 功能优化：给算力增减服务全部加上数据库事务和同步锁
-* 功能优化：支持用户在前端对话界面选择插件
-* 功能新增：支持 Luma 文生视频功能
+
+- 功能优化：重构用户登录模块，给所有的登录组件增加行为验证码功能，支持用户绑定手机，邮箱和微信
+- 功能优化：重构找回密码模块，支持通过手机或者邮箱找回密码
+- 功能优化：管理后台给可以拖动排序的组件添加拖动图标
+- 功能优化：Suno 支持合成完整歌曲，和上传自己的音乐作品进行二次创作
+- Bug 修复：手机端角色和模型选择不生效
+- Bug 修复：用户登录过期之后聊天页面出现大量报错，需要刷新页面才能正常
+- 功能优化：优化聊天页面 Websocket 断线重连代码，提高用户体验
+- 功能优化：给算力增减服务全部加上数据库事务和同步锁
+- 功能优化：支持用户在前端对话界面选择插件
+- 功能新增：支持 Luma 文生视频功能

 ## v4.1.2
-* Bug修复：修复思维导图页面获取模型失败的问题
-* 功能优化：优化MJ,SD,DALL-E 任务列表页面，显示失败任务的错误信息，删除失败任务可以恢复扣减算力
-* Bug修复：修复后台拖动排序组件 Bug
-* 功能优化：更新数据库失败时候显示具体的的报错信息
-* Bug修复：修复管理后台对话详情页内容显示异常问题
-* 功能优化：管理后台新增清空所有未支付订单的功能
-* 功能优化：给会话信息和系统配置数据加上缓存功能，减少 http 请求
-* 功能新增：移除微信机器人收款功能，增加卡密功能，支持用户使用卡密兑换算力
+
+- Bug 修复：修复思维导图页面获取模型失败的问题
+- 功能优化：优化 MJ,SD,DALL-E 任务列表页面，显示失败任务的错误信息，删除失败任务可以恢复扣减算力
+- Bug 修复：修复后台拖动排序组件 Bug
+- 功能优化：更新数据库失败时候显示具体的的报错信息
+- Bug 修复：修复管理后台对话详情页内容显示异常问题
+- 功能优化：管理后台新增清空所有未支付订单的功能
+- 功能优化：给会话信息和系统配置数据加上缓存功能，减少 http 请求
+- 功能新增：移除微信机器人收款功能，增加卡密功能，支持用户使用卡密兑换算力

 ## v4.1.1
-* Bug修复：修复 GPT 模型 function call 调用后没有输出的问题
-* 功能新增：允许获取 License 授权用户可以自定义版权信息
-* 功能新增：聊天对话框支持粘贴剪切板内容来上传截图和文件
-* 功能优化：增加 session 和系统配置缓存，确保每个页面只进行一次 session 和 get system config 请求
-* 功能优化：在应用列表页面，无需先添加模型到用户工作区，可以直接使用
-* 功能新增：MJ 绘图失败的任务不会自动删除，而是会在列表页显示失败详细错误信息
-* 功能新增：允许在设置首页纯色背景，背景图片，随机背景图片三种背景模式
-* 功能新增：允许在管理后台设置首页显示的导航菜单
-* Bug修复：修复注册页面先显示关闭注册组件，然后再显示注册组件
-* 功能新增：增加 Suno 文生歌曲功能
-* 功能优化：移除多平台模型支持，统一使用 one-api 接口形式，其他平台的模型需要通过 one-api 接口添加
-* 功能优化：在所有列表页面增加返回顶部按钮
+
+- Bug 修复：修复 GPT 模型 function call 调用后没有输出的问题
+- 功能新增：允许获取 License 授权用户可以自定义版权信息
+- 功能新增：聊天对话框支持粘贴剪切板内容来上传截图和文件
+- 功能优化：增加 session 和系统配置缓存，确保每个页面只进行一次 session 和 get system config 请求
+- 功能优化：在应用列表页面，无需先添加模型到用户工作区，可以直接使用
+- 功能新增：MJ 绘图失败的任务不会自动删除，而是会在列表页显示失败详细错误信息
+- 功能新增：允许在设置首页纯色背景，背景图片，随机背景图片三种背景模式
+- 功能新增：允许在管理后台设置首页显示的导航菜单
+- Bug 修复：修复注册页面先显示关闭注册组件，然后再显示注册组件
+- 功能新增：增加 Suno 文生歌曲功能
+- 功能优化：移除多平台模型支持，统一使用 one-api 接口形式，其他平台的模型需要通过 one-api 接口添加
+- 功能优化：在所有列表页面增加返回顶部按钮

 ## v4.1.0
-* bug修复：修复移动端修改聊天标题不生效的问题
-* Bug修复：修复用户注册不显示用户名的问题
-* Bug修复：修复管理后台拖动排序不生效的问题
-* 功能优化：允许用户设置自定义首页背景图片
-* 功能新增：**支持AI解读 PDF, Word, Excel等文件**
-* 功能优化：优化聊天界面的用户上传文件的列表样式
-* 功能优化：优化聊天页面对话样式，支持列表样式和对话样式切换
-* 功能新增：支持微信扫码登录，未注册用户微信扫码后会自动注册并登录。移动使用微信浏览器打开可以实现无感登录。

+- bug 修复：修复移动端修改聊天标题不生效的问题
+- Bug 修复：修复用户注册不显示用户名的问题
+- Bug 修复：修复管理后台拖动排序不生效的问题
+- 功能优化：允许用户设置自定义首页背景图片
+- 功能新增：**支持 AI 解读 PDF, Word, Excel 等文件**
+- 功能优化：优化聊天界面的用户上传文件的列表样式
+- 功能优化：优化聊天页面对话样式，支持列表样式和对话样式切换
+- 功能新增：支持微信扫码登录，未注册用户微信扫码后会自动注册并登录。移动使用微信浏览器打开可以实现无感登录。

 ## v4.0.9
-* 环境升级：升级 Golang 到 go1.22.4
-* 功能增加：接入微信商户号支付渠道
-* Bug修复：修复前端页面菜单把页面撑开，底部留白问题
-* 功能优化：聊天页面自动根据内容调整输入框的高度
-* Bug修复：修复Dalle绘图失败退回算力的问题
-* 功能优化：邀请码注册时被邀请人也可以获得赠送的算力
-* 功能优化：允许设置邮件验证码的抬头
-* Bug修复：修复免费模型不会记录聊天记录的bug
-* Bug修复：修复聊天输入公式显示异常的Bug
+
+- 环境升级：升级 Golang 到 go1.22.4
+- 功能增加：接入微信商户号支付渠道
+- Bug 修复：修复前端页面菜单把页面撑开，底部留白问题
+- 功能优化：聊天页面自动根据内容调整输入框的高度
+- Bug 修复：修复 Dalle 绘图失败退回算力的问题
+- 功能优化：邀请码注册时被邀请人也可以获得赠送的算力
+- 功能优化：允许设置邮件验证码的抬头
+- Bug 修复：修复免费模型不会记录聊天记录的 bug
+- Bug 修复：修复聊天输入公式显示异常的 Bug

 ## v4.0.8
-* 功能优化：升级 mathjax 公式解析插件，修复公式因为图片访问限制而无法显示的问题
-* 功能优化：当数据库更新失败的时候记录错误日志
-* 功能优化：聊天输入框会随着输入内容的增多自动调整高度
-* Bug修复：修复移动端聊天页面模型切换不生效的Bug
-* 功能优化：给PC端扫码支付增加签名验证和有效期验证
-* Bug修复：修复支付码生成API权限控制的问题
-* Bug修复：模型算力设置为0时，不扣减用户算力，并且不记录算力消费日志
-* 功能优化：新增随机背景配置项，可以在后台设置，首页使用 Bing 壁纸作为背景图片
-* 功能新增：H5端支持 Dalle 绘图
+
+- 功能优化：升级 mathjax 公式解析插件，修复公式因为图片访问限制而无法显示的问题
+- 功能优化：当数据库更新失败的时候记录错误日志
+- 功能优化：聊天输入框会随着输入内容的增多自动调整高度
+- Bug 修复：修复移动端聊天页面模型切换不生效的 Bug
+- 功能优化：给 PC 端扫码支付增加签名验证和有效期验证
+- Bug 修复：修复支付码生成 API 权限控制的问题
+- Bug 修复：模型算力设置为 0 时，不扣减用户算力，并且不记录算力消费日志
+- 功能优化：新增随机背景配置项，可以在后台设置，首页使用 Bing 壁纸作为背景图片
+- 功能新增：H5 端支持 Dalle 绘图

 ## v4.0.7

-* 功能优化：升级quic-go，支持 Go1.21
-* 功能优化：添加导航菜单的时候支持框入外部链接，并支持上传自定义菜单图片
-* Bug修复：修复弹窗等于图形验证码一直验证失败的问题
-* 功能重构：重构前端 UI 页面，增加顶部导航
-* 功能优化：优化 Vue 非父子组件之间的通信方式
-* 功能优化：优化 ItemList 组件，自动根据页面宽度计算 cols 数量
+- 功能优化：添加导航菜单的时候支持框入外部链接，并支持上传自定义菜单图片
+- Bug 修复：修复弹窗等于图形验证码一直验证失败的问题
+- 功能重构：重构前端 UI 页面，增加顶部导航
+- 功能优化：优化 Vue 非父子组件之间的通信方式
+- 功能优化：优化 ItemList 组件，自动根据页面宽度计算 cols 数量

 ## v4.0.6

-* Bug修复：修复PC端画廊页面的瀑布流组件样式错乱问题
-* 功能新增：给思维导图增加 ToolBar，实现思维导图的放大缩小和定位
-* Bug修复：修复思维导图不扣费的Bug
-* Bug修复：修复管理后台角色删除失败的Bug
-* Bug修复：兼容最新版秋叶SD懒人包的 SD API，新增 scheduler 参数
-* 功能优化：支持在管理后台配置 AI 绘图相关配置，包括 SD, MJ-PLUS, MJ-PROXY
-* Bug修复：修复注册用户提示注册人数达到上限的 Bug
-* 功能优化：将MJ,SD,Dall绘画页面的任务列表全改成瀑布流组件
+- Bug 修复：修复 PC 端画廊页面的瀑布流组件样式错乱问题
+- 功能新增：给思维导图增加 ToolBar，实现思维导图的放大缩小和定位
+- Bug 修复：修复思维导图不扣费的 Bug
+- Bug 修复：修复管理后台角色删除失败的 Bug
+- Bug 修复：兼容最新版秋叶 SD 懒人包的 SD API，新增 scheduler 参数
+- 功能优化：支持在管理后台配置 AI 绘图相关配置，包括 SD, MJ-PLUS, MJ-PROXY
+- Bug 修复：修复注册用户提示注册人数达到上限的 Bug
+- 功能优化：将 MJ,SD,Dall 绘画页面的任务列表全改成瀑布流组件

 ## v4.0.5

-* 功能优化：已授权系统在后台显示授权信息
-* 功能优化：使用思维链提示词生成思维导图，确保生成的思维导图不会出现格式错误
-* 功能优化：优化首页登录注册页面的 UI
-* BUG修复：修复License验证的逻辑漏洞
-* Bug修复：后台添加用户的时候密码规则限制跟前台注册保持一致
-* 功能新增：管理后台支持切换主题，支持 light 和 dark 两种主题
-* 功能新增：移动端新增 DALL-E 绘画功能
-* 功能新增：新增移动端首页功能，移动端支持 light 和 dark 两种主题
-* 功能新增：移动支持免登录预览功能
-* Bug修复：解决在同一个浏览器开启多个对话时候对话内容会相互乱串的问题
-* Bug修复：修复部分中转 API 模型会出现第一输出的字符被淹没的Bug
+- 功能优化：已授权系统在后台显示授权信息
+- 功能优化：使用思维链提示词生成思维导图，确保生成的思维导图不会出现格式错误
+- 功能优化：优化首页登录注册页面的 UI
+- BUG 修复：修复 License 验证的逻辑漏洞
+- Bug 修复：后台添加用户的时候密码规则限制跟前台注册保持一致
+- 功能新增：管理后台支持切换主题，支持 light 和 dark 两种主题
+- 功能新增：移动端新增 DALL-E 绘画功能
+- 功能新增：新增移动端首页功能，移动端支持 light 和 dark 两种主题
+- 功能新增：移动支持免登录预览功能
+- Bug 修复：解决在同一个浏览器开启多个对话时候对话内容会相互乱串的问题
+- Bug 修复：修复部分中转 API 模型会出现第一输出的字符被淹没的 Bug

 ## v4.0.4

-* Bug修复：修复统一千问第二句不回复的问题
-* 功能优化：MJ 和 SD 任务正在执行时不更新已完成任务列表，加快页面渲染速度
-* 功能新增：Dalle AI 绘画功能实现
-* Bug修复：修复思维导图格式乱码问题
-* 功能优化：支持使用 TLS 邮件协议，解决国内服务器无法使用 25 号端口发送邮件的问题
-* 功能新增：支持从应用列表直接和某个应用对话
-* 功能优化：优化算力日志的页面和首页的UI
-* 功能新增：支持思维导图导出 PNG 图片下载
+- Bug 修复：修复统一千问第二句不回复的问题
+- 功能优化：MJ 和 SD 任务正在执行时不更新已完成任务列表，加快页面渲染速度
+- 功能新增：Dalle AI 绘画功能实现
+- Bug 修复：修复思维导图格式乱码问题
+- 功能优化：支持使用 TLS 邮件协议，解决国内服务器无法使用 25 号端口发送邮件的问题
+- 功能新增：支持从应用列表直接和某个应用对话
+- 功能优化：优化算力日志的页面和首页的 UI
+- 功能新增：支持思维导图导出 PNG 图片下载

 ## v4.0.3

-* 功能新增：允许为角色应用绑定模型，如指定某个角色只能使用某个模型
-* Bug修复：兼容 gpt-4-turbo-2024-04-09 模型的函数调用 Bug
-* Bug修复：修复MidJourney在任务超时后出现后面的任务覆盖前面任务的问题
-* 功能新增：支持上传图片和视觉模型
-* 功能优化：优化聊天页面的复制代码按钮样式乱码
-* 功能新增：增加思维导图功能，支持选择不同的对话模型来生成思维导图
-* 功能新增：支持为角色绑定对话模型，比如绑定某个角色只能用GPT3.5或者 GPT4
-* 功能新增：支持为模型绑定 API KEY，比如为 GPT3.5 模型绑定免费的 API KEY 给用户免费使用来引流不至于消耗你的收费 KEY。
-* 功能新增：支持管理后台 Logo 修改
+- 功能新增：允许为角色应用绑定模型，如指定某个角色只能使用某个模型
+- Bug 修复：兼容 gpt-4-turbo-2024-04-09 模型的函数调用 Bug
+- Bug 修复：修复 MidJourney 在任务超时后出现后面的任务覆盖前面任务的问题
+- 功能新增：支持上传图片和视觉模型
+- 功能优化：优化聊天页面的复制代码按钮样式乱码
+- 功能新增：增加思维导图功能，支持选择不同的对话模型来生成思维导图
+- 功能新增：支持为角色绑定对话模型，比如绑定某个角色只能用 GPT3.5 或者 GPT4
+- 功能新增：支持为模型绑定 API KEY，比如为 GPT3.5 模型绑定免费的 API KEY 给用户免费使用来引流不至于消耗你的收费 KEY。
+- 功能新增：支持管理后台 Logo 修改

 ## 4.0.2

-* 功能新增：支持前端菜单可以配置
-* 功能优化：在登录和注册界面标题显示软件版本号
-* 功能优化：MJ 绘画支持 --sref 和 --cref 图片一致性参数
-* 功能优化：使用 leveldb 解决 SD 绘图进度图片预览问题
-* Bug修复：解决因为图片上传使用相对路径而导致融图失败的问题。
-* 功能新增：手机端支持 Stable-Diffusion 绘画
-* 功能新增：管理后台登录页面增加行为验证码，防止爆破
+- 功能新增：支持前端菜单可以配置
+- 功能优化：在登录和注册界面标题显示软件版本号
+- 功能优化：MJ 绘画支持 --sref 和 --cref 图片一致性参数
+- 功能优化：使用 leveldb 解决 SD 绘图进度图片预览问题
+- Bug 修复：解决因为图片上传使用相对路径而导致融图失败的问题。
+- 功能新增：手机端支持 Stable-Diffusion 绘画
+- 功能新增：管理后台登录页面增加行为验证码，防止爆破

 ## v4.0.1

-* 功能重构：重构 Stable-Diffusion 绘画实现，使用 SDAPI 替换之前的 websocket 接口，SDAPI 兼容各种 stable-diffusion
+- 功能重构：重构 Stable-Diffusion 绘画实现，使用 SDAPI 替换之前的 websocket 接口，SDAPI 兼容各种 stable-diffusion
  发行版，稳定性更强一些
-* 功能优化：使用 [midjouney-proxy](https://github.com/novicezk/midjourney-proxy) 项目替换内置的原生 MidJourney API，兼容
+- 功能优化：使用 [midjouney-proxy](https://github.com/novicezk/midjourney-proxy) 项目替换内置的原生 MidJourney API，兼容
  MJ-Plus 中转
-* 功能新增：用户算力消费日志增加统计功能，统计一段时间内用户消费的算力
-* Bug修复：修复 iphone 手机无法通过图形验证码的Bug，使用滑动验证码替换
-* Bug修复：修复手机端 MidJourney 绘画页面滚动条无法滚动的Bug
+- 功能新增：用户算力消费日志增加统计功能，统计一段时间内用户消费的算力
+- Bug 修复：修复 iphone 手机无法通过图形验证码的 Bug，使用滑动验证码替换
+- Bug 修复：修复手机端 MidJourney 绘画页面滚动条无法滚动的 Bug

 ## v4.0.0

-非兼容版本，重大重构，引入算力概念，将系统中所有的能力（AI对话，MJ绘画，SD绘画，DALL绘画）全部使用算力来兑换。
-只要你的算力值余额不为0，你就可以进行任何操作。比如一次 GPT3.5 对话消耗1个单位算力，一次 GPT4 对话消耗10个算力。一次 MJ
-对话消耗15个算力...
+非兼容版本，重大重构，引入算力概念，将系统中所有的能力（AI 对话，MJ 绘画，SD 绘画，DALL 绘画）全部使用算力来兑换。
+只要你的算力值余额不为 0，你就可以进行任何操作。比如一次 GPT3.5 对话消耗 1 个单位算力，一次 GPT4 对话消耗 10 个算力。一次 MJ
+对话消耗 15 个算力...

-* 功能重构：重构整体系统，全部采用算力来进行结算
-* 功能优化：SD 绘画页面采用 websocket 替换 http 轮询机制，节省带宽
-* 功能优化：移动端聊天页面图片支持预览和放大功能
-* 功能优化：MJ 和 SD 页面数据分页加载，解决一次性加载太多数据导致页面卡顿的问题
-* 功能优化：**PC端不登录也可以预览功能，只有在发起操作的时候才需要登录**
-* 功能优化：控制台订单管理页面显示未支付订单，并提供订单删除功能
-* 功能新增：支持H5支付
-* 功能优化：支持数学公式的识别和美化输出
-* 功能新增：新增算力消费日志功能
-* 功能优化：整合 XXL-JOB 实现订单清理，每日算力派发，VIP 算力重置等任务
-* 功能新增：管理后台新增7日内新增用户和新增订单统计
+- 功能重构：重构整体系统，全部采用算力来进行结算
+- 功能优化：SD 绘画页面采用 websocket 替换 http 轮询机制，节省带宽
+- 功能优化：移动端聊天页面图片支持预览和放大功能
+- 功能优化：MJ 和 SD 页面数据分页加载，解决一次性加载太多数据导致页面卡顿的问题
+- 功能优化：**PC 端不登录也可以预览功能，只有在发起操作的时候才需要登录**
+- 功能优化：控制台订单管理页面显示未支付订单，并提供订单删除功能
+- 功能新增：支持 H5 支付
+- 功能优化：支持数学公式的识别和美化输出
+- 功能新增：新增算力消费日志功能
+- 功能优化：整合 XXL-JOB 实现订单清理，每日算力派发，VIP 算力重置等任务
+- 功能新增：管理后台新增 7 日内新增用户和新增订单统计

 ## v3.2.7

-* 功能重构：采用 Vant 重构移动页面，新增 MidJourney 功能
-* 功能优化：优化 PC 端 MidJourney 页面布局，新增融图和换脸功能
-* Bug修复：修复 issue [
+- 功能重构：采用 Vant 重构移动页面，新增 MidJourney 功能
+- 功能优化：优化 PC 端 MidJourney 页面布局，新增融图和换脸功能
+- Bug 修复：修复 issue [
  管理界面操作用户存在的两个问题](https://github.com/yangjian102621/chatgpt-plus/issues/117#issuecomment-1909201532)
-* 功能优化：在对话和聊天记录表中新增冗余字段 model，存储对话模型
-* Bug修复：IPhone 手机验证码触摸事件坐标错位 [issue 144](https://github.com/yangjian102621/chatgpt-plus/issues/144)
-* Bug修复：重新生成按钮功能失效问题
-* Bug修复：对话输入HTML标签不显示的问题
-* 功能优化：gpt-4-all/gpts/midjourney-plus 支持第三方平台的 API KEY
-* 功能新增：新增删除文件功能
-* Bug修复：解决 MJ-Plus discord 图片下载失败问题，使用第三方平台中转地址下载
-* 功能新增：后台管理新怎对话查看和检索功能
+- 功能优化：在对话和聊天记录表中新增冗余字段 model，存储对话模型
+- Bug 修复：IPhone 手机验证码触摸事件坐标错位 [issue 144](https://github.com/yangjian102621/chatgpt-plus/issues/144)
+- Bug 修复：重新生成按钮功能失效问题
+- Bug 修复：对话输入 HTML 标签不显示的问题
+- 功能优化：gpt-4-all/gpts/midjourney-plus 支持第三方平台的 API KEY
+- 功能新增：新增删除文件功能
+- Bug 修复：解决 MJ-Plus discord 图片下载失败问题，使用第三方平台中转地址下载
+- 功能新增：后台管理新怎对话查看和检索功能

 ## v3.2.6

-* 功能优化：恢复关闭注册系统配置项，管理员可以在后台关闭用户注册，只允许内部添加账号
-* 功能优化：兼用旧版本微信收款消息解析
-* 功能优化：优化订单扫码支付状态轮询功能，当关闭二维码时取消轮询，节约网络资源
-* 功能新增：新增图片发布功能，画廊只显示用户已发布的图片
-* 功能新增：后台新增配置微信客服二维码，可以上传自己的微信客服二维码
-* 功能新增：新增网站公告，可以在管理后台自定义配置
-* 功能新增：新增阿里通义千问大模型支持
-* Bug修复：修复 MJ 放大任务失败时候 img_call 会增加的 Bug
-* 功能优化：新增虎皮椒和PayJS订单状态校验功能，增加安全性
-* Bug修复：修复微信转账交易 ID 提取失败 Bug
-* 功能优化：给所有的 websocket 连接加上心跳，解决 "close 1006 (abnormal closure): unexpected EOF" Bug
-* 功能新增：新增短信宝短信平台发送平台集成
+- 功能优化：恢复关闭注册系统配置项，管理员可以在后台关闭用户注册，只允许内部添加账号
+- 功能优化：兼用旧版本微信收款消息解析
+- 功能优化：优化订单扫码支付状态轮询功能，当关闭二维码时取消轮询，节约网络资源
+- 功能新增：新增图片发布功能，画廊只显示用户已发布的图片
+- 功能新增：后台新增配置微信客服二维码，可以上传自己的微信客服二维码
+- 功能新增：新增网站公告，可以在管理后台自定义配置
+- 功能新增：新增阿里通义千问大模型支持
+- Bug 修复：修复 MJ 放大任务失败时候 img_call 会增加的 Bug
+- 功能优化：新增虎皮椒和 PayJS 订单状态校验功能，增加安全性
+- Bug 修复：修复微信转账交易 ID 提取失败 Bug
+- 功能优化：给所有的 websocket 连接加上心跳，解决 "close 1006 (abnormal closure): unexpected EOF" Bug
+- 功能新增：新增短信宝短信平台发送平台集成

 ## v3.2.5

-* 功能新增：**重磅更新！！！** 新增 MidJourney-Plus API 支持，一秒配置，开箱即用，高效稳定。
-* 功能新增：**重磅更新！！！** 新增 GPT4-ALL 和 GPTs 模型支持，你只需花几块钱，可以丝滑享受 ChatGPT-Plus 会员的所有功能，无需再订阅
+- 功能新增：**重磅更新！！！** 新增 MidJourney-Plus API 支持，一秒配置，开箱即用，高效稳定。
+- 功能新增：**重磅更新！！！** 新增 GPT4-ALL 和 GPTs 模型支持，你只需花几块钱，可以丝滑享受 ChatGPT-Plus 会员的所有功能，无需再订阅
  Plus 账号了！！！
-* 功能优化：增强 markdown 图片和引用块解析。
-* 功能新增：新增用户文件管理，目前一支持上传文件跟 GPT 进行多态对话。
-* 功能优化：function call 兼用中转 API。
-* Bug修复：修复部分已知的 Bug。
+- 功能优化：增强 markdown 图片和引用块解析。
+- 功能新增：新增用户文件管理，目前一支持上传文件跟 GPT 进行多态对话。
+- 功能优化：function call 兼用中转 API。
+- Bug 修复：修复部分已知的 Bug。

 ## v3.2.4.1

-* 功能新增：新增 PayJs 支付通道
-* Bug修复：紧急修复后台添加用户失败问题
-* Bug修复：紧急修复使用中转 API-KEY 无法绘图的问题
-* Bug修复：允许用户关闭手机和邮箱注册通道，移除验证码依赖
+- 功能新增：新增 PayJs 支付通道
+- Bug 修复：紧急修复后台添加用户失败问题
+- Bug 修复：紧急修复使用中转 API-KEY 无法绘图的问题
+- Bug 修复：允许用户关闭手机和邮箱注册通道，移除验证码依赖

 ## v3.2.4

-* 功能新增：重磅更新，支持邮箱注册
-* 功能优化：优化函数调用授权
-* 功能优化：给用户表新增 nickname 字段
-* 功能优化：管理后台给聊天角色增加启用/禁用开关
-* Bug修复：SD绘画出现重复扣减绘图次数
-* 功能优化：优化聊天对话导出样式，适应移动端
-* 功能新增：众筹核销可以选择兑换对话还是绘图的额度
-* Bug修复：修复[从历史记录获取reply有并发风险 #92](https://github.com/yangjian102621/chatgpt-plus/issues/92)
-* Bug修复：修复 MidJourney 绘图任务调度Bug，为 task_id 建议唯一索引
-* 功能重构：重构了 API KEY模块，支持为每个 API KEY 都设置不同的 API 地址，并可以单独开启是否使用代理。
+- 功能新增：重磅更新，支持邮箱注册
+- 功能优化：优化函数调用授权
+- 功能优化：给用户表新增 nickname 字段
+- 功能优化：管理后台给聊天角色增加启用/禁用开关
+- Bug 修复：SD 绘画出现重复扣减绘图次数
+- 功能优化：优化聊天对话导出样式，适应移动端
+- 功能新增：众筹核销可以选择兑换对话还是绘图的额度
+- Bug 修复：修复[从历史记录获取 reply 有并发风险 #92](https://github.com/yangjian102621/chatgpt-plus/issues/92)
+- Bug 修复：修复 MidJourney 绘图任务调度 Bug，为 task_id 建议唯一索引
+- 功能重构：重构了 API KEY 模块，支持为每个 API KEY 都设置不同的 API 地址，并可以单独开启是否使用代理。

 ## v3.2.3

-* 功能重构：重构函数工具模块，设计成可以后台动态管理函数。支持添加自定义函数实现
-* 功能新增：为充值产品数据表添加 img_calls 字段，支持充值绘图次数
-* Bug修复：修复 [MJ 机器人空指针异常的 Bug](https://github.com/yangjian102621/chatgpt-plus/issues/73)
-* Bug修复：确保相同 Prompt 的绘图任务的 Upscale 和 Variation 任务调度给相同的频道
-* 功能新增：新增删除绘图任何和图片功能
-* Bug修复：修复虎皮椒支付二维码重复扫码时报错问题
-* 功能优化：自动将 AI 绘画中的中文提示词翻译成英文
-* 功能优化：优化AI绘画的大图压缩算法，新增图片缓存
-* 功能优化：支持为 MJ 绘图 API 增加反代功能，提高图片的加载速度，大大降低绘图任务的失败率
-* Bug修复：修复[Azure Api 更换api-version参数后请求失败的问题](https://github.com/yangjian102621/chatgpt-plus/pull/71)
-* Bug修复：修复科大讯飞 V1.5 API 请求失败的问题
-* Bug修复：绘图失败后，自动恢复用户的剩余绘图次数
-* 功能新增：为移动端新增 SD 绘图功能，分享功能
+- 功能重构：重构函数工具模块，设计成可以后台动态管理函数。支持添加自定义函数实现
+- 功能新增：为充值产品数据表添加 img_calls 字段，支持充值绘图次数
+- Bug 修复：修复 [MJ 机器人空指针异常的 Bug](https://github.com/yangjian102621/chatgpt-plus/issues/73)
+- Bug 修复：确保相同 Prompt 的绘图任务的 Upscale 和 Variation 任务调度给相同的频道
+- 功能新增：新增删除绘图任何和图片功能
+- Bug 修复：修复虎皮椒支付二维码重复扫码时报错问题
+- 功能优化：自动将 AI 绘画中的中文提示词翻译成英文
+- 功能优化：优化 AI 绘画的大图压缩算法，新增图片缓存
+- 功能优化：支持为 MJ 绘图 API 增加反代功能，提高图片的加载速度，大大降低绘图任务的失败率
+- Bug 修复：修复[Azure Api 更换 api-version 参数后请求失败的问题](https://github.com/yangjian102621/chatgpt-plus/pull/71)
+- Bug 修复：修复科大讯飞 V1.5 API 请求失败的问题
+- Bug 修复：绘图失败后，自动恢复用户的剩余绘图次数
+- 功能新增：为移动端新增 SD 绘图功能，分享功能

 ## v3.2.2

-* 功能重构：重构 MidJourney 和 Stable-Diffusion 绘图模块，支持使用多组配置创建池子提供绘画服务
-* 功能新增：AI绘画页面增加翻译和重写提示词功能
-* 功能优化：OSS上传组件支持在 Bucket 下设置二级目录
-* Bug修复：修复阿里云 OSS 访问路径错误
-* 功能优化：在 AI 绘图页面使用 HTTP 轮询替换 Websocket
+- 功能重构：重构 MidJourney 和 Stable-Diffusion 绘图模块，支持使用多组配置创建池子提供绘画服务
+- 功能新增：AI 绘画页面增加翻译和重写提示词功能
+- 功能优化：OSS 上传组件支持在 Bucket 下设置二级目录
+- Bug 修复：修复阿里云 OSS 访问路径错误
+- 功能优化：在 AI 绘图页面使用 HTTP 轮询替换 Websocket

 ## v3.2.1

-* 功能优化：切换角色和模型的时候自动创建新的对话
-* Bug修复：修复文件上传失败No such file bug
-* 功能新增：MidJourney 绘画页面新增提示词翻译功能，新增多个绘画参数
-* Bug修复：[PC端对话在刷新后异常](https://github.com/yangjian102621/chatgpt-plus/issues/59)
-* 功能新增：增加 arm64 架构打包脚本
-* 功能新增：支持 dall-e3 绘图的 API 地址自定义配置
-* 功能新增：新增虎皮椒支付功能接入，支持微信和支付宝通道
+- 功能优化：切换角色和模型的时候自动创建新的对话
+- Bug 修复：修复文件上传失败 No such file bug
+- 功能新增：MidJourney 绘画页面新增提示词翻译功能，新增多个绘画参数
+- Bug 修复：[PC 端对话在刷新后异常](https://github.com/yangjian102621/chatgpt-plus/issues/59)
+- 功能新增：增加 arm64 架构打包脚本
+- 功能新增：支持 dall-e3 绘图的 API 地址自定义配置
+- 功能新增：新增虎皮椒支付功能接入，支持微信和支付宝通道

 ## v3.2.0

-* 功能新增：新增邀请注册功能
-* 功能优化：增加中间件自动对HTTP请求的参数去掉首尾空格
-* 功能优化：增加中间件自动为大图片生成缩略图
-* 功能优化：MidJourney 页面图片加载优化，实现图片预览懒加载
-* 功能新增：新增 DALL-E-3 绘画支持，并作为对话页面默认绘画插件
-* Bug修复：修复阿里云 OSS 域名设置不起做用的bug
-* Bug修复：修复MidJourney绘图失败后重复添加到队列的问题
+- 功能新增：新增邀请注册功能
+- 功能优化：增加中间件自动对 HTTP 请求的参数去掉首尾空格
+- 功能优化：增加中间件自动为大图片生成缩略图
+- 功能优化：MidJourney 页面图片加载优化，实现图片预览懒加载
+- 功能新增：新增 DALL-E-3 绘画支持，并作为对话页面默认绘画插件
+- Bug 修复：修复阿里云 OSS 域名设置不起做用的 bug
+- Bug 修复：修复 MidJourney 绘图失败后重复添加到队列的问题

 ## v3.1.9

-* 功能新增：增加讯飞星火大模型 v3.0 支持
-* 功能新增：新增找回密码功能
-* 功能新增：支持 Markdown 代码复制功能
-* Bug修复: xxl-job 任务调度失败的 Bug
-* 功能优化：优化前端页面菜单图标，使用自定义图标替换 icon-font
-* Bug修复：Stable-Diffusion 绘画成功之后没有扣减用户画图次数
-* 功能优化：优化会员充值页面 ItemList 组件
-* 功能优化：给首页 Logo 增加链接
-* Bug修复：[新建会话时，提示"请输入合法的手机号" ](https://github.com/yangjian102621/chatgpt-plus/issues/51)
-* Bug修复：聊天上下文失效问题
-* 功能优化：关闭注册时显示联系管理员二维码
-* 功能优化：移除 leveldb 依赖，使用 redis 替换相应的功能
-* Bug修复：后台启用用户 VIP 不生效问题
-* 功能优化：充值支付页面的支付说明文字可以后台配置
-* Bug修复：ChatGLM，百度文心，科大讯飞模型输出代码不换行问题
+- 功能新增：增加讯飞星火大模型 v3.0 支持
+- 功能新增：新增找回密码功能
+- 功能新增：支持 Markdown 代码复制功能
+- Bug 修复: xxl-job 任务调度失败的 Bug
+- 功能优化：优化前端页面菜单图标，使用自定义图标替换 icon-font
+- Bug 修复：Stable-Diffusion 绘画成功之后没有扣减用户画图次数
+- 功能优化：优化会员充值页面 ItemList 组件
+- 功能优化：给首页 Logo 增加链接
+- Bug 修复：[新建会话时，提示"请输入合法的手机号" ](https://github.com/yangjian102621/chatgpt-plus/issues/51)
+- Bug 修复：聊天上下文失效问题
+- 功能优化：关闭注册时显示联系管理员二维码
+- 功能优化：移除 leveldb 依赖，使用 redis 替换相应的功能
+- Bug 修复：后台启用用户 VIP 不生效问题
+- 功能优化：充值支付页面的支付说明文字可以后台配置
+- Bug 修复：ChatGLM，百度文心，科大讯飞模型输出代码不换行问题

 ## v3.1.8

 1. 功能新增：新增会员套餐充值，点卡充值，订单系统，集成支付宝支付通道
-2. Bug修复：修复 MidJourney API 参数版本更新导致调用失败问题
-3. Bug修复：修复 Stable Diffusion 调用后没有更新绘图调用次数问题
-4. Bug修复：修复七牛云上传报错 expired token
-5. Bug修复：修复高权重模型导致的对话次数为负数的漏洞
+2. Bug 修复：修复 MidJourney API 参数版本更新导致调用失败问题
+3. Bug 修复：修复 Stable Diffusion 调用后没有更新绘图调用次数问题
+4. Bug 修复：修复七牛云上传报错 expired token
+5. Bug 修复：修复高权重模型导致的对话次数为负数的漏洞
 6. 功能优化：将聊天报错信息定义为统一常量，方便修改
 7. 功能优化：优化 markdown 表格显示样式，覆写 Element-Plus 表格样式
 8. 功能优化：增加倒数计时组件，定期自动清理未支付的订单

 ## v3.1.7

-1. 功能新增：支持文心4.0 AI 模型
+1. 功能新增：支持文心 4.0 AI 模型
 2. 功能新增：可以在管理后台为用户绑定指定的 AI 模型，如只给某个用户使用 GPT-4 模型
-3. 功能新增：模型新增权重字段，不同的模型每次调用耗费的点数可以设置不同，比如GPT4是GPT3.5的10倍
+3. 功能新增：模型新增权重字段，不同的模型每次调用耗费的点数可以设置不同，比如 GPT4 是 GPT3.5 的 10 倍
 4. 功能新增：新增系统配置关闭 AI 模型的函数功能
 5. 功能优化：优化 MidJourney 专业绘画页面图片预览样式

 ## v3.1.6

-1. 功能新增：新增AI 绘画照片墙功能页面，供用户查看所有的 AI 绘画作品
+1. 功能新增：新增 AI 绘画照片墙功能页面，供用户查看所有的 AI 绘画作品
 2. 功能新增：新增 AI 角色应用功能页面，用户可以添加自己感兴趣的应用
 3. 功能优化：优化瀑布流组件的页面布局
 4. 功能优化：新注册用户成功之后自动登录
@@ -319,55 +457,55 @@
 2. 功能新增：新增科大讯飞星火大模型 API 接入支持
 3. 功能重构：将 chat_handler 的所有功能实现放入单独的包中
 4. 功能新增：新增系统配置 `enabled_function` 用于启用和关闭函数功能
-5. Bug修复：修复管理后台更新 API Key 失败的 Bug
-6. Bug修复：修复新建的对话无法更新对话标题的 Bug
+5. Bug 修复：修复管理后台更新 API Key 失败的 Bug
+6. Bug 修复：修复新建的对话无法更新对话标题的 Bug
 7. 功能优化：其他一些小的体验优化工作

 ## v3.1.4

-1. 功能新增：新增阿里云 OSS 图片上传实现，目前已支持本地存储，七牛云，Minio和阿里云 OSS 四种存储介质。
+1. 功能新增：新增阿里云 OSS 图片上传实现，目前已支持本地存储，七牛云，Minio 和阿里云 OSS 四种存储介质。
 2. 功能新增：**增加 Stable Diffusion 绘画功能页面**。
 3. 功能重构：将 [chatgpt-plus-exts](https://github.com/yangjian102621/chatgpt-plus-exts) 合并到本项目，部署更加简单，无需部署两个项目了。
-4. Bug修复：修复[用户注册报错BUG #37](https://github.com/yangjian102621/chatgpt-plus/issues/37)。
-5. Bug修复：修复 MidJourney API 接口升级导致图片文保存失败的 Bug。
+4. Bug 修复：修复[用户注册报错 BUG #37](https://github.com/yangjian102621/chatgpt-plus/issues/37)。
+5. Bug 修复：修复 MidJourney API 接口升级导致图片文保存失败的 Bug。
 6. 功能优化：增加阿里云短信服务配置项 `Sign` 和 `CodeTempId` 用来配置自己的短信签名和短信验证码模版 ID。
 7. 功能优化：添加系统配置用来设置自定义的众筹微信收款二维码。
 8. 功能优化：优化绘画页面的弹窗样式和页面布局。

 ## v3.1.3

-1. 页面重构：重后 Home 页面，拆分成聊天，MJ绘画，SD 绘画，应用广场等多个功能菜单。
+1. 页面重构：重后 Home 页面，拆分成聊天，MJ 绘画，SD 绘画，应用广场等多个功能菜单。
 2. 功能新增：新增 MidJourney 专业绘画页面，开放更高级的 MJ 绘画姿势。
 3. 功能优化：采用队列的方式控制绘画任务并发，简化任务回调通知逻辑，给任务回调加锁。
 4. 功能优化：精简用户表字段，删除用户名和昵称，只保留手机号。
 5. 功能优化：优化文件上传服务工厂实现，只创建激活的 Uploader 服务，节省资源。
-6. Bug修复：修复 JWT token 有效期计算错误的 Bug。
+6. Bug 修复：修复 JWT token 有效期计算错误的 Bug。

 ## v3.1.2

 1. 功能新增：新增七牛云 OSS 实现，目前已支持三种文件上传服务：Local, Minio, QiNiu OSS。
 2. 功能新增：新增桌面版，使用 electron 套壳网页版。
-3. Bug修复：自动去除众筹核销时候转账单号中的空格，防止复制的时候多复制了空格。
+3. Bug 修复：自动去除众筹核销时候转账单号中的空格，防止复制的时候多复制了空格。
 4. 功能优化：ChatPlus.vue 页面支持通过 chat_id path variable 来定位到指定的聊天。
 5. 功能优化：取消导出聊天页面的授权验证
 6. 功能优化：所有路由跳转都使用绝对路径

 ## v3.1.1

-紧急修复版本，采用弹窗的方式显示验证码，解决验证码在低分辨率下被掩盖的Bug
+紧急修复版本，采用弹窗的方式显示验证码，解决验证码在低分辨率下被掩盖的 Bug

 ## v3.1.0(大版本更新)

 1. 功能重构：将聊天模型独立拆分，以便支持多平台模型，目前已经内置支持 OPenAI，Azure 以及
   ChatGLM，用户可以在这两个平台的模型中随意切换，体验不同的模型聊天。
 2. 功能重构：重写系统 API 授权机制，使用 JWT 替换传统的 session 会话授权，使得 API 授权变得更加灵活。
-3. 功能重构：重构文件夹上传服务，支持多种文件上传存储handler，目前已经实现本地存储和 minio oss 存储。
+3. 功能重构：重构文件夹上传服务，支持多种文件上传存储 handler，目前已经实现本地存储和 minio oss 存储。
 4. 功能优化：更新头像自动删除旧的图片资源。
 5. 功能优化：将应用日志在终端输出的同时存盘，方便 docker 部署查看日志。
 6. 功能新增：允许用户配置自己的 OPenAI，Azure 以及 ChatGLM API KEY。
 7. 功能优化：优化移动版的行为验证码样式，修复低分辨率显示器验证码被遮挡的 Bug
 8. 升级 gin, element-plus，redis 组件到最新版本。
-9. Bug修复：修复若干已知的的 Bug
+9. Bug 修复：修复若干已知的的 Bug

 ## v3.0.7

@@ -377,7 +515,7 @@
 4. 功能新增：支持导出聊天记录为 PDF 文件。
 5. 功能优化：在后台 dashboard 页面新增统计今日众筹收入。
 6. 功能优化：支持用户设置默认的 GPT 模型
-7. Bug修复：修复若干已知的的 Bug
+7. Bug 修复：修复若干已知的的 Bug

 ## v3.0.6

@@ -385,8 +523,8 @@
 2. 管理后台：新增重置用户密码功能
 3. 管理后台：支持关闭注册功能，新增添加用户功能，适用于内部使用场景
 4. 管理后台：新增仪表盘页面，统计当天的新增用户，新增会话数据，以及 Token 消耗
-5. Bug修复：修复注册页面验证码不显示 Bug
-6. Bug修复：优化上下文 Token 计算算法，修复聊天上下文超出限制时循环发送消息的 Bug
+5. Bug 修复：修复注册页面验证码不显示 Bug
+6. Bug 修复：优化上下文 Token 计算算法，修复聊天上下文超出限制时循环发送消息的 Bug
 7. 功能修正：允许用户使用手机号码登录
 8. 功能优化：更新系统配置后同步更新服务端内存变量数据
 9. 功能优化：优化打包脚本，减少容器镜像大小
@@ -444,5 +582,5 @@
 4. 新增聊天设置功能，用户可以导入自己的 API KEY
 5. 保存聊天记录，支持聊天上下文。
 6. 重构后台管理模块，更友好，扩展性更好的后台管理系统。
-7. 引入 ip2region 组件，记录用户的登录IP和地址。
-8. 支持会话搜索过滤。
+7. 引入 ip2region 组件，记录用户的登录 IP 和地址。
+8. 支持会话搜索过滤。
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -0,0 +1,66 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Build Commands
+
+### Go Backend (api/)
+- **Development**: `cd api && go run main.go` (uses config.toml)
+- **Build**: `cd api && make` (builds both amd64 and arm64 binaries)
+- **Individual builds**: `make amd64` or `make arm64`
+- **Clean**: `make clean`
+- **Config**: Copy `config.sample.toml` to `config.toml` and configure
+
+### Web Frontend (web/)
+- **Development**: `cd web && npm run dev` (runs on Vite dev server with --host)
+- **Build**: `cd web && npm run build`
+- **Lint**: `cd web && npm run lint` (ESLint with auto-fix)
+
+### Testing
+- Backend tests: `cd api/test && bash run_crawler_test.sh`
+- No specific frontend test configuration found
+
+## Project Architecture
+
+### Backend (Go)
+- **Framework**: Gin web framework with dependency injection via uber-go/fx
+- **Database**: GORM with MySQL, Redis for caching, LevelDB for local storage
+- **Authentication**: JWT tokens with Redis session storage
+- **Middleware**: CORS, authorization, parameter handling, static resource serving
+- **Structure**:
+  - `handler/`: HTTP request handlers (REST API endpoints)
+  - `service/`: Business logic services (AI integrations, payments, etc.)
+  - `store/`: Database models and data access layer
+  - `core/`: Application server and middleware configuration
+  - `utils/`: Utility functions and helpers
+
+### Frontend (Vue.js)
+- **Framework**: Vue 3 with Composition API
+- **UI Components**: Element Plus + Vant (mobile components)
+- **State Management**: Pinia
+- **Routing**: Vue Router with nested routes
+- **Build Tool**: Vite
+- **CSS**: Stylus preprocessor with Tailwind CSS utilities
+- **Features**: Responsive design (desktop/mobile views), theme switching (dark/light)
+
+### Key Features
+- **AI Chat**: Multiple chat models and conversation management
+- **Image Generation**: MidJourney, Stable Diffusion, DALL-E integration
+- **Audio/Video**: Suno music creation, Luma/KeLing video generation
+- **User Management**: Authentication, payments, power logs, invitations
+- **Admin Panel**: Comprehensive management interface
+
+### Database Models
+Key entities: User, ChatItem, ChatMessage, ChatRole, ChatModel, Order, Product, AdminUser, and various job types for AI services.
+
+### API Structure
+- User APIs: `/api/user/*` (auth, profile, settings)
+- Chat APIs: `/api/chat/*` (conversations, messages)
+- AI Service APIs: `/api/mj/*`, `/api/sd/*`, `/api/dall/*`, `/api/suno/*`, `/api/video/*`
+- Admin APIs: `/api/admin/*` (management functions)
+
+### Configuration
+- Backend: TOML configuration file (`config.toml`)
+- Database: MySQL with automatic migrations
+- Services: Redis, various AI API integrations
+- File Storage: Local, Aliyun OSS, MinIO, Qiniu options
--- a/JIMENG_CONFIG_README.md
+++ b/JIMENG_CONFIG_README.md
@@ -0,0 +1,195 @@
+# 即梦 AI 配置功能说明
+
+## 功能概述
+
+即梦 AI 配置功能允许管理员通过 Web 界面配置即梦 AI 的 API 密钥和算力消耗设置，支持动态配置更新，无需重启服务。
+
+## 功能特性
+
+### 1. 秘钥配置
+
+- AccessKey 和 SecretKey 配置
+- 支持密码显示/隐藏
+- 连接测试功能
+
+### 2. 算力配置
+
+- 文生图算力消耗
+- 图生图算力消耗
+- 图片编辑算力消耗
+- 图片特效算力消耗
+- 文生视频算力消耗
+- 图生视频算力消耗
+
+### 3. 动态配置
+
+- 配置实时生效
+- 无需重启服务
+- 支持配置验证
+
+## API 接口
+
+### 获取配置
+
+```
+GET /api/admin/jimeng/config
+```
+
+### 更新配置
+
+```
+POST /api/admin/jimeng/config
+Content-Type: application/json
+
+{
+  "config": {
+    "access_key": "your_access_key",
+    "secret_key": "your_secret_key",
+    "power": {
+      "text_to_image": 10,
+      "image_to_image": 15,
+      "image_edit": 20,
+      "image_effects": 25,
+      "text_to_video": 30,
+      "image_to_video": 35
+    }
+  }
+}
+```
+
+### 测试连接
+
+```
+POST /api/admin/jimeng/config/test
+Content-Type: application/json
+
+{
+  "config": {
+    "access_key": "your_access_key",
+    "secret_key": "your_secret_key"
+  }
+}
+```
+
+## 前端页面
+
+### 访问路径
+
+管理后台 -> 即梦 AI -> 配置设置
+
+### 页面功能
+
+1. **秘钥配置标签页**
+
+   - AccessKey 输入框（密码模式）
+   - SecretKey 输入框（密码模式）
+   - 测试连接按钮
+
+2. **算力配置标签页**
+
+   - 各种任务类型的算力消耗配置
+   - 数字输入框，支持 1-100 范围
+   - 提示信息说明
+
+3. **操作按钮**
+   - 保存配置
+   - 重置配置
+
+## 配置存储
+
+配置存储在数据库的`config`表中：
+
+- 配置键：`jimeng`
+- 配置值：JSON 格式的即梦 AI 配置
+
+## 默认配置
+
+如果配置不存在，系统会使用以下默认值：
+
+```json
+{
+  "access_key": "",
+  "secret_key": "",
+  "power": {
+    "text_to_image": 10,
+    "image_to_image": 15,
+    "image_edit": 20,
+    "image_effects": 25,
+    "text_to_video": 30,
+    "image_to_video": 35
+  }
+}
+```
+
+## 使用流程
+
+1. **初始配置**
+
+   - 访问管理后台即梦 AI 配置页面
+   - 填写 AccessKey 和 SecretKey
+   - 点击"测试连接"验证配置
+   - 调整各功能算力消耗
+   - 保存配置
+
+2. **配置更新**
+
+   - 修改需要更新的配置项
+   - 保存配置
+   - 配置立即生效
+
+3. **故障排查**
+   - 使用"测试连接"功能验证 API 密钥
+   - 检查配置是否正确保存
+   - 查看服务日志
+
+## 注意事项
+
+1. **权限要求**
+
+   - 只有管理员可以访问配置页面
+   - 需要有效的管理员登录会话
+
+2. **配置验证**
+
+   - AccessKey 和 SecretKey 不能为空
+   - 算力消耗必须大于 0
+   - 建议先测试连接再保存配置
+
+3. **服务影响**
+   - 配置更新不会影响正在进行的任务
+   - 新任务会使用更新后的配置
+   - 客户端配置会在下次请求时更新
+
+## 错误处理
+
+1. **配置加载失败**
+
+   - 使用默认配置
+   - 记录错误日志
+
+2. **连接测试失败**
+
+   - 显示具体错误信息
+   - 建议检查 API 密钥
+
+3. **配置保存失败**
+   - 显示错误信息
+   - 保留原有配置
+
+## 开发说明
+
+### 后端文件
+
+- `api/handler/admin/jimeng_handler.go` - 配置管理 API
+- `api/service/jimeng/service.go` - 配置服务逻辑
+- `api/core/types/jimeng.go` - 配置类型定义
+
+### 前端文件
+
+- `web/src/views/admin/jimeng/JimengSetting.vue` - 配置页面
+
+### 数据库
+
+- `config`表存储配置信息
+- 配置键：`jimeng`
+- 配置值：JSON 格式
--- a/README.md
+++ b/README.md
@@ -1,92 +1,19 @@
-# GeekAI
-> 根据[《生成式人工智能服务管理暂行办法》](https://www.cac.gov.cn/2023-07/13/c_1690898327029107.htm)的要求，请勿对中国地区公众提供一切未经备案的生成式人工智能服务。
+# GeekAI-PLUS
+基于 GeekAI 项目开发的高级版，增加了很多高级功能，比如思维导图，Dalle 绘画等。**高级版源码不会一次性开放，只提供镜像给大家免费使用**，源码会逐步逐步按照版同步迁移到[社区版（GeekAI）](https://github.com/yangjian102621/geekai)。所以如果大家想要二次开发，请移步去社区版。

-**GeekAI** 基于 AI 大语言模型 API 实现的 AI 助手全套开源解决方案，自带运营管理后台，开箱即用。集成了 OpenAI, Azure,
-ChatGLM,讯飞星火，文心一言等多个平台的大语言模型。集成了 MidJourney 和 Stable Diffusion AI绘画功能。
+## 演示站点
+[Geek-AI 创作系统](https://www.geekai.me)

-主要特性：
+## 文档地址
+[Geek-AI 文档](https://www.geekai.me/docs/)

- 完整的开源系统，前端应用和后台管理系统皆可开箱即用。
- 基于 Websocket 实现，完美的打字机体验。
- 内置了各种预训练好的角色应用，比如小红书写手，英语翻译大师，苏格拉底，孔子，乔布斯，周报助手等。轻松满足你的各种聊天和应用需求。
- 支持 OPenAI，Azure，文心一言，讯飞星火，清华 ChatGLM等多个大语言模型。
- 支持 Suno 文生音乐
- 支持 MidJourney / Stable Diffusion AI 绘画集成，文生图，图生图，换脸，融图。开箱即用。
- 支持使用个人微信二维码作为充值收费的支付渠道，无需企业支付通道。
- 已集成支付宝支付功能，微信支付，支持多种会员套餐和点卡购买功能。
- 集成插件 API 功能，可结合大语言模型的 function 功能开发各种强大的插件，已内置实现了微博热搜，今日头条，今日早报和 AI
-  绘画函数插件。
-
-### 🚀 更多功能请查看 [GeekAI-PLUS](https://github.com/yangjian102621/geekai-plus)
-
- [x] 更友好的 UI 界面
- [x] 支持 Dall-E 文生图功能
- [x] 支持文生思维导图
- [x] 支持为模型绑定指定的 API KEY，支持为角色绑定指定的模型等功能
- [x] 支持网站 Logo 版权等信息的修改
+## 部署
+1. 安装 docker 和 docker-compose 程序，这个自行解决。
+2. 直接在项目根目录运行启动命令:
+   ```shell
+   docker-compose up -d
+   ```

 ## 功能截图
 请参考 [GeekAI 项目介绍](https://docs.geekai.me/info/)。

-### 体验地址
-
-> 免费体验地址：[https://chat.geekai.me](https://chat.geekai.me) <br/>
-> **注意：请合法使用，禁止输出任何敏感、不友好或违规的内容！！！**
-
-## 快速部署
-
-请参考文档 [**GeekAI 快速部署**](https://docs.geekai.me/install/)。
-
-## 使用须知
-
-1. 本项目基于 Apache2.0 协议，免费开放全部源代码，可以作为个人学习使用或者商用。
-2. 如需商用必须保留版权信息，请自觉遵守。确保合法合规使用，在运营过程中产生的一切任何后果自负，与作者无关。
-
-## 项目地址
-
-* Github 地址：https://github.com/yangjian102621/geekai
-* 码云地址：https://gitee.com/blackfox/geekai
-
-## 客户端下载
-
-目前已经支持 Win/Linux/Mac/Android 客户端，下载地址为：https://github.com/yangjian102621/geekai/releases/tag/v3.1.2
-
-## TODOLIST
-
-* [ ] 支持基于知识库的 AI 问答
-* [ ] 文生视频，文生歌曲功能
-* [ ] 微信支付功能
-
-## 项目文档
-
-最新的部署视频教程：[https://www.bilibili.com/video/BV1Cc411t7CX/](https://www.bilibili.com/video/BV1Cc411t7CX/)
-
-详细的部署和开发文档请参考 [**GeekAI 文档**](https://docs.geekai.me)。
-
-加微信进入微信讨论群可获取 **一键部署脚本（添加好友时请注明来自Github!!!）。**
-
-![微信名片](docs/imgs/wx.png)
-
-## 参与贡献
-
-个人的力量始终有限，任何形式的贡献都是欢迎的，包括但不限于贡献代码，优化文档，提交 issue 和 PR 等。
-
-#### 特此声明：由于个人时间有限，不接受在微信或者微信群给开发者提 Bug，有问题或者优化建议请提交 Issue 和 PR。非常感谢您的配合！
-
-### Commit 类型
-
-* feat: 新特性或功能
-* fix: 缺陷修复
-* docs: 文档更新
-* style: 代码风格或者组件样式更新
-* refactor: 代码重构，不引入新功能和缺陷修复
-* opt: 性能优化
-* chore: 一些不涉及到功能变动的小提交，比如修改文字表述，修改注释等
-
-## 打赏
-
-如果你觉得这个项目对你有帮助，并且情况允许的话，可以请作者喝杯咖啡，非常感谢你的支持～
-
-![打赏](docs/imgs/donate.png)
-
-![Star History Chart](https://api.star-history.com/svg?repos=yangjian102621/geekai&type=Date)
--- a/api/.gitignore
+++ b/api/.gitignore
@@ -17,5 +17,6 @@ bin
 data
 config.toml
 static/upload 
+static/audio
 storage.json 
 res/certs/wechat/apiclient_key.pem
--- a/api/Makefile
+++ b/api/Makefile
@@ -3,11 +3,11 @@ NAME := geekai
 all: amd64 arm64

 amd64:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/$(NAME)-linux main.go
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w" -o bin/$(NAME)-linux main.go
 .PHONY: amd64

 arm64:
-	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 GOARM=7 go build -o bin/$(NAME)-linux main.go
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 GOARM=7 go build  -ldflags "-s -w" -o bin/$(NAME)-linux main.go
 .PHONY: arm64

 clean:
--- a/api/config.sample.toml
+++ b/api/config.sample.toml
@@ -71,6 +71,15 @@ TikaHost = "http://tika:9998"
  AccessToken = "xxl-job-api-token" # 执行器 API 通信 token
  RegistryKey = "chatgpt-plus" # 任务注册 key

+ [SmtpConfig] # 注意，阿里云服务器禁用了25号端口，请使用 465 端口，并开启 TLS 连接
+   UseTls = false
+   Host = "smtp.163.com"
+   Port = 25
+   AppName = "极客学长"
+   From = "test@163.com" # 发件邮箱人地址
+   Password = "" #邮箱 stmp 服务授权码
+
+# 支付宝商户支付
 [AlipayConfig]
  Enabled = false # 启用支付宝支付通道
  SandBox = false # 是否启用沙盒模式
@@ -80,31 +89,13 @@ TikaHost = "http://tika:9998"
  PublicKey = "certs/alipay/appPublicCert.crt" # 应用公钥证书
  AlipayPublicKey = "certs/alipay/alipayPublicCert.crt" # 支付宝公钥证书
  RootCert = "certs/alipay/alipayRootCert.crt" # 支付宝根证书
-  NotifyURL = "https://ai.r9it.com/api/payment/alipay/notify" # 支付异步回调地址

+# 虎皮椒支付
 [HuPiPayConfig]
  Enabled = false
-  Name = "wechat"
  AppId = ""
  AppSecret = ""
  ApiURL = "https://api.xunhupay.com"
-  NotifyURL = "https://ai.r9it.com/api/payment/hupipay/notify"
-
-[SmtpConfig] # 注意，阿里云服务器禁用了25号端口，请使用 465 端口，并开启 TLS 连接
-  UseTls = false
-  Host = "smtp.163.com"
-  Port = 25
-  AppName = "极客学长"
-  From = "test@163.com" # 发件邮箱人地址
-  Password = "" #邮箱 stmp 服务授权码
-
-[JPayConfig] # PayJs 支付配置
-  Enabled = false
-  Name = "wechat" # 请不要改动
-  AppId = "" # 商户 ID
-  PrivateKey = "" # 秘钥
-  ApiURL = "https://payjs.cn"
-  NotifyURL = "https://ai.r9it.com/api/payment/payjs/notify" # 异步回调地址，域名改成你自己的

 # 微信商户支付
 [WechatPayConfig]
@@ -114,6 +105,11 @@ TikaHost = "http://tika:9998"
  SerialNo = "" # API 证书序列号
  PrivateKey = "certs/alipay/privateKey.txt" # API 证书私钥文件路径，跟支付宝一样，把私钥文件拷贝到对应的路径，证书路径要映射到容器内
  ApiV3Key = "" # APIV3 私钥，这个是你自己在微信支付平台设置的
-  NotifyURL = "https://ai.r9it.com/api/payment/wechat/notify" # 支付成功异步回调地址，域名改成自己的
-  ReturnURL = "" # 支付成功同步回调地址

+# 易支付
+[GeekPayConfig]
+  Enabled = true
+  AppId = "" # 商户ID
+  PrivateKey = "" # 商户私钥
+  ApiURL = "https://pay.geekai.cn"
+  Methods = ["alipay", "wxpay", "qqpay", "jdpay", "douyin", "paypal"] # 支持的支付方式
--- a/api/core/app_server.go
+++ b/api/core/app_server.go
@@ -15,12 +15,6 @@ import (
 	"geekai/store/model"
 	"geekai/utils"
 	"geekai/utils/resp"
-	"github.com/gin-gonic/gin"
-	"github.com/go-redis/redis/v8"
-	"github.com/golang-jwt/jwt/v5"
-	"github.com/nfnt/resize"
-	"golang.org/x/image/webp"
-	"gorm.io/gorm"
 	"image"
 	"image/jpeg"
 	"io"
@@ -29,10 +23,62 @@ import (
 	"runtime/debug"
 	"strings"
 	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-redis/redis/v8"
+	"github.com/golang-jwt/jwt/v5"
+	"github.com/imroc/req/v3"
+	"github.com/nfnt/resize"
+	"github.com/shirou/gopsutil/host"
+	"golang.org/x/image/webp"
+	"gorm.io/gorm"
 )

+// AuthConfig 定义授权配置
+type AuthConfig struct {
+	ExactPaths  map[string]bool // 精确匹配的路径
+	PrefixPaths map[string]bool // 前缀匹配的路径
+}
+
+var authConfig = &AuthConfig{
+	ExactPaths: map[string]bool{
+		"/api/user/login":          false,
+		"/api/user/logout":         false,
+		"/api/user/resetPass":      false,
+		"/api/user/register":       false,
+		"/api/admin/login":         false,
+		"/api/admin/logout":        false,
+		"/api/admin/login/captcha": false,
+		"/api/app/list":            false,
+		"/api/app/type/list":       false,
+		"/api/app/list/user":       false,
+		"/api/model/list":          false,
+		"/api/mj/imgWall":          false,
+		"/api/mj/notify":           false,
+		"/api/invite/hits":         false,
+		"/api/sd/imgWall":          false,
+		"/api/dall/imgWall":        false,
+		"/api/product/list":        false,
+		"/api/menu/list":           false,
+		"/api/markMap/client":      false,
+		"/api/payment/doPay":       false,
+		"/api/payment/payWays":     false,
+		"/api/download":            false,
+		"/api/dall/models":         false,
+	},
+	PrefixPaths: map[string]bool{
+		"/api/test/":           false,
+		"/api/payment/notify/": false,
+		"/api/user/clogin":     false,
+		"/api/config/":         false,
+		"/api/function/":       false,
+		"/api/sms/":            false,
+		"/api/captcha/":        false,
+		"/static/":             false,
+	},
+}
+
 type AppServer struct {
-	Debug     bool
 	Config    *types.AppConfig
 	Engine    *gin.Engine
 	SysConfig *types.SystemConfig // system config cache
@@ -42,17 +88,12 @@ func NewServer(appConfig *types.AppConfig) *AppServer {
 	gin.SetMode(gin.ReleaseMode)
 	gin.DefaultWriter = io.Discard
 	return &AppServer{
-		Debug:  false,
 		Config: appConfig,
 		Engine: gin.Default(),
 	}
 }

 func (s *AppServer) Init(debug bool, client *redis.Client) {
-	if debug { // 调试模式允许跨域请求 API
-		s.Debug = debug
-		logger.Info("Enabled debug mode")
-	}
 	s.Engine.Use(corsMiddleware())
 	s.Engine.Use(staticResourceMiddleware())
 	s.Engine.Use(authorizeMiddleware(s, client))
@@ -63,16 +104,100 @@ func (s *AppServer) Init(debug bool, client *redis.Client) {
 }

 func (s *AppServer) Run(db *gorm.DB) error {
+
+	// 重命名 config 表字段
+	if db.Migrator().HasColumn(&model.Config{}, "config_json") {
+		db.Migrator().RenameColumn(&model.Config{}, "config_json", "value")
+	}
+	if db.Migrator().HasColumn(&model.Config{}, "marker") {
+		db.Migrator().RenameColumn(&model.Config{}, "marker", "name")
+	}
+	if db.Migrator().HasIndex(&model.Config{}, "idx_chatgpt_configs_key") {
+		db.Migrator().DropIndex(&model.Config{}, "idx_chatgpt_configs_key")
+	}
+	if db.Migrator().HasIndex(&model.Config{}, "marker") {
+		db.Migrator().DropIndex(&model.Config{}, "marker")
+	}
+
 	// load system configs
 	var sysConfig model.Config
-	res := db.Where("marker", "system").First(&sysConfig)
-	if res.Error != nil {
-		return res.Error
-	}
-	err := utils.JsonDecode(sysConfig.Config, &s.SysConfig)
+	err := db.Where("name", "system").First(&sysConfig).Error
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to load system config: %v", err)
 	}
+	err = utils.JsonDecode(sysConfig.Value, &s.SysConfig)
+	if err != nil {
+		return fmt.Errorf("failed to decode system config: %v", err)
+	}
+
+	// 迁移数据表
+	logger.Info("Migrating database tables...")
+	db.AutoMigrate(
+		&model.ChatItem{},
+		&model.ChatMessage{},
+		&model.ChatRole{},
+		&model.ChatModel{},
+		&model.InviteCode{},
+		&model.InviteLog{},
+		&model.Menu{},
+		&model.Order{},
+		&model.Product{},
+		&model.User{},
+		&model.Function{},
+		&model.File{},
+		&model.Redeem{},
+		&model.Config{},
+		&model.ApiKey{},
+		&model.AdminUser{},
+		&model.AppType{},
+		&model.SdJob{},
+		&model.SunoJob{},
+		&model.PowerLog{},
+		&model.VideoJob{},
+		&model.MidJourneyJob{},
+		&model.UserLoginLog{},
+		&model.DallJob{},
+		&model.JimengJob{},
+	)
+	// 手动删除字段
+	if db.Migrator().HasColumn(&model.Order{}, "deleted_at") {
+		db.Migrator().DropColumn(&model.Order{}, "deleted_at")
+	}
+	if db.Migrator().HasColumn(&model.ChatItem{}, "deleted_at") {
+		db.Migrator().DropColumn(&model.ChatItem{}, "deleted_at")
+	}
+	if db.Migrator().HasColumn(&model.ChatMessage{}, "deleted_at") {
+		db.Migrator().DropColumn(&model.ChatMessage{}, "deleted_at")
+	}
+	if db.Migrator().HasColumn(&model.User{}, "chat_config") {
+		db.Migrator().DropColumn(&model.User{}, "chat_config")
+	}
+	if db.Migrator().HasColumn(&model.ChatModel{}, "category") {
+		db.Migrator().DropColumn(&model.ChatModel{}, "category")
+	}
+	if db.Migrator().HasColumn(&model.ChatModel{}, "description") {
+		db.Migrator().DropColumn(&model.ChatModel{}, "description")
+	}
+
+	logger.Info("Database tables migrated successfully")
+
+	// 统计安装信息
+	go func() {
+		info, err := host.Info()
+		if err == nil {
+			apiURL := fmt.Sprintf("%s/%s", s.Config.ApiConfig.ApiURL, "api/installs/push")
+			timestamp := time.Now().Unix()
+			product := "geekai-plus"
+			signStr := fmt.Sprintf("%s#%s#%d", product, info.HostID, timestamp)
+			sign := utils.Sha256(signStr)
+			resp, err := req.C().R().SetBody(map[string]interface{}{"product": product, "device_id": info.HostID, "timestamp": timestamp, "sign": sign}).Post(apiURL)
+			if err != nil {
+				logger.Errorf("register install info failed: %v", err)
+			} else {
+				logger.Debugf("register install info success: %v", resp.String())
+			}
+		}
+	}()
 	logger.Infof("http://%s", s.Config.Listen)
 	return s.Engine.Run(s.Config.Listen)
 }
@@ -96,20 +221,24 @@ func corsMiddleware() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		method := c.Request.Method
 		origin := c.Request.Header.Get("Origin")
+
+		// 设置允许的请求源
 		if origin != "" {
-			// 设置允许的请求源
 			c.Header("Access-Control-Allow-Origin", origin)
-			c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE, UPDATE")
-			//允许跨域设置可以返回其他子段，可以自定义字段
-			c.Header("Access-Control-Allow-Headers", "Authorization, Content-Length, Content-Type, Chat-Token, Admin-Authorization")
-			// 允许浏览器（客户端）可以解析的头部 （重要）
-			c.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers")
-			//设置缓存时间
-			c.Header("Access-Control-Max-Age", "172800")
-			//允许客户端传递校验信息比如 cookie (重要)
-			c.Header("Access-Control-Allow-Credentials", "true")
+		} else {
+			c.Header("Access-Control-Allow-Origin", "*")
 		}

+		c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE, UPDATE")
+		//允许跨域设置可以返回其他子段，可以自定义字段
+		c.Header("Access-Control-Allow-Headers", "Authorization, Body-Length, Body-Type, Admin-Authorization,content-type")
+		// 允许浏览器（客户端）可以解析的头部 （重要）
+		c.Header("Access-Control-Expose-Headers", "Body-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers")
+		//设置缓存时间
+		c.Header("Access-Control-Max-Age", "172800")
+		//允许客户端传递校验信息比如 cookie (重要)
+		c.Header("Access-Control-Allow-Credentials", "true")
+
 		if method == http.MethodOptions {
 			c.JSON(http.StatusOK, "ok!")
 		}
@@ -127,29 +256,36 @@ func corsMiddleware() gin.HandlerFunc {
 // 用户授权验证
 func authorizeMiddleware(s *AppServer, client *redis.Client) gin.HandlerFunc {
 	return func(c *gin.Context) {
+		if !needLogin(c) {
+			c.Next()
+			return
+		}
+
+		clientProtocols := c.GetHeader("Sec-WebSocket-Protocol")
 		var tokenString string
 		isAdminApi := strings.Contains(c.Request.URL.Path, "/api/admin/")
 		if isAdminApi { // 后台管理 API
 			tokenString = c.GetHeader(types.AdminAuthHeader)
-		} else if c.Request.URL.Path == "/api/chat/new" {
-			tokenString = c.Query("token")
+		} else if clientProtocols != "" { // Websocket 连接
+			// 解析子协议内容
+			protocols := strings.Split(clientProtocols, ",")
+			if protocols[0] == "realtime" {
+				tokenString = strings.TrimSpace(protocols[1][25:])
+			} else if protocols[0] == "token" {
+				tokenString = strings.TrimSpace(protocols[1])
+			}
 		} else {
 			tokenString = c.GetHeader(types.UserAuthHeader)
 		}

 		if tokenString == "" {
-			if needLogin(c) {
-				resp.NotAuth(c, "You should put Authorization in request headers")
-				c.Abort()
-				return
-			} else { // 直接放行
-				c.Next()
-				return
-			}
+			resp.NotAuth(c, "You should put Authorization in request headers")
+			c.Abort()
+			return
 		}

 		token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
-			if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok && needLogin(c) {
+			if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
 				return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
 			}
 			if isAdminApi {
@@ -160,21 +296,21 @@ func authorizeMiddleware(s *AppServer, client *redis.Client) gin.HandlerFunc {

 		})

-		if err != nil && needLogin(c) {
+		if err != nil {
 			resp.NotAuth(c, fmt.Sprintf("Error with parse auth token: %v", err))
 			c.Abort()
 			return
 		}

 		claims, ok := token.Claims.(jwt.MapClaims)
-		if !ok || !token.Valid && needLogin(c) {
+		if !ok || !token.Valid {
 			resp.NotAuth(c, "Token is invalid")
 			c.Abort()
 			return
 		}

 		expr := utils.IntValue(utils.InterfaceToString(claims["expired"]), 0)
-		if expr > 0 && int64(expr) < time.Now().Unix() && needLogin(c) {
+		if expr > 0 && int64(expr) < time.Now().Unix() {
 			resp.NotAuth(c, "Token is expired")
 			c.Abort()
 			return
@@ -184,62 +320,48 @@ func authorizeMiddleware(s *AppServer, client *redis.Client) gin.HandlerFunc {
 		if isAdminApi {
 			key = fmt.Sprintf("admin/%v", claims["user_id"])
 		}
-		if _, err := client.Get(context.Background(), key).Result(); err != nil && needLogin(c) {
+		if _, err := client.Get(context.Background(), key).Result(); err != nil {
 			resp.NotAuth(c, "Token is not found in redis")
 			c.Abort()
 			return
 		}
 		c.Set(types.LoginUserID, claims["user_id"])
+		c.Next()
 	}
 }

 func needLogin(c *gin.Context) bool {
-	if c.Request.URL.Path == "/api/user/login" ||
-		c.Request.URL.Path == "/api/user/logout" ||
-		c.Request.URL.Path == "/api/user/resetPass" ||
-		c.Request.URL.Path == "/api/admin/login" ||
-		c.Request.URL.Path == "/api/admin/logout" ||
-		c.Request.URL.Path == "/api/admin/login/captcha" ||
-		c.Request.URL.Path == "/api/user/register" ||
-		c.Request.URL.Path == "/api/chat/history" ||
-		c.Request.URL.Path == "/api/chat/detail" ||
-		c.Request.URL.Path == "/api/chat/list" ||
-		c.Request.URL.Path == "/api/role/list" ||
-		c.Request.URL.Path == "/api/model/list" ||
-		c.Request.URL.Path == "/api/mj/imgWall" ||
-		c.Request.URL.Path == "/api/mj/client" ||
-		c.Request.URL.Path == "/api/mj/notify" ||
-		c.Request.URL.Path == "/api/invite/hits" ||
-		c.Request.URL.Path == "/api/sd/imgWall" ||
-		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/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/wechat/notify" ||
-		c.Request.URL.Path == "/api/payment/doPay" ||
-		c.Request.URL.Path == "/api/payment/payWays" ||
-		c.Request.URL.Path == "/api/suno/client" ||
-		c.Request.URL.Path == "/api/suno/detail" ||
-		c.Request.URL.Path == "/api/suno/play" ||
-		c.Request.URL.Path == "/api/download" ||
-		c.Request.URL.Path == "/api/video/client" ||
-		strings.HasPrefix(c.Request.URL.Path, "/api/test") ||
-		strings.HasPrefix(c.Request.URL.Path, "/api/user/clogin") ||
-		strings.HasPrefix(c.Request.URL.Path, "/api/config/") ||
-		strings.HasPrefix(c.Request.URL.Path, "/api/function/") ||
-		strings.HasPrefix(c.Request.URL.Path, "/api/sms/") ||
-		strings.HasPrefix(c.Request.URL.Path, "/api/captcha/") ||
-		strings.HasPrefix(c.Request.URL.Path, "/static/") {
+	path := c.Request.URL.Path
+
+	// 如果不是 API 路径，不需要登录
+	if !strings.HasPrefix(path, "/api") {
 		return false
 	}
+
+	// 检查精确匹配的路径
+	if skip, exists := authConfig.ExactPaths[path]; exists {
+		return skip
+	}
+
+	// 检查前缀匹配的路径
+	for prefix, skip := range authConfig.PrefixPaths {
+		if strings.HasPrefix(path, prefix) {
+			return skip
+		}
+	}
+
 	return true
 }

+// 跳过授权
+func (s *AppServer) SkipAuth(url string, prefix bool) {
+	if prefix {
+		authConfig.PrefixPaths[url] = false
+	} else {
+		authConfig.ExactPaths[url] = false
+	}
+}
+
 // 统一参数处理
 func parameterHandlerMiddleware() gin.HandlerFunc {
 	return func(c *gin.Context) {
--- a/api/core/types/chat.go
+++ b/api/core/types/chat.go
@@ -9,19 +9,20 @@ package types

 // ApiRequest API 请求实体
 type ApiRequest struct {
-	Model       string        `json:"model,omitempty"` // 兼容百度文心一言
-	Temperature float32       `json:"temperature"`
-	MaxTokens   int           `json:"max_tokens,omitempty"` // 兼容百度文心一言
-	Stream      bool          `json:"stream"`
-	Messages    []interface{} `json:"messages,omitempty"`
-	Prompt      []interface{} `json:"prompt,omitempty"` // 兼容 ChatGLM
-	Tools       []Tool        `json:"tools,omitempty"`
-	Functions   []interface{} `json:"functions,omitempty"` // 兼容中转平台
+	Model               string  `json:"model,omitempty"`
+	Temperature         float32 `json:"temperature"`
+	MaxTokens           int     `json:"max_tokens,omitempty"`
+	MaxCompletionTokens int     `json:"max_completion_tokens,omitempty"` // 兼容GPT O1 模型
+	Stream              bool    `json:"stream,omitempty"`
+	Messages            []any   `json:"messages,omitempty"`
+	Tools               []Tool  `json:"tools,omitempty"`
+	Functions           []any   `json:"functions,omitempty"`       // 兼容中转平台
+	ResponseFormat      any     `json:"response_format,omitempty"` // 响应格式

 	ToolChoice string `json:"tool_choice,omitempty"`

-	Input      map[string]interface{} `json:"input,omitempty"`      //兼容阿里通义千问
-	Parameters map[string]interface{} `json:"parameters,omitempty"` //兼容阿里通义千问
+	Input      map[string]any `json:"input,omitempty"`      //兼容阿里通义千问
+	Parameters map[string]any `json:"parameters,omitempty"` //兼容阿里通义千问
 }

 type Message struct {
@@ -40,26 +41,17 @@ type ChoiceItem struct {
 }

 type Delta struct {
-	Role         string      `json:"role"`
-	Name         string      `json:"name"`
-	Content      interface{} `json:"content"`
-	ToolCalls    []ToolCall  `json:"tool_calls,omitempty"`
-	FunctionCall struct {
+	Role             string     `json:"role"`
+	Name             string     `json:"name"`
+	Content          any        `json:"content"`
+	ReasoningContent string     `json:"reasoning_content,omitempty"`
+	ToolCalls        []ToolCall `json:"tool_calls,omitempty"`
+	FunctionCall     struct {
 		Name      string `json:"name,omitempty"`
 		Arguments string `json:"arguments,omitempty"`
 	} `json:"function_call,omitempty"`
 }

-// ChatSession 聊天会话对象
-type ChatSession struct {
-	SessionId string    `json:"session_id"`
-	UserId    uint      `json:"user_id"`
-	ClientIP  string    `json:"client_ip"` // 客户端 IP
-	ChatId    string    `json:"chat_id"`   // 客户端聊天会话 ID, 多会话模式专用字段
-	Model     ChatModel `json:"model"`     // GPT 模型
-	Tools     string    `json:"tools"`     // 函数
-}
-
 type ChatModel struct {
 	Id          uint    `json:"id"`
 	Name        string  `json:"name"`
@@ -67,6 +59,8 @@ type ChatModel struct {
 	Power       int     `json:"power"`
 	MaxTokens   int     `json:"max_tokens"`  // 最大响应长度
 	MaxContext  int     `json:"max_context"` // 最大上下文长度
+	Description string  `json:"description"` //模型描述
+	Category    string  `json:"category"`    //模型类别
 	Temperature float32 `json:"temperature"` // 模型温度
 	KeyId       int     `json:"key_id"`      // 绑定 API KEY
 }
@@ -93,6 +87,7 @@ const (
 	PowerInvite   = PowerType(4) // 邀请奖励
 	PowerRedeem   = PowerType(5) // 众筹
 	PowerGift     = PowerType(6) // 系统赠送
+	PowerSignIn   = PowerType(7) // 每日签到
 )

 func (t PowerType) String() string {
@@ -105,7 +100,12 @@ func (t PowerType) String() string {
 		return "退款"
 	case PowerRedeem:
 		return "兑换"
-
+	case PowerGift:
+		return "赠送"
+	case PowerInvite:
+		return "邀请"
+	case PowerSignIn:
+		return "签到"
 	}
 	return "其他"
 }
--- a/api/core/types/client.go
+++ b/api/core/types/client.go
@@ -17,15 +17,17 @@ var ErrConClosed = errors.New("connection Closed")

 // WsClient websocket client
 type WsClient struct {
+	Id     string
 	Conn   *websocket.Conn
 	lock   sync.Mutex
 	mt     int
 	Closed bool
 }

-func NewWsClient(conn *websocket.Conn) *WsClient {
+func NewWsClient(conn *websocket.Conn, id string) *WsClient {
 	return &WsClient{
 		Conn:   conn,
+		Id:     id,
 		lock:   sync.Mutex{},
 		mt:     2, // fixed bug for 'Invalid UTF-8 in text frame'
 		Closed: false,
--- a/api/core/types/config.go
+++ b/api/core/types/config.go
@@ -12,24 +12,23 @@ import (
 )

 type AppConfig struct {
-	Path         string `toml:"-"`
-	Listen       string
-	Session      Session
-	AdminSession Session
-	ProxyURL     string
-	MysqlDns     string      // mysql 连接地址
-	StaticDir    string      // 静态资源目录
-	StaticUrl    string      // 静态资源 URL
-	Redis        RedisConfig // redis 连接信息
-	ApiConfig    ApiConfig   // ChatPlus API authorization configs
-	SMS          SMSConfig   // send mobile message config
-	OSS          OSSConfig   // OSS config
-
+	Path            string `toml:"-"`
+	Listen          string
+	Session         Session
+	AdminSession    Session
+	ProxyURL        string
+	MysqlDns        string      // mysql 连接地址
+	StaticDir       string      // 静态资源目录
+	StaticUrl       string      // 静态资源 URL
+	Redis           RedisConfig // redis 连接信息
+	ApiConfig       ApiConfig   // ChatPlus API authorization configs
+	SMS             SMSConfig   // send mobile message config
+	OSS             OSSConfig   // OSS config
+	SmtpConfig      SmtpConfig  // 邮件发送配置
 	XXLConfig       XXLConfig
 	AlipayConfig    AlipayConfig    // 支付宝支付渠道配置
 	HuPiPayConfig   HuPiPayConfig   // 虎皮椒支付配置
-	SmtpConfig      SmtpConfig      // 邮件发送配置
-	JPayConfig      JPayConfig      // payjs 支付配置
+	GeekPayConfig   GeekPayConfig   // GEEK 支付配置
 	WechatPayConfig WechatPayConfig // 微信支付渠道配置
 	TikaHost        string          // TiKa 服务器地址
 }
@@ -44,9 +43,10 @@ type SmtpConfig struct {
 }

 type ApiConfig struct {
-	ApiURL string
-	AppId  string
-	Token  string
+	ApiURL       string
+	AppId        string
+	Token        string
+	JimengConfig JimengConfig // 即梦AI配置
 }

 type AlipayConfig struct {
@@ -58,8 +58,8 @@ type AlipayConfig struct {
 	PublicKey       string // 用户公钥文件路径
 	AlipayPublicKey string // 支付宝公钥文件路径
 	RootCert        string // Root 秘钥路径
-	NotifyURL       string // 异步通知回调
-	ReturnURL       string // 支付成功返回地址
+	NotifyURL       string // 异步通知地址
+	ReturnURL       string // 同步通知地址
 }

 type WechatPayConfig struct {
@@ -69,29 +69,27 @@ type WechatPayConfig struct {
 	SerialNo   string // 商户证书的证书序列号
 	PrivateKey string // 用户私钥文件路径
 	ApiV3Key   string // API V3 秘钥
-	NotifyURL  string // 异步通知回调
-	ReturnURL  string // 支付成功返回地址
+	NotifyURL  string // 异步通知地址
 }

 type HuPiPayConfig struct { //虎皮椒第四方支付配置
 	Enabled   bool   // 是否启用该支付通道
-	Name      string // 支付名称，如：wechat/alipay
 	AppId     string // App ID
 	AppSecret string // app 密钥
 	ApiURL    string // 支付网关
-	NotifyURL string // 异步通知回调
-	ReturnURL string // 支付成功返回地址
+	NotifyURL string // 异步通知地址
+	ReturnURL string // 同步通知地址
 }

-// JPayConfig PayJs 支付配置
-type JPayConfig struct {
+// GeekPayConfig GEEK支付配置
+type GeekPayConfig struct {
 	Enabled    bool
-	Name       string // 支付名称，默认 wechat
-	AppId      string // 商户 ID
-	PrivateKey string // 私钥
-	ApiURL     string // API 网关
-	NotifyURL  string // 异步回调地址
-	ReturnURL  string // 支付成功返回地址
+	AppId      string   // 商户 ID
+	PrivateKey string   // 私钥
+	ApiURL     string   // API 网关
+	NotifyURL  string   // 异步通知地址
+	ReturnURL  string   // 同步通知地址
+	Methods    []string // 支付方式
 }

 type XXLConfig struct { // XXL 任务调度配置
@@ -134,9 +132,10 @@ type SystemConfig struct {
 	Title         string `json:"title,omitempty"`           // 网站标题
 	Slogan        string `json:"slogan,omitempty"`          // 网站 slogan
 	AdminTitle    string `json:"admin_title,omitempty"`     // 管理后台标题
-	Logo          string `json:"logo,omitempty"`            // 方形 Logo
+	Logo          string `json:"logo,omitempty"`            // 圆形 Logo
+	BarLogo       string `json:"bar_logo,omitempty"`        // 条形 Logo
 	InitPower     int    `json:"init_power,omitempty"`      // 新用户注册赠送算力值
-	DailyPower    int    `json:"daily_power,omitempty"`     // 每日赠送算力
+	DailyPower    int    `json:"daily_power,omitempty"`     // 每日签到赠送算力
 	InvitePower   int    `json:"invite_power,omitempty"`    // 邀请新用户赠送算力值
 	VipMonthPower int    `json:"vip_month_power,omitempty"` // VIP 会员每月赠送的算力值

@@ -145,14 +144,16 @@ type SystemConfig struct {

 	OrderPayTimeout int    `json:"order_pay_timeout,omitempty"` //订单支付超时时间
 	VipInfoText     string `json:"vip_info_text,omitempty"`     // 会员页面充值说明
-	DefaultModels   []int  `json:"default_models,omitempty"`    // 默认开通的 AI 模型

-	MjPower       int `json:"mj_power,omitempty"`        // MJ 绘画消耗算力
-	MjActionPower int `json:"mj_action_power,omitempty"` // MJ 操作（放大，变换）消耗算力
-	SdPower       int `json:"sd_power,omitempty"`        // SD 绘画消耗算力
-	DallPower     int `json:"dall_power,omitempty"`      // DALL-E-3 绘图消耗算力
-	SunoPower     int `json:"suno_power,omitempty"`      // Suno 生成歌曲消耗算力
-	LumaPower     int `json:"luma_power,omitempty"`      // Luma 生成视频消耗算力
+	MjPower           int            `json:"mj_power,omitempty"`            // MJ 绘画消耗算力
+	MjActionPower     int            `json:"mj_action_power,omitempty"`     // MJ 操作（放大，变换）消耗算力
+	SdPower           int            `json:"sd_power,omitempty"`            // SD 绘画消耗算力
+	DallPower         int            `json:"dall_power,omitempty"`          // DALL-E-3 绘图消耗算力
+	SunoPower         int            `json:"suno_power,omitempty"`          // Suno 生成歌曲消耗算力
+	LumaPower         int            `json:"luma_power,omitempty"`          // Luma 生成视频消耗算力
+	KeLingPowers      map[string]int `json:"keling_powers,omitempty"`       // 可灵生成视频消耗算力
+	AdvanceVoicePower int            `json:"advance_voice_power,omitempty"` // 高级语音对话消耗算力
+	PromptPower       int            `json:"prompt_power,omitempty"`        // 生成提示词消耗算力

 	WechatCardURL string `json:"wechat_card_url,omitempty"` // 微信客服地址

@@ -162,10 +163,15 @@ type SystemConfig struct {
 	SdNegPrompt string `json:"sd_neg_prompt"` // SD 默认反向提示词
 	MjMode      string `json:"mj_mode"`       // midjourney 默认的API模式，relax, fast, turbo

-	IndexBgURL  string `json:"index_bg_url"`  // 前端首页背景图片
-	IndexNavs   []int  `json:"index_navs"`    // 首页显示的导航菜单
-	Copyright   string `json:"copyright"`     // 版权信息
-	MarkMapText string `json:"mark_map_text"` // 思维导入的默认文本
+	IndexNavs       []int  `json:"index_navs"`       // 首页显示的导航菜单
+	Copyright       string `json:"copyright"`        // 版权信息
+	DefaultNickname string `json:"default_nickname"` // 默认昵称
+	ICP             string `json:"icp"`              // ICP 备案号
+	MarkMapText     string `json:"mark_map_text"`    // 思维导入的默认文本
+
+	EnabledVerify    bool     `json:"enabled_verify"`     // 是否启用验证码
+	EmailWhiteList   []string `json:"email_white_list"`   // 邮箱白名单列表
+	AssistantModelId int      `json:"assistant_model_id"` // 用来做提示词,翻译的AI模型 id
+	MaxFileSize      int      `json:"max_file_size"`      // 最大文件大小,单位：MB

-	EnabledVerify bool `json:"enabled_verify"` // 是否启用验证码
 }
--- a/api/core/types/jimeng.go
+++ b/api/core/types/jimeng.go
@@ -0,0 +1,18 @@
+package types
+
+// JimengConfig 即梦AI配置
+type JimengConfig struct {
+	AccessKey string      `json:"access_key"`
+	SecretKey string      `json:"secret_key"`
+	Power     JimengPower `json:"power"`
+}
+
+// JimengPower 即梦AI算力配置
+type JimengPower struct {
+	TextToImage  int `json:"text_to_image"`
+	ImageToImage int `json:"image_to_image"`
+	ImageEdit    int `json:"image_edit"`
+	ImageEffects int `json:"image_effects"`
+	TextToVideo  int `json:"text_to_video"`
+	ImageToVideo int `json:"image_to_video"`
+}
--- a/api/core/types/locked_map.go
+++ b/api/core/types/locked_map.go
@@ -16,7 +16,7 @@ type MKey interface {
 	string | int | uint
 }
 type MValue interface {
-	*WsClient | *ChatSession | context.CancelFunc | []Message
+	*WsClient | context.CancelFunc | []any
 }
 type LMap[K MKey, T MValue] struct {
 	lock sync.RWMutex
--- a/api/core/types/order.go
+++ b/api/core/types/order.go
@@ -22,3 +22,18 @@ type OrderRemark struct {
 	Price    float64 `json:"price"`
 	Discount float64 `json:"discount"`
 }
+
+var PayMethods = map[string]string{
+	"alipay": "支付宝商号",
+	"wechat": "微信商号",
+	"hupi":   "虎皮椒",
+	"geek":   "易支付",
+}
+var PayNames = map[string]string{
+	"alipay": "支付宝",
+	"wxpay":  "微信支付",
+	"qqpay":  "QQ钱包",
+	"jdpay":  "京东支付",
+	"douyin": "抖音支付",
+	"paypal": "PayPal支付",
+}
--- a/api/core/types/task.go
+++ b/api/core/types/task.go
@@ -24,28 +24,29 @@ const (

 // MjTask MidJourney 任务
 type MjTask struct {
-	Id          uint     `json:"id"`
-	TaskId      string   `json:"task_id"`
-	ImgArr      []string `json:"img_arr"`
-	Type        TaskType `json:"type"`
-	UserId      int      `json:"user_id"`
-	Prompt      string   `json:"prompt,omitempty"`
-	NegPrompt   string   `json:"neg_prompt,omitempty"`
-	Params      string   `json:"full_prompt"`
-	Index       int      `json:"index,omitempty"`
-	MessageId   string   `json:"message_id,omitempty"`
-	MessageHash string   `json:"message_hash,omitempty"`
-	RetryCount  int      `json:"retry_count"`
-	ChannelId   string   `json:"channel_id"` // 渠道ID，用来区分是哪个渠道创建的任务，一个任务的 create 和 action 操作必须要再同一个渠道
-	Mode        string   `json:"mode"`       // 绘画模式，relax, fast, turbo
+	Id               uint     `json:"id"`      // 任务ID
+	TaskId           string   `json:"task_id"` // 中转任务ID
+	ImgArr           []string `json:"img_arr"`
+	Type             TaskType `json:"type"`
+	UserId           int      `json:"user_id"`
+	Prompt           string   `json:"prompt,omitempty"`
+	NegPrompt        string   `json:"neg_prompt,omitempty"`
+	Params           string   `json:"full_prompt"`
+	Index            int      `json:"index,omitempty"`
+	MessageId        string   `json:"message_id,omitempty"`
+	MessageHash      string   `json:"message_hash,omitempty"`
+	ChannelId        string   `json:"channel_id"`         // 渠道ID，用来区分是哪个渠道创建的任务，一个任务的 create 和 action 操作必须要再同一个渠道
+	Mode             string   `json:"mode"`               // 绘画模式，relax, fast, turbo
+	TranslateModelId int      `json:"translate_model_id"` // 提示词翻译模型ID
 }

 type SdTask struct {
-	Id         int          `json:"id"` // job 数据库ID
-	Type       TaskType     `json:"type"`
-	UserId     int          `json:"user_id"`
-	Params     SdTaskParams `json:"params"`
-	RetryCount int          `json:"retry_count"`
+	Id               int          `json:"id"` // job 数据库ID
+	Type             TaskType     `json:"type"`
+	UserId           int          `json:"user_id"`
+	Params           SdTaskParams `json:"params"`
+	RetryCount       int          `json:"retry_count"`
+	TranslateModelId int          `json:"translate_model_id"` // 提示词翻译模型ID
 }

 type SdTaskParams struct {
@@ -69,15 +70,17 @@ type SdTaskParams struct {

 // DallTask DALL-E task
 type DallTask struct {
-	JobId   uint   `json:"job_id"`
-	UserId  uint   `json:"user_id"`
-	Prompt  string `json:"prompt"`
-	N       int    `json:"n"`
-	Quality string `json:"quality"`
-	Size    string `json:"size"`
-	Style   string `json:"style"`
-
-	Power int `json:"power"`
+	ModelId          uint   `json:"model_id"`
+	ModelName        string `json:"model_name"`
+	Id               uint   `json:"id"`
+	UserId           uint   `json:"user_id"`
+	Prompt           string `json:"prompt"`
+	N                int    `json:"n"`
+	Quality          string `json:"quality"`
+	Size             string `json:"size"`
+	Style            string `json:"style"`
+	Power            int    `json:"power"`
+	TranslateModelId int    `json:"translate_model_id"` // 提示词翻译模型ID
 }

 type SunoTask struct {
@@ -88,7 +91,8 @@ type SunoTask struct {
 	Title        string `json:"title"`
 	RefTaskId    string `json:"ref_task_id,omitempty"`
 	RefSongId    string `json:"ref_song_id,omitempty"`
-	Prompt       string `json:"prompt"` // 提示词/歌词
+	Prompt       string `json:"prompt"`           // 提示词
+	Lyrics       string `json:"lyrics,omitempty"` // 歌词
 	Tags         string `json:"tags"`
 	Model        string `json:"model"`
 	Instrumental bool   `json:"instrumental"`          // 是否纯音乐
@@ -101,19 +105,21 @@ const (
 	VideoLuma   = "luma"
 	VideoRunway = "runway"
 	VideoCog    = "cog"
+	VideoKeLing = "keling"
 )

 type VideoTask struct {
-	Id      uint        `json:"id"`
-	Channel string      `json:"channel"`
-	UserId  int         `json:"user_id"`
-	Type    string      `json:"type"`
-	TaskId  string      `json:"task_id"`
-	Prompt  string      `json:"prompt"` // 提示词
-	Params  VideoParams `json:"params"`
+	Id               uint        `json:"id"`
+	Channel          string      `json:"channel"`
+	UserId           int         `json:"user_id"`
+	Type             string      `json:"type"`
+	TaskId           string      `json:"task_id"`
+	Prompt           string      `json:"prompt"` // 提示词
+	Params           interface{} `json:"params"`
+	TranslateModelId int         `json:"translate_model_id"` // 提示词翻译模型ID
 }

-type VideoParams struct {
+type LumaVideoParams struct {
 	PromptOptimize bool   `json:"prompt_optimize"` // 是否优化提示词
 	Loop           bool   `json:"loop"`            // 是否循环参考图
 	StartImgURL    string `json:"start_img_url"`   // 第一帧参考图地址
@@ -123,3 +129,33 @@ type VideoParams struct {
 	Style          string `json:"style"`           // 风格
 	Duration       int    `json:"duration"`        // 视频时长（秒）
 }
+
+type KeLingVideoParams struct {
+	TaskType      string        `json:"task_type"`       // 任务类型: text2video/image2video
+	Model         string        `json:"model"`           // 模型: default/anime
+	Prompt        string        `json:"prompt"`          // 视频描述
+	NegPrompt     string        `json:"negative_prompt"` // 负面提示词
+	CfgScale      float64       `json:"cfg_scale"`       // 相关性系数(0-1)
+	Mode          string        `json:"mode"`            // 生成模式: std/pro
+	AspectRatio   string        `json:"aspect_ratio"`    // 画面比例: 16:9/9:16/1:1
+	Duration      string        `json:"duration"`        // 视频时长: 5/10
+	CameraControl CameraControl `json:"camera_control"`  // 摄像机控制
+	Image         string        `json:"image"`           // 参考图片URL(image2video)
+	ImageTail     string        `json:"image_tail"`      // 尾帧图片URL(image2video)
+}
+
+// CameraControl 摄像机控制
+type CameraControl struct {
+	Type   string       `json:"type"`   // 控制类型: simple/down_back/forward_up/right_turn_forward/left_turn_forward
+	Config CameraConfig `json:"config"` // 控制参数(仅simple类型时使用)
+}
+
+// CameraConfig 摄像机参数
+type CameraConfig struct {
+	Horizontal int `json:"horizontal"` // 水平移动(-10到10)
+	Vertical   int `json:"vertical"`   // 垂直移动(-10到10)
+	Pan        int `json:"pan"`        // 左右旋转(-10到10)
+	Tilt       int `json:"tilt"`       // 上下旋转(-10到10)
+	Roll       int `json:"roll"`       // 横向翻转(-10到10)
+	Zoom       int `json:"zoom"`       // 镜头缩放(-10到10)
+}
--- a/api/core/types/web.go
+++ b/api/core/types/web.go
@@ -17,21 +17,49 @@ type BizVo struct {
 	Data     interface{} `json:"data,omitempty"`
 }

-// WsMessage Websocket message
-type WsMessage struct {
-	Type    WsMsgType   `json:"type"` // 消息类别，start, end, img
-	Content interface{} `json:"content"`
+// ReplyMessage 对话回复消息结构
+type ReplyMessage struct {
+	Channel  WsChannel   `json:"channel"`  // 消息频道，目前只有 chat
+	ClientId string      `json:"clientId"` // 客户端ID
+	Type     WsMsgType   `json:"type"`     // 消息类别
+	Body     interface{} `json:"body"`
 }

 type WsMsgType string
+type WsChannel string

 const (
-	WsStart  = WsMsgType("start")
-	WsMiddle = WsMsgType("middle")
-	WsEnd    = WsMsgType("end")
-	WsErr    = WsMsgType("error")
+	MsgTypeText = WsMsgType("text") // 输出内容
+	MsgTypeEnd  = WsMsgType("end")
+	MsgTypeErr  = WsMsgType("error")
+	MsgTypePing = WsMsgType("ping") // 心跳消息
+
+	ChPing   = WsChannel("ping")
+	ChChat   = WsChannel("chat")
+	ChMj     = WsChannel("mj")
+	ChSd     = WsChannel("sd")
+	ChDall   = WsChannel("dall")
+	ChSuno   = WsChannel("suno")
+	ChLuma   = WsChannel("luma")
+	ChKeLing = WsChannel("keling")
 )

+// InputMessage 对话输入消息结构
+type InputMessage struct {
+	Channel WsChannel   `json:"channel"` // 消息频道
+	Type    WsMsgType   `json:"type"`    // 消息类别
+	Body    interface{} `json:"body"`
+}
+
+type ChatMessage struct {
+	Tools   []int  `json:"tools,omitempty"`  // 允许调用工具列表
+	Stream  bool   `json:"stream,omitempty"` // 是否采用流式输出
+	RoleId  int    `json:"role_id"`
+	ModelId int    `json:"model_id"`
+	ChatId  string `json:"chat_id"`
+	Content string `json:"content"`
+}
+
 type BizCode int

 const (
--- a/api/go.mod
+++ b/api/go.mod
@@ -18,6 +18,7 @@ require (
 	github.com/pkoukk/tiktoken-go v0.1.1-0.20230418101013-cae809389480
 	github.com/qiniu/go-sdk/v7 v7.17.1
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
+	github.com/volcengine/volc-sdk-golang v1.0.23
 	go.uber.org/zap v1.23.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gorm.io/driver/mysql v1.4.7
@@ -27,8 +28,10 @@ require github.com/xxl-job/xxl-job-executor-go v1.2.0

 require (
 	github.com/go-pay/gopay v1.5.101
+	github.com/go-rod/rod v0.116.2
 	github.com/google/go-tika v0.3.1
 	github.com/microcosm-cc/bluemonday v1.0.26
+	github.com/sashabaranov/go-openai v1.38.1
 	github.com/shirou/gopsutil v3.21.11+incompatible
 	github.com/shopspring/decimal v1.3.1
 	github.com/syndtr/goleveldb v1.0.0
@@ -43,10 +46,15 @@ require (
 	github.com/go-pay/util v0.0.2 // indirect
 	github.com/go-pay/xlog v0.0.2 // indirect
 	github.com/go-pay/xtime v0.0.2 // indirect
-	github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
+	github.com/golang/snappy v0.0.4 // indirect
 	github.com/gorilla/css v1.0.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.13 // indirect
 	github.com/tklauser/numcpus v0.7.0 // indirect
+	github.com/ysmood/fetchup v0.3.0 // indirect
+	github.com/ysmood/goob v0.4.0 // indirect
+	github.com/ysmood/got v0.40.0 // indirect
+	github.com/ysmood/gson v0.7.3 // indirect
+	github.com/ysmood/leakless v0.9.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.uber.org/mock v0.4.0 // indirect
 )
@@ -71,7 +79,7 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
@@ -113,7 +121,7 @@ require (
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/fx v1.19.3
-	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/multierr v1.7.0 // indirect
 	golang.org/x/crypto v0.23.0
 	golang.org/x/sys v0.20.0 // indirect
 	gorm.io/gorm v1.25.1
--- a/api/go.sum
+++ b/api/go.sum
@@ -1,3 +1,5 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
 github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/aliyun/alibaba-cloud-sdk-go v1.62.405 h1:cKNFQmeCQFN0WNfjScKoVrGi7vXxTVbkCvCqSrOf+P4=
@@ -6,6 +8,7 @@ github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible h1:Sg/2xHwDrioHpxTN6WMiw
 github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
@@ -13,11 +16,13 @@ github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZx
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
 github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -28,6 +33,8 @@ github.com/dlclark/regexp2 v1.8.1 h1:6Lcdwya6GjPUNsBct8Lg/yRPwMhABj269AAzdGSiR+0
 github.com/dlclark/regexp2 v1.8.1/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
@@ -73,6 +80,8 @@ github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg
 github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
+github.com/go-rod/rod v0.116.2 h1:A5t2Ky2A+5eD/ZJQr1EfsQSe5rms5Xof/qj296e+ZqA=
+github.com/go-rod/rod v0.116.2/go.mod h1:H+CMO9SCNc2TJ2WfrG+pKhITz57uGNYU43qYHh438Mg=
 github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
 github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
@@ -82,11 +91,27 @@ github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG
 github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
 github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
 github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-tika v0.3.1 h1:l+jr10hDhZjcgxFRfcQChRLo1bPXQeLFluMyvDhXTTA=
@@ -113,8 +138,11 @@ github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkr
 github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
@@ -125,6 +153,7 @@ github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02
 github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
 github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
@@ -177,6 +206,7 @@ github.com/pkoukk/tiktoken-go v0.1.1-0.20230418101013-cae809389480 h1:IFhPCcB0/H
 github.com/pkoukk/tiktoken-go v0.1.1-0.20230418101013-cae809389480/go.mod h1:BijIqAP84FMYC4XbdJgjyMpiSjusU8x0Y0W9K2t0QtU=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/qiniu/dyn v1.3.0/go.mod h1:E8oERcm8TtwJiZvkQPbcAh0RL8jO1G0VXJMW3FAWdkk=
 github.com/qiniu/go-sdk/v7 v7.17.1 h1:UoQv7fBKtzAiD1qZPIvTy62Se48YLKxcCYP9nAwWMa0=
 github.com/qiniu/go-sdk/v7 v7.17.1/go.mod h1:nqoYCNo53ZlGA521RvRethvxUDvXKt4gtYXOwye868w=
@@ -192,6 +222,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/sashabaranov/go-openai v1.38.1 h1:TtZabbFQZa1nEni/IhVtDF/WQjVqDgd+cWR5OeddzF8=
+github.com/sashabaranov/go-openai v1.38.1/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
 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=
@@ -204,6 +236,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -226,8 +259,24 @@ github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVK
 github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
 github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
 github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/volcengine/volc-sdk-golang v1.0.23 h1:anOslb2Qp6ywnsbyq9jqR0ljuO63kg9PY+4OehIk5R8=
+github.com/volcengine/volc-sdk-golang v1.0.23/go.mod h1:AfG/PZRUkHJ9inETvbjNifTDgut25Wbkm2QoYBTbvyU=
 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/ysmood/fetchup v0.3.0 h1:UhYz9xnLEVn2ukSuK3KCgcznWpHMdrmbsPpllcylyu8=
+github.com/ysmood/fetchup v0.3.0/go.mod h1:hbysoq65PXL0NQeNzUczNYIKpwpkwFL4LXMDEvIQq9A=
+github.com/ysmood/goob v0.4.0 h1:HsxXhyLBeGzWXnqVKtmT9qM7EuVs/XOgkX7T6r1o1AQ=
+github.com/ysmood/goob v0.4.0/go.mod h1:u6yx7ZhS4Exf2MwciFr6nIM8knHQIE22lFpWHnfql18=
+github.com/ysmood/gop v0.2.0 h1:+tFrG0TWPxT6p9ZaZs+VY+opCvHU8/3Fk6BaNv6kqKg=
+github.com/ysmood/gop v0.2.0/go.mod h1:rr5z2z27oGEbyB787hpEcx4ab8cCiPnKxn0SUHt6xzk=
+github.com/ysmood/got v0.40.0 h1:ZQk1B55zIvS7zflRrkGfPDrPG3d7+JOza1ZkNxcc74Q=
+github.com/ysmood/got v0.40.0/go.mod h1:W7DdpuX6skL3NszLmAsC5hT7JAhuLZhByVzHTq874Qg=
+github.com/ysmood/gotrace v0.6.0 h1:SyI1d4jclswLhg7SWTL6os3L1WOKeNn/ZtzVQF8QmdY=
+github.com/ysmood/gotrace v0.6.0/go.mod h1:TzhIG7nHDry5//eYZDYcTzuJLYQIkykJzCRIo4/dzQM=
+github.com/ysmood/gson v0.7.3 h1:QFkWbTH8MxyUTKPkVWAENJhxqdBa4lYTQWqZCiLG6kE=
+github.com/ysmood/gson v0.7.3/go.mod h1:3Kzs5zDl21g5F/BlLTNcuAGAYLKt2lV5G8D1zF3RNmg=
+github.com/ysmood/leakless v0.9.0 h1:qxCG5VirSBvmi3uynXFkcnLMzkphdh3xx5FtrORwDCU=
+github.com/ysmood/leakless v0.9.0/go.mod h1:R8iAXPRaG97QJwqxs74RdwzcRHT1SWCGTNqY8q0JvMQ=
 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=
@@ -242,8 +291,8 @@ go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
 go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
-go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec=
+go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
 go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
 go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
@@ -257,15 +306,23 @@ golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDf
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
 golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
 golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
@@ -276,12 +333,15 @@ golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 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=
@@ -320,16 +380,39 @@ golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
 golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
@@ -342,6 +425,10 @@ gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYs
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
@@ -351,4 +438,6 @@ gorm.io/driver/mysql v1.4.7/go.mod h1:SxzItlnT1cb6e1e4ZRpgJN2VYtcqJgqnHxWr4wsP8o
 gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
 gorm.io/gorm v1.25.1 h1:nsSALe5Pr+cM3V1qwwQ7rOkw+6UeLrX5O4v3llhHa64=
 gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
--- a/api/handler/admin/api_key_handler.go
+++ b/api/handler/admin/api_key_handler.go
@@ -16,6 +16,7 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
+	"strings"

 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
@@ -71,20 +72,18 @@ func (h *ApiKeyHandler) Save(c *gin.Context) {
 	resp.SUCCESS(c, keyVo)
 }

+// List 获取 API KEY 列表
 func (h *ApiKeyHandler) List(c *gin.Context) {
 	status := h.GetBool(c, "status")
-	t := h.GetTrim(c, "type")
-	platform := h.GetTrim(c, "platform")
+	t := c.Query("type")

 	session := h.DB.Session(&gorm.Session{})
 	if status {
 		session = session.Where("enabled", true)
 	}
 	if t != "" {
-		session = session.Where("type", t)
-	}
-	if platform != "" {
-		session = session.Where("platform", platform)
+		types := strings.Split(t, "|")
+		session = session.Where("type IN ?", types)
 	}

 	var items []model.ApiKey
--- a/api/handler/admin/chat_role_handler.go
+++ b/api/handler/admin/chat_role_handler.go
@@ -22,16 +22,16 @@ import (
 	"gorm.io/gorm"
 )

-type ChatRoleHandler struct {
+type ChatAppHandler struct {
 	handler.BaseHandler
 }

-func NewChatRoleHandler(app *core.AppServer, db *gorm.DB) *ChatRoleHandler {
-	return &ChatRoleHandler{BaseHandler: handler.BaseHandler{App: app, DB: db}}
+func NewChatAppHandler(app *core.AppServer, db *gorm.DB) *ChatAppHandler {
+	return &ChatAppHandler{BaseHandler: handler.BaseHandler{App: app, DB: db}}
 }

 // Save 创建或者更新某个角色
-func (h *ChatRoleHandler) Save(c *gin.Context) {
+func (h *ChatAppHandler) Save(c *gin.Context) {
 	var data vo.ChatRole
 	if err := c.ShouldBindJSON(&data); err != nil {
 		resp.ERROR(c, types.InvalidArgs)
@@ -64,7 +64,7 @@ func (h *ChatRoleHandler) Save(c *gin.Context) {
 	resp.SUCCESS(c, data)
 }

-func (h *ChatRoleHandler) List(c *gin.Context) {
+func (h *ChatAppHandler) List(c *gin.Context) {
 	var items []model.ChatRole
 	var roles = make([]vo.ChatRole, 0)
 	res := h.DB.Order("sort_num ASC").Find(&items)
@@ -75,13 +75,18 @@ func (h *ChatRoleHandler) List(c *gin.Context) {

 	// initialize model mane for role
 	modelIds := make([]int, 0)
+	typeIds := make([]int, 0)
 	for _, v := range items {
 		if v.ModelId > 0 {
-			modelIds = append(modelIds, v.ModelId)
+			modelIds = append(modelIds, int(v.ModelId))
+		}
+		if v.Tid > 0 {
+			typeIds = append(typeIds, int(v.Tid))
 		}
 	}

 	modelNameMap := make(map[int]string)
+	typeNameMap := make(map[int]string)
 	if len(modelIds) > 0 {
 		var models []model.ChatModel
 		tx := h.DB.Where("id IN ?", modelIds).Find(&models)
@@ -91,6 +96,15 @@ func (h *ChatRoleHandler) List(c *gin.Context) {
 			}
 		}
 	}
+	if len(typeIds) > 0 {
+		var appTypes []model.AppType
+		tx := h.DB.Where("id IN ?", typeIds).Find(&appTypes)
+		if tx.Error == nil {
+			for _, m := range appTypes {
+				typeNameMap[int(m.Id)] = m.Name
+			}
+		}
+	}

 	for _, v := range items {
 		var role vo.ChatRole
@@ -99,7 +113,8 @@ func (h *ChatRoleHandler) List(c *gin.Context) {
 			role.Id = v.Id
 			role.CreatedAt = v.CreatedAt.Unix()
 			role.UpdatedAt = v.UpdatedAt.Unix()
-			role.ModelName = modelNameMap[role.ModelId]
+			role.ModelName = modelNameMap[int(role.ModelId)]
+			role.TypeName = typeNameMap[int(role.Tid)]
 			roles = append(roles, role)
 		}
 	}
@@ -108,7 +123,7 @@ func (h *ChatRoleHandler) List(c *gin.Context) {
 }

 // Sort 更新角色排序
-func (h *ChatRoleHandler) Sort(c *gin.Context) {
+func (h *ChatAppHandler) Sort(c *gin.Context) {
 	var data struct {
 		Ids   []uint `json:"ids"`
 		Sorts []int  `json:"sorts"`
@@ -130,7 +145,7 @@ func (h *ChatRoleHandler) Sort(c *gin.Context) {
 	resp.SUCCESS(c)
 }

-func (h *ChatRoleHandler) Set(c *gin.Context) {
+func (h *ChatAppHandler) Set(c *gin.Context) {
 	var data struct {
 		Id    uint        `json:"id"`
 		Filed string      `json:"filed"`
@@ -150,7 +165,7 @@ func (h *ChatRoleHandler) Set(c *gin.Context) {
 	resp.SUCCESS(c)
 }

-func (h *ChatRoleHandler) Remove(c *gin.Context) {
+func (h *ChatAppHandler) Remove(c *gin.Context) {
 	id := h.GetInt(c, "id", 0)

 	if id <= 0 {
--- a/api/handler/admin/chat_app_type_handler.go
+++ b/api/handler/admin/chat_app_type_handler.go
@@ -0,0 +1,148 @@
+package admin
+
+import (
+	"geekai/core"
+	"geekai/core/types"
+	"geekai/handler"
+	"geekai/store/model"
+	"geekai/store/vo"
+	"geekai/utils"
+	"geekai/utils/resp"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+type ChatAppTypeHandler struct {
+	handler.BaseHandler
+}
+
+func NewChatAppTypeHandler(app *core.AppServer, db *gorm.DB) *ChatAppTypeHandler {
+	return &ChatAppTypeHandler{BaseHandler: handler.BaseHandler{App: app, DB: db}}
+}
+
+// Save 创建或更新App类型
+func (h *ChatAppTypeHandler) Save(c *gin.Context) {
+	var data struct {
+		Id      uint   `json:"id"`
+		Name    string `json:"name"`
+		Enabled bool   `json:"enabled"`
+		Icon    string `json:"icon"`
+		SortNum int    `json:"sort_num"`
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	if data.Id == 0 { // for add
+		err := h.DB.Where("name", data.Name).First(&model.AppType{}).Error
+		if err == nil {
+			resp.ERROR(c, "当前分类已经存在")
+			return
+		}
+		err = h.DB.Create(&model.AppType{
+			Name:    data.Name,
+			Icon:    data.Icon,
+			Enabled: data.Enabled,
+			SortNum: data.SortNum,
+		}).Error
+		if err != nil {
+			resp.ERROR(c, err.Error())
+			return
+		}
+	} else { // for update
+		err := h.DB.Model(&model.AppType{}).Where("id", data.Id).Updates(map[string]interface{}{
+			"name":    data.Name,
+			"icon":    data.Icon,
+			"enabled": data.Enabled,
+		}).Error
+		if err != nil {
+			resp.ERROR(c, err.Error())
+			return
+		}
+	}
+	resp.SUCCESS(c)
+}
+
+// List 获取App类型列表
+func (h *ChatAppTypeHandler) List(c *gin.Context) {
+	var items []model.AppType
+	var appTypes = make([]vo.AppType, 0)
+	err := h.DB.Order("sort_num ASC").Find(&items).Error
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	for _, v := range items {
+		var appType vo.AppType
+		err = utils.CopyObject(v, &appType)
+		if err != nil {
+			continue
+		}
+		appType.Id = v.Id
+		appType.CreatedAt = v.CreatedAt.Unix()
+		appTypes = append(appTypes, appType)
+	}
+
+	resp.SUCCESS(c, appTypes)
+}
+
+// Remove 删除App类型
+func (h *ChatAppTypeHandler) Remove(c *gin.Context) {
+	id := h.GetInt(c, "id", 0)
+
+	if id <= 0 {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+	err := h.DB.Where("id", id).Delete(&model.AppType{}).Error
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+	resp.SUCCESS(c)
+}
+
+// Enable 启用|禁用
+func (h *ChatAppTypeHandler) Enable(c *gin.Context) {
+	var data struct {
+		Id      uint `json:"id"`
+		Enabled bool `json:"enabled"`
+	}
+
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	err := h.DB.Model(&model.AppType{}).Where("id", data.Id).UpdateColumn("enabled", data.Enabled).Error
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+	resp.SUCCESS(c)
+}
+
+// Sort 更新排序
+func (h *ChatAppTypeHandler) Sort(c *gin.Context) {
+	var data struct {
+		Ids   []uint `json:"ids"`
+		Sorts []int  `json:"sorts"`
+	}
+
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	for index, id := range data.Ids {
+		err := h.DB.Model(&model.AppType{}).Where("id", id).Update("sort_num", data.Sorts[index]).Error
+		if err != nil {
+			resp.ERROR(c, err.Error())
+			return
+		}
+	}
+
+	resp.SUCCESS(c)
+}
--- a/api/handler/admin/chat_handler.go
+++ b/api/handler/admin/chat_handler.go
@@ -15,6 +15,7 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
+
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
 )
@@ -189,7 +190,7 @@ func (h *ChatHandler) Messages(c *gin.Context) {
 		}
 		for _, item := range items {
 			list = append(list, chatMessageVo{
-				Id:        item.Id,
+				Id:        uint(item.Id),
 				UserId:    item.UserId,
 				Username:  userMap[item.UserId],
 				Content:   item.Content,
@@ -208,20 +209,28 @@ func (h *ChatHandler) Messages(c *gin.Context) {
 func (h *ChatHandler) History(c *gin.Context) {
 	chatId := c.Query("chat_id") // 会话 ID
 	var items []model.ChatMessage
-	var messages = make([]vo.HistoryMessage, 0)
+	var messages = make([]vo.ChatMessage, 0)
 	res := h.DB.Where("chat_id = ?", chatId).Find(&items)
 	if res.Error != nil {
 		resp.ERROR(c, "No history message")
 		return
 	} else {
 		for _, item := range items {
-			var v vo.HistoryMessage
+			var v vo.ChatMessage
 			err := utils.CopyObject(item, &v)
+			if err != nil {
+				continue
+			}
+			// 解析内容
+			var content vo.MsgContent
+			err = utils.JsonDecode(item.Content, &content)
+			if err != nil {
+				content.Text = item.Content
+			}
+			v.Content = content
 			v.CreatedAt = item.CreatedAt.Unix()
 			v.UpdatedAt = item.UpdatedAt.Unix()
-			if err == nil {
-				messages = append(messages, v)
-			}
+			messages = append(messages, v)
 		}
 	}

--- a/api/handler/admin/chat_model_handler.go
+++ b/api/handler/admin/chat_model_handler.go
@@ -30,19 +30,23 @@ func NewChatModelHandler(app *core.AppServer, db *gorm.DB) *ChatModelHandler {

 func (h *ChatModelHandler) Save(c *gin.Context) {
 	var data struct {
-		Id          uint    `json:"id"`
-		Name        string  `json:"name"`
-		Value       string  `json:"value"`
-		Enabled     bool    `json:"enabled"`
-		SortNum     int     `json:"sort_num"`
-		Open        bool    `json:"open"`
-		Platform    string  `json:"platform"`
-		Power       int     `json:"power"`
-		MaxTokens   int     `json:"max_tokens"`  // 最大响应长度
-		MaxContext  int     `json:"max_context"` // 最大上下文长度
-		Temperature float32 `json:"temperature"` // 模型温度
-		KeyId       int     `json:"key_id,omitempty"`
-		CreatedAt   int64   `json:"created_at"`
+		Id          uint              `json:"id"`
+		Name        string            `json:"name"`
+		Value       string            `json:"value"`
+		Enabled     bool              `json:"enabled"`
+		SortNum     int               `json:"sort_num"`
+		Open        bool              `json:"open"`
+		Platform    string            `json:"platform"`
+		Power       int               `json:"power"`
+		MaxTokens   int               `json:"max_tokens"`  // 最大响应长度
+		MaxContext  int               `json:"max_context"` // 最大上下文长度
+		Desc        string            `json:"desc"`        //模型描述
+		Tag         string            `json:"tag"`         //模型标签
+		Temperature float32           `json:"temperature"` // 模型温度
+		KeyId       int               `json:"key_id,omitempty"`
+		CreatedAt   int64             `json:"created_at"`
+		Type        string            `json:"type"`
+		Options     map[string]string `json:"options"`
 	}
 	if err := c.ShouldBindJSON(&data); err != nil {
 		resp.ERROR(c, types.InvalidArgs)
@@ -58,14 +62,16 @@ func (h *ChatModelHandler) Save(c *gin.Context) {
 	item.Name = data.Name
 	item.Value = data.Value
 	item.Enabled = data.Enabled
-	item.SortNum = data.SortNum
 	item.Open = data.Open
 	item.Power = data.Power
 	item.MaxTokens = data.MaxTokens
 	item.MaxContext = data.MaxContext
+	item.Desc = data.Desc
+	item.Tag = data.Tag
 	item.Temperature = data.Temperature
-	item.KeyId = data.KeyId
-
+	item.KeyId = uint(data.KeyId)
+	item.Type = data.Type
+	item.Options = utils.JsonEncode(data.Options)
 	var res *gorm.DB
 	if data.Id > 0 {
 		res = h.DB.Save(&item)
@@ -94,12 +100,16 @@ func (h *ChatModelHandler) List(c *gin.Context) {
 	session := h.DB.Session(&gorm.Session{})
 	enable := h.GetBool(c, "enable")
 	name := h.GetTrim(c, "name")
+	modelType := h.GetTrim(c, "type")
 	if enable {
 		session = session.Where("enabled", enable)
 	}
 	if name != "" {
 		session = session.Where("name LIKE ?", name+"%")
 	}
+	if modelType != "" {
+		session = session.Where("type", modelType)
+	}
 	var items []model.ChatModel
 	var cms = make([]vo.ChatModel, 0)
 	res := session.Order("sort_num ASC").Find(&items)
@@ -111,7 +121,7 @@ func (h *ChatModelHandler) List(c *gin.Context) {
 	// initialize key name
 	keyIds := make([]int, 0)
 	for _, v := range items {
-		keyIds = append(keyIds, v.KeyId)
+		keyIds = append(keyIds, int(v.KeyId))
 	}
 	var keys []model.ApiKey
 	keyMap := make(map[uint]string)
--- a/api/handler/admin/config_handler.go
+++ b/api/handler/admin/config_handler.go
@@ -48,6 +48,7 @@ func (h *ConfigHandler) Update(c *gin.Context) {
 	}

 	if err := c.ShouldBindJSON(&data); err != nil {
+		logger.Errorf("Update config failed: %v", err)
 		resp.ERROR(c, types.InvalidArgs)
 		return
 	}
@@ -58,16 +59,22 @@ func (h *ConfigHandler) Update(c *gin.Context) {
 		return
 	}

+	// 如果要启用图形验证码功能，则检查是否配置了 API 服务
+	if data.Config.EnabledVerify && h.App.Config.ApiConfig.AppId == "" {
+		resp.ERROR(c, "启用验证码服务需要先配置 GeekAI 官方 API 服务 AppId 和 Token")
+		return
+	}
+
 	value := utils.JsonEncode(&data.Config)
-	config := model.Config{Key: data.Key, Config: value}
-	res := h.DB.FirstOrCreate(&config, model.Config{Key: data.Key})
+	config := model.Config{Name: data.Key, Value: value}
+	res := h.DB.FirstOrCreate(&config, model.Config{Name: data.Key})
 	if res.Error != nil {
 		resp.ERROR(c, res.Error.Error())
 		return
 	}

 	if config.Id > 0 {
-		config.Config = value
+		config.Value = value
 		res := h.DB.Updates(&config)
 		if res.Error != nil {
 			resp.ERROR(c, res.Error.Error())
@@ -76,16 +83,16 @@ func (h *ConfigHandler) Update(c *gin.Context) {

 		// update config cache for AppServer
 		var cfg model.Config
-		h.DB.Where("marker", data.Key).First(&cfg)
+		h.DB.Where("name", data.Key).First(&cfg)
 		var err error
 		if data.Key == "system" {
-			err = utils.JsonDecode(cfg.Config, &h.App.SysConfig)
+			err = utils.JsonDecode(cfg.Value, &h.App.SysConfig)
 		}
 		if err != nil {
 			resp.ERROR(c, "Failed to update config cache: "+err.Error())
 			return
 		}
-		logger.Infof("Update AppServer's config successfully: %v", config.Config)
+		logger.Infof("Update AppServer's config successfully: %v", config.Value)
 	}

 	resp.SUCCESS(c, config)
@@ -95,14 +102,14 @@ func (h *ConfigHandler) Update(c *gin.Context) {
 func (h *ConfigHandler) Get(c *gin.Context) {
 	key := c.Query("key")
 	var config model.Config
-	res := h.DB.Where("marker", key).First(&config)
+	res := h.DB.Where("name", key).First(&config)
 	if res.Error != nil {
 		resp.ERROR(c, res.Error.Error())
 		return
 	}

 	var value map[string]interface{}
-	err := utils.JsonDecode(config.Config, &value)
+	err := utils.JsonDecode(config.Value, &value)
 	if err != nil {
 		resp.ERROR(c, err.Error())
 		return
@@ -132,7 +139,8 @@ func (h *ConfigHandler) Active(c *gin.Context) {
 		return
 	}

-	resp.SUCCESS(c, info.HostID)
+	resp.SUCCESS(c)
+
 }

 // GetLicense 获取 License 信息
@@ -140,3 +148,69 @@ func (h *ConfigHandler) GetLicense(c *gin.Context) {
 	license := h.licenseService.GetLicense()
 	resp.SUCCESS(c, license)
 }
+
+// FixData 修复数据
+func (h *ConfigHandler) FixData(c *gin.Context) {
+	resp.ERROR(c, "当前升级版本没有数据需要修正！")
+	//var fixed bool
+	//version := "data_fix_4.1.4"
+	//err := h.levelDB.Get(version, &fixed)
+	//if err == nil || fixed {
+	//	resp.ERROR(c, "当前版本数据修复已完成，请不要重复执行操作")
+	//	return
+	//}
+	//tx := h.DB.Begin()
+	//var users []model.User
+	//err = tx.Find(&users).Error
+	//if err != nil {
+	//	resp.ERROR(c, err.Error())
+	//	return
+	//}
+	//for _, user := range users {
+	//	if user.Email != "" || user.Mobile != "" {
+	//		continue
+	//	}
+	//	if utils.IsValidEmail(user.Username) {
+	//		user.Email = user.Username
+	//	} else if utils.IsValidMobile(user.Username) {
+	//		user.Mobile = user.Username
+	//	}
+	//	err = tx.Save(&user).Error
+	//	if err != nil {
+	//		resp.ERROR(c, err.Error())
+	//		tx.Rollback()
+	//		return
+	//	}
+	//}
+	//
+	//var orders []model.Order
+	//err = h.DB.Find(&orders).Error
+	//if err != nil {
+	//	resp.ERROR(c, err.Error())
+	//	return
+	//}
+	//for _, order := range orders {
+	//	if order.PayWay == "支付宝" {
+	//		order.PayWay = "alipay"
+	//		order.PayType = "alipay"
+	//	} else if order.PayWay == "微信支付" {
+	//		order.PayWay = "wechat"
+	//		order.PayType = "wxpay"
+	//	} else if order.PayWay == "hupi" {
+	//		order.PayType = "wxpay"
+	//	}
+	//	err = tx.Save(&order).Error
+	//	if err != nil {
+	//		resp.ERROR(c, err.Error())
+	//		tx.Rollback()
+	//		return
+	//	}
+	//}
+	//tx.Commit()
+	//err = h.levelDB.Put(version, true)
+	//if err != nil {
+	//	resp.ERROR(c, err.Error())
+	//	return
+	//}
+	//resp.SUCCESS(c)
+}
--- a/api/handler/admin/image_handler.go
+++ b/api/handler/admin/image_handler.go
@@ -0,0 +1,252 @@
+package admin
+
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// * Copyright 2023 The Geek-AI Authors. All rights reserved.
+// * Use of this source code is governed by a Apache-2.0 license
+// * that can be found in the LICENSE file.
+// * @Author yangjian102621@163.com
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+import (
+	"fmt"
+	"geekai/core"
+	"geekai/core/types"
+	"geekai/handler"
+	"geekai/service"
+	"geekai/service/oss"
+	"geekai/store/model"
+	"geekai/store/vo"
+	"geekai/utils"
+	"geekai/utils/resp"
+
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+type ImageHandler struct {
+	handler.BaseHandler
+	userService *service.UserService
+	uploader    *oss.UploaderManager
+}
+
+func NewImageHandler(app *core.AppServer, db *gorm.DB, userService *service.UserService, manager *oss.UploaderManager) *ImageHandler {
+	return &ImageHandler{BaseHandler: handler.BaseHandler{App: app, DB: db}, userService: userService, uploader: manager}
+}
+
+type imageQuery struct {
+	Prompt    string   `json:"prompt"`
+	Username  string   `json:"username"`
+	CreatedAt []string `json:"created_at"`
+	Page      int      `json:"page"`
+	PageSize  int      `json:"page_size"`
+}
+
+// MjList Midjourney 任务列表
+func (h *ImageHandler) MjList(c *gin.Context) {
+	var data imageQuery
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	session := h.DB.Session(&gorm.Session{})
+	if data.Username != "" {
+		var user model.User
+		err := h.DB.Where("username", data.Username).First(&user).Error
+		if err == nil {
+			session = session.Where("user_id", user.Id)
+		}
+	}
+	if data.Prompt != "" {
+		session = session.Where("prompt LIKE ?", "%"+data.Prompt+"%")
+	}
+	if len(data.CreatedAt) == 2 {
+		session = session.Where("created_at >= ? AND created_at <= ?", data.CreatedAt[0], data.CreatedAt[1])
+	}
+	var total int64
+	session.Model(&model.MidJourneyJob{}).Count(&total)
+	var list []model.MidJourneyJob
+	var items = make([]vo.MidJourneyJob, 0)
+	offset := (data.Page - 1) * data.PageSize
+	err := session.Order("id DESC").Offset(offset).Limit(data.PageSize).Find(&list).Error
+	if err == nil {
+		// 填充数据
+		for _, item := range list {
+			var job vo.MidJourneyJob
+			err = utils.CopyObject(item, &job)
+			if err != nil {
+				continue
+			}
+			job.CreatedAt = item.CreatedAt.Unix()
+			items = append(items, job)
+		}
+	}
+
+	resp.SUCCESS(c, vo.NewPage(total, data.Page, data.PageSize, items))
+}
+
+// SdList Stable Diffusion 任务列表
+func (h *ImageHandler) SdList(c *gin.Context) {
+	var data imageQuery
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	session := h.DB.Session(&gorm.Session{})
+	if data.Username != "" {
+		var user model.User
+		err := h.DB.Where("username", data.Username).First(&user).Error
+		if err == nil {
+			session = session.Where("user_id", user.Id)
+		}
+	}
+	if data.Prompt != "" {
+		session = session.Where("prompt LIKE ?", "%"+data.Prompt+"%")
+	}
+	if len(data.CreatedAt) == 2 {
+		session = session.Where("created_at >= ? AND created_at <= ?", data.CreatedAt[0], data.CreatedAt[1])
+	}
+	var total int64
+	session.Model(&model.SdJob{}).Count(&total)
+	var list []model.SdJob
+	var items = make([]vo.SdJob, 0)
+	offset := (data.Page - 1) * data.PageSize
+	err := session.Order("id DESC").Offset(offset).Limit(data.PageSize).Find(&list).Error
+	if err == nil {
+		// 填充数据
+		for _, item := range list {
+			var job vo.SdJob
+			err = utils.CopyObject(item, &job)
+			if err != nil {
+				continue
+			}
+			job.CreatedAt = item.CreatedAt.Unix()
+			items = append(items, job)
+		}
+	}
+
+	resp.SUCCESS(c, vo.NewPage(total, data.Page, data.PageSize, items))
+}
+
+// DallList DALL-E 任务列表
+func (h *ImageHandler) DallList(c *gin.Context) {
+	var data imageQuery
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	session := h.DB.Session(&gorm.Session{})
+	if data.Username != "" {
+		var user model.User
+		err := h.DB.Where("username", data.Username).First(&user).Error
+		if err == nil {
+			session = session.Where("user_id", user.Id)
+		}
+	}
+	if data.Prompt != "" {
+		session = session.Where("prompt LIKE ?", "%"+data.Prompt+"%")
+	}
+	if len(data.CreatedAt) == 2 {
+		session = session.Where("created_at >= ? AND created_at <= ?", data.CreatedAt[0], data.CreatedAt[1])
+	}
+	var total int64
+	session.Model(&model.DallJob{}).Count(&total)
+	var list []model.DallJob
+	var items = make([]vo.DallJob, 0)
+	offset := (data.Page - 1) * data.PageSize
+	err := session.Order("id DESC").Offset(offset).Limit(data.PageSize).Find(&list).Error
+	if err == nil {
+		// 填充数据
+		for _, item := range list {
+			var job vo.DallJob
+			err = utils.CopyObject(item, &job)
+			if err != nil {
+				continue
+			}
+			job.CreatedAt = item.CreatedAt.Unix()
+			items = append(items, job)
+		}
+	}
+
+	resp.SUCCESS(c, vo.NewPage(total, data.Page, data.PageSize, items))
+}
+
+func (h *ImageHandler) Remove(c *gin.Context) {
+	id := h.GetInt(c, "id", 0)
+	tab := c.Query("tab")
+
+	tx := h.DB.Begin()
+	var md, remark, imgURL string
+	var power, userId, progress int
+	switch tab {
+	case "mj":
+		var job model.MidJourneyJob
+		if err := h.DB.Where("id", id).First(&job).Error; err != nil {
+			resp.ERROR(c, "记录不存在")
+			return
+		}
+		tx.Delete(&job)
+		md = "mid-journey"
+		power = job.Power
+		userId = int(job.UserId)
+		remark = fmt.Sprintf("任务失败，退回算力。任务ID：%d，Err: %s", job.Id, job.ErrMsg)
+		progress = job.Progress
+		imgURL = job.ImgURL
+	case "sd":
+		var job model.SdJob
+		if res := h.DB.Where("id", id).First(&job); res.Error != nil {
+			resp.ERROR(c, "记录不存在")
+			return
+		}
+
+		// 删除任务
+		tx.Delete(&job)
+		md = "stable-diffusion"
+		power = job.Power
+		userId = int(job.UserId)
+		remark = fmt.Sprintf("任务失败，退回算力。任务ID：%d，Err: %s", job.Id, job.ErrMsg)
+		progress = job.Progress
+		imgURL = job.ImgURL
+	case "dall":
+		var job model.DallJob
+		if res := h.DB.Where("id", id).First(&job); res.Error != nil {
+			resp.ERROR(c, "记录不存在")
+			return
+		}
+
+		// 删除任务
+		tx.Delete(&job)
+		md = "dall-e-3"
+		power = job.Power
+		userId = int(job.UserId)
+		remark = fmt.Sprintf("任务失败，退回算力。任务ID：%d，Err: %s", job.Id, job.ErrMsg)
+		progress = job.Progress
+		imgURL = job.ImgURL
+	default:
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	if progress != 100 {
+		err := h.userService.IncreasePower(uint(userId), power, model.PowerLog{
+			Type:   types.PowerRefund,
+			Model:  md,
+			Remark: remark,
+		})
+		if err != nil {
+			tx.Rollback()
+			resp.ERROR(c, err.Error())
+			return
+		}
+	}
+	tx.Commit()
+	// remove image
+	err := h.uploader.GetUploadHandler().Delete(imgURL)
+	if err != nil {
+		logger.Error("remove image failed: ", err)
+	}
+
+	resp.SUCCESS(c)
+}
--- a/api/handler/admin/jimeng_handler.go
+++ b/api/handler/admin/jimeng_handler.go
@@ -0,0 +1,296 @@
+package admin
+
+import (
+	"fmt"
+	"strconv"
+
+	"geekai/core"
+	"geekai/core/types"
+	"geekai/handler"
+	"geekai/service"
+	"geekai/service/jimeng"
+	"geekai/service/oss"
+	"geekai/store/model"
+	"geekai/utils"
+	"geekai/utils/resp"
+
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+// AdminJimengHandler 管理后台即梦AI处理器
+type AdminJimengHandler struct {
+	handler.BaseHandler
+	jimengService *jimeng.Service
+	userService   *service.UserService
+	uploader      *oss.UploaderManager
+}
+
+// NewAdminJimengHandler 创建管理后台即梦AI处理器
+func NewAdminJimengHandler(app *core.AppServer, db *gorm.DB, jimengService *jimeng.Service, userService *service.UserService, uploader *oss.UploaderManager) *AdminJimengHandler {
+	return &AdminJimengHandler{
+		BaseHandler:   handler.BaseHandler{App: app, DB: db},
+		jimengService: jimengService,
+		userService:   userService,
+		uploader:      uploader,
+	}
+}
+
+// RegisterRoutes 注册即梦AI管理后台路由
+func (h *AdminJimengHandler) RegisterRoutes() {
+	rg := h.App.Engine.Group("/api/admin/jimeng/")
+	rg.GET("/jobs", h.Jobs)
+	rg.GET("/jobs/:id", h.JobDetail)
+	rg.POST("/jobs/remove", h.BatchRemove)
+	rg.GET("/stats", h.Stats)
+	rg.GET("/config", h.GetConfig)
+	rg.POST("/config/update", h.UpdateConfig)
+}
+
+// Jobs 获取任务列表
+func (h *AdminJimengHandler) Jobs(c *gin.Context) {
+	page := h.GetInt(c, "page", 1)
+	pageSize := h.GetInt(c, "page_size", 20)
+	userId := h.GetInt(c, "user_id", 0)
+	taskType := h.GetTrim(c, "type")
+	status := h.GetTrim(c, "status")
+
+	var tasks []model.JimengJob
+	var total int64
+
+	session := h.DB.Model(&model.JimengJob{})
+
+	// 构建查询条件
+	if userId > 0 {
+		session = session.Where("user_id = ?", userId)
+	}
+	if taskType != "" {
+		session = session.Where("type = ?", taskType)
+	}
+	if status != "" {
+		session = session.Where("status = ?", status)
+	}
+
+	// 获取总数
+	err := session.Count(&total).Error
+	if err != nil {
+		resp.ERROR(c, "获取任务数量失败")
+		return
+	}
+
+	// 获取数据
+	offset := (page - 1) * pageSize
+	err = session.Order("created_at DESC").Offset(offset).Limit(pageSize).Find(&tasks).Error
+	if err != nil {
+		resp.ERROR(c, "获取任务列表失败")
+		return
+	}
+
+	resp.SUCCESS(c, gin.H{
+		"jobs":      tasks,
+		"total":     total,
+		"page":      page,
+		"page_size": pageSize,
+	})
+}
+
+// JobDetail 获取任务详情
+func (h *AdminJimengHandler) JobDetail(c *gin.Context) {
+	idStr := c.Param("id")
+	jobId, err := strconv.ParseUint(idStr, 10, 32)
+	if err != nil {
+		resp.ERROR(c, "参数错误")
+		return
+	}
+
+	var job model.JimengJob
+	err = h.DB.Where("id = ?", jobId).First(&job).Error
+	if err != nil {
+		resp.ERROR(c, "任务不存在")
+		return
+	}
+
+	resp.SUCCESS(c, job)
+}
+
+// BatchRemove 批量删除任务
+func (h *AdminJimengHandler) BatchRemove(c *gin.Context) {
+	var req struct {
+		JobIds []uint `json:"job_ids" binding:"required"`
+	}
+
+	if err := c.ShouldBindJSON(&req); err != nil {
+		resp.ERROR(c, "参数错误")
+		return
+	}
+
+	var deletedCount int64 = 0
+	for _, jobId := range req.JobIds {
+		var job model.JimengJob
+		err := h.DB.Where("id = ?", jobId).First(&job).Error
+		if err != nil {
+			continue // 跳过不存在的
+		}
+		tx := h.DB.Begin()
+		if job.Status != model.JMTaskStatusSuccess && job.Power > 0 {
+			remark := fmt.Sprintf("任务未成功，退回算力。任务ID：%d，Err: %s", job.Id, job.ErrMsg)
+			err = h.userService.IncreasePower(job.UserId, job.Power, model.PowerLog{
+				Type:   types.PowerRefund,
+				Model:  "jimeng",
+				Remark: remark,
+			})
+			if err != nil {
+				tx.Rollback()
+				continue
+			}
+		}
+		err = tx.Where("id = ?", jobId).Delete(&model.JimengJob{}).Error
+		if err != nil {
+			tx.Rollback()
+			continue
+		}
+		tx.Commit()
+		deletedCount++
+		if job.ImgURL != "" {
+			err = h.uploader.GetUploadHandler().Delete(job.ImgURL)
+			if err != nil {
+				logger.Error("remove image failed: ", err)
+			}
+		}
+		if job.VideoURL != "" {
+			err = h.uploader.GetUploadHandler().Delete(job.VideoURL)
+			if err != nil {
+				logger.Error("remove video failed: ", err)
+			}
+		}
+	}
+	resp.SUCCESS(c, gin.H{
+		"message":       "批量删除成功",
+		"deleted_count": deletedCount,
+	})
+}
+
+// Stats 获取统计信息
+func (h *AdminJimengHandler) Stats(c *gin.Context) {
+	type StatResult struct {
+		Status model.JMTaskStatus `json:"status"`
+		Count  int64              `json:"count"`
+	}
+
+	var stats []StatResult
+	err := h.DB.Model(&model.JimengJob{}).
+		Select("status, COUNT(*) as count").
+		Group("status").
+		Find(&stats).Error
+	if err != nil {
+		resp.ERROR(c, "获取统计信息失败")
+		return
+	}
+
+	// 整理统计数据
+	result := gin.H{
+		"totalTasks":      int64(0),
+		"completedTasks":  int64(0),
+		"processingTasks": int64(0),
+		"failedTasks":     int64(0),
+		"pendingTasks":    int64(0),
+	}
+
+	for _, stat := range stats {
+		result["totalTasks"] = result["totalTasks"].(int64) + stat.Count
+		switch stat.Status {
+		case model.JMTaskStatusInQueue:
+			result["pendingTasks"] = stat.Count
+		case model.JMTaskStatusSuccess:
+			result["completedTasks"] = stat.Count
+		case model.JMTaskStatusGenerating:
+			result["processingTasks"] = stat.Count
+		case model.JMTaskStatusFailed:
+			result["failedTasks"] = stat.Count
+		}
+	}
+
+	resp.SUCCESS(c, result)
+}
+
+// GetConfig 获取即梦AI配置
+func (h *AdminJimengHandler) GetConfig(c *gin.Context) {
+	jimengConfig := h.jimengService.GetConfig()
+	resp.SUCCESS(c, jimengConfig)
+}
+
+// UpdateConfig 更新即梦AI配置
+func (h *AdminJimengHandler) UpdateConfig(c *gin.Context) {
+	var req types.JimengConfig
+	if err := c.ShouldBindJSON(&req); err != nil {
+		resp.ERROR(c, "参数错误")
+		return
+	}
+
+	// 验证必填字段
+	if req.AccessKey == "" {
+		resp.ERROR(c, "AccessKey不能为空")
+		return
+	}
+	if req.SecretKey == "" {
+		resp.ERROR(c, "SecretKey不能为空")
+		return
+	}
+
+	// 验证算力配置
+	if req.Power.TextToImage <= 0 {
+		resp.ERROR(c, "文生图算力必须大于0")
+		return
+	}
+	if req.Power.ImageToImage <= 0 {
+		resp.ERROR(c, "图生图算力必须大于0")
+		return
+	}
+	if req.Power.ImageEdit <= 0 {
+		resp.ERROR(c, "图片编辑算力必须大于0")
+		return
+	}
+	if req.Power.ImageEffects <= 0 {
+		resp.ERROR(c, "图片特效算力必须大于0")
+		return
+	}
+	if req.Power.TextToVideo <= 0 {
+		resp.ERROR(c, "文生视频算力必须大于0")
+		return
+	}
+	if req.Power.ImageToVideo <= 0 {
+		resp.ERROR(c, "图生视频算力必须大于0")
+		return
+	}
+
+	// 保存配置
+	tx := h.DB.Begin()
+	value := utils.JsonEncode(&req)
+	config := model.Config{Name: "jimeng", Value: value}
+
+	err := tx.FirstOrCreate(&config, model.Config{Name: "jimeng"}).Error
+	if err != nil {
+		resp.ERROR(c, "保存配置失败: "+err.Error())
+		return
+	}
+
+	if config.Id > 0 {
+		config.Value = value
+		err = tx.Updates(&config).Error
+		if err != nil {
+			resp.ERROR(c, "更新配置失败: "+err.Error())
+			return
+		}
+	}
+
+	// 更新服务中的客户端配置
+	updateErr := h.jimengService.UpdateClientConfig(req.AccessKey, req.SecretKey)
+	if updateErr != nil {
+		resp.ERROR(c, updateErr.Error())
+		tx.Rollback()
+		return
+	}
+	tx.Commit()
+
+	resp.SUCCESS(c, gin.H{"message": "配置更新成功"})
+}
--- a/api/handler/admin/media_handler.go
+++ b/api/handler/admin/media_handler.go
@@ -0,0 +1,201 @@
+package admin
+
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// * Copyright 2023 The Geek-AI Authors. All rights reserved.
+// * Use of this source code is governed by a Apache-2.0 license
+// * that can be found in the LICENSE file.
+// * @Author yangjian102621@163.com
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+import (
+	"fmt"
+	"geekai/core"
+	"geekai/core/types"
+	"geekai/handler"
+	"geekai/service"
+	"geekai/service/oss"
+	"geekai/store/model"
+	"geekai/store/vo"
+	"geekai/utils"
+	"geekai/utils/resp"
+
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+type MediaHandler struct {
+	handler.BaseHandler
+	userService *service.UserService
+	uploader    *oss.UploaderManager
+}
+
+func NewMediaHandler(app *core.AppServer, db *gorm.DB, userService *service.UserService, manager *oss.UploaderManager) *MediaHandler {
+	return &MediaHandler{BaseHandler: handler.BaseHandler{App: app, DB: db}, userService: userService, uploader: manager}
+}
+
+type mediaQuery struct {
+	Type      string   `json:"type"` // 任务类型 luma, keling
+	Prompt    string   `json:"prompt"`
+	Username  string   `json:"username"`
+	CreatedAt []string `json:"created_at"`
+	Page      int      `json:"page"`
+	PageSize  int      `json:"page_size"`
+}
+
+// SunoList Suno 任务列表
+func (h *MediaHandler) SunoList(c *gin.Context) {
+	var data mediaQuery
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	session := h.DB.Session(&gorm.Session{})
+	if data.Username != "" {
+		var user model.User
+		err := h.DB.Where("username", data.Username).First(&user).Error
+		if err == nil {
+			session = session.Where("user_id", user.Id)
+		}
+	}
+	if data.Prompt != "" {
+		session = session.Where("prompt LIKE ?", "%"+data.Prompt+"%")
+	}
+	if len(data.CreatedAt) == 2 {
+		session = session.Where("created_at >= ? AND created_at <= ?", data.CreatedAt[0], data.CreatedAt[1])
+	}
+	var total int64
+	session.Model(&model.SunoJob{}).Count(&total)
+	var list []model.SunoJob
+	var items = make([]vo.SunoJob, 0)
+	offset := (data.Page - 1) * data.PageSize
+	err := session.Order("id DESC").Offset(offset).Limit(data.PageSize).Find(&list).Error
+	if err == nil {
+		// 填充数据
+		for _, item := range list {
+			var job vo.SunoJob
+			err = utils.CopyObject(item, &job)
+			if err != nil {
+				continue
+			}
+			job.CreatedAt = item.CreatedAt.Unix()
+			items = append(items, job)
+		}
+	}
+
+	resp.SUCCESS(c, vo.NewPage(total, data.Page, data.PageSize, items))
+}
+
+// Videos 视频任务列表
+func (h *MediaHandler) Videos(c *gin.Context) {
+	var data mediaQuery
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	session := h.DB.Session(&gorm.Session{}).Where("type", data.Type)
+	if data.Username != "" {
+		var user model.User
+		err := h.DB.Where("username", data.Username).First(&user).Error
+		if err == nil {
+			session = session.Where("user_id", user.Id)
+		}
+	}
+	if data.Prompt != "" {
+		session = session.Where("prompt LIKE ?", "%"+data.Prompt+"%")
+	}
+	if len(data.CreatedAt) == 2 {
+		session = session.Where("created_at >= ? AND created_at <= ?", data.CreatedAt[0], data.CreatedAt[1])
+	}
+	var total int64
+	session.Model(&model.VideoJob{}).Count(&total)
+	var list []model.VideoJob
+	var items = make([]vo.VideoJob, 0)
+	offset := (data.Page - 1) * data.PageSize
+	err := session.Order("id DESC").Offset(offset).Limit(data.PageSize).Find(&list).Error
+	if err == nil {
+		// 填充数据
+		for _, item := range list {
+			var job vo.VideoJob
+			err = utils.CopyObject(item, &job)
+			if err != nil {
+				continue
+			}
+			job.CreatedAt = item.CreatedAt.Unix()
+			if job.VideoURL == "" {
+				job.VideoURL = job.WaterURL
+			}
+			items = append(items, job)
+		}
+	}
+
+	resp.SUCCESS(c, vo.NewPage(total, data.Page, data.PageSize, items))
+}
+
+func (h *MediaHandler) Remove(c *gin.Context) {
+	id := h.GetInt(c, "id", 0)
+	tab := c.Query("tab")
+
+	tx := h.DB.Begin()
+	var md, remark, fileURL string
+	var power, userId, progress int
+	switch tab {
+	case "suno":
+		var job model.SunoJob
+		if err := h.DB.Where("id", id).First(&job).Error; err != nil {
+			resp.ERROR(c, "记录不存在")
+			return
+		}
+		tx.Delete(&job)
+		md = "suno"
+		power = job.Power
+		userId = int(job.UserId)
+		remark = fmt.Sprintf("SUNO 任务失败，退回算力。任务ID：%d，Err: %s", job.Id, job.ErrMsg)
+		progress = job.Progress
+		fileURL = job.AudioURL
+	case "luma":
+	case "keling":
+		var job model.VideoJob
+		if res := h.DB.Where("id", id).First(&job); res.Error != nil {
+			resp.ERROR(c, "记录不存在")
+			return
+		}
+
+		// 删除任务
+		tx.Delete(&job)
+		md = job.Type
+		power = job.Power
+		userId = int(job.UserId)
+		remark = fmt.Sprintf("LUMA 任务失败，退回算力。任务ID：%d，Err: %s", job.Id, job.ErrMsg)
+		progress = job.Progress
+		fileURL = job.VideoURL
+		if fileURL == "" {
+			fileURL = job.WaterURL
+		}
+	default:
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	if progress != 100 {
+		err := h.userService.IncreasePower(uint(userId), power, model.PowerLog{
+			Type:   types.PowerRefund,
+			Model:  md,
+			Remark: remark,
+		})
+		if err != nil {
+			tx.Rollback()
+			resp.ERROR(c, err.Error())
+			return
+		}
+	}
+	tx.Commit()
+	// remove image
+	err := h.uploader.GetUploadHandler().Delete(fileURL)
+	if err != nil {
+		logger.Error("remove image failed: ", err)
+	}
+
+	resp.SUCCESS(c)
+}
--- a/api/handler/admin/order_handler.go
+++ b/api/handler/admin/order_handler.go
@@ -15,6 +15,7 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
+	"time"

 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
@@ -67,6 +68,16 @@ func (h *OrderHandler) List(c *gin.Context) {
 				order.Id = item.Id
 				order.CreatedAt = item.CreatedAt.Unix()
 				order.UpdatedAt = item.UpdatedAt.Unix()
+				payMethod, ok := types.PayMethods[item.PayWay]
+				if !ok {
+					payMethod = item.PayWay
+				}
+				payName, ok := types.PayNames[item.PayType]
+				if !ok {
+					payName = item.PayWay
+				}
+				order.PayMethod = payMethod
+				order.PayName = payName
 				list = append(list, order)
 			} else {
 				logger.Error(err)
@@ -92,7 +103,7 @@ func (h *OrderHandler) Remove(c *gin.Context) {
 			return
 		}

-		err := h.DB.Unscoped().Where("id = ?", id).Delete(&model.Order{}).Error
+		err := h.DB.Where("id = ?", id).Delete(&model.Order{}).Error
 		if err != nil {
 			resp.ERROR(c, err.Error())
 			return
@@ -102,8 +113,20 @@ func (h *OrderHandler) Remove(c *gin.Context) {
 }

 func (h *OrderHandler) Clear(c *gin.Context) {
-
-	err := h.DB.Unscoped().Where("status <> ?", 2).Where("pay_time", 0).Delete(&model.Order{}).Error
+	var orders []model.Order
+	err := h.DB.Where("status <> ?", 2).Where("pay_time", 0).Find(&orders).Error
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+	deleteIds := make([]uint, 0)
+	for _, order := range orders {
+		// 只删除 15 分钟内的未支付订单
+		if time.Now().After(order.CreatedAt.Add(time.Minute * 15)) {
+			deleteIds = append(deleteIds, order.Id)
+		}
+	}
+	err = h.DB.Where("id IN ?", deleteIds).Delete(&model.Order{}).Error
 	if err != nil {
 		resp.ERROR(c, err.Error())
 		return
--- a/api/handler/admin/power_log_handler.go
+++ b/api/handler/admin/power_log_handler.go
@@ -31,6 +31,7 @@ func NewPowerLogHandler(app *core.AppServer, db *gorm.DB) *PowerLogHandler {
 func (h *PowerLogHandler) List(c *gin.Context) {
 	var data struct {
 		Username string   `json:"username"`
+		UserId   uint     `json:"userid"`
 		Type     int      `json:"type"`
 		Model    string   `json:"model"`
 		Date     []string `json:"date"`
@@ -49,6 +50,12 @@ func (h *PowerLogHandler) List(c *gin.Context) {
 	if data.Type > 0 {
 		session = session.Where("type", data.Type)
 	}
+	if data.UserId > 0 {
+		session = session.Where("user_id", data.UserId)
+	}
+	if data.Username != "" {
+		session = session.Where("username", data.Username)
+	}
 	if len(data.Date) == 2 {
 		start := data.Date[0] + " 00:00:00"
 		end := data.Date[1] + " 00:00:00"
--- a/api/handler/admin/redeem_handler.go
+++ b/api/handler/admin/redeem_handler.go
@@ -8,6 +8,8 @@ package admin
 // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 import (
+	"encoding/csv"
+	"fmt"
 	"geekai/core"
 	"geekai/core/types"
 	"geekai/handler"
@@ -35,12 +37,10 @@ func (h *RedeemHandler) List(c *gin.Context) {

 	session := h.DB.Session(&gorm.Session{})
 	if code != "" {
-		session.Where("code LIKE ?", "%"+code+"%")
+		session = session.Where("code LIKE ?", "%"+code+"%")
 	}
-	if status == 0 {
-		session.Where("redeem_at = ?", 0)
-	} else if status == 1 {
-		session.Where("redeem_at > ?", 0)
+	if status >= 0 {
+		session = session.Where("redeemed_at", status)
 	}

 	var total int64
@@ -80,6 +80,65 @@ func (h *RedeemHandler) List(c *gin.Context) {
 	resp.SUCCESS(c, vo.NewPage(total, page, pageSize, items))
 }

+// Export 导出 CVS 文件
+func (h *RedeemHandler) Export(c *gin.Context) {
+	var data struct {
+		Status int   `json:"status"`
+		Ids    []int `json:"ids"`
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+	}
+
+	session := h.DB.Session(&gorm.Session{})
+	if data.Status >= 0 {
+		session = session.Where("redeemed_at", data.Status)
+	}
+	if len(data.Ids) > 0 {
+		session = session.Where("id IN ?", data.Ids)
+	}
+
+	var items []model.Redeem
+	err := session.Order("id DESC").Find(&items).Error
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	// 设置响应头，告诉浏览器这是一个附件，需要下载
+	c.Header("Prompt-Disposition", "attachment; filename=output.csv")
+	c.Header("Prompt-Type", "text/csv")
+
+	// 创建一个 CSV writer
+	writer := csv.NewWriter(c.Writer)
+
+	// 写入 CSV 文件的标题行
+	headers := []string{"名称", "兑换码", "算力", "创建时间"}
+	if err := writer.Write(headers); err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	// 写入数据行
+	records := make([][]string, 0)
+	for _, item := range items {
+		records = append(records, []string{item.Name, item.Code, fmt.Sprintf("%d", item.Power), item.CreatedAt.Format("2006-01-02 15:04:05")})
+	}
+	for _, record := range records {
+		if err := writer.Write(record); err != nil {
+			resp.ERROR(c, err.Error())
+			return
+		}
+	}
+
+	// 确保所有数据都已写入响应
+	writer.Flush()
+	if err := writer.Error(); err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+}
+
 func (h *RedeemHandler) Create(c *gin.Context) {
 	var data struct {
 		Name  string `json:"name"`
@@ -146,19 +205,15 @@ func (h *RedeemHandler) Set(c *gin.Context) {
 }

 func (h *RedeemHandler) Remove(c *gin.Context) {
-	var data struct {
-		Id uint
-	}
-	if err := c.ShouldBindJSON(&data); err != nil {
+	id := h.GetInt(c, "id", 0)
+	if id <= 0 {
 		resp.ERROR(c, types.InvalidArgs)
 		return
 	}
-	if data.Id > 0 {
-		err := h.DB.Where("id", data.Id).Delete(&model.Redeem{}).Error
-		if err != nil {
-			resp.ERROR(c, err.Error())
-			return
-		}
+	err := h.DB.Where("id", id).Delete(&model.Redeem{}).Error
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
 	}
 	resp.SUCCESS(c)
 }
--- a/api/handler/admin/upload_handler.go
+++ b/api/handler/admin/upload_handler.go
@@ -13,9 +13,10 @@ import (
 	"geekai/service/oss"
 	"geekai/store/model"
 	"geekai/utils/resp"
+	"time"
+
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
-	"time"
 )

 type UploadHandler struct {
@@ -28,14 +29,27 @@ func NewUploadHandler(app *core.AppServer, db *gorm.DB, manager *oss.UploaderMan
 }

 func (h *UploadHandler) Upload(c *gin.Context) {
+	// 判断文件大小
+	f, err := c.FormFile("file")
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	if h.App.SysConfig.MaxFileSize > 0 && f.Size > int64(h.App.SysConfig.MaxFileSize)*1024*1024 {
+		resp.ERROR(c, "文件大小超过限制")
+		return
+	}
+
 	file, err := h.uploaderManager.GetUploadHandler().PutFile(c, "file")
 	if err != nil {
 		resp.ERROR(c, err.Error())
 		return
 	}
+
 	userId := 0
 	res := h.DB.Create(&model.File{
-		UserId:    userId,
+		UserId:    uint(userId),
 		Name:      file.Name,
 		ObjKey:    file.ObjKey,
 		URL:       file.URL,
--- a/api/handler/admin/user_handler.go
+++ b/api/handler/admin/user_handler.go
@@ -19,6 +19,9 @@ import (
 	"geekai/utils/resp"
 	"time"

+	"github.com/go-redis/redis/v8"
+	"github.com/golang-jwt/jwt/v5"
+
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
 )
@@ -26,10 +29,11 @@ import (
 type UserHandler struct {
 	handler.BaseHandler
 	licenseService *service.LicenseService
+	redis          *redis.Client
 }

-func NewUserHandler(app *core.AppServer, db *gorm.DB, licenseService *service.LicenseService) *UserHandler {
-	return &UserHandler{BaseHandler: handler.BaseHandler{App: app, DB: db}, licenseService: licenseService}
+func NewUserHandler(app *core.AppServer, db *gorm.DB, licenseService *service.LicenseService, redisCli *redis.Client) *UserHandler {
+	return &UserHandler{BaseHandler: handler.BaseHandler{App: app, DB: db}, licenseService: licenseService, redis: redisCli}
 }

 // List 用户列表
@@ -37,6 +41,8 @@ func (h *UserHandler) List(c *gin.Context) {
 	page := h.GetInt(c, "page", 1)
 	pageSize := h.GetInt(c, "page_size", 20)
 	username := h.GetTrim(c, "username")
+	mobile := h.GetTrim(c, "mobile")
+	email := h.GetTrim(c, "email")

 	offset := (page - 1) * pageSize
 	var items []model.User
@@ -47,6 +53,12 @@ func (h *UserHandler) List(c *gin.Context) {
 	if username != "" {
 		session = session.Where("username LIKE ?", "%"+username+"%")
 	}
+	if mobile != "" {
+		session = session.Where("mobile LIKE ?", "%"+mobile+"%")
+	}
+	if email != "" {
+		session = session.Where("email LIKE ?", "%"+email+"%")
+	}

 	session.Model(&model.User{}).Count(&total)
 	res := session.Offset(offset).Limit(pageSize).Order("id DESC").Find(&items)
@@ -73,6 +85,8 @@ func (h *UserHandler) Save(c *gin.Context) {
 		Id          uint     `json:"id"`
 		Password    string   `json:"password"`
 		Username    string   `json:"username"`
+		Mobile      string   `json:"mobile"`
+		Email       string   `json:"email"`
 		ChatRoles   []string `json:"chat_roles"`
 		ChatModels  []int    `json:"chat_models"`
 		ExpiredTime string   `json:"expired_time"`
@@ -102,6 +116,8 @@ func (h *UserHandler) Save(c *gin.Context) {
 		}
 		var oldPower = user.Power
 		user.Username = data.Username
+		user.Email = data.Email
+		user.Mobile = data.Mobile
 		user.Status = data.Status
 		user.Vip = data.Vip
 		user.Power = data.Power
@@ -109,7 +125,8 @@ func (h *UserHandler) Save(c *gin.Context) {
 		user.ChatModels = utils.JsonEncode(data.ChatModels)
 		user.ExpiredTime = utils.Str2stamp(data.ExpiredTime)

-		res = h.DB.Select("username", "status", "vip", "power", "chat_roles_json", "chat_models_json", "expired_time").Updates(&user)
+		res = h.DB.Select("username", "mobile", "email", "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, res.Error.Error())
@@ -135,6 +152,13 @@ func (h *UserHandler) Save(c *gin.Context) {
 				CreatedAt: time.Now(),
 			})
 		}
+		// 如果禁用了用户，则将用户踢下线
+		if user.Status == false {
+			key := fmt.Sprintf("users/%v", user.Id)
+			if _, err := h.redis.Del(c, key).Result(); err != nil {
+				logger.Error("error with delete session: ", err)
+			}
+		}
 	} else {
 		// 检查用户是否已经存在
 		h.DB.Where("username", data.Username).First(&user)
@@ -147,11 +171,14 @@ func (h *UserHandler) Save(c *gin.Context) {
 		u := model.User{
 			Username:    data.Username,
 			Password:    utils.GenPassword(data.Password, salt),
+			Mobile:      data.Mobile,
+			Email:       data.Email,
 			Avatar:      "/images/avatar/user.png",
 			Salt:        salt,
 			Power:       data.Power,
 			Status:      true,
 			ChatRoles:   utils.JsonEncode(data.ChatRoles),
+			ChatConfig:  "{}",
 			ChatModels:  utils.JsonEncode(data.ChatModels),
 			ExpiredTime: utils.Str2stamp(data.ExpiredTime),
 		}
@@ -262,7 +289,7 @@ func (h *UserHandler) Remove(c *gin.Context) {
 		}
 	}
 	if err != nil {
-		resp.ERROR(c, "删除失败")
+		resp.ERROR(c, err.Error())
 		tx.Rollback()
 		return
 	}
@@ -295,3 +322,36 @@ func (h *UserHandler) LoginLog(c *gin.Context) {

 	resp.SUCCESS(c, vo.NewPage(total, page, pageSize, logs))
 }
+
+// GenLoginLink 生成登录链接
+func (h *UserHandler) GenLoginLink(c *gin.Context) {
+	id := c.Query("id")
+	if id == "" {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+	var user model.User
+	if err := h.DB.Where("id = ?", id).First(&user).Error; err != nil {
+		resp.ERROR(c, "用户不存在")
+		return
+	}
+
+	// 创建 token
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
+		"user_id": user.Id,
+		"expired": time.Now().Add(time.Second * time.Duration(h.App.Config.Session.MaxAge)).Unix(),
+	})
+	tokenString, err := token.SignedString([]byte(h.App.Config.Session.SecretKey))
+	if err != nil {
+		resp.ERROR(c, "Failed to generate token, "+err.Error())
+		return
+	}
+	// 保存到 redis
+	sessionKey := fmt.Sprintf("users/%d", user.Id)
+	if _, err = h.redis.Set(c, sessionKey, tokenString, 0).Result(); err != nil {
+		resp.ERROR(c, "error with save token: "+err.Error())
+		return
+	}
+
+	resp.SUCCESS(c, tokenString)
+}
--- a/api/handler/base_handler.go
+++ b/api/handler/base_handler.go
@@ -8,13 +8,13 @@ package handler
 // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 import (
+	"errors"
+	"fmt"
 	"geekai/core"
 	"geekai/core/types"
 	logger2 "geekai/logger"
 	"geekai/store/model"
 	"geekai/utils"
-	"errors"
-	"fmt"
 	"gorm.io/gorm"
 	"strings"

@@ -85,7 +85,7 @@ func (h *BaseHandler) GetLoginUser(c *gin.Context) (model.User, error) {
 	}

 	var user model.User
-	res := h.DB.First(&user, userId)
+	res := h.DB.Where("id", userId).First(&user)
 	// 更新缓存
 	if res.Error == nil {
 		c.Set(types.LoginUserCache, user)
--- a/api/handler/chat_app_type_handler.go
+++ b/api/handler/chat_app_type_handler.go
@@ -0,0 +1,44 @@
+package handler
+
+import (
+	"geekai/core"
+	"geekai/store/model"
+	"geekai/store/vo"
+	"geekai/utils"
+	"geekai/utils/resp"
+
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+type ChatAppTypeHandler struct {
+	BaseHandler
+}
+
+func NewChatAppTypeHandler(app *core.AppServer, db *gorm.DB) *ChatAppTypeHandler {
+	return &ChatAppTypeHandler{BaseHandler: BaseHandler{App: app, DB: db}}
+}
+
+// List 获取App类型列表
+func (h *ChatAppTypeHandler) List(c *gin.Context) {
+	var items []model.AppType
+	var appTypes = make([]vo.AppType, 0)
+	err := h.DB.Where("enabled", true).Order("sort_num ASC").Find(&items).Error
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	for _, v := range items {
+		var appType vo.AppType
+		err = utils.CopyObject(v, &appType)
+		if err != nil {
+			continue
+		}
+		appType.Id = v.Id
+		appType.CreatedAt = v.CreatedAt.Unix()
+		appTypes = append(appTypes, appType)
+	}
+
+	resp.SUCCESS(c, appTypes)
+}
--- a/api/handler/chat_handler.go
+++ b/api/handler/chat_handler.go
@@ -0,0 +1,930 @@
+package handler
+
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// * Copyright 2023 The Geek-AI Authors. All rights reserved.
+// * Use of this source code is governed by a Apache-2.0 license
+// * that can be found in the LICENSE file.
+// * @Author yangjian102621@163.com
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"geekai/core"
+	"geekai/core/types"
+	"geekai/service"
+	"geekai/service/oss"
+	"geekai/store/model"
+	"geekai/store/vo"
+	"geekai/utils"
+	"geekai/utils/resp"
+	"io"
+	"net/http"
+	"net/url"
+	"os"
+	"path"
+	"strings"
+	"time"
+	"unicode/utf8"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-redis/redis/v8"
+	"github.com/sashabaranov/go-openai"
+	"gorm.io/gorm"
+)
+
+const (
+	ChatEventStart        = "start"
+	ChatEventEnd          = "end"
+	ChatEventError        = "error"
+	ChatEventMessageDelta = "message_delta"
+	ChatEventTitle        = "title"
+)
+
+type ChatInput struct {
+	UserId    uint            `json:"user_id"`
+	RoleId    uint            `json:"role_id"`
+	ModelId   uint            `json:"model_id"`
+	ChatId    string          `json:"chat_id"`
+	Prompt    string          `json:"prompt"`
+	Tools     []uint          `json:"tools"`
+	Stream    bool            `json:"stream"`
+	Files     []vo.File       `json:"files"`
+	ChatModel model.ChatModel `json:"chat_model,omitempty"`
+	ChatRole  model.ChatRole  `json:"chat_role,omitempty"`
+	LastMsgId uint            `json:"last_msg_id,omitempty"` // 最后的消息ID，用于重新生成答案的时候过滤上下文
+}
+
+type ChatHandler struct {
+	BaseHandler
+	redis          *redis.Client
+	uploadManager  *oss.UploaderManager
+	licenseService *service.LicenseService
+	ReqCancelFunc  *types.LMap[string, context.CancelFunc] // HttpClient 请求取消 handle function
+	userService    *service.UserService
+}
+
+func NewChatHandler(app *core.AppServer, db *gorm.DB, redis *redis.Client, manager *oss.UploaderManager, licenseService *service.LicenseService, userService *service.UserService) *ChatHandler {
+	return &ChatHandler{
+		BaseHandler:    BaseHandler{App: app, DB: db},
+		redis:          redis,
+		uploadManager:  manager,
+		licenseService: licenseService,
+		ReqCancelFunc:  types.NewLMap[string, context.CancelFunc](),
+		userService:    userService,
+	}
+}
+
+// Chat 处理聊天请求
+func (h *ChatHandler) Chat(c *gin.Context) {
+	var input ChatInput
+	if err := c.ShouldBindJSON(&input); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	// 设置SSE响应头
+	c.Header("Prompt-Type", "text/event-stream")
+	c.Header("Cache-Control", "no-cache")
+	c.Header("Connection", "keep-alive")
+	c.Header("X-Accel-Buffering", "no")
+
+	ctx, cancel := context.WithCancel(c.Request.Context())
+	defer cancel()
+
+	// 这里做个全局的异常处理，防止整个请求异常，导致 SSE 连接断开
+	defer func() {
+		if err := recover(); err != nil {
+			logger.Errorf("chat handler error: %v", err)
+			pushMessage(c, ChatEventError, err)
+			c.Abort()
+		}
+	}()
+
+	// 使用旧的聊天数据覆盖模型和角色ID
+	var chat model.ChatItem
+	h.DB.Where("chat_id", input.ChatId).First(&chat)
+	if chat.Id > 0 {
+		input.ModelId = chat.ModelId
+		input.RoleId = chat.RoleId
+	}
+
+	// 验证聊天角色
+	var chatRole model.ChatRole
+	err := h.DB.First(&chatRole, input.RoleId).Error
+	if err != nil || !chatRole.Enable {
+		pushMessage(c, ChatEventError, "当前聊天角色不存在或者未启用，请更换角色之后再发起对话！")
+		return
+	}
+	input.ChatRole = chatRole
+
+	// 获取模型信息
+	var chatModel model.ChatModel
+	err = h.DB.Where("id", input.ModelId).First(&chatModel).Error
+	if err != nil || !chatModel.Enabled {
+		pushMessage(c, ChatEventError, "当前AI模型暂未启用，请更换模型后再发起对话！")
+		return
+	}
+	input.ChatModel = chatModel
+
+	// 发送消息
+	err = h.sendMessage(ctx, input, c)
+	if err != nil {
+		pushMessage(c, ChatEventError, err.Error())
+		return
+	}
+
+	pushMessage(c, ChatEventEnd, "对话完成")
+}
+
+func pushMessage(c *gin.Context, msgType string, content interface{}) {
+	c.SSEvent("message", map[string]interface{}{
+		"type": msgType,
+		"body": content,
+	})
+	c.Writer.Flush()
+}
+
+func (h *ChatHandler) sendMessage(ctx context.Context, input ChatInput, c *gin.Context) error {
+	var user model.User
+	res := h.DB.Model(&model.User{}).First(&user, input.UserId)
+	if res.Error != nil {
+		return errors.New("未授权用户，您正在进行非法操作！")
+	}
+	var userVo vo.User
+	err := utils.CopyObject(user, &userVo)
+	userVo.Id = user.Id
+	if err != nil {
+		return errors.New("User 对象转换失败，" + err.Error())
+	}
+
+	if !userVo.Status {
+		return errors.New("您的账号已经被禁用，如果疑问，请联系管理员！")
+	}
+
+	if userVo.Power < input.ChatModel.Power {
+		return fmt.Errorf("您当前剩余算力 %d 已不足以支付当前模型的单次对话需要消耗的算力 %d，[立即购买](/member)。", userVo.Power, input.ChatModel.Power)
+	}
+
+	if userVo.ExpiredTime > 0 && userVo.ExpiredTime <= time.Now().Unix() {
+		return errors.New("您的账号已经过期，请联系管理员！")
+	}
+
+	// 检查 prompt 长度是否超过了当前模型允许的最大上下文长度
+	promptTokens, _ := utils.CalcTokens(input.Prompt, input.ChatModel.Value)
+	if promptTokens > input.ChatModel.MaxContext {
+
+		return errors.New("对话内容超出了当前模型允许的最大上下文长度！")
+	}
+
+	var req = types.ApiRequest{
+		Model:       input.ChatModel.Value,
+		Stream:      input.Stream,
+		Temperature: input.ChatModel.Temperature,
+	}
+	// 兼容 OpenAI 模型
+	if strings.HasPrefix(input.ChatModel.Value, "o1-") ||
+		strings.HasPrefix(input.ChatModel.Value, "o3-") ||
+		strings.HasPrefix(input.ChatModel.Value, "gpt") {
+		req.MaxCompletionTokens = input.ChatModel.MaxTokens
+	} else {
+		req.MaxTokens = input.ChatModel.MaxTokens
+	}
+
+	if len(input.Tools) > 0 && !strings.HasPrefix(input.ChatModel.Value, "o1-") {
+		var items []model.Function
+		res = h.DB.Where("enabled", true).Where("id IN ?", input.Tools).Find(&items)
+		if res.Error == nil {
+			var tools = make([]types.Tool, 0)
+			for _, v := range items {
+				var parameters map[string]interface{}
+				err = utils.JsonDecode(v.Parameters, &parameters)
+				if err != nil {
+					continue
+				}
+				tool := types.Tool{
+					Type: "function",
+					Function: types.Function{
+						Name:        v.Name,
+						Description: v.Description,
+						Parameters:  parameters,
+					},
+				}
+				if v, ok := parameters["required"]; v == nil || !ok {
+					tool.Function.Parameters["required"] = []string{}
+				}
+				tools = append(tools, tool)
+			}
+
+			if len(tools) > 0 {
+				req.Tools = tools
+				req.ToolChoice = "auto"
+			}
+		}
+	}
+
+	// 加载聊天上下文
+	chatCtx := make([]any, 0)
+	messages := make([]any, 0)
+	if h.App.SysConfig.EnableContext {
+		_ = utils.JsonDecode(input.ChatRole.Context, &messages)
+		if h.App.SysConfig.ContextDeep > 0 {
+			var historyMessages []model.ChatMessage
+			dbSession := h.DB.Session(&gorm.Session{}).Where("chat_id", input.ChatId)
+			if input.LastMsgId > 0 { // 重新生成逻辑
+				dbSession = dbSession.Where("id < ?", input.LastMsgId)
+				// 删除对应的聊天记录
+				h.DB.Debug().Where("chat_id", input.ChatId).Where("id >= ?", input.LastMsgId).Delete(&model.ChatMessage{})
+			}
+			err = dbSession.Limit(h.App.SysConfig.ContextDeep).Order("id DESC").Find(&historyMessages).Error
+			if err == nil {
+				for i := len(historyMessages) - 1; i >= 0; i-- {
+					msg := historyMessages[i]
+					ms := types.Message{Role: "user", Content: msg.Content}
+					if msg.Type == types.ReplyMsg {
+						ms.Role = "assistant"
+					}
+					chatCtx = append(chatCtx, ms)
+				}
+			}
+		}
+
+		// 计算当前请求的 token 总长度，确保不会超出最大上下文长度
+		// MaxContextLength = Response + Tool + Prompt + Context
+		tokens := req.MaxTokens // 最大响应长度
+		tks, _ := utils.CalcTokens(utils.JsonEncode(req.Tools), req.Model)
+		tokens += tks + promptTokens
+
+		for i := len(messages) - 1; i >= 0; i-- {
+			v := messages[i]
+			tks, _ = utils.CalcTokens(utils.JsonEncode(v), req.Model)
+			// 上下文 token 超出了模型的最大上下文长度
+			if tokens+tks >= input.ChatModel.MaxContext {
+				break
+			}
+
+			// 上下文的深度超出了模型的最大上下文深度
+			if len(chatCtx) >= h.App.SysConfig.ContextDeep {
+				break
+			}
+
+			tokens += tks
+			chatCtx = append(chatCtx, v)
+		}
+	}
+	reqMgs := make([]any, 0)
+
+	for i := len(chatCtx) - 1; i >= 0; i-- {
+		reqMgs = append(reqMgs, chatCtx[i])
+	}
+
+	fileContents := make([]string, 0) // 文件内容
+	var finalPrompt = input.Prompt
+	imgList := make([]any, 0)
+	for _, file := range input.Files {
+		logger.Debugf("detected file: %+v", file.URL)
+		// 处理图片
+		if isImageURL(file.URL) {
+			imgList = append(imgList, gin.H{
+				"type": "image_url",
+				"image_url": gin.H{
+					"url": file.URL,
+				},
+			})
+		} else {
+			// 如果不是逆向模型，则提取文件内容
+			modelValue := input.ChatModel.Value
+			if !(strings.Contains(modelValue, "-all") || strings.HasPrefix(modelValue, "gpt-4-gizmo") || strings.HasPrefix(modelValue, "claude")) {
+				content, err := utils.ReadFileContent(file.URL, h.App.Config.TikaHost)
+				if err != nil {
+					logger.Error("error with read file: ", err)
+					continue
+				} else {
+					fileContents = append(fileContents, fmt.Sprintf("%s 文件内容：%s", file.Name, content))
+				}
+			}
+		}
+	}
+
+	if len(fileContents) > 0 {
+		finalPrompt = fmt.Sprintf("请根据提供的文件内容信息回答问题(其中Excel 已转成 HTML)：\n\n %s\n\n 问题：%s", strings.Join(fileContents, "\n"), input.Prompt)
+		tokens, _ := utils.CalcTokens(finalPrompt, req.Model)
+		if tokens > input.ChatModel.MaxContext {
+			return fmt.Errorf("文件的长度超出模型允许的最大上下文长度，请减少文件内容数量或文件大小。")
+		}
+	} else {
+		finalPrompt = input.Prompt
+	}
+
+	if len(imgList) > 0 {
+		imgList = append(imgList, map[string]interface{}{
+			"type": "text",
+			"text": input.Prompt,
+		})
+		req.Messages = append(reqMgs, map[string]interface{}{
+			"role":    "user",
+			"content": imgList,
+		})
+	} else {
+		req.Messages = append(reqMgs, map[string]interface{}{
+			"role":    "user",
+			"content": finalPrompt,
+		})
+	}
+
+	return h.sendOpenAiMessage(req, userVo, ctx, input, c)
+}
+
+// 判断一个 URL 是否图片链接
+func isImageURL(url string) bool {
+	// 检查是否是有效的URL
+	if !strings.HasPrefix(url, "http://") && !strings.HasPrefix(url, "https://") {
+		return false
+	}
+
+	// 检查文件扩展名
+	ext := strings.ToLower(path.Ext(url))
+	validImageExts := map[string]bool{
+		".jpg":  true,
+		".jpeg": true,
+		".png":  true,
+		".gif":  true,
+		".bmp":  true,
+		".webp": true,
+		".svg":  true,
+		".ico":  true,
+	}
+
+	if !validImageExts[ext] {
+		return false
+	}
+
+	// 发送HEAD请求检查Content-Type
+	client := &http.Client{
+		Timeout: 5 * time.Second,
+	}
+	resp, err := client.Head(url)
+	if err != nil {
+		return false
+	}
+	defer resp.Body.Close()
+
+	contentType := resp.Header.Get("Content-Type")
+	return strings.HasPrefix(contentType, "image/")
+}
+
+// Tokens 统计 token 数量
+func (h *ChatHandler) Tokens(c *gin.Context) {
+	var data struct {
+		Text   string `json:"text"`
+		Model  string `json:"model"`
+		ChatId string `json:"chat_id"`
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	// 如果没有传入 text 字段，则说明是获取当前 reply 总的 token 消耗（带上下文）
+	if data.Text == "" && data.ChatId != "" {
+		var item model.ChatMessage
+		userId, _ := c.Get(types.LoginUserID)
+		res := h.DB.Where("user_id = ?", userId).Where("chat_id = ?", data.ChatId).Last(&item)
+		if res.Error != nil {
+			resp.ERROR(c, res.Error.Error())
+			return
+		}
+		resp.SUCCESS(c, item.Tokens)
+		return
+	}
+
+	tokens, err := utils.CalcTokens(data.Text, data.Model)
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	resp.SUCCESS(c, tokens)
+}
+
+func getTotalTokens(req types.ApiRequest) int {
+	encode := utils.JsonEncode(req.Messages)
+	var items []map[string]interface{}
+	err := utils.JsonDecode(encode, &items)
+	if err != nil {
+		return 0
+	}
+	tokens := 0
+	for _, item := range items {
+		content, ok := item["content"]
+		if ok && !utils.IsEmptyValue(content) {
+			t, err := utils.CalcTokens(utils.InterfaceToString(content), req.Model)
+			if err == nil {
+				tokens += t
+			}
+		}
+	}
+	return tokens
+}
+
+// StopGenerate 停止生成
+func (h *ChatHandler) StopGenerate(c *gin.Context) {
+	sessionId := c.Query("session_id")
+	if h.ReqCancelFunc.Has(sessionId) {
+		h.ReqCancelFunc.Get(sessionId)()
+		h.ReqCancelFunc.Delete(sessionId)
+	}
+	resp.SUCCESS(c, types.OkMsg)
+}
+
+// 发送请求到 OpenAI 服务器
+// useOwnApiKey: 是否使用了用户自己的 API KEY
+func (h *ChatHandler) doRequest(ctx context.Context, req types.ApiRequest, input ChatInput, apiKey *model.ApiKey) (*http.Response, error) {
+	// if the chat model bind a KEY, use it directly
+	if input.ChatModel.KeyId > 0 {
+		h.DB.Where("id", input.ChatModel.KeyId).Find(apiKey)
+	} else { // use the last unused key
+		h.DB.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
+	err := h.licenseService.IsValidApiURL(apiKey.ApiURL)
+	if err != nil {
+		return nil, err
+	}
+	logger.Debugf("对话请求消息体：%+v", req)
+	var apiURL string
+	p, _ := url.Parse(apiKey.ApiURL)
+	// 如果设置的是 BASE_URL 没有路径，则添加 /v1/chat/completions
+	if p.Path == "" {
+		apiURL = fmt.Sprintf("%s/v1/chat/completions", apiKey.ApiURL)
+	} else {
+		apiURL = apiKey.ApiURL
+	}
+	// 创建 HttpClient 请求对象
+	var client *http.Client
+	requestBody, err := json.Marshal(req)
+	if err != nil {
+		return nil, err
+	}
+	request, err := http.NewRequest(http.MethodPost, apiURL, bytes.NewBuffer(requestBody))
+	if err != nil {
+		return nil, err
+	}
+
+	request = request.WithContext(ctx)
+	request.Header.Set("Content-Type", "application/json")
+	if len(apiKey.ProxyURL) > 5 { // 使用代理
+		proxy, _ := url.Parse(apiKey.ProxyURL)
+		client = &http.Client{
+			Transport: &http.Transport{
+				Proxy: http.ProxyURL(proxy),
+			},
+		}
+	} else {
+		client = http.DefaultClient
+	}
+	logger.Infof("Sending %s request, API KEY:%s, PROXY: %s, Model: %s", apiKey.ApiURL, apiURL, apiKey.ProxyURL, req.Model)
+	request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", apiKey.Value))
+	// 更新API KEY 最后使用时间
+	h.DB.Model(&model.ApiKey{}).Where("id", apiKey.Id).UpdateColumn("last_used_at", time.Now().Unix())
+	return client.Do(request)
+}
+
+// 扣减用户算力
+func (h *ChatHandler) subUserPower(userVo vo.User, input ChatInput, promptTokens int, replyTokens int) {
+	power := 1
+	if input.ChatModel.Power > 0 {
+		power = input.ChatModel.Power
+	}
+
+	err := h.userService.DecreasePower(userVo.Id, power, model.PowerLog{
+		Type:   types.PowerConsume,
+		Model:  input.ChatModel.Value,
+		Remark: fmt.Sprintf("模型名称：%s, 提问长度：%d，回复长度：%d", input.ChatModel.Name, promptTokens, replyTokens),
+	})
+	if err != nil {
+		logger.Error(err)
+	}
+}
+
+func (h *ChatHandler) saveChatHistory(
+	req types.ApiRequest,
+	usage Usage,
+	message types.Message,
+	input ChatInput,
+	userVo vo.User,
+	promptCreatedAt time.Time,
+	replyCreatedAt time.Time) {
+
+	// 追加聊天记录
+	// for prompt
+	var promptTokens, replyTokens, totalTokens int
+	if usage.PromptTokens > 0 {
+		promptTokens = usage.PromptTokens
+	} else {
+		promptTokens, _ = utils.CalcTokens(usage.Content, req.Model)
+	}
+
+	historyUserMsg := model.ChatMessage{
+		UserId: userVo.Id,
+		ChatId: input.ChatId,
+		RoleId: input.RoleId,
+		Type:   types.PromptMsg,
+		Icon:   userVo.Avatar,
+		Content: utils.JsonEncode(vo.MsgContent{
+			Text:  usage.Prompt,
+			Files: input.Files,
+		}),
+		Tokens:      promptTokens,
+		TotalTokens: promptTokens,
+		UseContext:  true,
+		Model:       req.Model,
+	}
+	historyUserMsg.CreatedAt = promptCreatedAt
+	historyUserMsg.UpdatedAt = promptCreatedAt
+	err := h.DB.Save(&historyUserMsg).Error
+	if err != nil {
+		logger.Error("failed to save prompt history message: ", err)
+	}
+
+	// for reply
+	// 计算本次对话消耗的总 token 数量
+	if usage.CompletionTokens > 0 {
+		replyTokens = usage.CompletionTokens
+		totalTokens = usage.TotalTokens
+	} else {
+		replyTokens, _ = utils.CalcTokens(message.Content, req.Model)
+		totalTokens = replyTokens + getTotalTokens(req)
+	}
+	historyReplyMsg := model.ChatMessage{
+		UserId: userVo.Id,
+		ChatId: input.ChatId,
+		RoleId: input.RoleId,
+		Type:   types.ReplyMsg,
+		Icon:   input.ChatRole.Icon,
+		Content: utils.JsonEncode(vo.MsgContent{
+			Text:  message.Content,
+			Files: input.Files,
+		}),
+		Tokens:      replyTokens,
+		TotalTokens: totalTokens,
+		UseContext:  true,
+		Model:       req.Model,
+	}
+	historyReplyMsg.CreatedAt = replyCreatedAt
+	historyReplyMsg.UpdatedAt = replyCreatedAt
+	err = h.DB.Create(&historyReplyMsg).Error
+	if err != nil {
+		logger.Error("failed to save reply history message: ", err)
+	}
+
+	// 更新用户算力
+	if input.ChatModel.Power > 0 {
+		h.subUserPower(userVo, input, promptTokens, replyTokens)
+	}
+	// 保存当前会话
+	var chatItem model.ChatItem
+	err = h.DB.Where("chat_id = ?", input.ChatId).First(&chatItem).Error
+	if err != nil {
+		chatItem.ChatId = input.ChatId
+		chatItem.UserId = userVo.Id
+		chatItem.RoleId = input.RoleId
+		chatItem.ModelId = input.ModelId
+		if utf8.RuneCountInString(usage.Prompt) > 30 {
+			chatItem.Title = string([]rune(usage.Prompt)[:30]) + "..."
+		} else {
+			chatItem.Title = usage.Prompt
+		}
+		chatItem.Model = req.Model
+		err = h.DB.Create(&chatItem).Error
+		if err != nil {
+			logger.Error("failed to save chat item: ", err)
+		}
+	}
+}
+
+// TextToSpeech 文本生成语音
+func (h *ChatHandler) TextToSpeech(c *gin.Context) {
+	var data struct {
+		ModelId int    `json:"model_id"`
+		Text    string `json:"text"`
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	textHash := utils.Sha256(fmt.Sprintf("%d/%s", data.ModelId, data.Text))
+	audioFile := fmt.Sprintf("%s/audio", h.App.Config.StaticDir)
+	if _, err := os.Stat(audioFile); err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	if err := os.MkdirAll(audioFile, 0755); err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+	audioFile = fmt.Sprintf("%s/%s.mp3", audioFile, textHash)
+	if _, err := os.Stat(audioFile); err == nil {
+		// 设置响应头
+		c.Header("Prompt-Type", "audio/mpeg")
+		c.Header("Prompt-Disposition", "attachment; filename=speech.mp3")
+		c.File(audioFile)
+		return
+	}
+
+	// 查询模型
+	var chatModel model.ChatModel
+	err := h.DB.Where("id", data.ModelId).First(&chatModel).Error
+	if err != nil {
+		resp.ERROR(c, "找不到语音模型")
+		return
+	}
+
+	// 调用 DeepSeek 的 API 接口
+	var apiKey model.ApiKey
+	if chatModel.KeyId > 0 {
+		h.DB.Where("id", chatModel.KeyId).First(&apiKey)
+	}
+	if apiKey.Id == 0 {
+		h.DB.Where("type", "tts").Where("enabled", true).First(&apiKey)
+	}
+	if apiKey.Id == 0 {
+		resp.ERROR(c, "no TTS API key, please import key")
+		return
+	}
+
+	logger.Debugf("chatModel: %+v, apiKey: %+v", chatModel, apiKey)
+
+	// 调用 openai tts api
+	config := openai.DefaultConfig(apiKey.Value)
+	config.BaseURL = apiKey.ApiURL + "/v1"
+	client := openai.NewClientWithConfig(config)
+	voice := openai.VoiceAlloy
+	var options map[string]string
+	err = utils.JsonDecode(chatModel.Options, &options)
+	if err == nil {
+		voice = openai.SpeechVoice(options["voice"])
+	}
+	req := openai.CreateSpeechRequest{
+		Model: openai.SpeechModel(chatModel.Value),
+		Input: data.Text,
+		Voice: voice,
+	}
+
+	audioData, err := client.CreateSpeech(context.Background(), req)
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	// 先将音频数据读取到内存
+	audioBytes, err := io.ReadAll(audioData)
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	// 保存到音频文件
+	err = os.WriteFile(audioFile, audioBytes, 0644)
+	if err != nil {
+		logger.Error("failed to save audio file: ", err)
+	}
+
+	// 设置响应头
+	c.Header("Prompt-Type", "audio/mpeg")
+	c.Header("Prompt-Disposition", "attachment; filename=speech.mp3")
+
+	// 直接写入完整的音频数据到响应
+	_, err = c.Writer.Write(audioBytes)
+	if err != nil {
+		logger.Error("写入音频数据到响应失败:", err)
+	}
+}
+
+// // OPenAI 消息发送实现
+// func (h *ChatHandler) sendOpenAiMessage(
+// 	req types.ApiRequest,
+// 	userVo vo.User,
+// 	ctx context.Context,
+// 	session *types.ChatSession,
+// 	role model.ChatRole,
+// 	prompt string,
+// 	c *gin.Context) error {
+// 	promptCreatedAt := time.Now() // 记录提问时间
+// 	start := time.Now()
+// 	var apiKey = model.ApiKey{}
+// 	response, err := h.doRequest(ctx, req, session, &apiKey)
+// 	logger.Info("HTTP请求完成，耗时：", time.Since(start))
+// 	if err != nil {
+// 		if strings.Contains(err.Error(), "context canceled") {
+// 			return fmt.Errorf("用户取消了请求：%s", prompt)
+// 		} else if strings.Contains(err.Error(), "no available key") {
+// 			return errors.New("抱歉😔😔😔，系统已经没有可用的 API KEY，请联系管理员！")
+// 		}
+// 		return err
+// 	} else {
+// 		defer response.Body.Close()
+// 	}
+
+// 	if response.StatusCode != 200 {
+// 		body, _ := io.ReadAll(response.Body)
+// 		return fmt.Errorf("请求 OpenAI API 失败：%d, %v", response.StatusCode, string(body))
+// 	}
+
+// 	contentType := response.Header.Get("Prompt-Type")
+// 	if strings.Contains(contentType, "text/event-stream") {
+// 		replyCreatedAt := time.Now() // 记录回复时间
+// 		// 循环读取 Chunk 消息
+// 		var message = types.Message{Role: "assistant"}
+// 		var contents = make([]string, 0)
+// 		var function model.Function
+// 		var toolCall = false
+// 		var arguments = make([]string, 0)
+// 		var reasoning = false
+
+// 		pushMessage(c, ChatEventStart, "开始响应")
+// 		scanner := bufio.NewScanner(response.Body)
+// 		for scanner.Scan() {
+// 			line := scanner.Text()
+// 			if !strings.Contains(line, "data:") || len(line) < 30 {
+// 				continue
+// 			}
+// 			var responseBody = types.ApiResponse{}
+// 			err = json.Unmarshal([]byte(line[6:]), &responseBody)
+// 			if err != nil { // 数据解析出错
+// 				return errors.New(line)
+// 			}
+// 			if len(responseBody.Choices) == 0 { // Fixed: 兼容 Azure API 第一个输出空行
+// 				continue
+// 			}
+// 			if responseBody.Choices[0].Delta.Prompt == nil &&
+// 				responseBody.Choices[0].Delta.ToolCalls == nil &&
+// 				responseBody.Choices[0].Delta.ReasoningContent == "" {
+// 				continue
+// 			}
+
+// 			if responseBody.Choices[0].FinishReason == "stop" && len(contents) == 0 {
+// 				pushMessage(c, ChatEventError, "抱歉😔😔😔，AI助手由于未知原因已经停止输出内容。")
+// 				break
+// 			}
+
+// 			var tool types.ToolCall
+// 			if len(responseBody.Choices[0].Delta.ToolCalls) > 0 {
+// 				tool = responseBody.Choices[0].Delta.ToolCalls[0]
+// 				if toolCall && tool.Function.Name == "" {
+// 					arguments = append(arguments, tool.Function.Arguments)
+// 					continue
+// 				}
+// 			}
+
+// 			// 兼容 Function Call
+// 			fun := responseBody.Choices[0].Delta.FunctionCall
+// 			if fun.Name != "" {
+// 				tool = *new(types.ToolCall)
+// 				tool.Function.Name = fun.Name
+// 			} else if toolCall {
+// 				arguments = append(arguments, fun.Arguments)
+// 				continue
+// 			}
+
+// 			if !utils.IsEmptyValue(tool) {
+// 				res := h.DB.Where("name = ?", tool.Function.Name).First(&function)
+// 				if res.Error == nil {
+// 					toolCall = true
+// 					callMsg := fmt.Sprintf("正在调用工具 `%s` 作答 ...\n\n", function.Label)
+// 					pushMessage(c, ChatEventMessageDelta, map[string]interface{}{
+// 						"type":    "text",
+// 						"content": callMsg,
+// 					})
+// 					contents = append(contents, callMsg)
+// 				}
+// 				continue
+// 			}
+
+// 			if responseBody.Choices[0].FinishReason == "tool_calls" ||
+// 				responseBody.Choices[0].FinishReason == "function_call" { // 函数调用完毕
+// 				break
+// 			}
+
+// 			// output stopped
+// 			if responseBody.Choices[0].FinishReason != "" {
+// 				break // 输出完成或者输出中断了
+// 			} else { // 正常输出结果
+// 				// 兼容思考过程
+// 				if responseBody.Choices[0].Delta.ReasoningContent != "" {
+// 					reasoningContent := responseBody.Choices[0].Delta.ReasoningContent
+// 					if !reasoning {
+// 						reasoningContent = fmt.Sprintf("<think>%s", reasoningContent)
+// 						reasoning = true
+// 					}
+
+// 					pushMessage(c, ChatEventMessageDelta, map[string]interface{}{
+// 						"type":    "text",
+// 						"content": reasoningContent,
+// 					})
+// 					contents = append(contents, reasoningContent)
+// 				} else if responseBody.Choices[0].Delta.Prompt != "" {
+// 					finalContent := responseBody.Choices[0].Delta.Prompt
+// 					if reasoning {
+// 						finalContent = fmt.Sprintf("</think>%s", responseBody.Choices[0].Delta.Prompt)
+// 						reasoning = false
+// 					}
+// 					contents = append(contents, utils.InterfaceToString(finalContent))
+// 					pushMessage(c, ChatEventMessageDelta, map[string]interface{}{
+// 						"type":    "text",
+// 						"content": finalContent,
+// 					})
+// 				}
+// 			}
+// 		} // end for
+
+// 		if err := scanner.Err(); err != nil {
+// 			if strings.Contains(err.Error(), "context canceled") {
+// 				logger.Info("用户取消了请求：", prompt)
+// 			} else {
+// 				logger.Error("信息读取出错：", err)
+// 			}
+// 		}
+
+// 		if toolCall { // 调用函数完成任务
+// 			params := make(map[string]any)
+// 			_ = utils.JsonDecode(strings.Join(arguments, ""), &params)
+// 			logger.Debugf("函数名称: %s, 函数参数：%s", function.Name, params)
+// 			params["user_id"] = userVo.Id
+// 			var apiRes types.BizVo
+// 			r, err := req2.C().R().SetHeader("Body-Type", "application/json").
+// 				SetHeader("Authorization", function.Token).
+// 				SetBody(params).Post(function.Action)
+// 			errMsg := ""
+// 			if err != nil {
+// 				errMsg = err.Error()
+// 			} else {
+// 				all, _ := io.ReadAll(r.Body)
+// 				err = json.Unmarshal(all, &apiRes)
+// 				if err != nil {
+// 					errMsg = err.Error()
+// 				} else if apiRes.Code != types.Success {
+// 					errMsg = apiRes.Message
+// 				}
+// 			}
+
+// 			if errMsg != "" {
+// 				errMsg = "调用函数工具出错：" + errMsg
+// 				contents = append(contents, errMsg)
+// 			} else {
+// 				errMsg = utils.InterfaceToString(apiRes.Data)
+// 				contents = append(contents, errMsg)
+// 			}
+// 			pushMessage(c, ChatEventMessageDelta, map[string]interface{}{
+// 				"type":    "text",
+// 				"content": errMsg,
+// 			})
+// 		}
+
+// 		// 消息发送成功
+// 		if len(contents) > 0 {
+// 			usage := Usage{
+// 				Prompt:           prompt,
+// 				Prompt:          strings.Join(contents, ""),
+// 				PromptTokens:     0,
+// 				CompletionTokens: 0,
+// 				TotalTokens:      0,
+// 			}
+// 			message.Prompt = usage.Prompt
+// 			h.saveChatHistory(req, usage, message, session, role, userVo, promptCreatedAt, replyCreatedAt)
+// 		}
+// 	} else {
+// 		var respVo OpenAIResVo
+// 		body, err := io.ReadAll(response.Body)
+// 		if err != nil {
+// 			return fmt.Errorf("读取响应失败：%v", body)
+// 		}
+// 		err = json.Unmarshal(body, &respVo)
+// 		if err != nil {
+// 			return fmt.Errorf("解析响应失败：%v", body)
+// 		}
+// 		content := respVo.Choices[0].Message.Prompt
+// 		if strings.HasPrefix(req.Model, "o1-") {
+// 			content = fmt.Sprintf("AI思考结束，耗时：%d 秒。\n%s", time.Now().Unix()-session.Start, respVo.Choices[0].Message.Prompt)
+// 		}
+// 		pushMessage(c, ChatEventMessageDelta, map[string]interface{}{
+// 			"type":    "text",
+// 			"content": content,
+// 		})
+// 		respVo.Usage.Prompt = prompt
+// 		respVo.Usage.Prompt = content
+// 		h.saveChatHistory(req, respVo.Usage, respVo.Choices[0].Message, session, role, userVo, promptCreatedAt, time.Now())
+// 	}
+
+// 	return nil
+// }
--- a/api/handler/chatimpl/chat_item_handler.go
+++ b/api/handler/chatimpl/chat_item_handler.go
@@ -1,4 +1,4 @@
-package chatimpl
+package handler

 // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // * Copyright 2023 The Geek-AI Authors. All rights reserved.
@@ -20,6 +20,7 @@ import (

 // List 获取会话列表
 func (h *ChatHandler) List(c *gin.Context) {
+	logger.Info(h.GetLoginUserId(c))
 	if !h.IsLogin(c) {
 		resp.SUCCESS(c)
 		return
@@ -28,31 +29,40 @@ func (h *ChatHandler) List(c *gin.Context) {
 	userId := h.GetLoginUserId(c)
 	var items = make([]vo.ChatItem, 0)
 	var chats []model.ChatItem
-	res := h.DB.Where("user_id = ?", userId).Order("id DESC").Find(&chats)
-	if res.Error == nil {
-		var roleIds = make([]uint, 0)
-		for _, chat := range chats {
-			roleIds = append(roleIds, chat.RoleId)
-		}
-		var roles []model.ChatRole
-		res = h.DB.Find(&roles, roleIds)
-		if res.Error == nil {
-			roleMap := make(map[uint]model.ChatRole)
-			for _, role := range roles {
-				roleMap[role.Id] = role
-			}
+	h.DB.Debug().Where("user_id", userId).Order("id DESC").Find(&chats)
+	if len(chats) == 0 {
+		resp.SUCCESS(c, items)
+		return
+	}

-			for _, chat := range chats {
-				var item vo.ChatItem
-				err := utils.CopyObject(chat, &item)
-				if err == nil {
-					item.Id = chat.Id
-					item.Icon = roleMap[chat.RoleId].Icon
-					items = append(items, item)
-				}
-			}
-		}
+	var roleIds = make([]uint, 0)
+	var modelValues = make([]string, 0)
+	for _, chat := range chats {
+		roleIds = append(roleIds, chat.RoleId)
+		modelValues = append(modelValues, chat.Model)
+	}

+	var roles []model.ChatRole
+	var models []model.ChatModel
+	roleMap := make(map[uint]model.ChatRole)
+	modelMap := make(map[string]model.ChatModel)
+	h.DB.Where("id IN ?", roleIds).Find(&roles)
+	h.DB.Where("value IN ?", modelValues).Find(&models)
+	for _, role := range roles {
+		roleMap[role.Id] = role
+	}
+	for _, m := range models {
+		modelMap[m.Value] = m
+	}
+	for _, chat := range chats {
+		var item vo.ChatItem
+		err := utils.CopyObject(chat, &item)
+		if err == nil {
+			item.Id = chat.Id
+			item.Icon = roleMap[chat.RoleId].Icon
+			item.ModelId = modelMap[chat.Model].Id
+			items = append(items, item)
+		}
 	}
 	resp.SUCCESS(c, items)
 }
@@ -95,8 +105,6 @@ func (h *ChatHandler) Clear(c *gin.Context) {
 	var chatIds = make([]string, 0)
 	for _, chat := range chats {
 		chatIds = append(chatIds, chat.ChatId)
-		// 清空会话上下文
-		h.ChatContexts.Delete(chat.ChatId)
 	}
 	err = h.DB.Transaction(func(tx *gorm.DB) error {
 		res := h.DB.Where("user_id =?", user.Id).Delete(&model.ChatItem{})
@@ -124,20 +132,28 @@ func (h *ChatHandler) Clear(c *gin.Context) {
 func (h *ChatHandler) History(c *gin.Context) {
 	chatId := c.Query("chat_id") // 会话 ID
 	var items []model.ChatMessage
-	var messages = make([]vo.HistoryMessage, 0)
+	var messages = make([]vo.ChatMessage, 0)
 	res := h.DB.Where("chat_id = ?", chatId).Find(&items)
 	if res.Error != nil {
 		resp.ERROR(c, "No history message")
 		return
 	} else {
 		for _, item := range items {
-			var v vo.HistoryMessage
+			var v vo.ChatMessage
 			err := utils.CopyObject(item, &v)
+			if err != nil {
+				continue
+			}
+			// 解析内容
+			var content vo.MsgContent
+			err = utils.JsonDecode(item.Content, &content)
+			if err != nil {
+				content.Text = item.Content
+			}
+			v.Content = content
 			v.CreatedAt = item.CreatedAt.Unix()
 			v.UpdatedAt = item.UpdatedAt.Unix()
-			if err == nil {
-				messages = append(messages, v)
-			}
+			messages = append(messages, v)
 		}
 	}

@@ -170,10 +186,6 @@ func (h *ChatHandler) Remove(c *gin.Context) {
 		return
 	}

-	// TODO: 是否要删除 MidJourney 绘画记录和图片文件？
-
-	// 清空会话上下文
-	h.ChatContexts.Delete(chatId)
 	resp.SUCCESS(c, types.OkMsg)
 }

--- a/api/handler/chat_model_handler.go
+++ b/api/handler/chat_model_handler.go
@@ -30,29 +30,27 @@ func NewChatModelHandler(app *core.AppServer, db *gorm.DB) *ChatModelHandler {
 func (h *ChatModelHandler) List(c *gin.Context) {
 	var items []model.ChatModel
 	var chatModels = make([]vo.ChatModel, 0)
-	var res *gorm.DB
 	session := h.DB.Session(&gorm.Session{}).Where("enabled", true)
 	t := c.Query("type")
 	if t != "" {
 		session = session.Where("type", t)
-	}
-	// 如果用户没有登录，则加载所有开放模型
-	if !h.IsLogin(c) {
-		res = session.Where("open", true).Order("sort_num ASC").Find(&items)
 	} else {
+		session = session.Where("type", "chat")
+	}
+
+	session = session.Where("open", true)
+	if h.IsLogin(c) && t == "chat" {
 		user, _ := h.GetLoginUser(c)
 		var models []int
 		err := utils.JsonDecode(user.ChatModels, &models)
-		if err != nil {
-			resp.ERROR(c, "当前用户没有订阅任何模型")
-			return
-		}
 		// 查询用户有权限访问的模型以及所有开放的模型
-		res = h.DB.Where("enabled = ?", true).Where(
-			h.DB.Where("id IN ?", models).Or("open", true),
-		).Order("sort_num ASC").Find(&items)
+		if err == nil {
+			session = session.Or("id IN ?", models)
+		}
+
 	}

+	res := session.Order("sort_num ASC").Find(&items)
 	if res.Error == nil {
 		for _, item := range items {
 			var cm vo.ChatModel
--- a/api/handler/chat_openai_handler.go
+++ b/api/handler/chat_openai_handler.go
@@ -0,0 +1,249 @@
+package handler
+
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// * Copyright 2023 The Geek-AI Authors. All rights reserved.
+// * Use of this source code is governed by a Apache-2.0 license
+// * that can be found in the LICENSE file.
+// * @Author yangjian102621@163.com
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+import (
+	"bufio"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"geekai/core/types"
+	"geekai/store/model"
+	"geekai/store/vo"
+	"geekai/utils"
+	"io"
+	"strings"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	req2 "github.com/imroc/req/v3"
+)
+
+type Usage struct {
+	Prompt           string `json:"prompt,omitempty"`
+	Content          string `json:"content,omitempty"`
+	PromptTokens     int    `json:"prompt_tokens"`
+	CompletionTokens int    `json:"completion_tokens"`
+	TotalTokens      int    `json:"total_tokens"`
+}
+
+type OpenAIResVo struct {
+	Id                string `json:"id"`
+	Object            string `json:"object"`
+	Created           int    `json:"created"`
+	Model             string `json:"model"`
+	SystemFingerprint string `json:"system_fingerprint"`
+	Choices           []struct {
+		Index   int `json:"index"`
+		Message struct {
+			Role    string `json:"role"`
+			Content string `json:"content"`
+		} `json:"message"`
+		Logprobs     interface{} `json:"logprobs"`
+		FinishReason string      `json:"finish_reason"`
+	} `json:"choices"`
+	Usage Usage `json:"usage"`
+}
+
+// OPenAI 消息发送实现
+func (h *ChatHandler) sendOpenAiMessage(
+	req types.ApiRequest,
+	userVo vo.User,
+	ctx context.Context,
+	input ChatInput,
+	c *gin.Context) error {
+	promptCreatedAt := time.Now() // 记录提问时间
+	start := time.Now()
+	var apiKey = model.ApiKey{}
+	response, err := h.doRequest(ctx, req, input, &apiKey)
+	logger.Info("HTTP请求完成，耗时：", time.Since(start))
+	if err != nil {
+		if strings.Contains(err.Error(), "context canceled") {
+			return fmt.Errorf("用户取消了请求：%s", input.Prompt)
+		} else if strings.Contains(err.Error(), "no available key") {
+			return errors.New("抱歉😔😔😔，系统已经没有可用的 API KEY，请联系管理员！")
+		}
+		return err
+	} else {
+		defer response.Body.Close()
+	}
+
+	if response.StatusCode != 200 {
+		body, _ := io.ReadAll(response.Body)
+		return fmt.Errorf("请求 OpenAI API 失败：%d, %v", response.StatusCode, string(body))
+	}
+
+	contentType := response.Header.Get("Content-Type")
+	if strings.Contains(contentType, "text/event-stream") {
+		replyCreatedAt := time.Now() // 记录回复时间
+		// 循环读取 Chunk 消息
+		var message = types.Message{Role: "assistant"}
+		var contents = make([]string, 0)
+		var function model.Function
+		var toolCall = false
+		var arguments = make([]string, 0)
+		var reasoning = false
+
+		scanner := bufio.NewScanner(response.Body)
+		for scanner.Scan() {
+			line := scanner.Text()
+			if !strings.Contains(line, "data:") || len(line) < 30 {
+				continue
+			}
+			var responseBody = types.ApiResponse{}
+			err = json.Unmarshal([]byte(line[6:]), &responseBody)
+			if err != nil { // 数据解析出错
+				return errors.New(line)
+			}
+			if len(responseBody.Choices) == 0 { // Fixed: 兼容 Azure API 第一个输出空行
+				continue
+			}
+			if responseBody.Choices[0].Delta.Content == nil &&
+				responseBody.Choices[0].Delta.ToolCalls == nil &&
+				responseBody.Choices[0].Delta.ReasoningContent == "" {
+				continue
+			}
+
+			if responseBody.Choices[0].FinishReason == "stop" && len(contents) == 0 {
+				pushMessage(c, "text", "抱歉😔😔😔，AI助手由于未知原因已经停止输出内容。")
+				break
+			}
+
+			var tool types.ToolCall
+			if len(responseBody.Choices[0].Delta.ToolCalls) > 0 {
+				tool = responseBody.Choices[0].Delta.ToolCalls[0]
+				if toolCall && tool.Function.Name == "" {
+					arguments = append(arguments, tool.Function.Arguments)
+					continue
+				}
+			}
+
+			// 兼容 Function Call
+			fun := responseBody.Choices[0].Delta.FunctionCall
+			if fun.Name != "" {
+				tool = *new(types.ToolCall)
+				tool.Function.Name = fun.Name
+			} else if toolCall {
+				arguments = append(arguments, fun.Arguments)
+				continue
+			}
+
+			if !utils.IsEmptyValue(tool) {
+				res := h.DB.Where("name = ?", tool.Function.Name).First(&function)
+				if res.Error == nil {
+					toolCall = true
+					callMsg := fmt.Sprintf("正在调用工具 `%s` 作答 ...\n\n", function.Label)
+					pushMessage(c, "text", callMsg)
+					contents = append(contents, callMsg)
+				}
+				continue
+			}
+
+			if responseBody.Choices[0].FinishReason == "tool_calls" ||
+				responseBody.Choices[0].FinishReason == "function_call" { // 函数调用完毕
+				break
+			}
+
+			// output stopped
+			if responseBody.Choices[0].FinishReason != "" {
+				break // 输出完成或者输出中断了
+			} else { // 正常输出结果
+				// 兼容思考过程
+				if responseBody.Choices[0].Delta.ReasoningContent != "" {
+					reasoningContent := responseBody.Choices[0].Delta.ReasoningContent
+					if !reasoning {
+						reasoningContent = fmt.Sprintf("<think>%s", reasoningContent)
+						reasoning = true
+					}
+
+					pushMessage(c, "text", reasoningContent)
+					contents = append(contents, reasoningContent)
+				} else if responseBody.Choices[0].Delta.Content != "" {
+					finalContent := responseBody.Choices[0].Delta.Content
+					if reasoning {
+						finalContent = fmt.Sprintf("</think>%s", responseBody.Choices[0].Delta.Content)
+						reasoning = false
+					}
+					contents = append(contents, utils.InterfaceToString(finalContent))
+					pushMessage(c, "text", finalContent)
+				}
+			}
+		} // end for
+
+		if err := scanner.Err(); err != nil {
+			if strings.Contains(err.Error(), "context canceled") {
+				logger.Info("用户取消了请求：", input.Prompt)
+			} else {
+				logger.Error("信息读取出错：", err)
+			}
+		}
+
+		if toolCall { // 调用函数完成任务
+			params := make(map[string]any)
+			_ = utils.JsonDecode(strings.Join(arguments, ""), &params)
+			logger.Debugf("函数名称: %s, 函数参数：%s", function.Name, params)
+			params["user_id"] = userVo.Id
+			var apiRes types.BizVo
+			r, err := req2.C().R().SetHeader("Body-Type", "application/json").
+				SetHeader("Authorization", function.Token).
+				SetBody(params).Post(function.Action)
+			errMsg := ""
+			if err != nil {
+				errMsg = err.Error()
+			} else {
+				all, _ := io.ReadAll(r.Body)
+				err = json.Unmarshal(all, &apiRes)
+				if err != nil {
+					errMsg = err.Error()
+				} else if apiRes.Code != types.Success {
+					errMsg = apiRes.Message
+				}
+			}
+
+			if errMsg != "" {
+				errMsg = "调用函数工具出错：" + errMsg
+				contents = append(contents, errMsg)
+			} else {
+				errMsg = utils.InterfaceToString(apiRes.Data)
+				contents = append(contents, errMsg)
+			}
+			pushMessage(c, "text", errMsg)
+		}
+
+		// 消息发送成功
+		if len(contents) > 0 {
+			usage := Usage{
+				Prompt:           input.Prompt,
+				Content:          strings.Join(contents, ""),
+				PromptTokens:     0,
+				CompletionTokens: 0,
+				TotalTokens:      0,
+			}
+			message.Content = usage.Content
+			h.saveChatHistory(req, usage, message, input, userVo, promptCreatedAt, replyCreatedAt)
+		}
+	} else { // 非流式输出
+		var respVo OpenAIResVo
+		body, err := io.ReadAll(response.Body)
+		if err != nil {
+			return fmt.Errorf("读取响应失败：%v", body)
+		}
+		err = json.Unmarshal(body, &respVo)
+		if err != nil {
+			return fmt.Errorf("解析响应失败：%v", body)
+		}
+		content := respVo.Choices[0].Message.Content
+		pushMessage(c, "text", content)
+		respVo.Usage.Prompt = input.Prompt
+		respVo.Usage.Content = content
+		h.saveChatHistory(req, respVo.Usage, respVo.Choices[0].Message, input, userVo, promptCreatedAt, time.Now())
+	}
+
+	return nil
+}
--- a/api/handler/chat_role_handler.go
+++ b/api/handler/chat_role_handler.go
@@ -29,25 +29,58 @@ func NewChatRoleHandler(app *core.AppServer, db *gorm.DB) *ChatRoleHandler {

 // List 获取用户聊天应用列表
 func (h *ChatRoleHandler) List(c *gin.Context) {
+	tid := h.GetInt(c, "tid", 0)
+	var roles []model.ChatRole
+	session := h.DB.Where("enable", true)
+	if tid > 0 {
+		session = session.Where("tid", tid)
+	}
+	err := session.Order("sort_num ASC").Find(&roles).Error
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	var roleVos = make([]vo.ChatRole, 0)
+	for _, r := range roles {
+		var v vo.ChatRole
+		err := utils.CopyObject(r, &v)
+		if err == nil {
+			v.Id = r.Id
+			roleVos = append(roleVos, v)
+		}
+	}
+	resp.SUCCESS(c, roleVos)
+}
+
+// ListByUser 获取用户添加的角色列表
+func (h *ChatRoleHandler) ListByUser(c *gin.Context) {
 	id := h.GetInt(c, "id", 0)
 	userId := h.GetLoginUserId(c)
 	var roles []model.ChatRole
-	query := h.DB.Where("enable", true)
+	session := h.DB.Where("enable", true)
+	// 如果用户没登录，则获取所有角色
 	if userId > 0 {
 		var user model.User
 		h.DB.First(&user, userId)
 		var roleKeys []string
-		err := utils.JsonDecode(user.ChatRoles, &roleKeys)
-		if err != nil {
-			resp.ERROR(c, "角色解析失败！")
-			return
+		if user.ChatRoles != "" {
+			err := utils.JsonDecode(user.ChatRoles, &roleKeys)
+			if err != nil {
+				resp.ERROR(c, "角色解析失败！")
+				return
+			}
+		}
+		// 保证用户至少有一个角色可用
+		if len(roleKeys) > 0 {
+			session = session.Where("marker IN ?", roleKeys)
 		}
-		query = query.Where("marker IN ?", roleKeys)
 	}
+
 	if id > 0 {
-		query = query.Or("id", id)
+		session = session.Or("id", id)
 	}
-	res := h.DB.Where("enable", true).Order("sort_num ASC").Find(&roles)
+	res := session.Order("sort_num ASC").Find(&roles)
 	if res.Error != nil {
 		resp.ERROR(c, res.Error.Error())
 		return
--- a/api/handler/chatimpl/chat_handler.go
+++ b/api/handler/chatimpl/chat_handler.go
@@ -1,622 +0,0 @@
-package chatimpl
-
-// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// * 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 (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"geekai/core"
-	"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"
-	"github.com/gorilla/websocket"
-	"gorm.io/gorm"
-)
-
-var logger = logger2.GetLogger()
-
-type ChatHandler struct {
-	handler.BaseHandler
-	redis          *redis.Client
-	uploadManager  *oss.UploaderManager
-	licenseService *service.LicenseService
-	ReqCancelFunc  *types.LMap[string, context.CancelFunc] // HttpClient 请求取消 handle function
-	ChatContexts   *types.LMap[string, []types.Message]    // 聊天上下文 Map [chatId] => []Message
-	userService    *service.UserService
-}
-
-func NewChatHandler(app *core.AppServer, db *gorm.DB, redis *redis.Client, manager *oss.UploaderManager, licenseService *service.LicenseService, userService *service.UserService) *ChatHandler {
-	return &ChatHandler{
-		BaseHandler:    handler.BaseHandler{App: app, DB: db},
-		redis:          redis,
-		uploadManager:  manager,
-		licenseService: licenseService,
-		ReqCancelFunc:  types.NewLMap[string, context.CancelFunc](),
-		ChatContexts:   types.NewLMap[string, []types.Message](),
-		userService:    userService,
-	}
-}
-
-// ChatHandle 处理聊天 WebSocket 请求
-func (h *ChatHandler) ChatHandle(c *gin.Context) {
-	ws, err := (&websocket.Upgrader{CheckOrigin: func(r *http.Request) bool { return true }}).Upgrade(c.Writer, c.Request, nil)
-	if err != nil {
-		logger.Error(err)
-		return
-	}
-
-	sessionId := c.Query("session_id")
-	roleId := h.GetInt(c, "role_id", 0)
-	chatId := c.Query("chat_id")
-	modelId := h.GetInt(c, "model_id", 0)
-	tools := c.Query("tools")
-
-	client := types.NewWsClient(ws)
-	var chatRole model.ChatRole
-	res := h.DB.First(&chatRole, roleId)
-	if res.Error != nil || !chatRole.Enable {
-		utils.ReplyMessage(client, "当前聊天角色不存在或者未启用，连接已关闭！！！")
-		c.Abort()
-		return
-	}
-	// if the role bind a model_id, use role's bind model_id
-	if chatRole.ModelId > 0 {
-		modelId = chatRole.ModelId
-	}
-	// get model info
-	var chatModel model.ChatModel
-	res = h.DB.First(&chatModel, modelId)
-	if res.Error != nil || chatModel.Enabled == false {
-		utils.ReplyMessage(client, "当前AI模型暂未启用，连接已关闭！！！")
-		c.Abort()
-		return
-	}
-
-	session := &types.ChatSession{
-		SessionId: sessionId,
-		ClientIP:  c.ClientIP(),
-		UserId:    h.GetLoginUserId(c),
-		Tools:     tools,
-	}
-
-	// use old chat data override the chat model and role ID
-	var chat model.ChatItem
-	res = h.DB.Where("chat_id = ?", chatId).First(&chat)
-	if res.Error == nil {
-		chatModel.Id = chat.ModelId
-		roleId = int(chat.RoleId)
-	}
-
-	session.ChatId = chatId
-	session.Model = types.ChatModel{
-		Id:          chatModel.Id,
-		Name:        chatModel.Name,
-		Value:       chatModel.Value,
-		Power:       chatModel.Power,
-		MaxTokens:   chatModel.MaxTokens,
-		MaxContext:  chatModel.MaxContext,
-		Temperature: chatModel.Temperature,
-		KeyId:       chatModel.KeyId}
-	logger.Infof("New websocket connected, IP: %s", c.ClientIP())
-
-	go func() {
-		for {
-			_, msg, err := client.Receive()
-			if err != nil {
-				logger.Debugf("close connection: %s", client.Conn.RemoteAddr())
-				client.Close()
-				cancelFunc := h.ReqCancelFunc.Get(sessionId)
-				if cancelFunc != nil {
-					cancelFunc()
-					h.ReqCancelFunc.Delete(sessionId)
-				}
-				return
-			}
-
-			var message types.WsMessage
-			err = utils.JsonDecode(string(msg), &message)
-			if err != nil {
-				continue
-			}
-
-			// 心跳消息
-			if message.Type == "heartbeat" {
-				logger.Debug("收到 Chat 心跳消息：", message.Content)
-				continue
-			}
-
-			logger.Info("Receive a message: ", message.Content)
-
-			ctx, cancel := context.WithCancel(context.Background())
-			h.ReqCancelFunc.Put(sessionId, cancel)
-			// 回复消息
-			err = h.sendMessage(ctx, session, chatRole, utils.InterfaceToString(message.Content), client)
-			if err != nil {
-				logger.Error(err)
-				utils.ReplyMessage(client, err.Error())
-			} else {
-				utils.ReplyChunkMessage(client, types.WsMessage{Type: types.WsEnd})
-				logger.Infof("回答完毕: %v", message.Content)
-			}
-
-		}
-	}()
-}
-
-func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSession, role model.ChatRole, prompt string, ws *types.WsClient) error {
-	if !h.App.Debug {
-		defer func() {
-			if r := recover(); r != nil {
-				logger.Error("Recover message from error: ", r)
-			}
-		}()
-	}
-
-	var user model.User
-	res := h.DB.Model(&model.User{}).First(&user, session.UserId)
-	if res.Error != nil {
-		return errors.New("未授权用户，您正在进行非法操作！")
-	}
-	var userVo vo.User
-	err := utils.CopyObject(user, &userVo)
-	userVo.Id = user.Id
-	if err != nil {
-		return errors.New("User 对象转换失败，" + err.Error())
-	}
-
-	if userVo.Status == false {
-		return errors.New("您的账号已经被禁用，如果疑问，请联系管理员！")
-	}
-
-	if userVo.Power < session.Model.Power {
-		return fmt.Errorf("您当前剩余算力 %d 已不足以支付当前模型的单次对话需要消耗的算力 %d，[立即购买](/member)。", userVo.Power, session.Model.Power)
-	}
-
-	if userVo.ExpiredTime > 0 && userVo.ExpiredTime <= time.Now().Unix() {
-		return errors.New("您的账号已经过期，请联系管理员！")
-	}
-
-	// 检查 prompt 长度是否超过了当前模型允许的最大上下文长度
-	promptTokens, err := utils.CalcTokens(prompt, session.Model.Value)
-	if promptTokens > session.Model.MaxContext {
-
-		return errors.New("对话内容超出了当前模型允许的最大上下文长度！")
-	}
-
-	var req = types.ApiRequest{
-		Model:  session.Model.Value,
-		Stream: true,
-	}
-	req.Temperature = session.Model.Temperature
-	req.MaxTokens = session.Model.MaxTokens
-
-	if session.Tools != "" {
-		toolIds := strings.Split(session.Tools, ",")
-		var items []model.Function
-		res = h.DB.Where("enabled", true).Where("id IN ?", toolIds).Find(&items)
-		if res.Error == nil {
-			var tools = make([]types.Tool, 0)
-			for _, v := range items {
-				var parameters map[string]interface{}
-				err = utils.JsonDecode(v.Parameters, &parameters)
-				if err != nil {
-					continue
-				}
-				tool := types.Tool{
-					Type: "function",
-					Function: types.Function{
-						Name:        v.Name,
-						Description: v.Description,
-						Parameters:  parameters,
-					},
-				}
-				if v, ok := parameters["required"]; v == nil || !ok {
-					tool.Function.Parameters["required"] = []string{}
-				}
-				tools = append(tools, tool)
-			}
-
-			if len(tools) > 0 {
-				req.Tools = tools
-				req.ToolChoice = "auto"
-			}
-		}
-	}
-
-	// 加载聊天上下文
-	chatCtx := make([]types.Message, 0)
-	messages := make([]types.Message, 0)
-	if h.App.SysConfig.EnableContext {
-		if h.ChatContexts.Has(session.ChatId) {
-			messages = h.ChatContexts.Get(session.ChatId)
-		} else {
-			_ = utils.JsonDecode(role.Context, &messages)
-			if h.App.SysConfig.ContextDeep > 0 {
-				var historyMessages []model.ChatMessage
-				res := h.DB.Where("chat_id = ? and use_context = 1", session.ChatId).Limit(h.App.SysConfig.ContextDeep).Order("id DESC").Find(&historyMessages)
-				if res.Error == nil {
-					for i := len(historyMessages) - 1; i >= 0; i-- {
-						msg := historyMessages[i]
-						ms := types.Message{Role: "user", Content: msg.Content}
-						if msg.Type == types.ReplyMsg {
-							ms.Role = "assistant"
-						}
-						chatCtx = append(chatCtx, ms)
-					}
-				}
-			}
-		}
-
-		// 计算当前请求的 token 总长度，确保不会超出最大上下文长度
-		// MaxContextLength = Response + Tool + Prompt + Context
-		tokens := req.MaxTokens // 最大响应长度
-		tks, _ := utils.CalcTokens(utils.JsonEncode(req.Tools), req.Model)
-		tokens += tks + promptTokens
-
-		for i := len(messages) - 1; i >= 0; i-- {
-			v := messages[i]
-			tks, _ := utils.CalcTokens(v.Content, req.Model)
-			// 上下文 token 超出了模型的最大上下文长度
-			if tokens+tks >= session.Model.MaxContext {
-				break
-			}
-
-			// 上下文的深度超出了模型的最大上下文深度
-			if len(chatCtx) >= h.App.SysConfig.ContextDeep {
-				break
-			}
-
-			tokens += tks
-			chatCtx = append(chatCtx, v)
-		}
-
-		logger.Debugf("聊天上下文：%+v", chatCtx)
-	}
-	reqMgs := make([]interface{}, 0)
-	for _, m := range chatCtx {
-		reqMgs = append(reqMgs, m)
-	}
-
-	fullPrompt := prompt
-	text := prompt
-	// extract files in prompt
-	files := utils.ExtractFileURLs(prompt)
-	logger.Debugf("detected FILES: %+v", files)
-	// 如果不是逆向模型，则提取文件内容
-	if len(files) > 0 && !(session.Model.Value == "gpt-4-all" ||
-		strings.HasPrefix(session.Model.Value, "gpt-4-gizmo") ||
-		strings.HasSuffix(session.Model.Value, "claude-3")) {
-		contents := make([]string, 0)
-		var file model.File
-		for _, v := range files {
-			h.DB.Where("url = ?", v).First(&file)
-			content, err := utils.ReadFileContent(v, h.App.Config.TikaHost)
-			if err != nil {
-				logger.Error("error with read file: ", err)
-			} else {
-				contents = append(contents, fmt.Sprintf("%s 文件内容：%s", file.Name, content))
-			}
-			text = strings.Replace(text, v, "", 1)
-		}
-		if len(contents) > 0 {
-			fullPrompt = fmt.Sprintf("请根据提供的文件内容信息回答问题(其中Excel 已转成 HTML)：\n\n %s\n\n 问题：%s", strings.Join(contents, "\n"), text)
-		}
-
-		tokens, _ := utils.CalcTokens(fullPrompt, req.Model)
-		if tokens > session.Model.MaxContext {
-			return fmt.Errorf("文件的长度超出模型允许的最大上下文长度，请减少文件内容数量或文件大小。")
-		}
-	}
-	logger.Debug("最终Prompt：", fullPrompt)
-
-	// extract images from prompt
-	imgURLs := utils.ExtractImgURLs(prompt)
-	logger.Debugf("detected IMG: %+v", imgURLs)
-	var content interface{}
-	if len(imgURLs) > 0 {
-		data := make([]interface{}, 0)
-		for _, v := range imgURLs {
-			text = strings.Replace(text, v, "", 1)
-			data = append(data, gin.H{
-				"type": "image_url",
-				"image_url": gin.H{
-					"url": v,
-				},
-			})
-		}
-		data = append(data, gin.H{
-			"type": "text",
-			"text": strings.TrimSpace(text),
-		})
-		content = data
-	} else {
-		content = fullPrompt
-	}
-	req.Messages = append(reqMgs, map[string]interface{}{
-		"role":    "user",
-		"content": content,
-	})
-
-	logger.Debugf("%+v", req.Messages)
-
-	return h.sendOpenAiMessage(chatCtx, req, userVo, ctx, session, role, prompt, ws)
-}
-
-// Tokens 统计 token 数量
-func (h *ChatHandler) Tokens(c *gin.Context) {
-	var data struct {
-		Text   string `json:"text"`
-		Model  string `json:"model"`
-		ChatId string `json:"chat_id"`
-	}
-	if err := c.ShouldBindJSON(&data); err != nil {
-		resp.ERROR(c, types.InvalidArgs)
-		return
-	}
-
-	// 如果没有传入 text 字段，则说明是获取当前 reply 总的 token 消耗（带上下文）
-	if data.Text == "" && data.ChatId != "" {
-		var item model.ChatMessage
-		userId, _ := c.Get(types.LoginUserID)
-		res := h.DB.Where("user_id = ?", userId).Where("chat_id = ?", data.ChatId).Last(&item)
-		if res.Error != nil {
-			resp.ERROR(c, res.Error.Error())
-			return
-		}
-		resp.SUCCESS(c, item.Tokens)
-		return
-	}
-
-	tokens, err := utils.CalcTokens(data.Text, data.Model)
-	if err != nil {
-		resp.ERROR(c, err.Error())
-		return
-	}
-
-	resp.SUCCESS(c, tokens)
-}
-
-func getTotalTokens(req types.ApiRequest) int {
-	encode := utils.JsonEncode(req.Messages)
-	var items []map[string]interface{}
-	err := utils.JsonDecode(encode, &items)
-	if err != nil {
-		return 0
-	}
-	tokens := 0
-	for _, item := range items {
-		content, ok := item["content"]
-		if ok && !utils.IsEmptyValue(content) {
-			t, err := utils.CalcTokens(utils.InterfaceToString(content), req.Model)
-			if err == nil {
-				tokens += t
-			}
-		}
-	}
-	return tokens
-}
-
-// StopGenerate 停止生成
-func (h *ChatHandler) StopGenerate(c *gin.Context) {
-	sessionId := c.Query("session_id")
-	if h.ReqCancelFunc.Has(sessionId) {
-		h.ReqCancelFunc.Get(sessionId)()
-		h.ReqCancelFunc.Delete(sessionId)
-	}
-	resp.SUCCESS(c, types.OkMsg)
-}
-
-// 发送请求到 OpenAI 服务器
-// useOwnApiKey: 是否使用了用户自己的 API KEY
-func (h *ChatHandler) doRequest(ctx context.Context, req types.ApiRequest, session *types.ChatSession, apiKey *model.ApiKey) (*http.Response, error) {
-	// if the chat model bind a KEY, use it directly
-	if session.Model.KeyId > 0 {
-		h.DB.Where("id", session.Model.KeyId).Find(apiKey)
-	}
-	// use the last unused key
-	if apiKey.Id == 0 {
-		h.DB.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
-	err := h.licenseService.IsValidApiURL(apiKey.ApiURL)
-	if err != nil {
-		return nil, err
-	}
-	logger.Debugf(utils.JsonEncode(req))
-
-	apiURL := fmt.Sprintf("%s/v1/chat/completions", apiKey.ApiURL)
-	// 创建 HttpClient 请求对象
-	var client *http.Client
-	requestBody, err := json.Marshal(req)
-	if err != nil {
-		return nil, err
-	}
-	request, err := http.NewRequest(http.MethodPost, apiURL, bytes.NewBuffer(requestBody))
-	if err != nil {
-		return nil, err
-	}
-
-	request = request.WithContext(ctx)
-	request.Header.Set("Content-Type", "application/json")
-	if len(apiKey.ProxyURL) > 5 { // 使用代理
-		proxy, _ := url.Parse(apiKey.ProxyURL)
-		client = &http.Client{
-			Transport: &http.Transport{
-				Proxy: http.ProxyURL(proxy),
-			},
-		}
-	} else {
-		client = http.DefaultClient
-	}
-	logger.Debugf("Sending %s request, API KEY:%s, PROXY: %s, Model: %s", apiKey.ApiURL, apiURL, apiKey.ProxyURL, req.Model)
-	request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", apiKey.Value))
-	// 更新API KEY 最后使用时间
-	h.DB.Model(&model.ApiKey{}).Where("id", apiKey.Id).UpdateColumn("last_used_at", time.Now().Unix())
-	return client.Do(request)
-}
-
-// 扣减用户算力
-func (h *ChatHandler) subUserPower(userVo vo.User, session *types.ChatSession, promptTokens int, replyTokens int) {
-	power := 1
-	if session.Model.Power > 0 {
-		power = session.Model.Power
-	}
-
-	err := h.userService.DecreasePower(int(userVo.Id), power, model.PowerLog{
-		Type:   types.PowerConsume,
-		Model:  session.Model.Value,
-		Remark: fmt.Sprintf("模型名称：%s, 提问长度：%d，回复长度：%d", session.Model.Name, promptTokens, replyTokens),
-	})
-	if err != nil {
-		logger.Error(err)
-	}
-}
-
-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.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
-	err = h.DB.Save(&historyUserMsg).Error
-	if err != nil {
-		logger.Error("failed to save prompt history message: ", err)
-	}
-
-	// 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
-	err = h.DB.Create(&historyReplyMsg).Error
-	if err != nil {
-		logger.Error("failed to save reply history message: ", err)
-	}
-
-	// 更新用户算力
-	if session.Model.Power > 0 {
-		h.subUserPower(userVo, session, promptToken, replyTokens)
-	}
-	// 保存当前会话
-	var chatItem model.ChatItem
-	err = h.DB.Where("chat_id = ?", session.ChatId).First(&chatItem).Error
-	if err != nil {
-		chatItem.ChatId = session.ChatId
-		chatItem.UserId = userVo.Id
-		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
-		err = h.DB.Create(&chatItem).Error
-		if err != nil {
-			logger.Error("failed to save chat item: ", err)
-		}
-	}
-}
-
-// 将AI回复消息中生成的图片链接下载到本地
-func (h *ChatHandler) extractImgUrl(text string) string {
-	pattern := `!\[([^\]]*)]\(([^)]+)\)`
-	re := regexp.MustCompile(pattern)
-	matches := re.FindAllStringSubmatch(text, -1)
-
-	// 下载图片并替换链接地址
-	for _, match := range matches {
-		imageURL := match[2]
-		logger.Debug(imageURL)
-		// 对于相同地址的图片，已经被替换了，就不再重复下载了
-		if !strings.Contains(text, imageURL) {
-			continue
-		}
-
-		newImgURL, err := h.uploadManager.GetUploadHandler().PutUrlFile(imageURL, false)
-		if err != nil {
-			logger.Error("error with download image: ", err)
-			continue
-		}
-
-		text = strings.ReplaceAll(text, imageURL, newImgURL)
-	}
-	return text
-}
--- a/api/handler/chatimpl/openai_handler.go
+++ b/api/handler/chatimpl/openai_handler.go
@@ -1,188 +0,0 @@
-package chatimpl
-
-// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// * 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 (
-	"bufio"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"geekai/core/types"
-	"geekai/store/model"
-	"geekai/store/vo"
-	"geekai/utils"
-	req2 "github.com/imroc/req/v3"
-	"io"
-	"strings"
-	"time"
-)
-
-// OPenAI 消息发送实现
-func (h *ChatHandler) sendOpenAiMessage(
-	chatCtx []types.Message,
-	req types.ApiRequest,
-	userVo vo.User,
-	ctx context.Context,
-	session *types.ChatSession,
-	role model.ChatRole,
-	prompt string,
-	ws *types.WsClient) error {
-	promptCreatedAt := time.Now() // 记录提问时间
-	start := time.Now()
-	var apiKey = model.ApiKey{}
-	response, err := h.doRequest(ctx, req, session, &apiKey)
-	logger.Info("HTTP请求完成，耗时：", time.Now().Sub(start))
-	if err != nil {
-		if strings.Contains(err.Error(), "context canceled") {
-			return fmt.Errorf("用户取消了请求：%s", prompt)
-		} else if strings.Contains(err.Error(), "no available key") {
-			return errors.New("抱歉😔😔😔，系统已经没有可用的 API KEY，请联系管理员！")
-		}
-		return err
-	} else {
-		defer response.Body.Close()
-	}
-
-	contentType := response.Header.Get("Content-Type")
-	if strings.Contains(contentType, "text/event-stream") {
-		replyCreatedAt := time.Now() // 记录回复时间
-		// 循环读取 Chunk 消息
-		var message = types.Message{}
-		var contents = make([]string, 0)
-		var function model.Function
-		var toolCall = false
-		var arguments = make([]string, 0)
-		scanner := bufio.NewScanner(response.Body)
-		var isNew = true
-		for scanner.Scan() {
-			line := scanner.Text()
-			if !strings.Contains(line, "data:") || len(line) < 30 {
-				continue
-			}
-			var responseBody = types.ApiResponse{}
-			err = json.Unmarshal([]byte(line[6:]), &responseBody)
-			if err != nil { // 数据解析出错
-				return errors.New(line)
-			}
-			if len(responseBody.Choices) == 0 { // Fixed: 兼容 Azure API 第一个输出空行
-				continue
-			}
-			if responseBody.Choices[0].Delta.Content == nil && responseBody.Choices[0].Delta.ToolCalls == nil {
-				continue
-			}
-
-			if responseBody.Choices[0].FinishReason == "stop" && len(contents) == 0 {
-				utils.ReplyMessage(ws, "抱歉😔😔😔，AI助手由于未知原因已经停止输出内容。")
-				break
-			}
-
-			var tool types.ToolCall
-			if len(responseBody.Choices[0].Delta.ToolCalls) > 0 {
-				tool = responseBody.Choices[0].Delta.ToolCalls[0]
-				if toolCall && tool.Function.Name == "" {
-					arguments = append(arguments, tool.Function.Arguments)
-					continue
-				}
-			}
-
-			// 兼容 Function Call
-			fun := responseBody.Choices[0].Delta.FunctionCall
-			if fun.Name != "" {
-				tool = *new(types.ToolCall)
-				tool.Function.Name = fun.Name
-			} else if toolCall {
-				arguments = append(arguments, fun.Arguments)
-				continue
-			}
-
-			if !utils.IsEmptyValue(tool) {
-				res := h.DB.Where("name = ?", tool.Function.Name).First(&function)
-				if res.Error == nil {
-					toolCall = true
-					callMsg := fmt.Sprintf("正在调用工具 `%s` 作答 ...\n\n", function.Label)
-					utils.ReplyChunkMessage(ws, types.WsMessage{Type: types.WsStart})
-					utils.ReplyChunkMessage(ws, types.WsMessage{Type: types.WsMiddle, Content: callMsg})
-					contents = append(contents, callMsg)
-				}
-				continue
-			}
-
-			if responseBody.Choices[0].FinishReason == "tool_calls" ||
-				responseBody.Choices[0].FinishReason == "function_call" { // 函数调用完毕
-				break
-			}
-
-			// output stopped
-			if responseBody.Choices[0].FinishReason != "" {
-				break // 输出完成或者输出中断了
-			} else {
-				content := responseBody.Choices[0].Delta.Content
-				contents = append(contents, utils.InterfaceToString(content))
-				if isNew {
-					utils.ReplyChunkMessage(ws, types.WsMessage{Type: types.WsStart})
-					isNew = false
-				}
-				utils.ReplyChunkMessage(ws, types.WsMessage{
-					Type:    types.WsMiddle,
-					Content: utils.InterfaceToString(responseBody.Choices[0].Delta.Content),
-				})
-			}
-		} // end for
-
-		if err := scanner.Err(); err != nil {
-			if strings.Contains(err.Error(), "context canceled") {
-				logger.Info("用户取消了请求：", prompt)
-			} else {
-				logger.Error("信息读取出错：", err)
-			}
-		}
-
-		if toolCall { // 调用函数完成任务
-			params := make(map[string]interface{})
-			_ = utils.JsonDecode(strings.Join(arguments, ""), &params)
-			logger.Debugf("函数名称: %s, 函数参数：%s", function.Name, params)
-			params["user_id"] = userVo.Id
-			var apiRes types.BizVo
-			r, err := req2.C().R().SetHeader("Content-Type", "application/json").
-				SetHeader("Authorization", function.Token).
-				SetBody(params).
-				SetSuccessResult(&apiRes).Post(function.Action)
-			errMsg := ""
-			if err != nil {
-				errMsg = err.Error()
-			} else if r.IsErrorState() {
-				errMsg = r.Status
-			}
-			if errMsg != "" || apiRes.Code != types.Success {
-				msg := "调用函数工具出错：" + apiRes.Message + errMsg
-				utils.ReplyChunkMessage(ws, types.WsMessage{
-					Type:    types.WsMiddle,
-					Content: msg,
-				})
-				contents = append(contents, msg)
-			} else {
-				utils.ReplyChunkMessage(ws, types.WsMessage{
-					Type:    types.WsMiddle,
-					Content: apiRes.Data,
-				})
-				contents = append(contents, utils.InterfaceToString(apiRes.Data))
-			}
-		}
-
-		// 消息发送成功
-		if len(contents) > 0 {
-			h.saveChatHistory(req, prompt, contents, message, chatCtx, session, role, userVo, promptCreatedAt, replyCreatedAt)
-		}
-	} else {
-		body, _ := io.ReadAll(response.Body)
-		return fmt.Errorf("请求 OpenAI API 失败：%s", body)
-	}
-
-	return nil
-}
--- a/api/handler/config_handler.go
+++ b/api/handler/config_handler.go
@@ -31,14 +31,14 @@ func NewConfigHandler(app *core.AppServer, db *gorm.DB, licenseService *service.
 func (h *ConfigHandler) Get(c *gin.Context) {
 	key := c.Query("key")
 	var config model.Config
-	res := h.DB.Where("marker", key).First(&config)
+	res := h.DB.Where("name", key).First(&config)
 	if res.Error != nil {
 		resp.ERROR(c, res.Error.Error())
 		return
 	}

-	var value map[string]interface{}
-	err := utils.JsonDecode(config.Config, &value)
+	var value map[string]any
+	err := utils.JsonDecode(config.Value, &value)
 	if err != nil {
 		resp.ERROR(c, err.Error())
 		return
--- a/api/handler/dalle_handler.go
+++ b/api/handler/dalle_handler.go
@@ -18,16 +18,13 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
+
 	"github.com/gin-gonic/gin"
-	"github.com/go-redis/redis/v8"
-	"github.com/gorilla/websocket"
 	"gorm.io/gorm"
-	"net/http"
 )

 type DallJobHandler struct {
 	BaseHandler
-	redis       *redis.Client
 	dallService *dalle.Service
 	uploader    *oss.UploaderManager
 	userService *service.UserService
@@ -45,82 +42,49 @@ func NewDallJobHandler(app *core.AppServer, db *gorm.DB, service *dalle.Service,
 	}
 }

-// Client WebSocket 客户端，用于通知任务状态变更
-func (h *DallJobHandler) Client(c *gin.Context) {
-	ws, err := (&websocket.Upgrader{CheckOrigin: func(r *http.Request) bool { return true }}).Upgrade(c.Writer, c.Request, nil)
-	if err != nil {
-		logger.Error(err)
-		c.Abort()
-		return
-	}
-
-	userId := h.GetInt(c, "user_id", 0)
-	if userId == 0 {
-		logger.Info("Invalid user ID")
-		c.Abort()
-		return
-	}
-
-	client := types.NewWsClient(ws)
-	h.dallService.Clients.Put(uint(userId), client)
-	logger.Infof("New websocket connected, IP: %s", c.RemoteIP())
-	go func() {
-		for {
-			_, msg, err := client.Receive()
-			if err != nil {
-				client.Close()
-				h.dallService.Clients.Delete(uint(userId))
-				return
-			}
-
-			var message types.WsMessage
-			err = utils.JsonDecode(string(msg), &message)
-			if err != nil {
-				continue
-			}
-
-			// 心跳消息
-			if message.Type == "heartbeat" {
-				logger.Debug("收到 DallE 心跳消息：", message.Content)
-				continue
-			}
-		}
-	}()
-}
-
-func (h *DallJobHandler) preCheck(c *gin.Context) bool {
-	user, err := h.GetLoginUser(c)
-	if err != nil {
-		resp.NotAuth(c)
-		return false
-	}
-	if user.Power < h.App.SysConfig.DallPower {
-		resp.ERROR(c, "当前用户剩余算力不足以完成本次绘画！")
-		return false
-	}
-
-	return true
-
-}
-
 // Image 创建一个绘画任务
 func (h *DallJobHandler) Image(c *gin.Context) {
-	if !h.preCheck(c) {
-		return
-	}
-
 	var data types.DallTask
 	if err := c.ShouldBindJSON(&data); err != nil || data.Prompt == "" {
 		resp.ERROR(c, types.InvalidArgs)
 		return
 	}

+	var chatModel model.ChatModel
+	if res := h.DB.Where("id = ?", data.ModelId).First(&chatModel); res.Error != nil {
+		resp.ERROR(c, "模型不存在")
+		return
+	}
+
+	// 检查用户剩余算力
+	user, err := h.GetLoginUser(c)
+	if err != nil {
+		resp.NotAuth(c)
+		return
+	}
+	if user.Power < chatModel.Power {
+		resp.ERROR(c, "当前用户剩余算力不足以完成本次绘画！")
+		return
+	}
+
 	idValue, _ := c.Get(types.LoginUserID)
 	userId := utils.IntValue(utils.InterfaceToString(idValue), 0)
+	task := types.DallTask{
+		UserId:           uint(userId),
+		ModelId:          chatModel.Id,
+		ModelName:        chatModel.Value,
+		Prompt:           data.Prompt,
+		Quality:          data.Quality,
+		Size:             data.Size,
+		Style:            data.Style,
+		TranslateModelId: h.App.SysConfig.AssistantModelId,
+		Power:            chatModel.Power,
+	}
 	job := model.DallJob{
-		UserId: uint(userId),
-		Prompt: data.Prompt,
-		Power:  h.App.SysConfig.DallPower,
+		UserId:   uint(userId),
+		Prompt:   data.Prompt,
+		Power:    chatModel.Power,
+		TaskInfo: utils.JsonEncode(task),
 	}
 	res := h.DB.Create(&job)
 	if res.Error != nil {
@@ -128,19 +92,18 @@ func (h *DallJobHandler) Image(c *gin.Context) {
 		return
 	}

-	h.dallService.PushTask(types.DallTask{
-		JobId:   job.Id,
-		UserId:  uint(userId),
-		Prompt:  data.Prompt,
-		Quality: data.Quality,
-		Size:    data.Size,
-		Style:   data.Style,
-		Power:   job.Power,
-	})
+	task.Id = job.Id
+	h.dallService.PushTask(task)

-	client := h.dallService.Clients.Get(job.UserId)
-	if client != nil {
-		_ = client.Send([]byte("Task Updated"))
+	// 扣减算力
+	err = h.userService.DecreasePower(user.Id, chatModel.Power, model.PowerLog{
+		Type:   types.PowerConsume,
+		Model:  chatModel.Value,
+		Remark: fmt.Sprintf("绘画提示词：%s", utils.CutWords(task.Prompt, 10)),
+	})
+	if err != nil {
+		resp.ERROR(c, "error with decrease power: "+err.Error())
+		return
 	}
 	resp.SUCCESS(c)
 }
@@ -228,30 +191,14 @@ func (h *DallJobHandler) Remove(c *gin.Context) {
 	}

 	// 删除任务
-	tx := h.DB.Begin()
-	if err := tx.Delete(&job).Error; err != nil {
-		tx.Rollback()
+	err := h.DB.Delete(&job).Error
+	if err != nil {
 		resp.ERROR(c, err.Error())
 		return
 	}

-	// 如果任务未完成，或者任务失败，则恢复用户算力
-	if job.Progress != 100 {
-		err := h.userService.IncreasePower(int(job.UserId), job.Power, model.PowerLog{
-			Type:   types.PowerRefund,
-			Model:  "dall-e-3",
-			Remark: fmt.Sprintf("任务失败，退回算力。任务ID：%d，Err: %s", job.Id, job.ErrMsg),
-		})
-		if err != nil {
-			tx.Rollback()
-			resp.ERROR(c, err.Error())
-			return
-		}
-	}
-	tx.Commit()
-
 	// remove image
-	err := h.uploader.GetUploadHandler().Delete(job.ImgURL)
+	err = h.uploader.GetUploadHandler().Delete(job.ImgURL)
 	if err != nil {
 		logger.Error("remove image failed: ", err)
 	}
@@ -273,3 +220,25 @@ func (h *DallJobHandler) Publish(c *gin.Context) {

 	resp.SUCCESS(c)
 }
+
+func (h *DallJobHandler) GetModels(c *gin.Context) {
+	var models []model.ChatModel
+	err := h.DB.Where("type", "img").Where("enabled", true).Find(&models).Error
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	var modelVos []vo.ChatModel
+	for _, v := range models {
+		var modelVo vo.ChatModel
+		err := utils.CopyObject(v, &modelVo)
+		if err != nil {
+			continue
+		}
+		modelVo.Id = v.Id
+		modelVos = append(modelVos, modelVo)
+	}
+
+	resp.SUCCESS(c, modelVos)
+}
--- a/api/handler/function_handler.go
+++ b/api/handler/function_handler.go
@@ -12,6 +12,8 @@ import (
 	"fmt"
 	"geekai/core"
 	"geekai/core/types"
+	"geekai/service"
+	"geekai/service/crawler"
 	"geekai/service/dalle"
 	"geekai/service/oss"
 	"geekai/store/model"
@@ -32,6 +34,7 @@ type FunctionHandler struct {
 	config        types.ApiConfig
 	uploadManager *oss.UploaderManager
 	dallService   *dalle.Service
+	userService   *service.UserService
 }

 func NewFunctionHandler(
@@ -39,7 +42,8 @@ func NewFunctionHandler(
 	db *gorm.DB,
 	config *types.AppConfig,
 	manager *oss.UploaderManager,
-	dallService *dalle.Service) *FunctionHandler {
+	dallService *dalle.Service,
+	userService *service.UserService) *FunctionHandler {
 	return &FunctionHandler{
 		BaseHandler: BaseHandler{
 			App: server,
@@ -48,6 +52,7 @@ func NewFunctionHandler(
 		config:        config.ApiConfig,
 		uploadManager: manager,
 		dallService:   dallService,
+		userService:   userService,
 	}
 }

@@ -113,10 +118,13 @@ func (h *FunctionHandler) WeiBo(c *gin.Context) {
 		SetHeader("AppId", h.config.AppId).
 		SetHeader("Authorization", fmt.Sprintf("Bearer %s", h.config.Token)).
 		SetSuccessResult(&res).Get(url)
-	if err != nil || r.IsErrorState() {
-		resp.ERROR(c, fmt.Sprintf("%v%v", err, r.Err))
+	if err != nil {
+		resp.ERROR(c, fmt.Sprintf("%v", err))
 		return
 	}
+	if r.IsErrorState() {
+		resp.ERROR(c, fmt.Sprintf("error http code status: %v", r.Status))
+	}

 	if res.Code != types.Success {
 		resp.ERROR(c, res.Message)
@@ -149,8 +157,12 @@ func (h *FunctionHandler) ZaoBao(c *gin.Context) {
 		SetHeader("AppId", h.config.AppId).
 		SetHeader("Authorization", fmt.Sprintf("Bearer %s", h.config.Token)).
 		SetSuccessResult(&res).Get(url)
-	if err != nil || r.IsErrorState() {
-		resp.ERROR(c, fmt.Sprintf("%v%v", err, r.Err))
+	if err != nil {
+		resp.ERROR(c, fmt.Sprintf("%v", err))
+		return
+	}
+	if r.IsErrorState() {
+		resp.ERROR(c, fmt.Sprintf("%v", r.Err))
 		return
 	}

@@ -164,7 +176,7 @@ func (h *FunctionHandler) ZaoBao(c *gin.Context) {
 	for _, v := range res.Data.Items {
 		builder = append(builder, v.Title)
 	}
-	builder = append(builder, fmt.Sprintf("%s", res.Data.Title))
+	builder = append(builder, res.Data.Title)
 	resp.SUCCESS(c, strings.Join(builder, "\n\n"))
 }

@@ -196,36 +208,121 @@ func (h *FunctionHandler) Dall3(c *gin.Context) {

 	// create dall task
 	prompt := utils.InterfaceToString(params["prompt"])
-	job := model.DallJob{
-		UserId: user.Id,
-		Prompt: prompt,
-		Power:  h.App.SysConfig.DallPower,
+	task := types.DallTask{
+		UserId:           user.Id,
+		Prompt:           prompt,
+		ModelId:          0,
+		ModelName:        "dall-e-3",
+		TranslateModelId: h.App.SysConfig.AssistantModelId,
+		N:                1,
+		Quality:          "standard",
+		Size:             "1024x1024",
+		Style:            "vivid",
+		Power:            h.App.SysConfig.DallPower,
 	}
-	res = h.DB.Create(&job)
-
-	if res.Error != nil {
-		resp.ERROR(c, "创建 DALL-E 绘图任务失败："+res.Error.Error())
+	job := model.DallJob{
+		UserId:   user.Id,
+		Prompt:   prompt,
+		Power:    h.App.SysConfig.DallPower,
+		TaskInfo: utils.JsonEncode(task),
+	}
+	err := h.DB.Create(&job).Error
+	if err != nil {
+		resp.ERROR(c, "创建 DALL-E 绘图任务失败："+err.Error())
 		return
 	}

-	content, err := h.dallService.Image(types.DallTask{
-		JobId:   job.Id,
-		UserId:  user.Id,
-		Prompt:  job.Prompt,
-		N:       1,
-		Quality: "standard",
-		Size:    "1024x1024",
-		Style:   "vivid",
-		Power:   job.Power,
-	}, true)
+	task.Id = job.Id
+	content, err := h.dallService.Image(task, true)
 	if err != nil {
 		resp.ERROR(c, "任务执行失败："+err.Error())
 		return
 	}

+	// 扣减算力
+	err = h.userService.DecreasePower(user.Id, job.Power, model.PowerLog{
+		Type:   types.PowerConsume,
+		Model:  task.ModelName,
+		Remark: fmt.Sprintf("绘画提示词：%s", utils.CutWords(job.Prompt, 10)),
+	})
+	if err != nil {
+		resp.ERROR(c, "扣减算力失败："+err.Error())
+		return
+	}
+
 	resp.SUCCESS(c, content)
 }

+// 实现一个联网搜索的函数工具，采用爬虫实现
+func (h *FunctionHandler) WebSearch(c *gin.Context) {
+	if err := h.checkAuth(c); err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	var params map[string]interface{}
+	if err := c.ShouldBindJSON(&params); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	// 从参数中获取搜索关键词
+	keyword, ok := params["keyword"].(string)
+	if !ok || keyword == "" {
+		resp.ERROR(c, "搜索关键词不能为空")
+		return
+	}
+
+	// 从参数中获取最大页数，默认为1页
+	maxPages := 1
+	if pages, ok := params["max_pages"].(float64); ok {
+		maxPages = int(pages)
+	}
+
+	// 获取用户ID
+	userID, ok := params["user_id"].(float64)
+	if !ok {
+		resp.ERROR(c, "用户ID不能为空")
+		return
+	}
+
+	// 查询用户信息
+	var user model.User
+	res := h.DB.Where("id = ?", int(userID)).First(&user)
+	if res.Error != nil {
+		resp.ERROR(c, "用户不存在")
+		return
+	}
+
+	// 检查用户算力是否足够
+	searchPower := 1 // 每次搜索消耗1点算力
+	if user.Power < searchPower {
+		resp.ERROR(c, "算力不足，无法执行网络搜索")
+		return
+	}
+
+	// 执行网络搜索
+	searchResults, err := crawler.SearchWeb(keyword, maxPages)
+	if err != nil {
+		resp.ERROR(c, fmt.Sprintf("搜索失败: %v", err))
+		return
+	}
+
+	// 扣减用户算力
+	err = h.userService.DecreasePower(user.Id, searchPower, model.PowerLog{
+		Type:   types.PowerConsume,
+		Model:  "web_search",
+		Remark: fmt.Sprintf("网络搜索：%s", utils.CutWords(keyword, 10)),
+	})
+	if err != nil {
+		resp.ERROR(c, "扣减算力失败："+err.Error())
+		return
+	}
+
+	// 返回搜索结果
+	resp.SUCCESS(c, searchResults)
+}
+
 // List 获取所有的工具函数列表
 func (h *FunctionHandler) List(c *gin.Context) {
 	var items []model.Function
--- a/api/handler/jimeng_handler.go
+++ b/api/handler/jimeng_handler.go
@@ -0,0 +1,442 @@
+package handler
+
+import (
+	"fmt"
+
+	"geekai/core"
+	"geekai/core/types"
+	"geekai/service"
+	"geekai/service/jimeng"
+	"geekai/store/model"
+	"geekai/store/vo"
+	"geekai/utils"
+	"geekai/utils/resp"
+
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+// JimengHandler 即梦AI处理器
+type JimengHandler struct {
+	BaseHandler
+	jimengService *jimeng.Service
+	userService   *service.UserService
+}
+
+// NewJimengHandler 创建即梦AI处理器
+func NewJimengHandler(app *core.AppServer, jimengService *jimeng.Service, db *gorm.DB, userService *service.UserService) *JimengHandler {
+	return &JimengHandler{
+		BaseHandler:   BaseHandler{App: app, DB: db},
+		jimengService: jimengService,
+		userService:   userService,
+	}
+}
+
+// RegisterRoutes 注册路由，新增统一任务接口
+func (h *JimengHandler) RegisterRoutes() {
+	rg := h.App.Engine.Group("/api/jimeng")
+	rg.POST("task", h.CreateTask)            // 只保留统一任务接口
+	rg.GET("power-config", h.GetPowerConfig) // 新增算力配置接口
+	rg.POST("jobs", h.Jobs)
+	rg.GET("remove", h.Remove)
+	rg.GET("retry", h.Retry)
+}
+
+// JimengTaskRequest 统一任务请求结构体
+// 支持所有生图和生成视频类型
+type JimengTaskRequest struct {
+	TaskType         string   `json:"task_type" binding:"required"`
+	Prompt           string   `json:"prompt"`
+	ImageInput       string   `json:"image_input"`
+	ImageUrls        []string `json:"image_urls"`
+	BinaryDataBase64 []string `json:"binary_data_base64"`
+	Scale            float64  `json:"scale"`
+	Width            int      `json:"width"`
+	Height           int      `json:"height"`
+	Gpen             float64  `json:"gpen"`
+	Skin             float64  `json:"skin"`
+	SkinUnifi        float64  `json:"skin_unifi"`
+	GenMode          string   `json:"gen_mode"`
+	Seed             int64    `json:"seed"`
+	UsePreLLM        bool     `json:"use_pre_llm"`
+	TemplateId       string   `json:"template_id"`
+	AspectRatio      string   `json:"aspect_ratio"`
+}
+
+// CreateTask 统一任务创建接口
+func (h *JimengHandler) CreateTask(c *gin.Context) {
+	var req JimengTaskRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+	// 新增：除图像特效外，其他任务类型必须有提示词
+	if req.TaskType != "image_effects" && req.Prompt == "" {
+		resp.ERROR(c, "提示词不能为空")
+		return
+	}
+	user, err := h.GetLoginUser(c)
+	if err != nil {
+		resp.NotAuth(c)
+		return
+	}
+
+	if req.Width == 0 {
+		req.Width = 1328
+	}
+	if req.Height == 0 {
+		req.Height = 1328
+	}
+	if req.Seed == 0 {
+		req.Seed = -1
+	}
+
+	var powerCost int
+	var taskType model.JMTaskType
+	var params map[string]any
+	var reqKey string
+	var modelName string
+
+	switch req.TaskType {
+	case "text_to_image":
+		powerCost = h.getPowerFromConfig(model.JMTaskTypeTextToImage)
+		taskType = model.JMTaskTypeTextToImage
+		reqKey = jimeng.ReqKeyTextToImage
+		modelName = "即梦文生图"
+		if req.Scale == 0 {
+			req.Scale = 2.5
+		}
+		params = map[string]any{
+			"seed":        req.Seed,
+			"scale":       req.Scale,
+			"width":       req.Width,
+			"height":      req.Height,
+			"use_pre_llm": req.UsePreLLM,
+		}
+	case "image_to_image":
+		powerCost = h.getPowerFromConfig(model.JMTaskTypeImageToImage)
+		taskType = model.JMTaskTypeImageToImage
+		reqKey = jimeng.ReqKeyImageToImagePortrait
+		modelName = "即梦图生图"
+		if req.Gpen == 0 {
+			req.Gpen = 0.4
+		}
+		if req.Skin == 0 {
+			req.Skin = 0.3
+		}
+		if req.GenMode == "" {
+			if req.Prompt != "" {
+				req.GenMode = jimeng.GenModeCreative
+			} else {
+				req.GenMode = jimeng.GenModeReference
+			}
+		}
+		params = map[string]any{
+			"image_input": req.ImageInput,
+			"width":       req.Width,
+			"height":      req.Height,
+			"gpen":        req.Gpen,
+			"skin":        req.Skin,
+			"skin_unifi":  req.SkinUnifi,
+			"gen_mode":    req.GenMode,
+			"seed":        req.Seed,
+		}
+	case "image_edit":
+		powerCost = h.getPowerFromConfig(model.JMTaskTypeImageEdit)
+		taskType = model.JMTaskTypeImageEdit
+		reqKey = jimeng.ReqKeyImageEdit
+		modelName = "即梦图像编辑"
+		if req.Scale == 0 {
+			req.Scale = 0.5
+		}
+		params = map[string]any{
+			"seed":  req.Seed,
+			"scale": req.Scale,
+		}
+		if len(req.ImageUrls) > 0 {
+			params["image_urls"] = req.ImageUrls
+		}
+		if len(req.BinaryDataBase64) > 0 {
+			params["binary_data_base64"] = req.BinaryDataBase64
+		}
+	case "image_effects":
+		powerCost = h.getPowerFromConfig(model.JMTaskTypeImageEffects)
+		taskType = model.JMTaskTypeImageEffects
+		reqKey = jimeng.ReqKeyImageEffects
+		modelName = "即梦图像特效"
+		if req.Width == 0 {
+			req.Width = 1328
+		}
+		if req.Height == 0 {
+			req.Height = 1328
+		}
+		params = map[string]any{
+			"image_input1": req.ImageInput,
+			"template_id":  req.TemplateId,
+			"width":        req.Width,
+			"height":       req.Height,
+		}
+	case "text_to_video":
+		powerCost = h.getPowerFromConfig(model.JMTaskTypeTextToVideo)
+		taskType = model.JMTaskTypeTextToVideo
+		reqKey = jimeng.ReqKeyTextToVideo
+		modelName = "即梦文生视频"
+		if req.Seed == 0 {
+			req.Seed = -1
+		}
+		if req.AspectRatio == "" {
+			req.AspectRatio = jimeng.AspectRatio16_9
+		}
+		params = map[string]any{
+			"seed":         req.Seed,
+			"aspect_ratio": req.AspectRatio,
+		}
+	case "image_to_video":
+		powerCost = h.getPowerFromConfig(model.JMTaskTypeImageToVideo)
+		taskType = model.JMTaskTypeImageToVideo
+		reqKey = jimeng.ReqKeyImageToVideo
+		modelName = "即梦图生视频"
+		if req.Seed == 0 {
+			req.Seed = -1
+		}
+		params = map[string]any{
+			"seed":         req.Seed,
+			"aspect_ratio": req.AspectRatio,
+		}
+		if len(req.ImageUrls) > 0 {
+			params["image_urls"] = req.ImageUrls
+		}
+		if len(req.BinaryDataBase64) > 0 {
+			params["binary_data_base64"] = req.BinaryDataBase64
+		}
+	default:
+		resp.ERROR(c, "不支持的任务类型")
+		return
+	}
+
+	if user.Power < powerCost {
+		resp.ERROR(c, fmt.Sprintf("算力不足，需要%d算力", powerCost))
+		return
+	}
+
+	taskReq := &jimeng.CreateTaskRequest{
+		Type:   taskType,
+		Prompt: req.Prompt,
+		Params: params,
+		ReqKey: reqKey,
+		Power:  powerCost,
+	}
+
+	job, err := h.jimengService.CreateTask(user.Id, taskReq)
+	if err != nil {
+		logger.Errorf("create jimeng task failed: %v", err)
+		resp.ERROR(c, "创建任务失败")
+		return
+	}
+
+	h.userService.DecreasePower(user.Id, powerCost, model.PowerLog{
+		Type:   types.PowerConsume,
+		Model:  "jimeng",
+		Remark: fmt.Sprintf("%s，任务ID：%d", modelName, job.Id),
+	})
+
+	resp.SUCCESS(c, job)
+}
+
+// Jobs 获取任务列表
+func (h *JimengHandler) Jobs(c *gin.Context) {
+	userId := h.GetLoginUserId(c)
+
+	var req struct {
+		Page     int    `json:"page"`
+		PageSize int    `json:"page_size"`
+		Filter   string `json:"filter"`
+		Ids      []uint `json:"ids"`
+	}
+
+	if err := c.ShouldBindJSON(&req); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	var jobs []model.JimengJob
+	var total int64
+	query := h.DB.Model(&model.JimengJob{}).Where("user_id = ?", userId)
+
+	switch req.Filter {
+	case "image":
+		query = query.Where("type IN (?)", []model.JMTaskType{
+			model.JMTaskTypeTextToImage,
+			model.JMTaskTypeImageToImage,
+			model.JMTaskTypeImageEdit,
+			model.JMTaskTypeImageEffects,
+		})
+	case "video":
+		query = query.Where("type IN (?)", []model.JMTaskType{
+			model.JMTaskTypeTextToVideo,
+			model.JMTaskTypeImageToVideo,
+		})
+	}
+
+	if len(req.Ids) > 0 {
+		query = query.Where("id IN (?)", req.Ids)
+	}
+
+	// 统计总数
+	if err := query.Count(&total).Error; err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	// 分页查询
+	offset := (req.Page - 1) * req.PageSize
+	if err := query.Order("updated_at DESC").Offset(offset).Limit(req.PageSize).Find(&jobs).Error; err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	// 填充 VO
+	var jobVos []vo.JimengJob
+	for _, job := range jobs {
+		var jobVo vo.JimengJob
+		err := utils.CopyObject(job, &jobVo)
+		if err != nil {
+			continue
+		}
+		jobVo.CreatedAt = job.CreatedAt.Unix()
+		jobVos = append(jobVos, jobVo)
+	}
+	resp.SUCCESS(c, vo.NewPage(total, req.Page, req.PageSize, jobVos))
+}
+
+// Remove 删除任务
+func (h *JimengHandler) Remove(c *gin.Context) {
+	user, err := h.GetLoginUser(c)
+	if err != nil {
+		resp.NotAuth(c)
+		return
+	}
+
+	jobId := h.GetInt(c, "id", 0)
+	if jobId == 0 {
+		resp.ERROR(c, "参数错误")
+		return
+	}
+
+	// 获取任务，判断状态
+	job, err := h.jimengService.GetJob(uint(jobId))
+	if err != nil {
+		resp.ERROR(c, "任务不存在")
+		return
+	}
+	if job.UserId != user.Id {
+		resp.ERROR(c, "无权限操作")
+		return
+	}
+	if job.Status != model.JMTaskStatusFailed {
+		resp.ERROR(c, "只有失败的任务才能删除")
+		return
+	}
+
+	tx := h.DB.Begin()
+	if err := tx.Where("id = ? AND user_id = ?", jobId, user.Id).Delete(&model.JimengJob{}).Error; err != nil {
+		logger.Errorf("delete jimeng job failed: %v", err)
+		resp.ERROR(c, "删除任务失败")
+		return
+	}
+
+	// 退回算力
+	err = h.userService.IncreasePower(user.Id, job.Power, model.PowerLog{
+		Type:   types.PowerRefund,
+		Model:  "jimeng",
+		Remark: fmt.Sprintf("删除任务，退回%d算力", job.Power),
+	})
+	if err != nil {
+		resp.ERROR(c, "退回算力失败")
+		tx.Rollback()
+		return
+	}
+	tx.Commit()
+
+	resp.SUCCESS(c, gin.H{})
+}
+
+// Retry 重试任务
+func (h *JimengHandler) Retry(c *gin.Context) {
+	userId := h.GetLoginUserId(c)
+
+	jobId := h.GetInt(c, "id", 0)
+	if jobId == 0 {
+		resp.ERROR(c, "参数错误")
+		return
+	}
+
+	// 检查任务是否存在且属于当前用户
+	job, err := h.jimengService.GetJob(uint(jobId))
+	if err != nil {
+		resp.ERROR(c, "任务不存在")
+		return
+	}
+
+	if job.UserId != userId {
+		resp.ERROR(c, "无权限操作")
+		return
+	}
+
+	// 只有失败的任务才能重试
+	if job.Status != model.JMTaskStatusFailed {
+		resp.ERROR(c, "只有失败的任务才能重试")
+		return
+	}
+
+	// 重置任务状态
+	if err := h.jimengService.UpdateJobStatus(uint(jobId), model.JMTaskStatusInQueue, ""); err != nil {
+		logger.Errorf("reset job status failed: %v", err)
+		resp.ERROR(c, "重置任务状态失败")
+		return
+	}
+
+	// 重新推送到队列
+	if err := h.jimengService.PushTaskToQueue(uint(jobId)); err != nil {
+		logger.Errorf("push retry task to queue failed: %v", err)
+		resp.ERROR(c, "推送重试任务失败")
+		return
+	}
+
+	resp.SUCCESS(c, gin.H{"message": "重试任务已提交"})
+}
+
+// getPowerFromConfig 从配置中获取指定类型的算力消耗
+func (h *JimengHandler) getPowerFromConfig(taskType model.JMTaskType) int {
+	config := h.jimengService.GetConfig()
+
+	switch taskType {
+	case model.JMTaskTypeTextToImage:
+		return config.Power.TextToImage
+	case model.JMTaskTypeImageToImage:
+		return config.Power.ImageToImage
+	case model.JMTaskTypeImageEdit:
+		return config.Power.ImageEdit
+	case model.JMTaskTypeImageEffects:
+		return config.Power.ImageEffects
+	case model.JMTaskTypeTextToVideo:
+		return config.Power.TextToVideo
+	case model.JMTaskTypeImageToVideo:
+		return config.Power.ImageToVideo
+	default:
+		return 10
+	}
+}
+
+// GetPowerConfig 获取即梦各任务类型算力消耗配置
+func (h *JimengHandler) GetPowerConfig(c *gin.Context) {
+	config := h.jimengService.GetConfig()
+	resp.SUCCESS(c, gin.H{
+		"text_to_image":  config.Power.TextToImage,
+		"image_to_image": config.Power.ImageToImage,
+		"image_edit":     config.Power.ImageEdit,
+		"image_effects":  config.Power.ImageEffects,
+		"text_to_video":  config.Power.TextToVideo,
+		"image_to_video": config.Power.ImageToVideo,
+	})
+}
--- a/api/handler/markmap_handler.go
+++ b/api/handler/markmap_handler.go
@@ -8,24 +8,16 @@ package handler
 // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"errors"
 	"fmt"
 	"geekai/core"
 	"geekai/core/types"
 	"geekai/service"
 	"geekai/store/model"
 	"geekai/utils"
+	"geekai/utils/resp"
+
 	"github.com/gin-gonic/gin"
-	"github.com/gorilla/websocket"
 	"gorm.io/gorm"
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
 )

 // MarkMapHandler 生成思维导图
@@ -43,69 +35,35 @@ func NewMarkMapHandler(app *core.AppServer, db *gorm.DB, userService *service.Us
 	}
 }

-func (h *MarkMapHandler) Client(c *gin.Context) {
-	ws, err := (&websocket.Upgrader{CheckOrigin: func(r *http.Request) bool { return true }}).Upgrade(c.Writer, c.Request, nil)
-	if err != nil {
-		logger.Error(err)
+// Generate 生成思维导图
+func (h *MarkMapHandler) Generate(c *gin.Context) {
+	var data struct {
+		Prompt  string `json:"prompt"`
+		ModelId int    `json:"model_id"`
+	}
+
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
 		return
 	}

-	modelId := h.GetInt(c, "model_id", 0)
-	userId := h.GetInt(c, "user_id", 0)
-
-	client := types.NewWsClient(ws)
-	h.clients.Put(userId, client)
-	go func() {
-		for {
-			_, msg, err := client.Receive()
-			if err != nil {
-				client.Close()
-				h.clients.Delete(userId)
-				return
-			}
-
-			var message types.WsMessage
-			err = utils.JsonDecode(string(msg), &message)
-			if err != nil {
-				continue
-			}
-
-			// 心跳消息
-			if message.Type == "heartbeat" {
-				logger.Debug("收到 MarkMap 心跳消息：", message.Content)
-				continue
-			}
-			// change model
-			if message.Type == "model_id" {
-				modelId = utils.IntValue(utils.InterfaceToString(message.Content), 0)
-				continue
-			}
-
-			logger.Info("Receive a message: ", message.Content)
-			err = h.sendMessage(client, utils.InterfaceToString(message.Content), modelId, userId)
-			if err != nil {
-				logger.Error(err)
-				utils.ReplyChunkMessage(client, types.WsMessage{Type: types.WsErr, Content: err.Error()})
-			}
-
-		}
-	}()
-}
-
-func (h *MarkMapHandler) sendMessage(client *types.WsClient, prompt string, modelId int, userId int) error {
+	userId := h.GetLoginUserId(c)
 	var user model.User
-	res := h.DB.Model(&model.User{}).First(&user, userId)
-	if res.Error != nil {
-		return fmt.Errorf("error with query user info: %v", res.Error)
+	err := h.DB.Where("id", userId).First(&user, userId).Error
+	if err != nil {
+		resp.ERROR(c, "error with query user info")
+		return
 	}
 	var chatModel model.ChatModel
-	res = h.DB.Where("id", modelId).First(&chatModel)
-	if res.Error != nil {
-		return fmt.Errorf("error with query chat model: %v", res.Error)
+	err = h.DB.Where("id", data.ModelId).First(&chatModel).Error
+	if err != nil {
+		resp.ERROR(c, "error with query chat model")
+		return
 	}

 	if user.Power < chatModel.Power {
-		return fmt.Errorf("您当前剩余算力（%d）已不足以支付当前模型算力（%d）！", user.Power, chatModel.Power)
+		resp.ERROR(c, fmt.Sprintf("您当前剩余算力（%d）已不足以支付当前模型算力（%d）！", user.Power, chatModel.Power))
+		return
 	}

 	messages := make([]interface{}, 0)
@@ -127,63 +85,13 @@ func (h *MarkMapHandler) sendMessage(client *types.WsClient, prompt string, mode
 ### 支付宝
 ### 微信

-另外，除此之外不要任何解释性语句。
+请直接生成结果，不要任何解释性语句。
 `})
-	messages = append(messages, types.Message{Role: "user", Content: fmt.Sprintf("请生成一份有关【%s】一份思维导图，要求结构清晰，有条理", prompt)})
-	var req = types.ApiRequest{
-		Model:    chatModel.Value,
-		Stream:   true,
-		Messages: messages,
-	}
-
-	var apiKey model.ApiKey
-	response, err := h.doRequest(req, chatModel, &apiKey)
+	messages = append(messages, types.Message{Role: "user", Content: fmt.Sprintf("请生成一份有关【%s】一份思维导图，要求结构清晰，有条理", data.Prompt)})
+	content, err := utils.SendOpenAIMessage(h.DB, messages, data.ModelId)
 	if err != nil {
-		return fmt.Errorf("请求 OpenAI API 失败: %s", err)
-	}
-
-	defer response.Body.Close()
-
-	contentType := response.Header.Get("Content-Type")
-	if strings.Contains(contentType, "text/event-stream") {
-		// 循环读取 Chunk 消息
-		scanner := bufio.NewScanner(response.Body)
-		var isNew = true
-		for scanner.Scan() {
-			line := scanner.Text()
-			if !strings.Contains(line, "data:") || len(line) < 30 {
-				continue
-			}
-
-			var responseBody = types.ApiResponse{}
-			err = json.Unmarshal([]byte(line[6:]), &responseBody)
-			if err != nil { // 数据解析出错
-				return fmt.Errorf("error with decode data: %v", line)
-			}
-
-			if len(responseBody.Choices) == 0 { // Fixed: 兼容 Azure API 第一个输出空行
-				continue
-			}
-
-			if responseBody.Choices[0].FinishReason == "stop" {
-				break
-			}
-
-			if isNew {
-				utils.ReplyChunkMessage(client, types.WsMessage{Type: types.WsStart})
-				isNew = false
-			}
-			utils.ReplyChunkMessage(client, types.WsMessage{
-				Type:    types.WsMiddle,
-				Content: utils.InterfaceToString(responseBody.Choices[0].Delta.Content),
-			})
-		} // end for
-
-		utils.ReplyChunkMessage(client, types.WsMessage{Type: types.WsEnd})
-
-	} else {
-		body, _ := io.ReadAll(response.Body)
-		return fmt.Errorf("请求 OpenAI API 失败：%s", string(body))
+		resp.ERROR(c, fmt.Sprintf("请求 OpenAI API 失败: %s", err))
+		return
 	}

 	// 扣减算力
@@ -194,55 +102,10 @@ func (h *MarkMapHandler) sendMessage(client *types.WsClient, prompt string, mode
 			Remark: fmt.Sprintf("AI绘制思维导图，模型名称：%s, ", chatModel.Value),
 		})
 		if err != nil {
-			return err
+			resp.ERROR(c, "error with save power log, "+err.Error())
+			return
 		}
 	}

-	return nil
-}
-
-func (h *MarkMapHandler) doRequest(req types.ApiRequest, chatModel model.ChatModel, apiKey *model.ApiKey) (*http.Response, error) {
-
-	session := h.DB.Session(&gorm.Session{})
-	// if the chat model bind a KEY, use it directly
-	if chatModel.KeyId > 0 {
-		session = session.Where("id", chatModel.KeyId)
-	} else { // use the last unused key
-		session = session.Where("type", "chat").
-			Where("enabled", true).Order("last_used_at ASC")
-	}
-
-	res := session.First(apiKey)
-	if res.Error != nil {
-		return nil, errors.New("no available key, please import key")
-	}
-	apiURL := fmt.Sprintf("%s/v1/chat/completions", apiKey.ApiURL)
-	// 更新 API KEY 的最后使用时间
-	h.DB.Model(apiKey).UpdateColumn("last_used_at", time.Now().Unix())
-
-	// 创建 HttpClient 请求对象
-	var client *http.Client
-	requestBody, err := json.Marshal(req)
-	if err != nil {
-		return nil, err
-	}
-	request, err := http.NewRequest(http.MethodPost, apiURL, bytes.NewBuffer(requestBody))
-	if err != nil {
-		return nil, err
-	}
-
-	request.Header.Set("Content-Type", "application/json")
-	if len(apiKey.ProxyURL) > 5 { // 使用代理
-		proxy, _ := url.Parse(apiKey.ProxyURL)
-		client = &http.Client{
-			Transport: &http.Transport{
-				Proxy: http.ProxyURL(proxy),
-			},
-		}
-	} else {
-		client = http.DefaultClient
-	}
-	request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", apiKey.Value))
-	logger.Debugf("Sending %s request, API KEY:%s, PROXY: %s, Model: %s", apiKey.ApiURL, apiURL, apiKey.ProxyURL, req.Model)
-	return client.Do(request)
+	resp.SUCCESS(c, content)
 }
--- a/api/handler/mj_handler.go
+++ b/api/handler/mj_handler.go
@@ -8,7 +8,6 @@ package handler
 // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 import (
-	"encoding/base64"
 	"fmt"
 	"geekai/core"
 	"geekai/core/types"
@@ -19,12 +18,10 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
-	"net/http"
 	"strings"
 	"time"

 	"github.com/gin-gonic/gin"
-	"github.com/gorilla/websocket"
 	"gorm.io/gorm"
 )

@@ -65,27 +62,6 @@ func (h *MidJourneyHandler) preCheck(c *gin.Context) bool {

 }

-// Client WebSocket 客户端，用于通知任务状态变更
-func (h *MidJourneyHandler) Client(c *gin.Context) {
-	ws, err := (&websocket.Upgrader{CheckOrigin: func(r *http.Request) bool { return true }}).Upgrade(c.Writer, c.Request, nil)
-	if err != nil {
-		logger.Error(err)
-		c.Abort()
-		return
-	}
-
-	userId := h.GetInt(c, "user_id", 0)
-	if userId == 0 {
-		logger.Info("Invalid user ID")
-		c.Abort()
-		return
-	}
-
-	client := types.NewWsClient(ws)
-	h.mjService.Clients.Put(uint(userId), client)
-	logger.Infof("New websocket connected, IP: %s", c.RemoteIP())
-}
-
 // Image 创建一个绘画任务
 func (h *MidJourneyHandler) Image(c *gin.Context) {
 	var data struct {
@@ -175,10 +151,22 @@ func (h *MidJourneyHandler) Image(c *gin.Context) {
 		resp.ERROR(c, "error with generate task id: "+err.Error())
 		return
 	}
+	task := types.MjTask{
+		TaskId:           taskId,
+		Type:             types.TaskType(data.TaskType),
+		Prompt:           data.Prompt,
+		NegPrompt:        data.NegPrompt,
+		Params:           params,
+		UserId:           userId,
+		ImgArr:           data.ImgArr,
+		Mode:             h.App.SysConfig.MjMode,
+		TranslateModelId: h.App.SysConfig.AssistantModelId,
+	}
 	job := model.MidJourneyJob{
 		Type:      data.TaskType,
-		UserId:    userId,
+		UserId:    uint(userId),
 		TaskId:    taskId,
+		TaskInfo:  utils.JsonEncode(task),
 		Progress:  0,
 		Prompt:    fmt.Sprintf("%s %s", data.Prompt, params),
 		Power:     h.App.SysConfig.MjPower,
@@ -198,22 +186,8 @@ func (h *MidJourneyHandler) Image(c *gin.Context) {
 		return
 	}

-	h.mjService.PushTask(types.MjTask{
-		Id:        job.Id,
-		TaskId:    taskId,
-		Type:      types.TaskType(data.TaskType),
-		Prompt:    data.Prompt,
-		NegPrompt: data.NegPrompt,
-		Params:    params,
-		UserId:    userId,
-		ImgArr:    data.ImgArr,
-		Mode:      h.App.SysConfig.MjMode,
-	})
-
-	client := h.mjService.Clients.Get(uint(job.UserId))
-	if client != nil {
-		_ = client.Send([]byte("Task Updated"))
-	}
+	task.Id = job.Id
+	h.mjService.PushTask(task)

 	// update user's power
 	err = h.userService.DecreasePower(job.UserId, job.Power, model.PowerLog{
@@ -251,22 +225,7 @@ func (h *MidJourneyHandler) Upscale(c *gin.Context) {
 	idValue, _ := c.Get(types.LoginUserID)
 	userId := utils.IntValue(utils.InterfaceToString(idValue), 0)
 	taskId, _ := h.snowflake.Next(true)
-	job := model.MidJourneyJob{
-		Type:        types.TaskUpscale.String(),
-		ReferenceId: data.MessageId,
-		UserId:      userId,
-		TaskId:      taskId,
-		Progress:    0,
-		Power:       h.App.SysConfig.MjActionPower,
-		CreatedAt:   time.Now(),
-	}
-	if res := h.DB.Create(&job); res.Error != nil || res.RowsAffected == 0 {
-		resp.ERROR(c, "添加任务失败："+res.Error.Error())
-		return
-	}
-
-	h.mjService.PushTask(types.MjTask{
-		Id:          job.Id,
+	task := types.MjTask{
 		Type:        types.TaskUpscale,
 		UserId:      userId,
 		ChannelId:   data.ChannelId,
@@ -274,12 +233,23 @@ func (h *MidJourneyHandler) Upscale(c *gin.Context) {
 		MessageId:   data.MessageId,
 		MessageHash: data.MessageHash,
 		Mode:        h.App.SysConfig.MjMode,
-	})
-
-	client := h.mjService.Clients.Get(uint(job.UserId))
-	if client != nil {
-		_ = client.Send([]byte("Task Updated"))
 	}
+	job := model.MidJourneyJob{
+		Type:      types.TaskUpscale.String(),
+		UserId:    uint(userId),
+		TaskId:    taskId,
+		TaskInfo:  utils.JsonEncode(task),
+		Progress:  0,
+		Power:     h.App.SysConfig.MjActionPower,
+		CreatedAt: time.Now(),
+	}
+	if res := h.DB.Create(&job); res.Error != nil || res.RowsAffected == 0 {
+		resp.ERROR(c, "添加任务失败："+res.Error.Error())
+		return
+	}
+
+	task.Id = job.Id
+	h.mjService.PushTask(task)

 	// update user's power
 	err := h.userService.DecreasePower(job.UserId, job.Power, model.PowerLog{
@@ -310,23 +280,7 @@ func (h *MidJourneyHandler) Variation(c *gin.Context) {
 	idValue, _ := c.Get(types.LoginUserID)
 	userId := utils.IntValue(utils.InterfaceToString(idValue), 0)
 	taskId, _ := h.snowflake.Next(true)
-	job := model.MidJourneyJob{
-		Type:        types.TaskVariation.String(),
-		ChannelId:   data.ChannelId,
-		ReferenceId: data.MessageId,
-		UserId:      userId,
-		TaskId:      taskId,
-		Progress:    0,
-		Power:       h.App.SysConfig.MjActionPower,
-		CreatedAt:   time.Now(),
-	}
-	if res := h.DB.Create(&job); res.Error != nil || res.RowsAffected == 0 {
-		resp.ERROR(c, "添加任务失败："+res.Error.Error())
-		return
-	}
-
-	h.mjService.PushTask(types.MjTask{
-		Id:          job.Id,
+	task := types.MjTask{
 		Type:        types.TaskVariation,
 		UserId:      userId,
 		Index:       data.Index,
@@ -334,12 +288,24 @@ func (h *MidJourneyHandler) Variation(c *gin.Context) {
 		MessageId:   data.MessageId,
 		MessageHash: data.MessageHash,
 		Mode:        h.App.SysConfig.MjMode,
-	})
-
-	client := h.mjService.Clients.Get(uint(job.UserId))
-	if client != nil {
-		_ = client.Send([]byte("Task Updated"))
 	}
+	job := model.MidJourneyJob{
+		Type:      types.TaskVariation.String(),
+		ChannelId: data.ChannelId,
+		UserId:    uint(userId),
+		TaskId:    taskId,
+		TaskInfo:  utils.JsonEncode(task),
+		Progress:  0,
+		Power:     h.App.SysConfig.MjActionPower,
+		CreatedAt: time.Now(),
+	}
+	if res := h.DB.Create(&job); res.Error != nil || res.RowsAffected == 0 {
+		resp.ERROR(c, "添加任务失败："+res.Error.Error())
+		return
+	}
+
+	task.Id = job.Id
+	h.mjService.PushTask(task)

 	err := h.userService.DecreasePower(job.UserId, job.Power, model.PowerLog{
 		Type:   types.PowerConsume,
@@ -420,14 +386,6 @@ func (h *MidJourneyHandler) getData(finish bool, userId uint, page int, pageSize
 		if err != nil {
 			continue
 		}
-
-		if item.Progress < 100 && item.ImgURL == "" && item.OrgURL != "" {
-			image, err := utils.DownloadImage(item.OrgURL, h.App.Config.ProxyURL)
-			if err == nil {
-				job.ImgURL = "data:image/png;base64," + base64.StdEncoding.EncodeToString(image)
-			}
-		}
-
 		jobs = append(jobs, job)
 	}
 	return nil, vo.NewPage(total, page, pageSize, jobs)
@@ -443,40 +401,19 @@ func (h *MidJourneyHandler) Remove(c *gin.Context) {
 		return
 	}

-	// remove job recode
-	tx := h.DB.Begin()
-	if err := tx.Delete(&job).Error; err != nil {
-		tx.Rollback()
+	// remove job
+	err := h.DB.Delete(&job).Error
+	if err != nil {
 		resp.ERROR(c, err.Error())
 		return
 	}

-	// 如果任务未完成，或者任务失败，则恢复用户算力
-	if job.Progress != 100 {
-		err := h.userService.IncreasePower(job.UserId, job.Power, model.PowerLog{
-			Type:   types.PowerRefund,
-			Model:  "mid-journey",
-			Remark: fmt.Sprintf("任务失败，退回算力。任务ID：%d，Err: %s", job.Id, job.ErrMsg),
-		})
-		if err != nil {
-			tx.Rollback()
-			resp.ERROR(c, err.Error())
-			return
-		}
-	}
-	tx.Commit()
-
 	// remove image
-	err := h.uploader.GetUploadHandler().Delete(job.ImgURL)
+	err = h.uploader.GetUploadHandler().Delete(job.ImgURL)
 	if err != nil {
 		logger.Error("remove image failed: ", err)
 	}

-	client := h.mjService.Clients.Get(uint(job.UserId))
-	if client != nil {
-		_ = client.Send([]byte("Task Updated"))
-	}
-
 	resp.SUCCESS(c)
 }

@@ -485,7 +422,7 @@ func (h *MidJourneyHandler) Publish(c *gin.Context) {
 	id := h.GetInt(c, "id", 0)
 	userId := h.GetInt(c, "user_id", 0)
 	action := h.GetBool(c, "action") // 发布动作，true => 发布，false => 取消分享
-	err := h.DB.Model(&model.MidJourneyJob{Id: uint(id), UserId: userId}).UpdateColumn("publish", action).Error
+	err := h.DB.Model(&model.MidJourneyJob{Id: uint(id), UserId: uint(userId)}).UpdateColumn("publish", action).Error
 	if err != nil {
 		resp.ERROR(c, err.Error())
 		return
--- a/api/handler/upload_handler.go
+++ b/api/handler/upload_handler.go
@@ -15,11 +15,12 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
-	"github.com/gin-gonic/gin"
-	"gorm.io/gorm"
 	"io"
 	"net/http"
 	"time"
+
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
 )

 type NetHandler struct {
@@ -46,7 +47,7 @@ func (h *NetHandler) Upload(c *gin.Context) {

 	userId := h.GetLoginUserId(c)
 	res := h.DB.Create(&model.File{
-		UserId:    int(userId),
+		UserId:    uint(userId),
 		Name:      file.Name,
 		ObjKey:    file.ObjKey,
 		URL:       file.URL,
@@ -64,7 +65,9 @@ func (h *NetHandler) Upload(c *gin.Context) {

 func (h *NetHandler) List(c *gin.Context) {
 	var data struct {
-		Urls []string `json:"urls,omitempty"`
+		Urls     []string `json:"urls,omitempty"`
+		Page     int      `json:"page"`
+		PageSize int      `json:"page_size"`
 	}
 	if err := c.ShouldBindJSON(&data); err != nil {
 		resp.ERROR(c, types.InvalidArgs)
@@ -79,21 +82,32 @@ func (h *NetHandler) List(c *gin.Context) {
 	if len(data.Urls) > 0 {
 		session = session.Where("url IN ?", data.Urls)
 	}
-	session.Find(&items)
-	if len(items) > 0 {
-		for _, v := range items {
-			var file vo.File
-			err := utils.CopyObject(v, &file)
-			if err != nil {
-				logger.Error(err)
-				continue
-			}
-			file.CreatedAt = v.CreatedAt.Unix()
-			files = append(files, file)
-		}
+	// 统计总数
+	var total int64
+	session.Model(&model.File{}).Count(&total)
+
+	if data.Page > 0 && data.PageSize > 0 {
+		offset := (data.Page - 1) * data.PageSize
+		session = session.Offset(offset).Limit(data.PageSize)
+	}
+	err := session.Order("id desc").Find(&items).Error
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
 	}

-	resp.SUCCESS(c, files)
+	for _, v := range items {
+		var file vo.File
+		err := utils.CopyObject(v, &file)
+		if err != nil {
+			logger.Error(err)
+			continue
+		}
+		file.CreatedAt = v.CreatedAt.Unix()
+		files = append(files, file)
+	}
+
+	resp.SUCCESS(c, vo.NewPage(total, data.Page, data.PageSize, files))
 }

 // Remove remove files
@@ -130,7 +144,15 @@ func (h *NetHandler) Download(c *gin.Context) {
 		return
 	}
 	// 使用http.Get下载文件
-	r, err := http.Get(fileUrl)
+	req, err := http.NewRequest("GET", fileUrl, nil)
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+	// 模拟浏览器 UA
+	req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36")
+	client := &http.Client{}
+	r, err := client.Do(req)
 	if err != nil {
 		resp.ERROR(c, err.Error())
 		return
@@ -143,6 +165,5 @@ func (h *NetHandler) Download(c *gin.Context) {
 	}

 	c.Status(http.StatusOK)
-	// 将下载的文件内容写入响应
 	_, _ = io.Copy(c.Writer, r.Body)
 }
--- a/api/handler/order_handler.go
+++ b/api/handler/order_handler.go
@@ -48,6 +48,16 @@ func (h *OrderHandler) List(c *gin.Context) {
 				order.Id = item.Id
 				order.CreatedAt = item.CreatedAt.Unix()
 				order.UpdatedAt = item.UpdatedAt.Unix()
+				payMethod, ok := types.PayMethods[item.PayWay]
+				if !ok {
+					payMethod = item.PayWay
+				}
+				payName, ok := types.PayNames[item.PayType]
+				if !ok {
+					payName = item.PayWay
+				}
+				order.PayMethod = payMethod
+				order.PayName = payName
 				list = append(list, order)
 			} else {
 				logger.Error(err)
--- a/api/handler/payment_handler.go
+++ b/api/handler/payment_handler.go
@@ -9,7 +9,6 @@ package handler

 import (
 	"embed"
-	"encoding/base64"
 	"fmt"
 	"geekai/core"
 	"geekai/core/types"
@@ -18,10 +17,7 @@ import (
 	"geekai/store/model"
 	"geekai/utils"
 	"geekai/utils/resp"
-	"github.com/shopspring/decimal"
-	"math"
 	"net/http"
-	"net/url"
 	"sync"
 	"time"

@@ -34,21 +30,15 @@ type PayWay struct {
 	Value string `json:"value"`
 }

-var (
-	PayWayAlipay = PayWay{Name: "支付宝", Value: "alipay"}
-	PayWayXunHu  = PayWay{Name: "虎皮椒", Value: "hupi"}
-	PayWayJs     = PayWay{Name: "PayJS", Value: "payjs"}
-	PayWayWechat = PayWay{Name: "微信支付", Value: "wechat"}
-)
-
 // PaymentHandler 支付服务回调 handler
 type PaymentHandler struct {
 	BaseHandler
 	alipayService    *payment.AlipayService
 	huPiPayService   *payment.HuPiPayService
-	jsPayService     *payment.JPayService
+	geekPayService   *payment.GeekPayService
 	wechatPayService *payment.WechatPayService
 	snowflake        *service.Snowflake
+	userService      *service.UserService
 	fs               embed.FS
 	lock             sync.Mutex
 	signKey          string // 用来签名的随机秘钥
@@ -58,17 +48,19 @@ func NewPaymentHandler(
 	server *core.AppServer,
 	alipayService *payment.AlipayService,
 	huPiPayService *payment.HuPiPayService,
-	jsPayService *payment.JPayService,
+	geekPayService *payment.GeekPayService,
 	wechatPayService *payment.WechatPayService,
 	db *gorm.DB,
+	userService *service.UserService,
 	snowflake *service.Snowflake,
 	fs embed.FS) *PaymentHandler {
 	return &PaymentHandler{
 		alipayService:    alipayService,
 		huPiPayService:   huPiPayService,
-		jsPayService:     jsPayService,
+		geekPayService:   geekPayService,
 		wechatPayService: wechatPayService,
 		snowflake:        snowflake,
+		userService:      userService,
 		fs:               fs,
 		lock:             sync.Mutex{},
 		BaseHandler: BaseHandler{
@@ -79,309 +71,167 @@ func NewPaymentHandler(
 	}
 }

-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
+func (h *PaymentHandler) Pay(c *gin.Context) {
+	var data struct {
+		PayWay    string `json:"pay_way"`
+		PayType   string `json:"pay_type"`
+		ProductId int    `json:"product_id"`
+		UserId    int    `json:"user_id"`
+		Device    string `json:"device"`
+		Host      string `json:"host"`
 	}
-
-	// 检查二维码是否过期
-	if time.Now().Unix()-int64(t) > int64(h.App.SysConfig.OrderPayTimeout) {
-		resp.ERROR(c, "支付二维码已过期，请重新生成！")
-		return
-	}
-
-	if orderNo == "" {
+	if err := c.ShouldBindJSON(&data); err != nil {
 		resp.ERROR(c, types.InvalidArgs)
 		return
 	}

-	var order model.Order
-	res := h.DB.Where("order_no = ?", orderNo).First(&order)
-	if res.Error != nil {
-		resp.ERROR(c, "Order not found")
+	var product model.Product
+	err := h.DB.Where("id", data.ProductId).First(&product).Error
+	if err != nil {
+		resp.ERROR(c, "Product not found")
 		return
 	}

-	// fix: 这里先检查一下订单状态，如果已经支付了，就直接返回
-	if order.Status == types.OrderPaidSuccess {
-		resp.ERROR(c, "订单已支付成功，无需重复支付！")
+	orderNo, err := h.snowflake.Next(false)
+	if err != nil {
+		resp.ERROR(c, "error with generate trade no: "+err.Error())
+		return
+	}
+	var user model.User
+	err = h.DB.Where("id", data.UserId).First(&user).Error
+	if err != nil {
+		resp.NotAuth(c)
 		return
 	}

-	// 更新扫码状态
-	h.DB.Model(&order).UpdateColumn("status", types.OrderScanned)
+	amount := product.Discount
+	var payURL, returnURL, notifyURL string
+	switch data.PayWay {
+	case "alipay":
+		if h.App.Config.AlipayConfig.NotifyURL != "" { // 用于本地调试支付
+			notifyURL = h.App.Config.AlipayConfig.NotifyURL
+		} else {
+			notifyURL = fmt.Sprintf("%s/api/payment/notify/alipay", data.Host)
+		}
+		if h.App.Config.AlipayConfig.ReturnURL != "" { // 用于本地调试支付
+			returnURL = h.App.Config.AlipayConfig.ReturnURL
+		} else {
+			returnURL = fmt.Sprintf("%s/payReturn", data.Host)
+		}
+		money := fmt.Sprintf("%.2f", amount)
+		if data.Device == "wechat" {
+			payURL, err = h.alipayService.PayMobile(payment.AlipayParams{
+				OutTradeNo: orderNo,
+				Subject:    product.Name,
+				TotalFee:   money,
+				ReturnURL:  returnURL,
+				NotifyURL:  notifyURL,
+			})
+		} else {
+			payURL, err = h.alipayService.PayPC(payment.AlipayParams{
+				OutTradeNo: orderNo,
+				Subject:    product.Name,
+				TotalFee:   money,
+				ReturnURL:  returnURL,
+				NotifyURL:  notifyURL,
+			})
+		}

-	if payWay == "alipay" { // 支付宝
-		amount := fmt.Sprintf("%.2f", order.Amount)
-		uri, err := h.alipayService.PayUrlMobile(order.OrderNo, amount, order.Subject)
 		if err != nil {
 			resp.ERROR(c, "error with generate pay url: "+err.Error())
 			return
 		}
-
-		c.Redirect(302, uri)
-		return
-	} else if payWay == "hupi" { // 虎皮椒支付
-		params := payment.HuPiPayReq{
-			Version:      "1.1",
-			TradeOrderId: orderNo,
-			TotalFee:     fmt.Sprintf("%f", order.Amount),
-			Title:        order.Subject,
-			NotifyURL:    h.App.Config.HuPiPayConfig.NotifyURL,
-			WapName:      "极客学长",
+		break
+	case "wechat":
+		if h.App.Config.WechatPayConfig.NotifyURL != "" {
+			notifyURL = h.App.Config.WechatPayConfig.NotifyURL
+		} else {
+			notifyURL = fmt.Sprintf("%s/api/payment/notify/wechat", data.Host)
+		}
+		if data.Device == "wechat" {
+			payURL, err = h.wechatPayService.PayUrlH5(payment.WechatPayParams{
+				OutTradeNo: orderNo,
+				TotalFee:   int(amount * 100),
+				Subject:    product.Name,
+				NotifyURL:  notifyURL,
+				ClientIP:   c.ClientIP(),
+			})
+		} else {
+			payURL, err = h.wechatPayService.PayUrlNative(payment.WechatPayParams{
+				OutTradeNo: orderNo,
+				TotalFee:   int(amount * 100),
+				Subject:    product.Name,
+				NotifyURL:  notifyURL,
+			})
 		}
-		r, err := h.huPiPayService.Pay(params)
 		if err != nil {
 			resp.ERROR(c, err.Error())
 			return
 		}
-
-		c.Redirect(302, r.URL)
-	}
-	resp.ERROR(c, "Invalid operations")
-}
-
-// PayQrcode 生成支付 URL 二维码
-func (h *PaymentHandler) PayQrcode(c *gin.Context) {
-	var data struct {
-		PayWay    string `json:"pay_way"` // 支付方式
-		ProductId uint   `json:"product_id"`
-	}
-	if err := c.ShouldBindJSON(&data); err != nil {
-		resp.ERROR(c, types.InvalidArgs)
-		return
-	}
-
-	var product model.Product
-	res := h.DB.First(&product, data.ProductId)
-	if res.Error != nil {
-		resp.ERROR(c, "Product not found")
-		return
-	}
-
-	orderNo, err := h.snowflake.Next(false)
-	if err != nil {
-		resp.ERROR(c, "error with generate trade no: "+err.Error())
-		return
-	}
-	user, err := h.GetLoginUser(c)
-	if err != nil {
-		resp.NotAuth(c)
-		return
-	}
-
-	var payWay string
-	var notifyURL string
-	switch data.PayWay {
+		break
 	case "hupi":
-		payWay = PayWayXunHu.Value
-		notifyURL = h.App.Config.HuPiPayConfig.NotifyURL
-		break
-	case "payjs":
-		payWay = PayWayJs.Value
-		notifyURL = h.App.Config.JPayConfig.NotifyURL
-		break
-	case "alipay":
-		payWay = PayWayAlipay.Value
-		notifyURL = h.App.Config.AlipayConfig.NotifyURL
-		break
-	default:
-		payWay = PayWayWechat.Value
-		notifyURL = h.App.Config.WechatPayConfig.NotifyURL
-
-	}
-	// 创建订单
-	remark := types.OrderRemark{
-		Days:     product.Days,
-		Power:    product.Power,
-		Name:     product.Name,
-		Price:    product.Price,
-		Discount: product.Discount,
-	}
-
-	amount, _ := decimal.NewFromFloat(product.Price).Sub(decimal.NewFromFloat(product.Discount)).Float64()
-	order := model.Order{
-		UserId:    user.Id,
-		Username:  user.Username,
-		ProductId: product.Id,
-		OrderNo:   orderNo,
-		Subject:   product.Name,
-		Amount:    amount,
-		Status:    types.OrderNotPaid,
-		PayWay:    payWay,
-		Remark:    utils.JsonEncode(remark),
-	}
-	res = h.DB.Create(&order)
-	if res.Error != nil || res.RowsAffected == 0 {
-		resp.ERROR(c, "error with create order: "+res.Error.Error())
-		return
-	}
-
-	// PayJs 单独处理，只能用官方生成的二维码
-	if data.PayWay == "payjs" {
-		params := payment.JPayReq{
-			TotalFee:   int(math.Ceil(order.Amount * 100)),
-			OutTradeNo: order.OrderNo,
-			Subject:    product.Name,
-		}
-		r := h.jsPayService.Pay(params)
-		if r.IsOK() {
-			resp.SUCCESS(c, gin.H{"order_no": order.OrderNo, "image": r.Qrcode})
-			return
+		if h.App.Config.HuPiPayConfig.NotifyURL != "" {
+			notifyURL = h.App.Config.HuPiPayConfig.NotifyURL
 		} else {
-			resp.ERROR(c, "error with generating payment qrcode: "+r.ReturnMsg)
-			return
+			notifyURL = fmt.Sprintf("%s/api/payment/notify/hupi", data.Host)
 		}
-	}
-
-	var logo string
-	if data.PayWay == "alipay" {
-		logo = "res/img/alipay.jpg"
-	} else if data.PayWay == "hupi" {
-		if h.App.Config.HuPiPayConfig.Name == "wechat" {
-			logo = "res/img/wechat-pay.jpg"
+		if h.App.Config.HuPiPayConfig.ReturnURL != "" {
+			returnURL = h.App.Config.HuPiPayConfig.ReturnURL
 		} else {
-			logo = "res/img/alipay.jpg"
+			returnURL = fmt.Sprintf("%s/payReturn", data.Host)
 		}
-	} else if data.PayWay == "wechat" {
-		logo = "res/img/wechat-pay.jpg"
-	}
-
-	file, err := h.fs.Open(logo)
-	if err != nil {
-		resp.ERROR(c, "error with open qrcode log file: "+err.Error())
-		return
-	}
-
-	parse, err := url.Parse(notifyURL)
-	if err != nil {
-		resp.ERROR(c, err.Error())
-		return
-	}
-	timestamp := time.Now().Unix()
-	signStr := fmt.Sprintf("%s-%s-%d-%s", orderNo, data.PayWay, timestamp, h.signKey)
-	sign := utils.Sha256(signStr)
-	var imageURL string
-	if data.PayWay == "wechat" {
-		payUrl, err := h.wechatPayService.PayUrlNative(order.OrderNo, int(math.Floor(order.Amount*100)), product.Name)
-		if err != nil {
-			resp.ERROR(c, "error with generating wechat payment qrcode: "+err.Error())
-			return
-		} else {
-			imageURL = payUrl
-		}
-	} else {
-		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())
-		return
-	}
-	imgDataBase64 := base64.StdEncoding.EncodeToString(imgData)
-	resp.SUCCESS(c, gin.H{"order_no": orderNo, "image": fmt.Sprintf("data:image/jpg;base64, %s", imgDataBase64), "url": imageURL})
-}
-
-// Mobile 移动端支付
-func (h *PaymentHandler) Mobile(c *gin.Context) {
-	var data struct {
-		PayWay    string `json:"pay_way"` // 支付方式
-		ProductId uint   `json:"product_id"`
-	}
-	if err := c.ShouldBindJSON(&data); err != nil {
-		resp.ERROR(c, types.InvalidArgs)
-		return
-	}
-
-	var product model.Product
-	res := h.DB.First(&product, data.ProductId)
-	if res.Error != nil {
-		resp.ERROR(c, "Product not found")
-		return
-	}
-
-	orderNo, err := h.snowflake.Next(false)
-	if err != nil {
-		resp.ERROR(c, "error with generate trade no: "+err.Error())
-		return
-	}
-	user, err := h.GetLoginUser(c)
-	if err != nil {
-		resp.NotAuth(c)
-		return
-	}
-
-	amount, _ := decimal.NewFromFloat(product.Price).Sub(decimal.NewFromFloat(product.Discount)).Float64()
-	var payWay string
-	var notifyURL, returnURL string
-	var payURL string
-	switch data.PayWay {
-	case "hupi":
-		payWay = PayWayXunHu.Name
-		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{
+		r, err := h.huPiPayService.Pay(payment.HuPiPayParams{
 			Version:      "1.1",
 			TradeOrderId: orderNo,
 			TotalFee:     fmt.Sprintf("%f", amount),
 			Title:        product.Name,
 			NotifyURL:    notifyURL,
 			ReturnURL:    returnURL,
-			CallbackURL:  returnURL,
-			WapName:      "极客学长",
-			WapUrl:       baseURL,
-			Type:         "WAP",
-		}
-		r, err := h.huPiPayService.Pay(params)
+			WapName:      "GeekAI助手",
+		})
 		if err != nil {
-			errMsg := "error with generating Pay Hupi URL: " + err.Error()
-			logger.Error(errMsg)
-			resp.ERROR(c, errMsg)
+			resp.ERROR(c, err.Error())
 			return
 		}
 		payURL = r.URL
-	case "payjs":
-		payWay = PayWayJs.Name
-		notifyURL = h.App.Config.JPayConfig.NotifyURL
-		returnURL = h.App.Config.JPayConfig.ReturnURL
-		totalFee := decimal.NewFromFloat(product.Price).Sub(decimal.NewFromFloat(product.Discount)).Mul(decimal.NewFromInt(100)).IntPart()
-		params := url.Values{}
-		params.Add("total_fee", fmt.Sprintf("%d", totalFee))
-		params.Add("out_trade_no", orderNo)
-		params.Add("body", product.Name)
-		params.Add("notify_url", notifyURL)
-		params.Add("auto", "0")
-		payURL = h.jsPayService.PayH5(params)
-	case "alipay":
-		payWay = PayWayAlipay.Name
-		payURL, err = h.alipayService.PayUrlMobile(orderNo, fmt.Sprintf("%.2f", amount), product.Name)
+		break
+	case "geek":
+		if h.App.Config.GeekPayConfig.NotifyURL != "" {
+			notifyURL = h.App.Config.GeekPayConfig.NotifyURL
+		} else {
+			notifyURL = fmt.Sprintf("%s/api/payment/notify/geek", data.Host)
+		}
+		if h.App.Config.GeekPayConfig.ReturnURL != "" {
+			data.Host = utils.GetBaseURL(h.App.Config.GeekPayConfig.ReturnURL)
+		}
+		if data.Device == "wechat" { // 微信客户端打开，调回手机端用户中心页面
+			returnURL = fmt.Sprintf("%s/mobile/profile", data.Host)
+		} else {
+			returnURL = fmt.Sprintf("%s/payReturn", data.Host)
+		}
+		params := payment.GeekPayParams{
+			OutTradeNo: orderNo,
+			Method:     "web",
+			Name:       product.Name,
+			Money:      fmt.Sprintf("%f", amount),
+			ClientIP:   c.ClientIP(),
+			Device:     data.Device,
+			Type:       data.PayType,
+			ReturnURL:  returnURL,
+			NotifyURL:  notifyURL,
+		}
+
+		res, err := h.geekPayService.Pay(params)
 		if err != nil {
-			errMsg := "error with generating Alipay URL: " + err.Error()
-			resp.ERROR(c, errMsg)
-			return
-		}
-	case "wechat":
-		payWay = PayWayWechat.Name
-		payURL, err = h.wechatPayService.PayUrlH5(orderNo, int(amount*100), product.Name, c.ClientIP())
-		if err != nil {
-			errMsg := "error with generating Wechat URL: " + err.Error()
-			logger.Error(errMsg)
-			resp.ERROR(c, errMsg)
+			resp.ERROR(c, err.Error())
 			return
 		}
+		payURL = res.PayURL
 	default:
-		resp.ERROR(c, "Unsupported pay way: "+data.PayWay)
+		resp.ERROR(c, "不支持的支付渠道")
 		return
 	}
+
 	// 创建订单
 	remark := types.OrderRemark{
 		Days:     product.Days,
@@ -390,7 +240,6 @@ func (h *PaymentHandler) Mobile(c *gin.Context) {
 		Price:    product.Price,
 		Discount: product.Discount,
 	}
-
 	order := model.Order{
 		UserId:    user.Id,
 		Username:  user.Username,
@@ -399,26 +248,24 @@ func (h *PaymentHandler) Mobile(c *gin.Context) {
 		Subject:   product.Name,
 		Amount:    amount,
 		Status:    types.OrderNotPaid,
-		PayWay:    payWay,
+		PayWay:    data.PayWay,
+		PayType:   data.PayType,
 		Remark:    utils.JsonEncode(remark),
 	}
-	res = h.DB.Create(&order)
-	if res.Error != nil || res.RowsAffected == 0 {
-		resp.ERROR(c, "error with create order: "+res.Error.Error())
+	err = h.DB.Create(&order).Error
+	if err != nil {
+		resp.ERROR(c, "error with create order: "+err.Error())
 		return
 	}
-
-	resp.SUCCESS(c, gin.H{"url": payURL, "order_no": orderNo})
+	resp.SUCCESS(c, payURL)
 }

 // 异步通知回调公共逻辑
 func (h *PaymentHandler) notify(orderNo string, tradeNo string) error {
 	var order model.Order
-	res := h.DB.Where("order_no = ?", orderNo).First(&order)
-	if res.Error != nil {
-		err := fmt.Errorf("error with fetch order: %v", res.Error)
-		logger.Error(err)
-		return err
+	err := h.DB.Where("order_no = ?", orderNo).First(&order).Error
+	if err != nil {
+		return fmt.Errorf("error with fetch order: %v", err)
 	}

 	h.lock.Lock()
@@ -430,45 +277,24 @@ func (h *PaymentHandler) notify(orderNo string, tradeNo string) error {
 	}

 	var user model.User
-	res = h.DB.First(&user, order.UserId)
-	if res.Error != nil {
-		err := fmt.Errorf("error with fetch user info: %v", res.Error)
-		logger.Error(err)
-		return err
+	err = h.DB.First(&user, order.UserId).Error
+	if err != nil {
+		return fmt.Errorf("error with fetch user info: %v", err)
 	}

 	var remark types.OrderRemark
-	err := utils.JsonDecode(order.Remark, &remark)
+	err = utils.JsonDecode(order.Remark, &remark)
 	if err != nil {
-		err := fmt.Errorf("error with decode order remark: %v", err)
-		logger.Error(err)
-		return err
+		return fmt.Errorf("error with decode order remark: %v", err)
 	}

-	var opt string
-	var power int
-	if remark.Days > 0 { // VIP 充值
-		if user.ExpiredTime >= time.Now().Unix() {
-			user.ExpiredTime = time.Unix(user.ExpiredTime, 0).AddDate(0, 0, remark.Days).Unix()
-			opt = "VIP充值，VIP 没到期，只延期不增加算力"
-		} else {
-			user.ExpiredTime = time.Now().AddDate(0, 0, remark.Days).Unix()
-			user.Power += h.App.SysConfig.VipMonthPower
-			power = h.App.SysConfig.VipMonthPower
-			opt = "VIP充值"
-		}
-		user.Vip = true
-	} else { // 充值点卡，直接增加次数即可
-		user.Power += remark.Power
-		opt = "点卡充值"
-		power = remark.Power
-	}
-
-	// 更新用户信息
-	res = h.DB.Updates(&user)
-	if res.Error != nil {
-		err := fmt.Errorf("error with update user info: %v", res.Error)
-		logger.Error(err)
+	// 增加用户算力
+	err = h.userService.IncreasePower(order.UserId, remark.Power, model.PowerLog{
+		Type:   types.PowerRecharge,
+		Model:  order.PayWay,
+		Remark: fmt.Sprintf("充值算力，金额：%f，订单号：%s", order.Amount, order.OrderNo),
+	})
+	if err != nil {
 		return err
 	}

@@ -476,29 +302,16 @@ func (h *PaymentHandler) notify(orderNo string, tradeNo string) error {
 	order.PayTime = time.Now().Unix()
 	order.Status = types.OrderPaidSuccess
 	order.TradeNo = tradeNo
-	res = h.DB.Updates(&order)
-	if res.Error != nil {
-		err := fmt.Errorf("error with update order info: %v", res.Error)
-		logger.Error(err)
-		return err
+	err = h.DB.Updates(&order).Error
+	if err != nil {
+		return fmt.Errorf("error with update order info: %v", err)
 	}

 	// 更新产品销量
-	h.DB.Model(&model.Product{}).Where("id = ?", order.ProductId).UpdateColumn("sales", gorm.Expr("sales + ?", 1))
-
-	// 记录算力充值日志
-	if power > 0 {
-		h.DB.Create(&model.PowerLog{
-			UserId:    user.Id,
-			Username:  user.Username,
-			Type:      types.PowerRecharge,
-			Amount:    power,
-			Balance:   user.Power,
-			Mark:      types.PowerAdd,
-			Model:     order.PayWay,
-			Remark:    fmt.Sprintf("%s，金额：%f，订单号：%s", opt, order.Amount, order.OrderNo),
-			CreatedAt: time.Now(),
-		})
+	err = h.DB.Model(&model.Product{}).Where("id = ?", order.ProductId).
+		UpdateColumn("sales", gorm.Expr("sales + ?", 1)).Error
+	if err != nil {
+		return fmt.Errorf("error with update product sales: %v", err)
 	}

 	return nil
@@ -506,20 +319,22 @@ func (h *PaymentHandler) notify(orderNo string, tradeNo string) error {

 // GetPayWays 获取支付方式
 func (h *PaymentHandler) GetPayWays(c *gin.Context) {
-	data := gin.H{}
+	payWays := make([]gin.H, 0)
 	if h.App.Config.AlipayConfig.Enabled {
-		data["alipay"] = gin.H{"name": "alipay"}
+		payWays = append(payWays, gin.H{"pay_way": "alipay", "pay_type": "alipay"})
 	}
 	if h.App.Config.HuPiPayConfig.Enabled {
-		data["hupi"] = gin.H{"name": h.App.Config.HuPiPayConfig.Name}
+		payWays = append(payWays, gin.H{"pay_way": "hupi", "pay_type": "wxpay"})
 	}
-	if h.App.Config.JPayConfig.Enabled {
-		data["payjs"] = gin.H{"name": h.App.Config.JPayConfig.Name}
+	if h.App.Config.GeekPayConfig.Enabled {
+		for _, v := range h.App.Config.GeekPayConfig.Methods {
+			payWays = append(payWays, gin.H{"pay_way": "geek", "pay_type": v})
+		}
 	}
 	if h.App.Config.WechatPayConfig.Enabled {
-		data["wechat"] = gin.H{"name": "wechat"}
+		payWays = append(payWays, gin.H{"pay_way": "wechat", "pay_type": "wxpay"})
 	}
-	resp.SUCCESS(c, data)
+	resp.SUCCESS(c, payWays)
 }

 // HuPiPayNotify 虎皮椒支付异步回调
@@ -532,15 +347,17 @@ func (h *PaymentHandler) HuPiPayNotify(c *gin.Context) {

 	orderNo := c.Request.Form.Get("trade_order_id")
 	tradeNo := c.Request.Form.Get("open_order_id")
-	logger.Infof("收到虎皮椒订单支付回调，订单 NO：%s，交易流水号：%s", orderNo, tradeNo)
+	logger.Infof("收到虎皮椒订单支付回调，%+v", c.Request.Form)

-	if err = h.huPiPayService.Check(tradeNo); err != nil {
+	if err = h.huPiPayService.Check(orderNo); err != nil {
 		logger.Error("订单校验失败：", err)
 		c.String(http.StatusOK, "fail")
 		return
 	}
+
 	err = h.notify(orderNo, tradeNo)
 	if err != nil {
+		logger.Error(err)
 		c.String(http.StatusOK, "fail")
 		return
 	}
@@ -556,18 +373,18 @@ func (h *PaymentHandler) AlipayNotify(c *gin.Context) {
 		return
 	}

-	// TODO：验证交易签名
-	res := h.alipayService.TradeVerify(c.Request)
-	logger.Infof("验证支付结果：%+v", res)
-	if !res.Success() {
-		logger.Error("订单校验失败：", res.Message)
+	result := h.alipayService.TradeVerify(c.Request)
+	logger.Infof("收到支付宝商号订单支付回调：%+v", result)
+	if !result.Success() {
+		logger.Error("订单校验失败：", result.Message)
 		c.String(http.StatusOK, "fail")
 		return
 	}

 	tradeNo := c.Request.Form.Get("trade_no")
-	err = h.notify(res.OutTradeNo, tradeNo)
+	err = h.notify(result.OutTradeNo, tradeNo)
 	if err != nil {
+		logger.Error(err)
 		c.String(http.StatusOK, "fail")
 		return
 	}
@@ -575,33 +392,30 @@ func (h *PaymentHandler) AlipayNotify(c *gin.Context) {
 	c.String(http.StatusOK, "success")
 }

-// PayJsNotify PayJs 支付异步回调
-func (h *PaymentHandler) PayJsNotify(c *gin.Context) {
-	err := c.Request.ParseForm()
-	if err != nil {
+// GeekPayNotify 支付异步回调
+func (h *PaymentHandler) GeekPayNotify(c *gin.Context) {
+	var params = make(map[string]string)
+	for k := range c.Request.URL.Query() {
+		params[k] = c.Query(k)
+	}
+
+	logger.Infof("收到GeekPay订单支付回调：%+v", params)
+	// 检查支付状态
+	if params["trade_status"] != "TRADE_SUCCESS" {
+		c.String(http.StatusOK, "success")
+		return
+	}
+
+	sign := h.geekPayService.Sign(params)
+	if sign != c.Query("sign") {
+		logger.Errorf("签名验证失败, %s, %s", sign, c.Query("sign"))
 		c.String(http.StatusOK, "fail")
 		return
 	}

-	orderNo := c.Request.Form.Get("out_trade_no")
-	returnCode := c.Request.Form.Get("return_code")
-	logger.Infof("收到PayJs订单支付回调，订单 NO：%s，支付结果代码：%v", orderNo, returnCode)
-	// 支付失败
-	if returnCode != "1" {
-		return
-	}
-
-	// 校验订单支付状态
-	tradeNo := c.Request.Form.Get("payjs_order_id")
-	err = h.jsPayService.TradeVerify(tradeNo)
-	if err != nil {
-		logger.Error("订单校验失败：", err)
-		c.String(http.StatusOK, "fail")
-		return
-	}
-
-	err = h.notify(orderNo, tradeNo)
+	err := h.notify(params["out_trade_no"], params["trade_no"])
 	if err != nil {
+		logger.Error(err)
 		c.String(http.StatusOK, "fail")
 		return
 	}
@@ -618,6 +432,7 @@ func (h *PaymentHandler) WechatPayNotify(c *gin.Context) {
 	}

 	result := h.wechatPayService.TradeVerify(c.Request)
+	logger.Infof("收到微信商号订单支付回调：%+v", result)
 	if !result.Success() {
 		logger.Error("订单校验失败：", err)
 		c.JSON(http.StatusBadRequest, gin.H{
@@ -629,6 +444,7 @@ func (h *PaymentHandler) WechatPayNotify(c *gin.Context) {

 	err = h.notify(result.OutTradeNo, result.TradeId)
 	if err != nil {
+		logger.Error(err)
 		c.String(http.StatusOK, "fail")
 		return
 	}
--- a/api/handler/prompt_handler.go
+++ b/api/handler/prompt_handler.go
@@ -0,0 +1,167 @@
+package handler
+
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// * Copyright 2023 The Geek-AI Authors. All rights reserved.
+// * Use of this source code is governed by a Apache-2.0 license
+// * that can be found in the LICENSE file.
+// * @Author yangjian102621@163.com
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+import (
+	"fmt"
+	"geekai/core"
+	"geekai/core/types"
+	"geekai/service"
+	"geekai/store/model"
+	"geekai/utils"
+	"geekai/utils/resp"
+	"strings"
+
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+// 提示词生成 handler
+// 使用 AI 生成绘画指令，歌词，视频生成指令等
+
+type PromptHandler struct {
+	BaseHandler
+	userService *service.UserService
+}
+
+func NewPromptHandler(app *core.AppServer, db *gorm.DB, userService *service.UserService) *PromptHandler {
+	return &PromptHandler{
+		BaseHandler: BaseHandler{
+			App: app,
+			DB:  db,
+		},
+		userService: userService,
+	}
+}
+
+// Lyric 生成歌词
+func (h *PromptHandler) Lyric(c *gin.Context) {
+	var data struct {
+		Prompt string `json:"prompt"`
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+	content, err := utils.OpenAIRequest(h.DB, fmt.Sprintf(service.LyricPromptTemplate, data.Prompt), h.App.SysConfig.AssistantModelId)
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	if h.App.SysConfig.PromptPower > 0 {
+		userId := h.GetLoginUserId(c)
+		err = h.userService.DecreasePower(userId, h.App.SysConfig.PromptPower, model.PowerLog{
+			Type:   types.PowerConsume,
+			Model:  h.getPromptModel(),
+			Remark: "生成歌词",
+		})
+		if err != nil {
+			resp.ERROR(c, err.Error())
+			return
+		}
+	}
+
+	resp.SUCCESS(c, content)
+}
+
+// Image 生成 AI 绘画提示词
+func (h *PromptHandler) Image(c *gin.Context) {
+	var data struct {
+		Prompt string `json:"prompt"`
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+	content, err := utils.OpenAIRequest(h.DB, fmt.Sprintf(service.ImagePromptOptimizeTemplate, data.Prompt), h.App.SysConfig.AssistantModelId)
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+	if h.App.SysConfig.PromptPower > 0 {
+		userId := h.GetLoginUserId(c)
+		err = h.userService.DecreasePower(userId, h.App.SysConfig.PromptPower, model.PowerLog{
+			Type:   types.PowerConsume,
+			Model:  h.getPromptModel(),
+			Remark: "生成绘画提示词",
+		})
+		if err != nil {
+			resp.ERROR(c, err.Error())
+			return
+		}
+	}
+	resp.SUCCESS(c, strings.Trim(content, `"`))
+}
+
+// Video 生成视频提示词
+func (h *PromptHandler) Video(c *gin.Context) {
+	var data struct {
+		Prompt string `json:"prompt"`
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+	content, err := utils.OpenAIRequest(h.DB, fmt.Sprintf(service.VideoPromptTemplate, data.Prompt), h.App.SysConfig.AssistantModelId)
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	if h.App.SysConfig.PromptPower > 0 {
+		userId := h.GetLoginUserId(c)
+		err = h.userService.DecreasePower(userId, h.App.SysConfig.PromptPower, model.PowerLog{
+			Type:   types.PowerConsume,
+			Model:  h.getPromptModel(),
+			Remark: "生成视频脚本",
+		})
+		if err != nil {
+			resp.ERROR(c, err.Error())
+			return
+		}
+	}
+
+	resp.SUCCESS(c, strings.Trim(content, `"`))
+}
+
+// MetaPrompt 生成元提示词
+func (h *PromptHandler) MetaPrompt(c *gin.Context) {
+	var data struct {
+		Prompt string `json:"prompt"`
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+	messages := make([]interface{}, 0)
+	messages = append(messages, types.Message{
+		Role:    "system",
+		Content: service.MetaPromptTemplate,
+	})
+	messages = append(messages, types.Message{
+		Role:    "user",
+		Content: "Task, Goal, or the Role to actor is:\n" + data.Prompt,
+	})
+	content, err := utils.SendOpenAIMessage(h.DB, messages, 0)
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	resp.SUCCESS(c, strings.Trim(content, `"`))
+}
+
+func (h *PromptHandler) getPromptModel() string {
+	if h.App.SysConfig.AssistantModelId > 0 {
+		var chatModel model.ChatModel
+		h.DB.Where("id", h.App.SysConfig.AssistantModelId).First(&chatModel)
+		return chatModel.Value
+	}
+	return "gpt-4o"
+}
--- a/api/handler/realtime_handler.go
+++ b/api/handler/realtime_handler.go
@@ -0,0 +1,221 @@
+package handler
+
+import (
+	"encoding/json"
+	"fmt"
+	"geekai/core"
+	"geekai/core/types"
+	"geekai/service"
+	"geekai/store/model"
+	"geekai/utils"
+	"geekai/utils/resp"
+	"io"
+	"net/http"
+	"regexp"
+	"strings"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/gorilla/websocket"
+	"github.com/imroc/req/v3"
+	"gorm.io/gorm"
+)
+
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// * 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
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+// OpenAI Realtime API Relay Server
+
+type RealtimeHandler struct {
+	BaseHandler
+	userService *service.UserService
+}
+
+func NewRealtimeHandler(server *core.AppServer, db *gorm.DB, userService *service.UserService) *RealtimeHandler {
+	return &RealtimeHandler{BaseHandler: BaseHandler{App: server, DB: db}, userService: userService}
+}
+
+func (h *RealtimeHandler) Connection(c *gin.Context) {
+	// 获取客户端请求中指定的子协议
+	clientProtocols := c.GetHeader("Sec-WebSocket-Protocol")
+	md := c.Query("model")
+
+	userId := h.GetLoginUserId(c)
+	var user model.User
+	if err := h.DB.Where("id", userId).First(&user).Error; err != nil {
+		c.Abort()
+		return
+	}
+
+	// 将 HTTP 协议升级为 Websocket 协议
+	subProtocols := strings.Split(clientProtocols, ",")
+	ws, err := (&websocket.Upgrader{
+		CheckOrigin:  func(r *http.Request) bool { return true },
+		Subprotocols: subProtocols,
+	}).Upgrade(c.Writer, c.Request, nil)
+	if err != nil {
+		logger.Error(err)
+		c.Abort()
+		return
+	}
+	defer ws.Close()
+
+	// 目前只针对 VIP 用户可以访问
+	if !user.Vip {
+		sendError(ws, "当前功能只针对 VIP 用户开放")
+		c.Abort()
+		return
+	}
+
+	var apiKey model.ApiKey
+	h.DB.Where("type", "realtime").Where("enabled", true).Order("last_used_at ASC").First(&apiKey)
+	if apiKey.Id == 0 {
+		sendError(ws, "管理员未配置 Realtime API KEY")
+		c.Abort()
+		return
+	}
+
+	apiURL := fmt.Sprintf("%s/v1/realtime?model=%s", apiKey.ApiURL, md)
+	// 连接到真实的后端服务器，传入相同的子协议
+	headers := http.Header{}
+	// 修正子协议内容
+	subProtocols[1] = "openai-insecure-api-key." + apiKey.Value
+	if clientProtocols != "" {
+		headers.Set("Sec-WebSocket-Protocol", strings.Join(subProtocols, ","))
+	}
+	backendConn, _, err := websocket.DefaultDialer.Dial(apiURL, headers)
+	if err != nil {
+		sendError(ws, "桥接后端 API 失败："+err.Error())
+		c.Abort()
+		return
+	}
+	defer backendConn.Close()
+
+	// 确保协议一致性，如果失败返回
+	if ws.Subprotocol() != backendConn.Subprotocol() {
+		sendError(ws, "Websocket 子协议不匹配")
+		c.Abort()
+		return
+	}
+
+	// 更新API KEY 最后使用时间
+	h.DB.Model(&model.ApiKey{}).Where("id", apiKey.Id).UpdateColumn("last_used_at", time.Now().Unix())
+
+	// 开始双向转发
+	errorChan := make(chan error, 2)
+	go relay(ws, backendConn, errorChan)
+	go relay(backendConn, ws, errorChan)
+
+	// 等待其中一个连接关闭
+	err = <-errorChan
+	logger.Infof("Relay ended: %v", err)
+}
+
+func relay(src, dst *websocket.Conn, errorChan chan error) {
+	for {
+		messageType, message, err := src.ReadMessage()
+		if err != nil {
+			errorChan <- err
+			return
+		}
+		err = dst.WriteMessage(messageType, message)
+		if err != nil {
+			errorChan <- err
+			return
+		}
+	}
+}
+
+func sendError(ws *websocket.Conn, message string) {
+	err := ws.WriteJSON(map[string]string{"event_id": "event_01", "type": "error", "error": message})
+	if err != nil {
+		logger.Error(err)
+	}
+}
+
+// OpenAI 实时语音对话，一次性对话
+func (h *RealtimeHandler) VoiceChat(c *gin.Context) {
+	var apiKey model.ApiKey
+	err := h.DB.Session(&gorm.Session{}).Where("type", "realtime").Where("enabled", true).First(&apiKey).Error
+	if err != nil {
+		resp.ERROR(c, fmt.Sprintf("error with fetch OpenAI API KEY：%v", err))
+		return
+	}
+
+	// 检查用户是否还有算力
+	userId := h.GetLoginUserId(c)
+	var user model.User
+	if err := h.DB.Where("id", userId).First(&user).Error; err != nil {
+		resp.ERROR(c, fmt.Sprintf("error with fetch user：%v", err))
+		return
+	}
+
+	if user.Power < h.App.SysConfig.AdvanceVoicePower {
+		resp.ERROR(c, "当前用户算力不足，无法使用该功能")
+		return
+	}
+
+	var response utils.OpenAIResponse
+	client := req.C()
+	if len(apiKey.ProxyURL) > 5 {
+		client.SetProxyURL(apiKey.ApiURL)
+	}
+	apiURL := fmt.Sprintf("%s/v1/chat/completions", apiKey.ApiURL)
+	logger.Infof("Sending %s request, API KEY:%s, PROXY: %s, Model: %s", apiKey.ApiURL, apiURL, apiKey.ProxyURL, "advanced-voice")
+	r, err := client.R().SetHeader("Body-Type", "application/json").
+		SetHeader("Authorization", "Bearer "+apiKey.Value).
+		SetBody(types.ApiRequest{
+			Model:       "advanced-voice",
+			Temperature: 0.9,
+			MaxTokens:   1024,
+			Stream:      false,
+			Messages: []interface{}{types.Message{
+				Role:    "user",
+				Content: "实时语音通话",
+			}},
+		}).Post(apiURL)
+	if err != nil {
+		resp.ERROR(c, fmt.Sprintf("请求 OpenAI API失败：%v", err))
+		return
+	}
+
+	if r.IsErrorState() {
+		resp.ERROR(c, fmt.Sprintf("请求 OpenAI API失败：%v", r.Status))
+		return
+	}
+
+	body, _ := io.ReadAll(r.Body)
+	err = json.Unmarshal(body, &response)
+	if err != nil {
+		resp.ERROR(c, fmt.Sprintf("解析API数据失败：%v, %s", err, string(body)))
+	}
+
+	// 更新 API KEY 的最后使用时间
+	h.DB.Model(&apiKey).UpdateColumn("last_used_at", time.Now().Unix())
+
+	// 扣减算力
+	err = h.userService.DecreasePower(userId, h.App.SysConfig.AdvanceVoicePower, model.PowerLog{
+		Type:   types.PowerConsume,
+		Model:  "advanced-voice",
+		Remark: "实时语音通话",
+	})
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	logger.Infof("Response: %v", response.Choices[0].Message.Content)
+
+	// 提取链接
+	re := regexp.MustCompile(`\[(.*?)\]\((.*?)\)`)
+	links := re.FindAllStringSubmatch(response.Choices[0].Message.Content, -1)
+	var url = ""
+	if len(links) > 0 {
+		url = links[0][2]
+	}
+	resp.SUCCESS(c, url)
+}
--- a/api/handler/redeem_handler.go
+++ b/api/handler/redeem_handler.go
@@ -61,7 +61,7 @@ func (h *RedeemHandler) Verify(c *gin.Context) {
 	}

 	tx := h.DB.Begin()
-	err := h.userService.IncreasePower(int(userId), item.Power, model.PowerLog{
+	err := h.userService.IncreasePower(userId, item.Power, model.PowerLog{
 		Type:   types.PowerRedeem,
 		Model:  "兑换码",
 		Remark: fmt.Sprintf("兑换码核销，算力：%d，兑换码：%s...", item.Power, item.Code[:10]),
--- a/api/handler/sd_handler.go
+++ b/api/handler/sd_handler.go
@@ -19,11 +19,8 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
-	"net/http"
 	"time"

-	"github.com/gorilla/websocket"
-
 	"github.com/gin-gonic/gin"
 	"github.com/go-redis/redis/v8"
 	"gorm.io/gorm"
@@ -59,27 +56,6 @@ func NewSdJobHandler(app *core.AppServer,
 	}
 }

-// Client WebSocket 客户端，用于通知任务状态变更
-func (h *SdJobHandler) Client(c *gin.Context) {
-	ws, err := (&websocket.Upgrader{CheckOrigin: func(r *http.Request) bool { return true }}).Upgrade(c.Writer, c.Request, nil)
-	if err != nil {
-		logger.Error(err)
-		c.Abort()
-		return
-	}
-
-	userId := h.GetInt(c, "user_id", 0)
-	if userId == 0 {
-		logger.Info("Invalid user ID")
-		c.Abort()
-		return
-	}
-
-	client := types.NewWsClient(ws)
-	h.sdService.Clients.Put(uint(userId), client)
-	logger.Infof("New websocket connected, IP: %s", c.RemoteIP())
-}
-
 func (h *SdJobHandler) preCheck(c *gin.Context) bool {
 	user, err := h.GetLoginUser(c)
 	if err != nil {
@@ -126,6 +102,7 @@ func (h *SdJobHandler) Image(c *gin.Context) {
 	if data.Sampler == "" {
 		data.Sampler = "Euler a"
 	}
+
 	idValue, _ := c.Get(types.LoginUserID)
 	userId := utils.IntValue(utils.InterfaceToString(idValue), 0)
 	taskId, err := h.snowflake.Next(true)
@@ -133,29 +110,36 @@ func (h *SdJobHandler) Image(c *gin.Context) {
 		resp.ERROR(c, "error with generate task id: "+err.Error())
 		return
 	}
-	params := types.SdTaskParams{
-		TaskId:       taskId,
-		Prompt:       data.Prompt,
-		NegPrompt:    data.NegPrompt,
-		Steps:        data.Steps,
-		Sampler:      data.Sampler,
-		FaceFix:      data.FaceFix,
-		CfgScale:     data.CfgScale,
-		Seed:         data.Seed,
-		Height:       data.Height,
-		Width:        data.Width,
-		HdFix:        data.HdFix,
-		HdRedrawRate: data.HdRedrawRate,
-		HdScale:      data.HdScale,
-		HdScaleAlg:   data.HdScaleAlg,
-		HdSteps:      data.HdSteps,
+
+	task := types.SdTask{
+		Type: types.TaskImage,
+		Params: types.SdTaskParams{
+			TaskId:       taskId,
+			Prompt:       data.Prompt,
+			NegPrompt:    data.NegPrompt,
+			Steps:        data.Steps,
+			Sampler:      data.Sampler,
+			FaceFix:      data.FaceFix,
+			CfgScale:     data.CfgScale,
+			Seed:         data.Seed,
+			Height:       data.Height,
+			Width:        data.Width,
+			HdFix:        data.HdFix,
+			HdRedrawRate: data.HdRedrawRate,
+			HdScale:      data.HdScale,
+			HdScaleAlg:   data.HdScaleAlg,
+			HdSteps:      data.HdSteps,
+		},
+		UserId:           userId,
+		TranslateModelId: h.App.SysConfig.AssistantModelId,
 	}

 	job := model.SdJob{
-		UserId:    userId,
+		UserId:    uint(userId),
 		Type:      types.TaskImage.String(),
-		TaskId:    params.TaskId,
-		Params:    utils.JsonEncode(params),
+		TaskId:    taskId,
+		Params:    utils.JsonEncode(task.Params),
+		TaskInfo:  utils.JsonEncode(task),
 		Prompt:    data.Prompt,
 		Progress:  0,
 		Power:     h.App.SysConfig.SdPower,
@@ -167,17 +151,8 @@ func (h *SdJobHandler) Image(c *gin.Context) {
 		return
 	}

-	h.sdService.PushTask(types.SdTask{
-		Id:     int(job.Id),
-		Type:   types.TaskImage,
-		Params: params,
-		UserId: userId,
-	})
-
-	client := h.sdService.Clients.Get(uint(job.UserId))
-	if client != nil {
-		_ = client.Send([]byte("Task Updated"))
-	}
+	task.Id = int(job.Id)
+	h.sdService.PushTask(task)

 	// update user's power
 	err = h.userService.DecreasePower(job.UserId, job.Power, model.PowerLog{
@@ -260,15 +235,6 @@ func (h *SdJobHandler) getData(finish bool, userId uint, page int, pageSize int,
 		if err != nil {
 			continue
 		}
-
-		if item.Progress < 100 {
-			// 从 leveldb 中获取图片预览数据
-			var imageData string
-			err = h.leveldb.Get(item.TaskId, &imageData)
-			if err == nil {
-				job.ImgURL = "data:image/png;base64," + imageData
-			}
-		}
 		jobs = append(jobs, job)
 	}

@@ -286,30 +252,14 @@ func (h *SdJobHandler) Remove(c *gin.Context) {
 	}

 	// 删除任务
-	tx := h.DB.Begin()
-	if err := tx.Delete(&job).Error; err != nil {
-		tx.Rollback()
+	err := h.DB.Delete(&job).Error
+	if err != nil {
 		resp.ERROR(c, err.Error())
 		return
 	}

-	// 如果任务未完成，或者任务失败，则恢复用户算力
-	if job.Progress != 100 {
-		err := h.userService.IncreasePower(job.UserId, job.Power, model.PowerLog{
-			Type:   types.PowerRefund,
-			Model:  "stable-diffusion",
-			Remark: fmt.Sprintf("任务失败，退回算力。任务ID：%s， Err: %s", job.TaskId, job.ErrMsg),
-		})
-		if err != nil {
-			tx.Rollback()
-			resp.ERROR(c, err.Error())
-			return
-		}
-	}
-	tx.Commit()
-
 	// remove image
-	err := h.uploader.GetUploadHandler().Delete(job.ImgURL)
+	err = h.uploader.GetUploadHandler().Delete(job.ImgURL)
 	if err != nil {
 		logger.Error("remove image failed: ", err)
 	}
@@ -323,7 +273,7 @@ func (h *SdJobHandler) Publish(c *gin.Context) {
 	userId := h.GetLoginUserId(c)
 	action := h.GetBool(c, "action") // 发布动作，true => 发布，false => 取消分享

-	err := h.DB.Model(&model.SdJob{Id: uint(id), UserId: int(userId)}).UpdateColumn("publish", action).Error
+	err := h.DB.Model(&model.SdJob{Id: uint(id), UserId: uint(userId)}).UpdateColumn("publish", action).Error
 	if err != nil {
 		resp.ERROR(c, err.Error())
 		return
--- a/api/handler/sms_handler.go
+++ b/api/handler/sms_handler.go
@@ -76,6 +76,20 @@ func (h *SmsHandler) SendCode(c *gin.Context) {
 			resp.ERROR(c, "系统已禁用邮箱注册！")
 			return
 		}
+		// 检查邮箱后缀是否在白名单
+		if len(h.App.SysConfig.EmailWhiteList) > 0 {
+			inWhiteList := false
+			for _, suffix := range h.App.SysConfig.EmailWhiteList {
+				if strings.HasSuffix(data.Receiver, suffix) {
+					inWhiteList = true
+					break
+				}
+			}
+			if !inWhiteList {
+				resp.ERROR(c, "邮箱后缀不在白名单中")
+				return
+			}
+		}
 		err = h.smtp.SendVerifyCode(data.Receiver, code)
 	} else {
 		if !utils.Contains(h.App.SysConfig.RegisterWays, "mobile") {
@@ -97,9 +111,5 @@ func (h *SmsHandler) SendCode(c *gin.Context) {
 		return
 	}

-	if h.App.Debug {
-		resp.SUCCESS(c, code)
-	} else {
-		resp.SUCCESS(c)
-	}
+	resp.SUCCESS(c)
 }
--- a/api/handler/suno_handler.go
+++ b/api/handler/suno_handler.go
@@ -18,11 +18,10 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
-	"github.com/gin-gonic/gin"
-	"github.com/gorilla/websocket"
-	"gorm.io/gorm"
-	"net/http"
 	"time"
+
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
 )

 type SunoHandler struct {
@@ -44,27 +43,6 @@ func NewSunoHandler(app *core.AppServer, db *gorm.DB, service *suno.Service, upl
 	}
 }

-// Client WebSocket 客户端，用于通知任务状态变更
-func (h *SunoHandler) Client(c *gin.Context) {
-	ws, err := (&websocket.Upgrader{CheckOrigin: func(r *http.Request) bool { return true }}).Upgrade(c.Writer, c.Request, nil)
-	if err != nil {
-		logger.Error(err)
-		c.Abort()
-		return
-	}
-
-	userId := h.GetInt(c, "user_id", 0)
-	if userId == 0 {
-		logger.Info("Invalid user ID")
-		c.Abort()
-		return
-	}
-
-	client := types.NewWsClient(ws)
-	h.sunoService.Clients.Put(uint(userId), client)
-	logger.Infof("New websocket connected, IP: %s", c.RemoteIP())
-}
-
 func (h *SunoHandler) Create(c *gin.Context) {

 	var data struct {
@@ -86,6 +64,17 @@ func (h *SunoHandler) Create(c *gin.Context) {
 		return
 	}

+	user, err := h.GetLoginUser(c)
+	if err != nil {
+		resp.NotAuth(c)
+		return
+	}
+
+	if user.Power < h.App.SysConfig.SunoPower {
+		resp.ERROR(c, "您的算力不足，请充值后再试！")
+		return
+	}
+
 	// 歌曲拼接
 	if data.SongId != "" && data.Type == 3 {
 		var song model.SunoJob
@@ -100,13 +89,29 @@ func (h *SunoHandler) Create(c *gin.Context) {
 			data.Prompt = fmt.Sprintf("%s\n%s", song.Prompt, refSong.Prompt)
 		}
 	}
+	task := types.SunoTask{
+		UserId:       int(h.GetLoginUserId(c)),
+		Type:         data.Type,
+		Title:        data.Title,
+		RefTaskId:    data.RefTaskId,
+		RefSongId:    data.RefSongId,
+		ExtendSecs:   data.ExtendSecs,
+		Prompt:       data.Prompt,
+		Lyrics:       data.Lyrics,
+		Tags:         data.Tags,
+		Model:        data.Model,
+		Instrumental: data.Instrumental,
+		SongId:       data.SongId,
+		AudioURL:     data.AudioURL,
+	}

 	// 插入数据库
 	job := model.SunoJob{
-		UserId:       int(h.GetLoginUserId(c)),
+		UserId:       uint(task.UserId),
 		Prompt:       data.Prompt,
 		Instrumental: data.Instrumental,
 		ModelName:    data.Model,
+		TaskInfo:     utils.JsonEncode(task),
 		Tags:         data.Tags,
 		Title:        data.Title,
 		Type:         data.Type,
@@ -126,25 +131,13 @@ func (h *SunoHandler) Create(c *gin.Context) {
 	}

 	// 创建任务
-	h.sunoService.PushTask(types.SunoTask{
-		Id:           job.Id,
-		UserId:       job.UserId,
-		Type:         job.Type,
-		Title:        job.Title,
-		RefTaskId:    data.RefTaskId,
-		RefSongId:    data.RefSongId,
-		ExtendSecs:   data.ExtendSecs,
-		Prompt:       job.Prompt,
-		Tags:         data.Tags,
-		Model:        data.Model,
-		Instrumental: data.Instrumental,
-		SongId:       data.SongId,
-		AudioURL:     data.AudioURL,
-	})
+	task.Id = job.Id
+	h.sunoService.PushTask(task)

 	// update user's power
-	err := h.userService.DecreasePower(job.UserId, job.Power, model.PowerLog{
+	err = h.userService.DecreasePower(job.UserId, job.Power, model.PowerLog{
 		Type:      types.PowerConsume,
+		Model:     job.ModelName,
 		Remark:    fmt.Sprintf("Suno 文生歌曲，%s", job.ModelName),
 		CreatedAt: time.Now(),
 	})
@@ -153,10 +146,6 @@ func (h *SunoHandler) Create(c *gin.Context) {
 		return
 	}

-	client := h.sunoService.Clients.Get(uint(job.UserId))
-	if client != nil {
-		_ = client.Send([]byte("Task Updated"))
-	}
 	resp.SUCCESS(c)
 }

@@ -225,28 +214,19 @@ func (h *SunoHandler) Remove(c *gin.Context) {
 		resp.ERROR(c, err.Error())
 		return
 	}
-	// 删除任务
-	tx := h.DB.Begin()
-	if err := tx.Delete(&job).Error; err != nil {
-		tx.Rollback()
-		resp.ERROR(c, err.Error())
+
+	// 只有失败或者已完成的任务可以删除
+	if !(job.Progress == service.FailTaskProgress || job.Progress == 100) {
+		resp.ERROR(c, "只有失败和超时(10分钟)的任务才能删除！")
 		return
 	}

-	// 如果任务未完成，或者任务失败，则恢复用户算力
-	if job.Progress != 100 {
-		err := h.userService.IncreasePower(job.UserId, job.Power, model.PowerLog{
-			Type:   types.PowerRefund,
-			Model:  job.ModelName,
-			Remark: fmt.Sprintf("Suno 任务失败，退回算力。任务ID：%s，Err:%s", job.TaskId, job.ErrMsg),
-		})
-		if err != nil {
-			tx.Rollback()
-			resp.ERROR(c, err.Error())
-			return
-		}
+	// 删除任务
+	err = h.DB.Delete(&job).Error
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
 	}
-	tx.Commit()

 	// 删除文件
 	_ = h.uploader.GetUploadHandler().Delete(job.CoverURL)
@@ -343,40 +323,3 @@ func (h *SunoHandler) Play(c *gin.Context) {
 	}
 	h.DB.Model(&model.SunoJob{}).Where("song_id", songId).UpdateColumn("play_times", gorm.Expr("play_times + ?", 1))
 }
-
-const genLyricTemplate = `
-你是一位才华横溢的作曲家，拥有丰富的情感和细腻的笔触，你对文字有着独特的感悟力，能将各种情感和意境巧妙地融入歌词中。
-请以【%s】为主题创作一首歌曲，歌曲时间不要太短，3分钟左右，不要输出任何解释性的内容。
-输出格式如下：
-歌曲名称
-第一节：
-{{歌词内容}}
-副歌：
-{{歌词内容}}
-
-第二节：
-{{歌词内容}}
-副歌：
-{{歌词内容}}
-
-尾声：
-{{歌词内容}}
-`
-
-// Lyric 生成歌词
-func (h *SunoHandler) Lyric(c *gin.Context) {
-	var data struct {
-		Prompt string `json:"prompt"`
-	}
-	if err := c.ShouldBindJSON(&data); err != nil {
-		resp.ERROR(c, types.InvalidArgs)
-		return
-	}
-	content, err := utils.OpenAIRequest(h.DB, fmt.Sprintf(genLyricTemplate, data.Prompt), "gpt-4o-mini")
-	if err != nil {
-		resp.ERROR(c, err.Error())
-		return
-	}
-
-	resp.SUCCESS(c, content)
-}
--- a/api/handler/test_handler.go
+++ b/api/handler/test_handler.go
@@ -11,15 +11,15 @@ import (
 type TestHandler struct {
 	db        *gorm.DB
 	snowflake *service.Snowflake
-	js        *payment.JPayService
+	js        *payment.GeekPayService
 }

-func NewTestHandler(db *gorm.DB, snowflake *service.Snowflake, js *payment.JPayService) *TestHandler {
+func NewTestHandler(db *gorm.DB, snowflake *service.Snowflake, js *payment.GeekPayService) *TestHandler {
 	return &TestHandler{db: db, snowflake: snowflake, js: js}
 }

 func (h *TestHandler) SseTest(c *gin.Context) {
-	//c.Header("Content-Type", "text/event-stream")
+	//c.Header("Body-Type", "text/event-stream")
 	//c.Header("Cache-Control", "no-cache")
 	//c.Header("Connection", "keep-alive")
 	//
--- a/api/handler/user_handler.go
+++ b/api/handler/user_handler.go
@@ -12,14 +12,16 @@ import (
 	"geekai/core"
 	"geekai/core/types"
 	"geekai/service"
+	"geekai/store"
 	"geekai/store/model"
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
-	"github.com/imroc/req/v3"
 	"strings"
 	"time"

+	"github.com/imroc/req/v3"
+
 	"github.com/go-redis/redis/v8"
 	"github.com/golang-jwt/jwt/v5"

@@ -32,6 +34,7 @@ type UserHandler struct {
 	BaseHandler
 	searcher       *xdb.Searcher
 	redis          *redis.Client
+	levelDB        *store.LevelDB
 	licenseService *service.LicenseService
 	captcha        *service.CaptchaService
 	userService    *service.UserService
@@ -42,6 +45,7 @@ func NewUserHandler(
 	db *gorm.DB,
 	searcher *xdb.Searcher,
 	client *redis.Client,
+	levelDB *store.LevelDB,
 	captcha *service.CaptchaService,
 	userService *service.UserService,
 	licenseService *service.LicenseService) *UserHandler {
@@ -49,6 +53,7 @@ func NewUserHandler(
 		BaseHandler:    BaseHandler{DB: db, App: app},
 		searcher:       searcher,
 		redis:          client,
+		levelDB:        levelDB,
 		captcha:        captcha,
 		licenseService: licenseService,
 		userService:    userService,
@@ -74,6 +79,20 @@ func (h *UserHandler) Register(c *gin.Context) {
 		resp.ERROR(c, types.InvalidArgs)
 		return
 	}
+
+	if h.App.SysConfig.EnabledVerify && data.RegWay == "username" {
+		var check bool
+		if data.X != 0 {
+			check = h.captcha.SlideCheck(data)
+		} else {
+			check = h.captcha.Check(data)
+		}
+		if !check {
+			resp.ERROR(c, "请先完人机验证")
+			return
+		}
+	}
+
 	data.Password = strings.TrimSpace(data.Password)
 	if len(data.Password) < 8 {
 		resp.ERROR(c, "密码长度不能少于8个字符")
@@ -116,15 +135,30 @@ func (h *UserHandler) Register(c *gin.Context) {
 		}
 	}

+	salt := utils.RandString(8)
+	user := model.User{
+		Username:   data.Username,
+		Password:   utils.GenPassword(data.Password, salt),
+		Avatar:     "/images/avatar/user.png",
+		Salt:       salt,
+		Status:     true,
+		ChatRoles:  utils.JsonEncode([]string{"gpt"}), // 默认只订阅通用助手角色
+		ChatConfig: "{}",
+		ChatModels: "{}",
+		Power:      h.App.SysConfig.InitPower,
+	}
+
 	// check if the username is existing
 	var item model.User
 	session := h.DB.Session(&gorm.Session{})
 	if data.Mobile != "" {
 		session = session.Where("mobile = ?", data.Mobile)
-		data.Username = data.Mobile
+		user.Username = data.Mobile
+		user.Mobile = data.Mobile
 	} else if data.Email != "" {
 		session = session.Where("email = ?", data.Email)
-		data.Username = data.Email
+		user.Username = data.Email
+		user.Email = data.Email
 	} else if data.Username != "" {
 		session = session.Where("username = ?", data.Username)
 	}
@@ -134,28 +168,19 @@ func (h *UserHandler) Register(c *gin.Context) {
 		return
 	}

-	salt := utils.RandString(8)
-	user := model.User{
-		Username:   data.Username,
-		Mobile:     data.Mobile,
-		Email:      data.Email,
-		Password:   utils.GenPassword(data.Password, salt),
-		Avatar:     "/images/avatar/user.png",
-		Salt:       salt,
-		Status:     true,
-		ChatRoles:  utils.JsonEncode([]string{"gpt"}),               // 默认只订阅通用助手角色
-		ChatModels: utils.JsonEncode(h.App.SysConfig.DefaultModels), // 默认开通的模型
-		Power:      h.App.SysConfig.InitPower,
-	}
-
 	// 被邀请人也获得赠送算力
 	if data.InviteCode != "" {
 		user.Power += h.App.SysConfig.InvitePower
 	}
+
 	if h.licenseService.GetLicense().Configs.DeCopy {
 		user.Nickname = fmt.Sprintf("用户@%d", utils.RandomNumber(6))
 	} else {
-		user.Nickname = fmt.Sprintf("极客学长@%d", utils.RandomNumber(6))
+		defaultNickname := h.App.SysConfig.DefaultNickname
+		if defaultNickname == "" {
+			defaultNickname = "极客学长"
+		}
+		user.Nickname = fmt.Sprintf("%s@%d", defaultNickname, utils.RandomNumber(6))
 	}

 	tx := h.DB.Begin()
@@ -169,9 +194,9 @@ func (h *UserHandler) Register(c *gin.Context) {
 		// 增加邀请数量
 		h.DB.Model(&model.InviteCode{}).Where("code = ?", data.InviteCode).UpdateColumn("reg_num", gorm.Expr("reg_num + ?", 1))
 		if h.App.SysConfig.InvitePower > 0 {
-			err := h.userService.IncreasePower(int(inviteCode.UserId), h.App.SysConfig.InvitePower, model.PowerLog{
+			err := h.userService.IncreasePower(inviteCode.UserId, h.App.SysConfig.InvitePower, model.PowerLog{
 				Type:   types.PowerInvite,
-				Model:  "",
+				Model:  "Invite",
 				Remark: fmt.Sprintf("邀请用户注册奖励，金额：%d，邀请码：%s，新用户：%s", h.App.SysConfig.InvitePower, inviteCode.Code, user.Username),
 			})
 			if err != nil {
@@ -230,8 +255,10 @@ func (h *UserHandler) Login(c *gin.Context) {
 		resp.ERROR(c, types.InvalidArgs)
 		return
 	}
+	verifyKey := fmt.Sprintf("users/verify/%s", data.Username)
+	needVerify, err := h.redis.Get(c, verifyKey).Bool()

-	if h.App.SysConfig.EnabledVerify {
+	if h.App.SysConfig.EnabledVerify && needVerify {
 		var check bool
 		if data.X != 0 {
 			check = h.captcha.SlideCheck(data)
@@ -247,12 +274,14 @@ func (h *UserHandler) Login(c *gin.Context) {
 	var user model.User
 	res := h.DB.Where("username = ?", data.Username).First(&user)
 	if res.Error != nil {
+		h.redis.Set(c, verifyKey, true, 0)
 		resp.ERROR(c, "用户名不存在")
 		return
 	}

 	password := utils.GenPassword(data.Password, user.Salt)
 	if password != user.Password {
+		h.redis.Set(c, verifyKey, true, 0)
 		resp.ERROR(c, "用户名或密码错误")
 		return
 	}
@@ -285,11 +314,13 @@ func (h *UserHandler) Login(c *gin.Context) {
 		return
 	}
 	// 保存到 redis
-	key := fmt.Sprintf("users/%d", user.Id)
-	if _, err := h.redis.Set(c, key, tokenString, 0).Result(); err != nil {
+	sessionKey := fmt.Sprintf("users/%d", user.Id)
+	if _, err = h.redis.Set(c, sessionKey, tokenString, 0).Result(); err != nil {
 		resp.ERROR(c, "error with save token: "+err.Error())
 		return
 	}
+	// 移除登录行为验证码
+	h.redis.Del(c, verifyKey)
 	resp.SUCCESS(c, gin.H{"token": tokenString, "user_id": user.Id, "username": user.Username})
 }

@@ -397,16 +428,15 @@ func (h *UserHandler) CLoginCallback(c *gin.Context) {
 		salt := utils.RandString(8)
 		password := fmt.Sprintf("%d", utils.RandomNumber(8))
 		user = model.User{
-			Username:   fmt.Sprintf("%s@%d", loginType, utils.RandomNumber(10)),
-			Password:   utils.GenPassword(password, salt),
-			Avatar:     fmt.Sprintf("%s", data["avatar"]),
-			Salt:       salt,
-			Status:     true,
-			ChatRoles:  utils.JsonEncode([]string{"gpt"}),               // 默认只订阅通用助手角色
-			ChatModels: utils.JsonEncode(h.App.SysConfig.DefaultModels), // 默认开通的模型
-			Power:      h.App.SysConfig.InitPower,
-			OpenId:     fmt.Sprintf("%s", data["openid"]),
-			Nickname:   fmt.Sprintf("%s", data["nickname"]),
+			Username:  fmt.Sprintf("%s@%d", loginType, utils.RandomNumber(10)),
+			Password:  utils.GenPassword(password, salt),
+			Avatar:    fmt.Sprintf("%s", data["avatar"]),
+			Salt:      salt,
+			Status:    true,
+			ChatRoles: utils.JsonEncode([]string{"gpt"}), // 默认只订阅通用助手角色
+			Power:     h.App.SysConfig.InitPower,
+			OpenId:    fmt.Sprintf("%s", data["openid"]),
+			Nickname:  fmt.Sprintf("%s", data["nickname"]),
 		}

 		tx = h.DB.Create(&user)
@@ -587,7 +617,7 @@ func (h *UserHandler) ResetPass(c *gin.Context) {
 		session = session.Where("email", data.Email)
 		key = CodeStorePrefix + data.Email
 	} else if data.Type == "mobile" {
-		session = session.Where("mobile", data.Email)
+		session = session.Where("mobile", data.Mobile)
 		key = CodeStorePrefix + data.Mobile
 	} else {
 		resp.ERROR(c, "验证类别错误")
@@ -694,3 +724,30 @@ func (h *UserHandler) BindEmail(c *gin.Context) {
 	_ = h.redis.Del(c, key) // 删除短信验证码
 	resp.SUCCESS(c)
 }
+
+// SignIn 每日签到
+func (h *UserHandler) SignIn(c *gin.Context) {
+	// 获取当前日期
+	date := time.Now().Format("2006-01-02")
+
+	// 检查是否已经签到
+	userId := h.GetLoginUserId(c)
+	key := fmt.Sprintf("signin/%d/%s", userId, date)
+	var signIn bool
+	err := h.levelDB.Get(key, &signIn)
+	if err == nil && signIn {
+		resp.ERROR(c, "今日已签到，请明日再来！")
+		return
+	}
+
+	// 签到
+	h.levelDB.Put(key, true)
+	if h.App.SysConfig.DailyPower > 0 {
+		h.userService.IncreasePower(userId, h.App.SysConfig.DailyPower, model.PowerLog{
+			Type:   types.PowerSignIn,
+			Model:  "SignIn",
+			Remark: fmt.Sprintf("每日签到奖励，金额：%d", h.App.SysConfig.DailyPower),
+		})
+	}
+	resp.SUCCESS(c)
+}
--- a/api/handler/video_handler.go
+++ b/api/handler/video_handler.go
@@ -18,10 +18,10 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
+	"time"
+
 	"github.com/gin-gonic/gin"
-	"github.com/gorilla/websocket"
 	"gorm.io/gorm"
-	"net/http"
 )

 type VideoHandler struct {
@@ -43,27 +43,6 @@ func NewVideoHandler(app *core.AppServer, db *gorm.DB, service *video.Service, u
 	}
 }

-// Client WebSocket 客户端，用于通知任务状态变更
-func (h *VideoHandler) Client(c *gin.Context) {
-	ws, err := (&websocket.Upgrader{CheckOrigin: func(r *http.Request) bool { return true }}).Upgrade(c.Writer, c.Request, nil)
-	if err != nil {
-		logger.Error(err)
-		c.Abort()
-		return
-	}
-
-	userId := h.GetInt(c, "user_id", 0)
-	if userId == 0 {
-		logger.Info("Invalid user ID")
-		c.Abort()
-		return
-	}
-
-	client := types.NewWsClient(ws)
-	h.videoService.Clients.Put(uint(userId), client)
-	logger.Infof("New websocket connected, IP: %s", c.RemoteIP())
-}
-
 func (h *VideoHandler) LumaCreate(c *gin.Context) {

 	var data struct {
@@ -77,25 +56,44 @@ func (h *VideoHandler) LumaCreate(c *gin.Context) {
 		resp.ERROR(c, types.InvalidArgs)
 		return
 	}
+	// 检查 Prompt 长度
 	if data.Prompt == "" {
 		resp.ERROR(c, "prompt is needed")
 		return
 	}

+	user, err := h.GetLoginUser(c)
+	if err != nil {
+		resp.NotAuth(c)
+		return
+	}
+
+	if user.Power < h.App.SysConfig.LumaPower {
+		resp.ERROR(c, "您的算力不足，请充值后再试！")
+		return
+	}
+
 	userId := int(h.GetLoginUserId(c))
-	params := types.VideoParams{
+	params := types.LumaVideoParams{
 		PromptOptimize: data.ExpandPrompt,
 		Loop:           data.Loop,
 		StartImgURL:    data.FirstFrameImg,
 		EndImgURL:      data.EndFrameImg,
 	}
+	task := types.VideoTask{
+		UserId:           userId,
+		Type:             types.VideoLuma,
+		Prompt:           data.Prompt,
+		Params:           params,
+		TranslateModelId: h.App.SysConfig.AssistantModelId,
+	}
 	// 插入数据库
 	job := model.VideoJob{
-		UserId: userId,
-		Type:   types.VideoLuma,
-		Prompt: data.Prompt,
-		Power:  h.App.SysConfig.LumaPower,
-		Params: utils.JsonEncode(params),
+		UserId:   uint(userId),
+		Type:     types.VideoLuma,
+		Prompt:   data.Prompt,
+		Power:    h.App.SysConfig.LumaPower,
+		TaskInfo: utils.JsonEncode(task),
 	}
 	tx := h.DB.Create(&job)
 	if tx.Error != nil {
@@ -104,16 +102,11 @@ func (h *VideoHandler) LumaCreate(c *gin.Context) {
 	}

 	// 创建任务
-	h.videoService.PushTask(types.VideoTask{
-		Id:     job.Id,
-		UserId: userId,
-		Type:   types.VideoLuma,
-		Prompt: data.Prompt,
-		Params: params,
-	})
+	task.Id = job.Id
+	h.videoService.PushTask(task)

 	// update user's power
-	err := h.userService.DecreasePower(job.UserId, job.Power, model.PowerLog{
+	err = h.userService.DecreasePower(job.UserId, job.Power, model.PowerLog{
 		Type:   types.PowerConsume,
 		Model:  "luma",
 		Remark: fmt.Sprintf("Luma 文生视频，任务ID：%d", job.Id),
@@ -122,10 +115,102 @@ func (h *VideoHandler) LumaCreate(c *gin.Context) {
 		resp.ERROR(c, err.Error())
 		return
 	}
+	resp.SUCCESS(c)
+}

-	client := h.videoService.Clients.Get(uint(job.UserId))
-	if client != nil {
-		_ = client.Send([]byte("Task Updated"))
+func (h *VideoHandler) KeLingCreate(c *gin.Context) {
+
+	var data struct {
+		Channel       string              `json:"channel"`
+		TaskType      string              `json:"task_type"`       // 任务类型: text2video/image2video
+		Model         string              `json:"model"`           // 模型: kling-v1-5,kling-v1-6
+		Prompt        string              `json:"prompt"`          // 视频描述
+		NegPrompt     string              `json:"negative_prompt"` // 负面提示词
+		CfgScale      float64             `json:"cfg_scale"`       // 相关性系数(0-1)
+		Mode          string              `json:"mode"`            // 生成模式: std/pro
+		AspectRatio   string              `json:"aspect_ratio"`    // 画面比例: 16:9/9:16/1:1
+		Duration      string              `json:"duration"`        // 视频时长: 5/10
+		CameraControl types.CameraControl `json:"camera_control"`  // 摄像机控制
+		Image         string              `json:"image"`           // 参考图片URL(image2video)
+		ImageTail     string              `json:"image_tail"`      // 尾帧图片URL(image2video)
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	user, err := h.GetLoginUser(c)
+	if err != nil {
+		resp.NotAuth(c)
+		return
+	}
+
+	// 计算当前任务所需算力
+	key := fmt.Sprintf("%s_%s_%s", data.Model, data.Mode, data.Duration)
+	power := h.App.SysConfig.KeLingPowers[key]
+	if power == 0 {
+		resp.ERROR(c, "当前模型暂不支持")
+		return
+	}
+	if user.Power < power {
+		resp.ERROR(c, "您的算力不足，请充值后再试！")
+		return
+	}
+
+	if data.Prompt == "" {
+		resp.ERROR(c, "prompt is needed")
+		return
+	}
+
+	userId := int(h.GetLoginUserId(c))
+	params := types.KeLingVideoParams{
+		TaskType:      data.TaskType,
+		Model:         data.Model,
+		Prompt:        data.Prompt,
+		NegPrompt:     data.NegPrompt,
+		CfgScale:      data.CfgScale,
+		Mode:          data.Mode,
+		AspectRatio:   data.AspectRatio,
+		Duration:      data.Duration,
+		CameraControl: data.CameraControl,
+		Image:         data.Image,
+		ImageTail:     data.ImageTail,
+	}
+	task := types.VideoTask{
+		UserId:           userId,
+		Type:             types.VideoKeLing,
+		Prompt:           data.Prompt,
+		Params:           params,
+		TranslateModelId: h.App.SysConfig.AssistantModelId,
+		Channel:          data.Channel,
+	}
+	// 插入数据库
+	job := model.VideoJob{
+		UserId:   uint(userId),
+		Type:     types.VideoKeLing,
+		Prompt:   data.Prompt,
+		Power:    power,
+		TaskInfo: utils.JsonEncode(task),
+	}
+	tx := h.DB.Create(&job)
+	if tx.Error != nil {
+		resp.ERROR(c, tx.Error.Error())
+		return
+	}
+
+	// 创建任务
+	task.Id = job.Id
+	h.videoService.PushTask(task)
+
+	// update user's power
+	err = h.userService.DecreasePower(job.UserId, job.Power, model.PowerLog{
+		Type:   types.PowerConsume,
+		Model:  "keling",
+		Remark: fmt.Sprintf("keling 文生视频，任务ID：%d", job.Id),
+	})
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
 	}
 	resp.SUCCESS(c)
 }
@@ -136,14 +221,14 @@ func (h *VideoHandler) List(c *gin.Context) {
 	page := h.GetInt(c, "page", 1)
 	pageSize := h.GetInt(c, "page_size", 20)
 	all := h.GetBool(c, "all")
-	session := h.DB.Session(&gorm.Session{}).Where("user_id", userId)
+	session := h.DB.Session(&gorm.Session{})
 	if t != "" {
 		session = session.Where("type", t)
 	}
 	if all {
 		session = session.Where("publish", 0).Where("progress", 100)
 	} else {
-		session = session.Where("user_id", h.GetLoginUserId(c))
+		session = session.Where("user_id", userId)
 	}
 	// 统计总数
 	var total int64
@@ -169,6 +254,36 @@ func (h *VideoHandler) List(c *gin.Context) {
 			continue
 		}
 		item.CreatedAt = v.CreatedAt.Unix()
+		if item.VideoURL == "" {
+			item.VideoURL = v.WaterURL
+		}
+		// 解析任务详情
+		if item.Type == types.VideoKeLing {
+			task := types.VideoTask{}
+			err = utils.JsonDecode(v.TaskInfo, &task)
+			if err != nil {
+				continue
+			}
+			var params types.KeLingVideoParams
+			err = utils.JsonDecode(utils.JsonEncode(task.Params), &params)
+			if err != nil {
+				continue
+			}
+			item.RawData = map[string]interface{}{
+				"task_type":    params.TaskType,
+				"model":        params.Model,
+				"cfg_scale":    params.CfgScale,
+				"mode":         params.Mode,
+				"aspect_ratio": params.AspectRatio,
+				"duration":     params.Duration,
+				"model_name":   fmt.Sprintf("%s_%s_%s", params.Model, params.Mode, params.Duration),
+			}
+
+			// 如果视频URL不为空，则设置为生成成功
+			if item.VideoURL != "" {
+				item.Progress = 100
+			}
+		}
 		items = append(items, item)
 	}

@@ -184,32 +299,24 @@ func (h *VideoHandler) Remove(c *gin.Context) {
 		resp.ERROR(c, err.Error())
 		return
 	}
+	// 只有失败或者超时的任务才能删除
+	if !(job.Progress == service.FailTaskProgress || time.Now().After(job.CreatedAt.Add(time.Minute*30))) {
+		resp.ERROR(c, "只有失败和超时(30分钟)的任务才能删除！")
+		return
+	}
+
 	// 删除任务
-	tx := h.DB.Begin()
-	if err := tx.Delete(&job).Error; err != nil {
-		tx.Rollback()
+	err = h.DB.Delete(&job).Error
+	if err != nil {
 		resp.ERROR(c, err.Error())
 		return
 	}

-	// 如果任务未完成，或者任务失败，则恢复用户算力
-	if job.Progress != 100 {
-		err = h.userService.IncreasePower(job.UserId, job.Power, model.PowerLog{
-			Type:   types.PowerRefund,
-			Model:  "luma",
-			Remark: fmt.Sprintf("Luma 任务失败，退回算力。任务ID：%s，Err:%s", job.TaskId, job.ErrMsg),
-		})
-		if err != nil {
-			tx.Rollback()
-			resp.ERROR(c, err.Error())
-			return
-		}
-	}
-	tx.Commit()
-
 	// 删除文件
 	_ = h.uploader.GetUploadHandler().Delete(job.CoverURL)
 	_ = h.uploader.GetUploadHandler().Delete(job.VideoURL)
+
+	resp.SUCCESS(c)
 }

 func (h *VideoHandler) Publish(c *gin.Context) {
--- a/api/logger/logger.go
+++ b/api/logger/logger.go
@@ -8,11 +8,12 @@ package logger
 // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 import (
+	"os"
+	"strings"
+
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"gopkg.in/natefinch/lumberjack.v2"
-	"os"
-	"strings"
 )

 var logger *zap.Logger
@@ -23,7 +24,7 @@ func GetLogger() *zap.SugaredLogger {
 		return sugarLogger
 	}

-	logLevel := zap.NewAtomicLevelAt(getLogLevel(os.Getenv("LOG_LEVEL")))
+	logLevel := zap.NewAtomicLevelAt(getLogLevel(os.Getenv("GEEKAI_LOG_LEVEL")))
 	encoder := getEncoder()
 	writerSyncer := getLogWriter()
 	fileCore := zapcore.NewCore(encoder, writerSyncer, logLevel)
--- a/api/main.go
+++ b/api/main.go
@@ -14,10 +14,10 @@ import (
 	"geekai/core/types"
 	"geekai/handler"
 	"geekai/handler/admin"
-	"geekai/handler/chatimpl"
 	logger2 "geekai/logger"
 	"geekai/service"
 	"geekai/service/dalle"
+	"geekai/service/jimeng"
 	"geekai/service/mj"
 	"geekai/service/oss"
 	"geekai/service/payment"
@@ -128,7 +128,7 @@ func main() {
 		// 创建控制器
 		fx.Provide(handler.NewChatRoleHandler),
 		fx.Provide(handler.NewUserHandler),
-		fx.Provide(chatimpl.NewChatHandler),
+		fx.Provide(handler.NewChatHandler),
 		fx.Provide(handler.NewNetHandler),
 		fx.Provide(handler.NewSmsHandler),
 		fx.Provide(handler.NewRedeemHandler),
@@ -141,12 +141,13 @@ func main() {
 		fx.Provide(handler.NewProductHandler),
 		fx.Provide(handler.NewConfigHandler),
 		fx.Provide(handler.NewPowerLogHandler),
+		fx.Provide(handler.NewJimengHandler),

 		fx.Provide(admin.NewConfigHandler),
 		fx.Provide(admin.NewAdminHandler),
 		fx.Provide(admin.NewApiKeyHandler),
 		fx.Provide(admin.NewUserHandler),
-		fx.Provide(admin.NewChatRoleHandler),
+		fx.Provide(admin.NewChatAppHandler),
 		fx.Provide(admin.NewRedeemHandler),
 		fx.Provide(admin.NewDashboardHandler),
 		fx.Provide(admin.NewChatModelHandler),
@@ -154,6 +155,7 @@ func main() {
 		fx.Provide(admin.NewOrderHandler),
 		fx.Provide(admin.NewChatHandler),
 		fx.Provide(admin.NewPowerLogHandler),
+		fx.Provide(admin.NewAdminJimengHandler),

 		// 创建服务
 		fx.Provide(sms.NewSendServiceManager),
@@ -164,7 +166,6 @@ func main() {
 		fx.Provide(dalle.NewService),
 		fx.Invoke(func(s *dalle.Service) {
 			s.Run()
-			s.CheckTaskNotify()
 			s.DownloadImages()
 			s.CheckTaskStatus()
 		}),
@@ -183,7 +184,6 @@ func main() {
 		fx.Invoke(func(s *mj.Service) {
 			s.Run()
 			s.SyncTaskProgress()
-			s.CheckTaskNotify()
 			s.DownloadImages()
 		}),

@@ -192,23 +192,26 @@ func main() {
 		fx.Invoke(func(s *sd.Service, config *types.AppConfig) {
 			s.Run()
 			s.CheckTaskStatus()
-			s.CheckTaskNotify()
 		}),

 		fx.Provide(suno.NewService),
 		fx.Invoke(func(s *suno.Service) {
 			s.Run()
 			s.SyncTaskProgress()
-			s.CheckTaskNotify()
 			s.DownloadFiles()
 		}),
 		fx.Provide(video.NewService),
 		fx.Invoke(func(s *video.Service) {
 			s.Run()
 			s.SyncTaskProgress()
-			s.CheckTaskNotify()
 			s.DownloadFiles()
 		}),
+
+		// 即梦AI 服务
+		fx.Provide(jimeng.NewService),
+		fx.Invoke(func(service *jimeng.Service) {
+			service.Start()
+		}),
 		fx.Provide(service.NewUserService),
 		fx.Provide(payment.NewAlipayService),
 		fx.Provide(payment.NewHuPiPay),
@@ -226,8 +229,9 @@ func main() {

 		// 注册路由
 		fx.Invoke(func(s *core.AppServer, h *handler.ChatRoleHandler) {
-			group := s.Engine.Group("/api/role/")
+			group := s.Engine.Group("/api/app/")
 			group.GET("list", h.List)
+			group.GET("list/user", h.ListByUser)
 			group.POST("update", h.UpdateRole)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *handler.UserHandler) {
@@ -244,10 +248,11 @@ func main() {
 			group.POST("resetPass", h.ResetPass)
 			group.GET("clogin", h.CLogin)
 			group.GET("clogin/callback", h.CLoginCallback)
+			group.GET("signin", h.SignIn)
 		}),
-		fx.Invoke(func(s *core.AppServer, h *chatimpl.ChatHandler) {
+		fx.Invoke(func(s *core.AppServer, h *handler.ChatHandler) {
 			group := s.Engine.Group("/api/chat/")
-			group.Any("new", h.ChatHandle)
+			group.Any("message", h.Chat)
 			group.GET("list", h.List)
 			group.GET("detail", h.Detail)
 			group.POST("update", h.Update)
@@ -256,6 +261,7 @@ func main() {
 			group.GET("clear", h.Clear)
 			group.POST("tokens", h.Tokens)
 			group.GET("stop", h.StopGenerate)
+			group.POST("tts", h.TextToSpeech)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *handler.NetHandler) {
 			s.Engine.POST("/api/upload", h.Upload)
@@ -280,7 +286,6 @@ func main() {
 		}),
 		fx.Invoke(func(s *core.AppServer, h *handler.MidJourneyHandler) {
 			group := s.Engine.Group("/api/mj/")
-			group.Any("client", h.Client)
 			group.POST("image", h.Image)
 			group.POST("upscale", h.Upscale)
 			group.POST("variation", h.Variation)
@@ -291,7 +296,6 @@ func main() {
 		}),
 		fx.Invoke(func(s *core.AppServer, h *handler.SdJobHandler) {
 			group := s.Engine.Group("/api/sd")
-			group.Any("client", h.Client)
 			group.POST("image", h.Image)
 			group.GET("jobs", h.JobList)
 			group.GET("imgWall", h.ImgWall)
@@ -306,11 +310,12 @@ func main() {

 		// 管理后台控制器
 		fx.Invoke(func(s *core.AppServer, h *admin.ConfigHandler) {
-			group := s.Engine.Group("/api/admin/")
-			group.POST("config/update", h.Update)
-			group.GET("config/get", h.Get)
+			group := s.Engine.Group("/api/admin/config")
+			group.POST("update", h.Update)
+			group.GET("get", h.Get)
 			group.POST("active", h.Active)
-			group.GET("config/get/license", h.GetLicense)
+			group.GET("fixData", h.FixData)
+			group.GET("license", h.GetLicense)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *admin.ManagerHandler) {
 			group := s.Engine.Group("/api/admin/")
@@ -336,9 +341,10 @@ func main() {
 			group.POST("save", h.Save)
 			group.GET("remove", h.Remove)
 			group.GET("loginLog", h.LoginLog)
+			group.GET("genLoginLink", h.GenLoginLink)
 			group.POST("resetPass", h.ResetPass)
 		}),
-		fx.Invoke(func(s *core.AppServer, h *admin.ChatRoleHandler) {
+		fx.Invoke(func(s *core.AppServer, h *admin.ChatAppHandler) {
 			group := s.Engine.Group("/api/admin/role/")
 			group.GET("list", h.List)
 			group.POST("save", h.Save)
@@ -351,7 +357,8 @@ func main() {
 			group.GET("list", h.List)
 			group.POST("create", h.Create)
 			group.POST("set", h.Set)
-			group.POST("remove", h.Remove)
+			group.GET("remove", h.Remove)
+			group.POST("export", h.Export)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *admin.DashboardHandler) {
 			group := s.Engine.Group("/api/admin/dashboard/")
@@ -371,14 +378,12 @@ func main() {
 		}),
 		fx.Invoke(func(s *core.AppServer, h *handler.PaymentHandler) {
 			group := s.Engine.Group("/api/payment/")
-			group.GET("doPay", h.DoPay)
+			group.POST("doPay", h.Pay)
 			group.GET("payWays", h.GetPayWays)
-			group.POST("qrcode", h.PayQrcode)
-			group.POST("mobile", h.Mobile)
-			group.POST("alipay/notify", h.AlipayNotify)
-			group.POST("hupipay/notify", h.HuPiPayNotify)
-			group.POST("payjs/notify", h.PayJsNotify)
-			group.POST("wechat/notify", h.WechatPayNotify)
+			group.POST("notify/alipay", h.AlipayNotify)
+			group.GET("notify/geek", h.GeekPayNotify)
+			group.POST("notify/wechat", h.WechatPayNotify)
+			group.POST("notify/hupi", h.HuPiPayNotify)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *admin.ProductHandler) {
 			group := s.Engine.Group("/api/admin/product/")
@@ -433,6 +438,7 @@ func main() {
 			group.POST("weibo", h.WeiBo)
 			group.POST("zaobao", h.ZaoBao)
 			group.POST("dalle3", h.Dall3)
+			group.POST("websearch", h.WebSearch)
 			group.GET("list", h.List)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *admin.ChatHandler) {
@@ -467,23 +473,21 @@ func main() {
 		}),
 		fx.Provide(handler.NewMarkMapHandler),
 		fx.Invoke(func(s *core.AppServer, h *handler.MarkMapHandler) {
-			group := s.Engine.Group("/api/markMap/")
-			group.Any("client", h.Client)
+			s.Engine.POST("/api/markMap/gen", h.Generate)
 		}),
 		fx.Provide(handler.NewDallJobHandler),
 		fx.Invoke(func(s *core.AppServer, h *handler.DallJobHandler) {
 			group := s.Engine.Group("/api/dall")
-			group.Any("client", h.Client)
 			group.POST("image", h.Image)
 			group.GET("jobs", h.JobList)
 			group.GET("imgWall", h.ImgWall)
 			group.GET("remove", h.Remove)
 			group.GET("publish", h.Publish)
+			group.GET("models", h.GetModels)
 		}),
 		fx.Provide(handler.NewSunoHandler),
 		fx.Invoke(func(s *core.AppServer, h *handler.SunoHandler) {
 			group := s.Engine.Group("/api/suno")
-			group.Any("client", h.Client)
 			group.POST("create", h.Create)
 			group.GET("list", h.List)
 			group.GET("remove", h.Remove)
@@ -491,27 +495,57 @@ func main() {
 			group.POST("update", h.Update)
 			group.GET("detail", h.Detail)
 			group.GET("play", h.Play)
-			group.POST("lyric", h.Lyric)
 		}),
 		fx.Provide(handler.NewVideoHandler),
 		fx.Invoke(func(s *core.AppServer, h *handler.VideoHandler) {
 			group := s.Engine.Group("/api/video")
-			group.Any("client", h.Client)
 			group.POST("luma/create", h.LumaCreate)
+			group.POST("keling/create", h.KeLingCreate)
 			group.GET("list", h.List)
 			group.GET("remove", h.Remove)
 			group.GET("publish", h.Publish)
 		}),
+
+		// 即梦AI 路由
+		fx.Invoke(func(s *core.AppServer, h *handler.JimengHandler) {
+			h.RegisterRoutes()
+		}),
+		fx.Invoke(func(s *core.AppServer, h *admin.AdminJimengHandler) {
+			h.RegisterRoutes()
+		}),
+		fx.Provide(admin.NewChatAppTypeHandler),
+		fx.Invoke(func(s *core.AppServer, h *admin.ChatAppTypeHandler) {
+			group := s.Engine.Group("/api/admin/app/type")
+			group.POST("save", h.Save)
+			group.GET("list", h.List)
+			group.GET("remove", h.Remove)
+			group.POST("enable", h.Enable)
+			group.POST("sort", h.Sort)
+		}),
+		fx.Provide(handler.NewChatAppTypeHandler),
+		fx.Invoke(func(s *core.AppServer, h *handler.ChatAppTypeHandler) {
+			group := s.Engine.Group("/api/app/type")
+			group.GET("list", h.List)
+		}),
 		fx.Provide(handler.NewTestHandler),
 		fx.Invoke(func(s *core.AppServer, h *handler.TestHandler) {
 			group := s.Engine.Group("/api/test")
 			group.Any("sse", h.PostTest, h.SseTest)
 		}),
+		fx.Provide(handler.NewPromptHandler),
+		fx.Invoke(func(s *core.AppServer, h *handler.PromptHandler) {
+			group := s.Engine.Group("/api/prompt")
+			group.POST("/lyric", h.Lyric)
+			group.POST("/image", h.Image)
+			group.POST("/video", h.Video)
+			group.POST("/meta", h.MetaPrompt)
+		}),
 		fx.Invoke(func(s *core.AppServer, db *gorm.DB) {
 			go func() {
 				err := s.Run(db)
 				if err != nil {
-					log.Fatal(err)
+					logger.Error(err)
+					os.Exit(0)
 				}
 			}()
 		}),
@@ -527,6 +561,26 @@ func main() {
 				},
 			})
 		}),
+		fx.Provide(admin.NewImageHandler),
+		fx.Invoke(func(s *core.AppServer, h *admin.ImageHandler) {
+			group := s.Engine.Group("/api/admin/image")
+			group.POST("/list/mj", h.MjList)
+			group.POST("/list/sd", h.SdList)
+			group.POST("/list/dall", h.DallList)
+			group.GET("/remove", h.Remove)
+		}),
+		fx.Provide(admin.NewMediaHandler),
+		fx.Invoke(func(s *core.AppServer, h *admin.MediaHandler) {
+			group := s.Engine.Group("/api/admin/media")
+			group.POST("/suno", h.SunoList)
+			group.POST("/videos", h.Videos)
+			group.GET("/remove", h.Remove)
+		}),
+		fx.Provide(handler.NewRealtimeHandler),
+		fx.Invoke(func(s *core.AppServer, h *handler.RealtimeHandler) {
+			s.Engine.Any("/api/realtime", h.Connection)
+			s.Engine.POST("/api/realtime/voice", h.VoiceChat)
+		}),
 	)
 	// 启动应用程序
 	go func() {
--- a/api/res/img/geek-pay.jpg
+++ b/api/res/img/geek-pay.jpg
--- a/api/res/img/qq-pay.jpg
+++ b/api/res/img/qq-pay.jpg
--- a/api/service/crawler/service.go
+++ b/api/service/crawler/service.go
@@ -0,0 +1,333 @@
+package crawler
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"geekai/logger"
+	"net/url"
+	"strings"
+	"time"
+
+	"github.com/go-rod/rod"
+	"github.com/go-rod/rod/lib/launcher"
+	"github.com/go-rod/rod/lib/proto"
+)
+
+// Service 网络爬虫服务
+type Service struct {
+	browser *rod.Browser
+}
+
+// NewService 创建一个新的爬虫服务
+func NewService() (*Service, error) {
+	// 启动浏览器
+	path, _ := launcher.LookPath()
+	u := launcher.New().Bin(path).
+		Headless(true).                    // 无头模式
+		Set("disable-web-security", "").   // 禁用网络安全限制
+		Set("disable-gpu", "").            // 禁用 GPU 加速
+		Set("no-sandbox", "").             // 禁用沙箱模式
+		Set("disable-setuid-sandbox", ""). // 禁用 setuid 沙箱
+		MustLaunch()
+
+	browser := rod.New().ControlURL(u).MustConnect()
+
+	return &Service{
+		browser: browser,
+	}, nil
+}
+
+// SearchResult 搜索结果
+type SearchResult struct {
+	Title   string `json:"title"`   // 标题
+	URL     string `json:"url"`     // 链接
+	Content string `json:"content"` // 内容摘要
+}
+
+// WebSearch 网络搜索
+func (s *Service) WebSearch(keyword string, maxPages int) ([]SearchResult, error) {
+	if keyword == "" {
+		return nil, errors.New("搜索关键词不能为空")
+	}
+
+	if maxPages <= 0 {
+		maxPages = 1
+	}
+	if maxPages > 10 {
+		maxPages = 10 // 最多搜索 10 页
+	}
+
+	results := make([]SearchResult, 0)
+
+	// 使用百度搜索
+	searchURL := fmt.Sprintf("https://www.baidu.com/s?wd=%s", url.QueryEscape(keyword))
+
+	// 设置页面超时
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
+
+	// 创建页面
+	page := s.browser.MustPage()
+	defer page.MustClose()
+
+	// 设置视口大小
+	err := page.SetViewport(&proto.EmulationSetDeviceMetricsOverride{
+		Width:  1280,
+		Height: 800,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("设置视口失败: %v", err)
+	}
+
+	// 导航到搜索页面
+	err = page.Context(ctx).Navigate(searchURL)
+	if err != nil {
+		return nil, fmt.Errorf("导航到搜索页面失败: %v", err)
+	}
+
+	// 等待搜索结果加载完成
+	err = page.WaitLoad()
+	if err != nil {
+		return nil, fmt.Errorf("等待页面加载完成失败: %v", err)
+	}
+
+	// 分析当前页面的搜索结果
+	for i := 0; i < maxPages; i++ {
+		if i > 0 {
+			// 点击下一页按钮
+			nextPage, err := page.Element("a.n")
+			if err != nil || nextPage == nil {
+				break // 没有下一页
+			}
+
+			err = nextPage.Click(proto.InputMouseButtonLeft, 1)
+			if err != nil {
+				break // 点击下一页失败
+			}
+
+			// 等待新页面加载
+			err = page.WaitLoad()
+			if err != nil {
+				break
+			}
+		}
+
+		// 提取搜索结果
+		resultElements, err := page.Elements(".result, .c-container")
+		if err != nil || resultElements == nil {
+			continue
+		}
+
+		for _, result := range resultElements {
+			// 获取标题
+			titleElement, err := result.Element("h3, .t")
+			if err != nil || titleElement == nil {
+				continue
+			}
+
+			title, err := titleElement.Text()
+			if err != nil {
+				continue
+			}
+
+			// 获取 URL
+			linkElement, err := titleElement.Element("a")
+			if err != nil || linkElement == nil {
+				continue
+			}
+
+			href, err := linkElement.Attribute("href")
+			if err != nil || href == nil {
+				continue
+			}
+
+			// 获取内容摘要 - 尝试多个可能的选择器
+			var contentElement *rod.Element
+			var content string
+
+			// 尝试多个可能的选择器来适应不同版本的百度搜索结果
+			selectors := []string{".content-right_8Zs40", ".c-abstract", ".content_LJ0WN", ".content"}
+			for _, selector := range selectors {
+				contentElement, err = result.Element(selector)
+				if err == nil && contentElement != nil {
+					content, _ = contentElement.Text()
+					if content != "" {
+						break
+					}
+				}
+			}
+
+			// 如果所有选择器都失败，尝试直接从结果块中提取文本
+			if content == "" {
+				// 获取结果元素的所有文本
+				fullText, err := result.Text()
+				if err == nil && fullText != "" {
+					// 简单处理：从全文中移除标题，剩下的可能是摘要
+					fullText = strings.Replace(fullText, title, "", 1)
+					// 清理文本
+					content = strings.TrimSpace(fullText)
+					// 限制内容长度
+					if len(content) > 200 {
+						content = content[:200] + "..."
+					}
+				}
+			}
+
+			// 添加到结果集
+			results = append(results, SearchResult{
+				Title:   title,
+				URL:     *href,
+				Content: content,
+			})
+
+			// 限制结果数量，每页最多 10 条
+			if len(results) >= 10*maxPages {
+				break
+			}
+		}
+	}
+
+	// 获取真实 URL（百度搜索结果中的 URL 是短链接，需要跳转获取真实 URL）
+	for i, result := range results {
+		realURL, err := s.getRedirectURL(result.URL)
+		if err == nil && realURL != "" {
+			results[i].URL = realURL
+		}
+	}
+
+	return results, nil
+}
+
+// 获取真实 URL
+func (s *Service) getRedirectURL(shortURL string) (string, error) {
+	// 创建页面
+	page, err := s.browser.Page(proto.TargetCreateTarget{URL: ""})
+	if err != nil {
+		return shortURL, err // 返回原始URL
+	}
+	defer func() {
+		_ = page.Close()
+	}()
+
+	// 导航到短链接
+	err = page.Navigate(shortURL)
+	if err != nil {
+		return shortURL, err // 返回原始URL
+	}
+
+	// 等待重定向完成
+	time.Sleep(2 * time.Second)
+
+	// 获取当前 URL
+	info, err := page.Info()
+	if err != nil {
+		return shortURL, err // 返回原始URL
+	}
+
+	return info.URL, nil
+}
+
+// Close 关闭浏览器
+func (s *Service) Close() error {
+	if s.browser != nil {
+		err := s.browser.Close()
+		s.browser = nil
+		return err
+	}
+	return nil
+}
+
+// SearchWeb 封装的搜索方法
+func SearchWeb(keyword string, maxPages int) (string, error) {
+	// 添加panic恢复机制
+	defer func() {
+		if r := recover(); r != nil {
+			log := logger.GetLogger()
+			log.Errorf("爬虫服务崩溃: %v", r)
+		}
+	}()
+
+	service, err := NewService()
+	if err != nil {
+		return "", fmt.Errorf("创建爬虫服务失败: %v", err)
+	}
+	defer service.Close()
+
+	// 设置超时上下文
+	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
+	defer cancel()
+
+	// 使用goroutine和通道来处理超时
+	resultChan := make(chan []SearchResult, 1)
+	errChan := make(chan error, 1)
+
+	go func() {
+		results, err := service.WebSearch(keyword, maxPages)
+		if err != nil {
+			errChan <- err
+			return
+		}
+		resultChan <- results
+	}()
+
+	// 等待结果或超时
+	select {
+	case <-ctx.Done():
+		return "", fmt.Errorf("搜索超时: %v", ctx.Err())
+	case err := <-errChan:
+		return "", fmt.Errorf("搜索失败: %v", err)
+	case results := <-resultChan:
+		if len(results) == 0 {
+			return "未找到关于 \"" + keyword + "\" 的相关搜索结果", nil
+		}
+
+		// 格式化结果
+		var builder strings.Builder
+		builder.WriteString(fmt.Sprintf("为您找到关于 \"%s\" 的 %d 条搜索结果：\n\n", keyword, len(results)))
+
+		for i, result := range results {
+			// // 尝试打开链接获取实际内容
+			// page := service.browser.MustPage()
+			// defer page.MustClose()
+
+			// // 设置页面超时
+			// pageCtx, pageCancel := context.WithTimeout(context.Background(), 10*time.Second)
+			// defer pageCancel()
+
+			// // 导航到目标页面
+			// err := page.Context(pageCtx).Navigate(result.URL)
+			// if err == nil {
+			// 	// 等待页面加载
+			// 	_ = page.WaitLoad()
+
+			// 	// 获取页面标题
+			// 	title, err := page.Eval("() => document.title")
+			// 	if err == nil && title.Value.String() != "" {
+			// 		result.Title = title.Value.String()
+			// 	}
+
+			// 	// 获取页面主要内容
+			// 	if content, err := page.Element("body"); err == nil {
+			// 		if text, err := content.Text(); err == nil {
+			// 			// 清理并截取内容
+			// 			text = strings.TrimSpace(text)
+			// 			if len(text) > 200 {
+			// 				text = text[:200] + "..."
+			// 			}
+			// 			result.Prompt = text
+			// 		}
+			// 	}
+			// }
+
+			builder.WriteString(fmt.Sprintf("%d. **%s**\n", i+1, result.Title))
+			builder.WriteString(fmt.Sprintf("   链接: %s\n", result.URL))
+			if result.Content != "" {
+				builder.WriteString(fmt.Sprintf("   摘要: %s\n", result.Content))
+			}
+			builder.WriteString("\n")
+		}
+
+		return builder.String(), nil
+	}
+}
--- a/api/service/dalle/service.go
+++ b/api/service/dalle/service.go
@@ -8,7 +8,6 @@ package dalle
 // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 import (
-	"errors"
 	"fmt"
 	"geekai/core/types"
 	logger2 "geekai/logger"
@@ -17,9 +16,10 @@ import (
 	"geekai/store"
 	"geekai/store/model"
 	"geekai/utils"
-	"github.com/go-redis/redis/v8"
 	"time"

+	"github.com/go-redis/redis/v8"
+
 	"github.com/imroc/req/v3"
 	"gorm.io/gorm"
 )
@@ -33,8 +33,6 @@ type Service struct {
 	db            *gorm.DB
 	uploadManager *oss.UploaderManager
 	taskQueue     *store.RedisQueue
-	notifyQueue   *store.RedisQueue
-	Clients       *types.LMap[uint, *types.WsClient] // UserId => Client
 	userService   *service.UserService
 }

@@ -43,8 +41,6 @@ func NewService(db *gorm.DB, manager *oss.UploaderManager, redisCli *redis.Clien
 		httpClient:    req.C().SetTimeout(time.Minute * 3),
 		db:            db,
 		taskQueue:     store.NewRedisQueue("DallE_Task_Queue", redisCli),
-		notifyQueue:   store.NewRedisQueue("DallE_Notify_Queue", redisCli),
-		Clients:       types.NewLMap[uint, *types.WsClient](),
 		uploadManager: manager,
 		userService:   userService,
 	}
@@ -53,10 +49,26 @@ func NewService(db *gorm.DB, manager *oss.UploaderManager, redisCli *redis.Clien
 // PushTask push a new mj task in to task queue
 func (s *Service) PushTask(task types.DallTask) {
 	logger.Infof("add a new DALL-E task to the task list: %+v", task)
-	s.taskQueue.RPush(task)
+	if err := s.taskQueue.RPush(task); err != nil {
+		logger.Errorf("push dall-e task to queue failed: %v", err)
+	}
 }

 func (s *Service) Run() {
+	// 将数据库中未提交的任务加载到队列
+	var jobs []model.DallJob
+	s.db.Where("progress", 0).Find(&jobs)
+	for _, v := range jobs {
+		var task types.DallTask
+		err := utils.JsonDecode(v.TaskInfo, &task)
+		if err != nil {
+			logger.Errorf("decode task info with error: %v", err)
+			continue
+		}
+		task.Id = v.Id
+		s.PushTask(task)
+	}
+
 	logger.Info("Starting DALL-E job consumer...")
 	go func() {
 		for {
@@ -67,15 +79,16 @@ func (s *Service) Run() {
 				continue
 			}
 			logger.Infof("handle a new DALL-E task: %+v", task)
-			_, err = s.Image(task, false)
-			if err != nil {
-				logger.Errorf("error with image task: %v", err)
-				s.db.Model(&model.DallJob{Id: task.JobId}).UpdateColumns(map[string]interface{}{
-					"progress": service.FailTaskProgress,
-					"err_msg":  err.Error(),
-				})
-				s.notifyQueue.RPush(service.NotifyMessage{UserId: int(task.UserId), JobId: int(task.JobId), Message: service.TaskStatusFailed})
-			}
+			go func() {
+				_, err = s.Image(task, false)
+				if err != nil {
+					logger.Errorf("error with image task: %v", err)
+					s.db.Model(&model.DallJob{Id: task.Id}).UpdateColumns(map[string]interface{}{
+						"progress": service.FailTaskProgress,
+						"err_msg":  err.Error(),
+					})
+				}
+			}()
 		}
 	}()
 }
@@ -83,17 +96,18 @@ func (s *Service) Run() {
 type imgReq struct {
 	Model   string `json:"model"`
 	Prompt  string `json:"prompt"`
-	N       int    `json:"n"`
-	Size    string `json:"size"`
-	Quality string `json:"quality"`
-	Style   string `json:"style"`
+	N       int    `json:"n,omitempty"`
+	Size    string `json:"size,omitempty"`
+	Quality string `json:"quality,omitempty"`
+	Style   string `json:"style,omitempty"`
 }

 type imgRes struct {
 	Created int64 `json:"created"`
 	Data    []struct {
-		RevisedPrompt string `json:"revised_prompt"`
-		Url           string `json:"url"`
+		RevisedPrompt string `json:"revised_prompt,omitempty"`
+		Url           string `json:"url,omitempty"`
+		B64Json       string `json:"b64_json,omitempty"`
 	} `json:"data"`
 }

@@ -111,36 +125,31 @@ func (s *Service) Image(task types.DallTask, sync bool) (string, error) {
 	prompt := task.Prompt
 	// translate prompt
 	if utils.HasChinese(prompt) {
-		content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.RewritePromptTemplate, prompt), "gpt-4o-mini")
+		content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.TranslatePromptTemplate, prompt), task.TranslateModelId)
 		if err == nil {
 			prompt = content
 			logger.Debugf("重写后提示词：%s", prompt)
 		}
 	}

-	var user model.User
-	s.db.Where("id", task.UserId).First(&user)
-	if user.Power < task.Power {
-		return "", errors.New("insufficient of power")
-	}
-
-	// 扣减算力
-	err := s.userService.DecreasePower(int(user.Id), task.Power, model.PowerLog{
-		Type:   types.PowerConsume,
-		Model:  "dall-e-3",
-		Remark: fmt.Sprintf("绘画提示词：%s", utils.CutWords(task.Prompt, 10)),
-	})
-	if err != nil {
-		return "", fmt.Errorf("error with decrease power: %v", err)
+	var chatModel model.ChatModel
+	if task.ModelId > 0 {
+		s.db.Where("id", task.ModelId).First(&chatModel)
+	} else {
+		s.db.Where("value", task.ModelName).First(&chatModel)
 	}

 	// get image generation API KEY
 	var apiKey model.ApiKey
-	err = s.db.Where("type", "dalle").
-		Where("enabled", true).
-		Order("last_used_at ASC").First(&apiKey).Error
+	session := s.db.Where("enabled", true)
+	if chatModel.KeyId > 0 {
+		session = session.Where("id = ?", chatModel.KeyId)
+	} else {
+		session = session.Where("type = ?", "dalle")
+	}
+	err := session.Order("last_used_at ASC").First(&apiKey).Error
 	if err != nil {
-		return "", fmt.Errorf("no available DALL-E api key: %v", err)
+		return "", fmt.Errorf("no available Image Generation api key: %v", err)
 	}

 	var res imgRes
@@ -150,7 +159,7 @@ func (s *Service) Image(task types.DallTask, sync bool) (string, error) {
 	}
 	apiURL := fmt.Sprintf("%s/v1/images/generations", apiKey.ApiURL)
 	reqBody := imgReq{
-		Model:   "dall-e-3",
+		Model:   chatModel.Value,
 		Prompt:  prompt,
 		N:       1,
 		Size:    task.Size,
@@ -158,35 +167,50 @@ func (s *Service) Image(task types.DallTask, sync bool) (string, error) {
 		Quality: task.Quality,
 	}
 	logger.Infof("Channel:%s, API KEY:%s, BODY: %+v", apiURL, apiKey.Value, reqBody)
-	r, err := s.httpClient.R().SetHeader("Content-Type", "application/json").
+	r, err := s.httpClient.R().SetHeader("Body-Type", "application/json").
 		SetHeader("Authorization", "Bearer "+apiKey.Value).
 		SetBody(reqBody).
 		SetErrorResult(&errRes).
 		SetSuccessResult(&res).
 		Post(apiURL)
 	if err != nil {
+		logger.Errorf("error with send request: %v", err)
 		return "", fmt.Errorf("error with send request: %v", err)
 	}

 	if r.IsErrorState() {
+		logger.Errorf("error with send request, status: %s, %+v", r.Status, errRes.Error)
 		return "", fmt.Errorf("error with send request, status: %s, %+v", r.Status, errRes.Error)
 	}
+
 	// update the api key last use time
 	s.db.Model(&apiKey).UpdateColumn("last_used_at", time.Now().Unix())
-	// update task progress
-	err = s.db.Model(&model.DallJob{Id: task.JobId}).UpdateColumns(map[string]interface{}{
+	var imgURL string
+	var data = map[string]interface{}{
 		"progress": 100,
-		"org_url":  res.Data[0].Url,
 		"prompt":   prompt,
-	}).Error
+	}
+	// 如果返回的是base64，则需要上传到oss
+	if res.Data[0].B64Json != "" {
+		imgURL, err = s.uploadManager.GetUploadHandler().PutBase64(res.Data[0].B64Json)
+		if err != nil {
+			return "", fmt.Errorf("error with upload image: %v", err)
+		}
+		logger.Infof("upload image to oss: %s", imgURL)
+		data["img_url"] = imgURL
+	} else {
+		imgURL = res.Data[0].Url
+	}
+	data["org_url"] = imgURL
+	// update task progress
+	err = s.db.Model(&model.DallJob{Id: task.Id}).UpdateColumns(data).Error
 	if err != nil {
 		return "", fmt.Errorf("err with update database: %v", err)
 	}

-	s.notifyQueue.RPush(service.NotifyMessage{UserId: int(task.UserId), JobId: int(task.JobId), Message: service.TaskStatusFailed})
 	var content string
 	if sync {
-		imgURL, err := s.downloadImage(task.JobId, int(task.UserId), res.Data[0].Url)
+		imgURL, err := s.downloadImage(task.Id, res.Data[0].Url)
 		if err != nil {
 			return "", fmt.Errorf("error with download image: %v", err)
 		}
@@ -196,46 +220,41 @@ func (s *Service) Image(task types.DallTask, sync bool) (string, error) {
 	return content, nil
 }

-func (s *Service) CheckTaskNotify() {
-	go func() {
-		logger.Info("Running DALL-E task notify checking ...")
-		for {
-			var message service.NotifyMessage
-			err := s.notifyQueue.LPop(&message)
-			if err != nil {
-				continue
-			}
-			client := s.Clients.Get(uint(message.UserId))
-			if client == nil {
-				continue
-			}
-			err = client.Send([]byte(message.Message))
-			if err != nil {
-				continue
-			}
-		}
-	}()
-}
-
 func (s *Service) CheckTaskStatus() {
 	go func() {
 		logger.Info("Running DALL-E task status checking ...")
 		for {
+			// 检查未完成任务进度
 			var jobs []model.DallJob
-			res := s.db.Where("progress < ?", 100).Find(&jobs)
-			if res.Error != nil {
-				time.Sleep(5 * time.Second)
-				continue
-			}
-
+			s.db.Where("progress < ?", 100).Find(&jobs)
 			for _, job := range jobs {
 				// 超时的任务标记为失败
-				if time.Now().Sub(job.CreatedAt) > time.Minute*10 {
+				if time.Since(job.CreatedAt) > time.Minute*10 {
 					job.Progress = service.FailTaskProgress
 					job.ErrMsg = "任务超时"
 					s.db.Updates(&job)
 				}
 			}
+
+			// 找出失败的任务，并恢复其扣减算力
+			s.db.Where("progress", service.FailTaskProgress).Where("power > ?", 0).Find(&jobs)
+			for _, job := range jobs {
+				var task types.DallTask
+				err := utils.JsonDecode(job.TaskInfo, &task)
+				if err != nil {
+					continue
+				}
+				err = s.userService.IncreasePower(job.UserId, job.Power, model.PowerLog{
+					Type:   types.PowerRefund,
+					Model:  task.ModelName,
+					Remark: fmt.Sprintf("任务失败，退回算力。任务ID：%d，Err: %s", job.Id, job.ErrMsg),
+				})
+				if err != nil {
+					continue
+				}
+				// 更新任务状态
+				s.db.Model(&job).UpdateColumn("power", 0)
+			}
 			time.Sleep(time.Second * 10)
 		}
 	}()
@@ -257,7 +276,7 @@ func (s *Service) DownloadImages() {
 				}

 				logger.Infof("try to download image: %s", v.OrgURL)
-				imgURL, err := s.downloadImage(v.Id, int(v.UserId), v.OrgURL)
+				imgURL, err := s.downloadImage(v.Id, v.OrgURL)
 				if err != nil {
 					logger.Error("error with download image: %s, error: %v", imgURL, err)
 					continue
@@ -272,9 +291,9 @@ func (s *Service) DownloadImages() {
 	}()
 }

-func (s *Service) downloadImage(jobId uint, userId int, orgURL string) (string, error) {
+func (s *Service) downloadImage(jobId uint, orgURL string) (string, error) {
 	// sava image
-	imgURL, err := s.uploadManager.GetUploadHandler().PutUrlFile(orgURL, false)
+	imgURL, err := s.uploadManager.GetUploadHandler().PutUrlFile(orgURL, ".png", false)
 	if err != nil {
 		return "", err
 	}
@@ -284,6 +303,5 @@ func (s *Service) downloadImage(jobId uint, userId int, orgURL string) (string,
 	if res.Error != nil {
 		return "", err
 	}
-	s.notifyQueue.RPush(service.NotifyMessage{UserId: userId, JobId: int(jobId), Message: service.TaskStatusFinished})
 	return imgURL, nil
 }
--- a/api/service/jimeng/client.go
+++ b/api/service/jimeng/client.go
@@ -0,0 +1,139 @@
+package jimeng
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/url"
+
+	"github.com/volcengine/volc-sdk-golang/base"
+	"github.com/volcengine/volc-sdk-golang/service/visual"
+)
+
+// Client 即梦API客户端
+type Client struct {
+	visual *visual.Visual
+}
+
+// NewClient 创建即梦API客户端
+func NewClient(accessKey, secretKey string) *Client {
+	// 使用官方SDK的visual实例
+	visualInstance := visual.NewInstance()
+	visualInstance.Client.SetAccessKey(accessKey)
+	visualInstance.Client.SetSecretKey(secretKey)
+
+	// 添加即梦AI专有的API配置
+	jimengApis := map[string]*base.ApiInfo{
+		"CVSync2AsyncSubmitTask": {
+			Method: http.MethodPost,
+			Path:   "/",
+			Query: url.Values{
+				"Action":  []string{"CVSync2AsyncSubmitTask"},
+				"Version": []string{"2022-08-31"},
+			},
+		},
+		"CVSync2AsyncGetResult": {
+			Method: http.MethodPost,
+			Path:   "/",
+			Query: url.Values{
+				"Action":  []string{"CVSync2AsyncGetResult"},
+				"Version": []string{"2022-08-31"},
+			},
+		},
+		"CVProcess": {
+			Method: http.MethodPost,
+			Path:   "/",
+			Query: url.Values{
+				"Action":  []string{"CVProcess"},
+				"Version": []string{"2022-08-31"},
+			},
+		},
+	}
+
+	// 将即梦API添加到现有的ApiInfoList中
+	for name, info := range jimengApis {
+		visualInstance.Client.ApiInfoList[name] = info
+	}
+
+	return &Client{
+		visual: visualInstance,
+	}
+}
+
+// SubmitTask 提交异步任务
+func (c *Client) SubmitTask(req *SubmitTaskRequest) (*SubmitTaskResponse, error) {
+	// 直接将请求转为map[string]interface{}
+	reqBodyBytes, err := json.Marshal(req)
+	if err != nil {
+		return nil, fmt.Errorf("marshal request failed: %w", err)
+	}
+
+	// 直接使用序列化后的字节
+	jsonBody := reqBodyBytes
+
+	// 调用SDK的JSON方法
+	respBody, statusCode, err := c.visual.Client.Json("CVSync2AsyncSubmitTask", nil, string(jsonBody))
+	if err != nil {
+		return nil, fmt.Errorf("submit task failed (status: %d): %w", statusCode, err)
+	}
+
+	logger.Infof("Jimeng SubmitTask Response: %s", string(respBody))
+
+	// 解析响应
+	var result SubmitTaskResponse
+	if err := json.Unmarshal(respBody, &result); err != nil {
+		return nil, fmt.Errorf("unmarshal response failed: %w", err)
+	}
+
+	return &result, nil
+}
+
+// QueryTask 查询任务结果
+func (c *Client) QueryTask(req *QueryTaskRequest) (*QueryTaskResponse, error) {
+	// 序列化请求
+	jsonBody, err := json.Marshal(req)
+	if err != nil {
+		return nil, fmt.Errorf("marshal request failed: %w", err)
+	}
+
+	// 调用SDK的JSON方法
+	respBody, statusCode, err := c.visual.Client.Json("CVSync2AsyncGetResult", nil, string(jsonBody))
+	if err != nil {
+		return nil, fmt.Errorf("query task failed (status: %d): %w", statusCode, err)
+	}
+
+	logger.Infof("Jimeng QueryTask Response: %s", string(respBody))
+
+	// 解析响应
+	var result QueryTaskResponse
+	if err := json.Unmarshal(respBody, &result); err != nil {
+		return nil, fmt.Errorf("unmarshal response failed: %w", err)
+	}
+
+	return &result, nil
+}
+
+// SubmitSyncTask 提交同步任务（仅用于文生图）
+func (c *Client) SubmitSyncTask(req *SubmitTaskRequest) (*QueryTaskResponse, error) {
+	// 序列化请求
+	jsonBody, err := json.Marshal(req)
+	if err != nil {
+		return nil, fmt.Errorf("marshal request failed: %w", err)
+	}
+
+	// 调用SDK的JSON方法
+	respBody, statusCode, err := c.visual.Client.Json("CVProcess", nil, string(jsonBody))
+	if err != nil {
+		return nil, fmt.Errorf("submit sync task failed (status: %d): %w", statusCode, err)
+	}
+
+	logger.Infof("Jimeng SubmitSyncTask Response: %s", string(respBody))
+
+	// 解析响应，同步任务直接返回结果
+	var result QueryTaskResponse
+	if err := json.Unmarshal(respBody, &result); err != nil {
+		return nil, fmt.Errorf("unmarshal response failed: %w", err)
+	}
+
+	return &result, nil
+}
--- a/api/service/jimeng/service.go
+++ b/api/service/jimeng/service.go
@@ -0,0 +1,600 @@
+package jimeng
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"gorm.io/gorm"
+
+	logger2 "geekai/logger"
+	"geekai/service/oss"
+	"geekai/store"
+	"geekai/store/model"
+	"geekai/utils"
+
+	"geekai/core/types"
+
+	"github.com/go-redis/redis/v8"
+)
+
+var logger = logger2.GetLogger()
+
+// Service 即梦服务（合并了消费者功能）
+type Service struct {
+	db        *gorm.DB
+	redis     *redis.Client
+	taskQueue *store.RedisQueue
+	client    *Client
+	ctx       context.Context
+	cancel    context.CancelFunc
+	running   bool
+	uploader  *oss.UploaderManager
+}
+
+// NewService 创建即梦服务
+func NewService(db *gorm.DB, redisCli *redis.Client, uploader *oss.UploaderManager) *Service {
+	taskQueue := store.NewRedisQueue("JimengTaskQueue", redisCli)
+	// 从数据库加载配置
+	var config model.Config
+	db.Where("name = ?", "Jimeng").First(&config)
+	var jimengConfig types.JimengConfig
+	if config.Id > 0 {
+		_ = utils.JsonDecode(config.Value, &jimengConfig)
+	}
+	client := NewClient(jimengConfig.AccessKey, jimengConfig.SecretKey)
+
+	ctx, cancel := context.WithCancel(context.Background())
+	return &Service{
+		db:        db,
+		redis:     redisCli,
+		taskQueue: taskQueue,
+		client:    client,
+		ctx:       ctx,
+		cancel:    cancel,
+		running:   false,
+		uploader:  uploader,
+	}
+}
+
+// Start 启动服务（包含消费者）
+func (s *Service) Start() {
+	if s.running {
+		return
+	}
+	logger.Info("Starting Jimeng service and task consumer...")
+	s.running = true
+	go s.consumeTasks()
+	go s.pollTaskStatus()
+}
+
+// Stop 停止服务
+func (s *Service) Stop() {
+	if !s.running {
+		return
+	}
+	logger.Info("Stopping Jimeng service and task consumer...")
+	s.running = false
+	s.cancel()
+}
+
+// consumeTasks 消费任务
+func (s *Service) consumeTasks() {
+	for {
+		select {
+		case <-s.ctx.Done():
+			logger.Info("Jimeng task consumer stopped")
+			return
+		default:
+			s.processNextTask()
+		}
+	}
+}
+
+// processNextTask 处理下一个任务
+func (s *Service) processNextTask() {
+	var jobId uint
+	if err := s.taskQueue.LPop(&jobId); err != nil {
+		// 队列为空，等待1秒后重试
+		time.Sleep(time.Second)
+		return
+	}
+
+	logger.Infof("Processing Jimeng task: job_id=%d", jobId)
+
+	if err := s.ProcessTask(jobId); err != nil {
+		logger.Errorf("process jimeng task failed: job_id=%d, error=%v", jobId, err)
+		s.UpdateJobStatus(jobId, model.JMTaskStatusFailed, err.Error())
+	} else {
+		logger.Infof("Jimeng task processed successfully: job_id=%d", jobId)
+	}
+}
+
+// CreateTask 创建任务
+func (s *Service) CreateTask(userId uint, req *CreateTaskRequest) (*model.JimengJob, error) {
+	// 生成任务ID
+	taskId := utils.RandString(20)
+
+	// 序列化任务参数
+	paramsJson, err := json.Marshal(req.Params)
+	if err != nil {
+		return nil, fmt.Errorf("marshal task params failed: %w", err)
+	}
+
+	// 创建任务记录
+	job := &model.JimengJob{
+		UserId:     userId,
+		TaskId:     taskId,
+		Type:       req.Type,
+		ReqKey:     req.ReqKey,
+		Prompt:     req.Prompt,
+		TaskParams: string(paramsJson),
+		Status:     model.JMTaskStatusInQueue,
+		Power:      req.Power,
+		CreatedAt:  time.Now(),
+		UpdatedAt:  time.Now(),
+	}
+
+	// 保存到数据库
+	if err := s.db.Create(job).Error; err != nil {
+		return nil, fmt.Errorf("create jimeng job failed: %w", err)
+	}
+
+	// 推送到任务队列
+	if err := s.taskQueue.RPush(job.Id); err != nil {
+		return nil, fmt.Errorf("push jimeng task to queue failed: %w", err)
+	}
+
+	return job, nil
+}
+
+// ProcessTask 处理任务
+func (s *Service) ProcessTask(jobId uint) error {
+	// 获取任务记录
+	var job model.JimengJob
+	if err := s.db.First(&job, jobId).Error; err != nil {
+		return fmt.Errorf("get jimeng job failed: %w", err)
+	}
+
+	// 更新任务状态为处理中
+	if err := s.UpdateJobStatus(job.Id, model.JMTaskStatusGenerating, ""); err != nil {
+		return fmt.Errorf("update job status failed: %w", err)
+	}
+
+	// 构建请求并提交任务
+	req, err := s.buildTaskRequest(&job)
+	if err != nil {
+		return s.handleTaskError(job.Id, fmt.Sprintf("build task request failed: %v", err))
+	}
+
+	logger.Infof("提交即梦任务: %+v", req)
+
+	// 提交异步任务
+	resp, err := s.client.SubmitTask(req)
+	if err != nil {
+		return s.handleTaskError(job.Id, fmt.Sprintf("submit task failed: %v", err))
+	}
+
+	if resp.Code != 10000 {
+		return s.handleTaskError(job.Id, fmt.Sprintf("submit task failed: %s", resp.Message))
+	}
+
+	// 更新任务ID和原始数据
+	rawData, _ := json.Marshal(resp)
+	if err := s.db.Model(&model.JimengJob{}).Where("id = ?", job.Id).Updates(map[string]any{
+		"task_id":    resp.Data.TaskId,
+		"raw_data":   string(rawData),
+		"updated_at": time.Now(),
+	}).Error; err != nil {
+		logger.Errorf("update jimeng job task_id failed: %v", err)
+	}
+
+	return nil
+}
+
+// buildTaskRequest 构建任务请求（统一的参数解析）
+func (s *Service) buildTaskRequest(job *model.JimengJob) (*SubmitTaskRequest, error) {
+	// 解析任务参数
+	var params map[string]any
+	if err := json.Unmarshal([]byte(job.TaskParams), &params); err != nil {
+		return nil, fmt.Errorf("parse task params failed: %w", err)
+	}
+
+	// 构建基础请求
+	req := &SubmitTaskRequest{
+		ReqKey: job.ReqKey,
+		Prompt: job.Prompt,
+	}
+
+	// 根据任务类型设置特定参数
+	switch job.Type {
+	case model.JMTaskTypeTextToImage:
+		s.setTextToImageParams(req, params)
+	case model.JMTaskTypeImageToImage:
+		s.setImageToImageParams(req, params)
+	case model.JMTaskTypeImageEdit:
+		s.setImageEditParams(req, params)
+	case model.JMTaskTypeImageEffects:
+		s.setImageEffectsParams(req, params)
+	case model.JMTaskTypeTextToVideo:
+		s.setTextToVideoParams(req, params)
+	case model.JMTaskTypeImageToVideo:
+		s.setImageToVideoParams(req, params)
+	default:
+		return nil, fmt.Errorf("unsupported task type: %s", job.Type)
+	}
+
+	return req, nil
+}
+
+// setTextToImageParams 设置文生图参数
+func (s *Service) setTextToImageParams(req *SubmitTaskRequest, params map[string]any) {
+	if seed, ok := params["seed"]; ok {
+		if seedVal, err := strconv.ParseInt(fmt.Sprintf("%.0f", seed), 10, 64); err == nil {
+			req.Seed = seedVal
+		}
+	}
+	if scale, ok := params["scale"]; ok {
+		if scaleVal, ok := scale.(float64); ok {
+			req.Scale = scaleVal
+		}
+	}
+	if width, ok := params["width"]; ok {
+		if widthVal, ok := width.(float64); ok {
+			req.Width = int(widthVal)
+		}
+	}
+	if height, ok := params["height"]; ok {
+		if heightVal, ok := height.(float64); ok {
+			req.Height = int(heightVal)
+		}
+	}
+	if usePreLlm, ok := params["use_pre_llm"]; ok {
+		if usePreLlmVal, ok := usePreLlm.(bool); ok {
+			req.UsePreLLM = usePreLlmVal
+		}
+	}
+}
+
+// setImageToImageParams 设置图生图参数
+func (s *Service) setImageToImageParams(req *SubmitTaskRequest, params map[string]any) {
+	if imageInput, ok := params["image_input"].(string); ok {
+		req.ImageInput = imageInput
+	}
+	if gpen, ok := params["gpen"]; ok {
+		if gpenVal, ok := gpen.(float64); ok {
+			req.Gpen = gpenVal
+		}
+	}
+	if skin, ok := params["skin"]; ok {
+		if skinVal, ok := skin.(float64); ok {
+			req.Skin = skinVal
+		}
+	}
+	if skinUnifi, ok := params["skin_unifi"]; ok {
+		if skinUnifiVal, ok := skinUnifi.(float64); ok {
+			req.SkinUnifi = skinUnifiVal
+		}
+	}
+	if genMode, ok := params["gen_mode"].(string); ok {
+		req.GenMode = genMode
+	}
+	s.setCommonParams(req, params) // 复用通用参数
+}
+
+// setImageEditParams 设置图像编辑参数
+func (s *Service) setImageEditParams(req *SubmitTaskRequest, params map[string]any) {
+	if imageUrls, ok := params["image_urls"].([]any); ok {
+		for _, url := range imageUrls {
+			if urlStr, ok := url.(string); ok {
+				req.ImageUrls = append(req.ImageUrls, urlStr)
+			}
+		}
+	}
+	if binaryData, ok := params["binary_data_base64"].([]any); ok {
+		for _, data := range binaryData {
+			if dataStr, ok := data.(string); ok {
+				req.BinaryDataBase64 = append(req.BinaryDataBase64, dataStr)
+			}
+		}
+	}
+	if scale, ok := params["scale"]; ok {
+		if scaleVal, ok := scale.(float64); ok {
+			req.Scale = scaleVal
+		}
+	}
+	s.setCommonParams(req, params)
+}
+
+// setImageEffectsParams 设置图像特效参数
+func (s *Service) setImageEffectsParams(req *SubmitTaskRequest, params map[string]any) {
+	if imageInput1, ok := params["image_input1"].(string); ok {
+		req.ImageInput1 = imageInput1
+	}
+	if templateId, ok := params["template_id"].(string); ok {
+		req.TemplateId = templateId
+	}
+	if width, ok := params["width"]; ok {
+		if widthVal, ok := width.(float64); ok {
+			req.Width = int(widthVal)
+		}
+	}
+	if height, ok := params["height"]; ok {
+		if heightVal, ok := height.(float64); ok {
+			req.Height = int(heightVal)
+		}
+	}
+}
+
+// setTextToVideoParams 设置文生视频参数
+func (s *Service) setTextToVideoParams(req *SubmitTaskRequest, params map[string]any) {
+	if aspectRatio, ok := params["aspect_ratio"].(string); ok {
+		req.AspectRatio = aspectRatio
+	}
+	s.setCommonParams(req, params)
+}
+
+// setImageToVideoParams 设置图生视频参数
+func (s *Service) setImageToVideoParams(req *SubmitTaskRequest, params map[string]any) {
+	s.setImageEditParams(req, params) // 复用图像编辑的参数设置
+	if aspectRatio, ok := params["aspect_ratio"].(string); ok {
+		req.AspectRatio = aspectRatio
+	}
+}
+
+// setCommonParams 设置通用参数（seed, width, height等）
+func (s *Service) setCommonParams(req *SubmitTaskRequest, params map[string]any) {
+	if seed, ok := params["seed"]; ok {
+		if seedVal, err := strconv.ParseInt(fmt.Sprintf("%.0f", seed), 10, 64); err == nil {
+			req.Seed = seedVal
+		}
+	}
+	if width, ok := params["width"]; ok {
+		if widthVal, ok := width.(float64); ok {
+			req.Width = int(widthVal)
+		}
+	}
+	if height, ok := params["height"]; ok {
+		if heightVal, ok := height.(float64); ok {
+			req.Height = int(heightVal)
+		}
+	}
+}
+
+// pollTaskStatus 轮询任务状态
+func (s *Service) pollTaskStatus() {
+
+	for {
+		var jobs []model.JimengJob
+		s.db.Where("status IN (?)", []model.JMTaskStatus{model.JMTaskStatusGenerating, model.JMTaskStatusInQueue}).Find(&jobs)
+		if len(jobs) == 0 {
+			logger.Debugf("no jimeng task to poll, sleep 10s")
+			time.Sleep(10 * time.Second)
+			continue
+		}
+
+		for _, job := range jobs {
+			// 任务超时处理
+			if job.UpdatedAt.Before(time.Now().Add(-5 * time.Minute)) {
+				s.handleTaskError(job.Id, "task timeout")
+				continue
+			}
+
+			// 查询任务状态
+			resp, err := s.client.QueryTask(&QueryTaskRequest{
+				ReqKey:  job.ReqKey,
+				TaskId:  job.TaskId,
+				ReqJson: `{"return_url":true}`,
+			})
+
+			if err != nil {
+				logger.Errorf("query jimeng task status failed: %v", err)
+				continue
+			}
+
+			// 更新原始数据
+			rawData, _ := json.Marshal(resp)
+			s.db.Model(&model.JimengJob{}).Where("id = ?", job.Id).Update("raw_data", string(rawData))
+
+			if resp.Code != 10000 {
+				s.handleTaskError(job.Id, fmt.Sprintf("query task failed: %s", resp.Message))
+				continue
+			}
+
+			switch resp.Data.Status {
+			case model.JMTaskStatusDone:
+				// 判断任务是否成功
+				if resp.Message != "Success" {
+					s.handleTaskError(job.Id, fmt.Sprintf("task failed: %s", resp.Data.AlgorithmBaseResp.StatusMessage))
+					continue
+				}
+
+				// 任务完成，更新结果
+				updates := map[string]any{
+					"status":     model.JMTaskStatusSuccess,
+					"updated_at": time.Now(),
+				}
+
+				// 设置结果URL
+				if len(resp.Data.ImageUrls) > 0 {
+					imgUrl, err := s.uploader.GetUploadHandler().PutUrlFile(resp.Data.ImageUrls[0], ".png", false)
+					if err != nil {
+						logger.Errorf("upload image failed: %v", err)
+						imgUrl = resp.Data.ImageUrls[0]
+					}
+					updates["img_url"] = imgUrl
+				}
+				if resp.Data.VideoUrl != "" {
+					videoUrl, err := s.uploader.GetUploadHandler().PutUrlFile(resp.Data.VideoUrl, ".mp4", false)
+					if err != nil {
+						logger.Errorf("upload video failed: %v", err)
+						videoUrl = resp.Data.VideoUrl
+					}
+					updates["video_url"] = videoUrl
+				}
+
+				s.db.Model(&model.JimengJob{}).Where("id = ?", job.Id).Updates(updates)
+			case model.JMTaskStatusInQueue, model.JMTaskStatusGenerating:
+				// 任务处理中
+				s.UpdateJobStatus(job.Id, model.JMTaskStatusGenerating, "")
+
+			case model.JMTaskStatusNotFound:
+				// 任务未找到
+				s.handleTaskError(job.Id, "task not found")
+
+			case model.JMTaskStatusExpired:
+				// 任务过期
+				s.handleTaskError(job.Id, "task expired")
+
+			default:
+				logger.Warnf("unknown task status: %s", resp.Data.Status)
+			}
+
+		}
+
+		time.Sleep(5 * time.Second)
+
+	}
+
+}
+
+// UpdateJobStatus 更新任务状态
+func (s *Service) UpdateJobStatus(jobId uint, status model.JMTaskStatus, errMsg string) error {
+	updates := map[string]any{
+		"status":     status,
+		"updated_at": time.Now(),
+	}
+	if errMsg != "" {
+		updates["err_msg"] = errMsg
+	}
+	return s.db.Model(&model.JimengJob{}).Where("id = ?", jobId).Updates(updates).Error
+}
+
+// handleTaskError 处理任务错误
+func (s *Service) handleTaskError(jobId uint, errMsg string) error {
+	logger.Errorf("Jimeng task error (job_id: %d): %s", jobId, errMsg)
+	return s.UpdateJobStatus(jobId, model.JMTaskStatusFailed, errMsg)
+}
+
+// PushTaskToQueue 推送任务到队列（用于手动重试）
+func (s *Service) PushTaskToQueue(jobId uint) error {
+	return s.taskQueue.RPush(jobId)
+}
+
+// GetTaskStats 获取任务统计信息
+func (s *Service) GetTaskStats() (map[string]any, error) {
+	type StatResult struct {
+		Status string `json:"status"`
+		Count  int64  `json:"count"`
+	}
+
+	var stats []StatResult
+	err := s.db.Model(&model.JimengJob{}).
+		Select("status, COUNT(*) as count").
+		Group("status").
+		Find(&stats).Error
+	if err != nil {
+		return nil, err
+	}
+
+	result := map[string]any{
+		"total":      int64(0),
+		"completed":  int64(0),
+		"processing": int64(0),
+		"failed":     int64(0),
+		"pending":    int64(0),
+	}
+
+	for _, stat := range stats {
+		result["total"] = result["total"].(int64) + stat.Count
+		result[stat.Status] = stat.Count
+	}
+
+	return result, nil
+}
+
+// GetJob 获取任务
+func (s *Service) GetJob(jobId uint) (*model.JimengJob, error) {
+	var job model.JimengJob
+	if err := s.db.First(&job, jobId).Error; err != nil {
+		return nil, err
+	}
+	return &job, nil
+}
+
+// testConnection 测试即梦AI连接
+func (s *Service) testConnection(accessKey, secretKey string) error {
+	testClient := NewClient(accessKey, secretKey)
+
+	// 使用一个简单的查询任务来测试连接
+	testReq := &QueryTaskRequest{
+		ReqKey: "test_connection",
+		TaskId: "test_task_id_12345",
+	}
+
+	_, err := testClient.QueryTask(testReq)
+	// 即使任务不存在，只要不是认证错误就说明连接正常
+	if err != nil {
+		// 检查是否是认证错误
+		if strings.Contains(err.Error(), "InvalidAccessKey") {
+			return fmt.Errorf("认证失败，请检查AccessKey和SecretKey是否正确")
+		}
+		// 其他错误（如任务不存在）说明连接正常
+		return nil
+	}
+	return nil
+}
+
+// UpdateClientConfig 更新客户端配置
+func (s *Service) UpdateClientConfig(accessKey, secretKey string) error {
+	// 创建新的客户端
+	newClient := NewClient(accessKey, secretKey)
+
+	// 测试新客户端是否可用
+	err := s.testConnection(accessKey, secretKey)
+	if err != nil {
+		return err
+	}
+
+	// 更新客户端
+	s.client = newClient
+	return nil
+}
+
+var defaultPower = types.JimengPower{
+	TextToImage:  20,
+	ImageToImage: 20,
+	ImageEdit:    20,
+	ImageEffects: 20,
+	TextToVideo:  300,
+	ImageToVideo: 300,
+}
+
+// GetConfig 获取即梦AI配置
+func (s *Service) GetConfig() *types.JimengConfig {
+	var config model.Config
+	err := s.db.Where("name", "jimeng").First(&config).Error
+	if err != nil {
+		// 如果配置不存在，返回默认配置
+		return &types.JimengConfig{
+			AccessKey: "",
+			SecretKey: "",
+			Power:     defaultPower,
+		}
+	}
+
+	var jimengConfig types.JimengConfig
+	err = utils.JsonDecode(config.Value, &jimengConfig)
+	if err != nil {
+		return &types.JimengConfig{
+			AccessKey: "",
+			SecretKey: "",
+			Power:     defaultPower,
+		}
+	}
+
+	return &jimengConfig
+}
--- a/api/service/jimeng/types.go
+++ b/api/service/jimeng/types.go
@@ -0,0 +1,145 @@
+package jimeng
+
+import "geekai/store/model"
+
+// ReqKey 常量定义
+const (
+	ReqKeyTextToImage          = "high_aes_general_v30l_zt2i" // 文生图
+	ReqKeyImageToImagePortrait = "i2i_portrait_photo"         // 图生图人像写真
+	ReqKeyImageEdit            = "seededit_v3.0"              // 图像编辑
+	ReqKeyImageEffects         = "i2i_multi_style_zx2x"       // 图像特效
+	ReqKeyTextToVideo          = "jimeng_vgfm_t2v_l20"        // 文生视频
+	ReqKeyImageToVideo         = "jimeng_vgfm_i2v_l20"        // 图生视频
+)
+
+// SubmitTaskRequest 提交任务请求
+type SubmitTaskRequest struct {
+	ReqKey string `json:"req_key"`
+	// 文生图参数
+	Prompt    string  `json:"prompt,omitempty"`
+	Seed      int64   `json:"seed,omitempty"`
+	Scale     float64 `json:"scale,omitempty"`
+	Width     int     `json:"width,omitempty"`
+	Height    int     `json:"height,omitempty"`
+	UsePreLLM bool    `json:"use_pre_llm,omitempty"`
+	// 图生图参数
+	ImageInput       string   `json:"image_input,omitempty"`
+	ImageUrls        []string `json:"image_urls,omitempty"`
+	BinaryDataBase64 []string `json:"binary_data_base64,omitempty"`
+	Gpen             float64  `json:"gpen,omitempty"`
+	Skin             float64  `json:"skin,omitempty"`
+	SkinUnifi        float64  `json:"skin_unifi,omitempty"`
+	GenMode          string   `json:"gen_mode,omitempty"`
+	// 图像编辑参数
+	// 图像特效参数
+	ImageInput1 string `json:"image_input1,omitempty"`
+	TemplateId  string `json:"template_id,omitempty"`
+	// 视频生成参数
+	AspectRatio string `json:"aspect_ratio,omitempty"`
+}
+
+// SubmitTaskResponse 提交任务响应
+type SubmitTaskResponse struct {
+	Code        int    `json:"code"`
+	Message     string `json:"message"`
+	RequestId   string `json:"request_id"`
+	Status      int    `json:"status"`
+	TimeElapsed string `json:"time_elapsed"`
+	Data        struct {
+		TaskId string `json:"task_id"`
+	} `json:"data"`
+}
+
+// QueryTaskRequest 查询任务请求
+type QueryTaskRequest struct {
+	ReqKey  string `json:"req_key"`
+	TaskId  string `json:"task_id"`
+	ReqJson string `json:"req_json,omitempty"`
+}
+
+// QueryTaskResponse 查询任务响应
+type QueryTaskResponse struct {
+	Code        int    `json:"code"`
+	Message     string `json:"message"`
+	RequestId   string `json:"request_id"`
+	Status      int    `json:"status"`
+	TimeElapsed string `json:"time_elapsed"`
+	Data        struct {
+		AlgorithmBaseResp struct {
+			StatusCode    int    `json:"status_code"`
+			StatusMessage string `json:"status_message"`
+		} `json:"algorithm_base_resp"`
+		BinaryDataBase64  []string           `json:"binary_data_base64"`
+		ImageUrls         []string           `json:"image_urls"`
+		VideoUrl          string             `json:"video_url"`
+		RespData          string             `json:"resp_data"`
+		Status            model.JMTaskStatus `json:"status"`
+		LlmResult         string             `json:"llm_result"`
+		PeResult          string             `json:"pe_result"`
+		PredictTagsResult string             `json:"predict_tags_result"`
+		RephraserResult   string             `json:"rephraser_result"`
+		VlmResult         string             `json:"vlm_result"`
+		InferCtx          any                `json:"infer_ctx"`
+	} `json:"data"`
+}
+
+// CreateTaskRequest 创建任务请求
+type CreateTaskRequest struct {
+	Type      model.JMTaskType `json:"type"`
+	Prompt    string           `json:"prompt"`
+	Params    map[string]any   `json:"params"`
+	ReqKey    string           `json:"req_key"`
+	ImageUrls []string         `json:"image_urls,omitempty"`
+	Power     int              `json:"power,omitempty"`
+}
+
+// LogoInfo 水印信息
+type LogoInfo struct {
+	AddLogo         bool    `json:"add_logo"`
+	Position        int     `json:"position"`
+	Language        int     `json:"language"`
+	Opacity         float64 `json:"opacity"`
+	LogoTextContent string  `json:"logo_text_content"`
+}
+
+// ReqJsonConfig 查询配置
+type ReqJsonConfig struct {
+	ReturnUrl bool      `json:"return_url"`
+	LogoInfo  *LogoInfo `json:"logo_info,omitempty"`
+}
+
+// ImageEffectTemplate 图像特效模板
+const (
+	TemplateIdFelt3DPolaroid             = "felt_3d_polaroid"                        // 毛毡3d拍立得风格
+	TemplateIdMyWorld                    = "my_world"                                // 像素世界风
+	TemplateIdMyWorldUniversal           = "my_world_universal"                      // 像素世界-万物通用版
+	TemplateIdPlasticBubbleFigure        = "plastic_bubble_figure"                   // 盲盒玩偶风
+	TemplateIdPlasticBubbleFigureCartoon = "plastic_bubble_figure_cartoon_text"      // 塑料泡罩人偶-文字卡头版
+	TemplateIdFurryDreamDoll             = "furry_dream_doll"                        // 毛绒玩偶风
+	TemplateIdMicroLandscapeMiniWorld    = "micro_landscape_mini_world"              // 迷你世界玩偶风
+	TemplateIdMicroLandscapeProfessional = "micro_landscape_mini_world_professional" // 微型景观小世界-职业版
+	TemplateIdAcrylicOrnaments           = "acrylic_ornaments"                       // 亚克力挂饰
+	TemplateIdFeltKeychain               = "felt_keychain"                           // 毛毡钥匙扣
+	TemplateIdLofiPixelCharacter         = "lofi_pixel_character_mini_card"          // Lofi像素人物小卡
+	TemplateIdAngelFigurine              = "angel_figurine"                          // 天使形象手办
+	TemplateIdLyingInFluffyBelly         = "lying_in_fluffy_belly"                   // 躺在毛茸茸肚皮里
+	TemplateIdGlassBall                  = "glass_ball"                              // 玻璃球
+)
+
+// AspectRatio 视频宽高比
+const (
+	AspectRatio16_9 = "16:9" // 1280×720
+	AspectRatio9_16 = "9:16" // 720×1280
+	AspectRatio1_1  = "1:1"  // 960×960
+	AspectRatio4_3  = "4:3"  // 960×720
+	AspectRatio3_4  = "3:4"  // 720×960
+	AspectRatio21_9 = "21:9" // 1680×720
+	AspectRatio9_21 = "9:21" // 720×1680
+)
+
+// GenMode 生成模式
+const (
+	GenModeCreative      = "creative"       // 提示词模式
+	GenModeReference     = "reference"      // 全参考模式
+	GenModeReferenceChar = "reference_char" // 人物参考模式
+)
--- a/api/service/license_service.go
+++ b/api/service/license_service.go
@@ -8,13 +8,16 @@ package service
 // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 import (
+	"errors"
 	"fmt"
 	"geekai/core"
 	"geekai/core/types"
 	"geekai/store"
+	"strings"
 	"time"

 	"github.com/imroc/req/v3"
+	"github.com/shirou/gopsutil/host"
 )

 type LicenseService struct {
@@ -27,11 +30,19 @@ type LicenseService struct {

 func NewLicenseService(server *core.AppServer, levelDB *store.LevelDB) *LicenseService {
 	var license types.License
+	var machineId string
+	err := levelDB.Get(types.LicenseKey, &license)
+	logger.Infof("License: %+v", server.SysConfig)
+	info, err := host.Info()
+	if err == nil {
+		machineId = info.HostID
+	}
+	logger.Infof("License: %+v", license)
 	return &LicenseService{
 		config:    server.Config.ApiConfig,
 		levelDB:   levelDB,
 		license:   &license,
-		machineId: "",
+		machineId: machineId,
 	}
 }

@@ -91,7 +102,7 @@ func (s *LicenseService) SyncLicense() {
 			if err != nil {
 				retryCounter++
 				if retryCounter < 5 {
-					logger.Warn(err)
+					logger.Debug(err)
 				}
 				s.license.IsActive = false
 			} else {
@@ -109,33 +120,30 @@ func (s *LicenseService) SyncLicense() {
 }

 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)
-	//}
+	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,
+		Key:       res.Data.License,
+		MachineId: res.Data.MachineId,
+		Configs:   res.Data.Configs,
+		ExpiredAt: res.Data.ExpiredAt,
 		IsActive:  true,
 	}, nil
 }
@@ -169,29 +177,28 @@ func (s *LicenseService) GetLicense() *types.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)
+	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)
 }
--- a/api/service/mj/service.go
+++ b/api/service/mj/service.go
@@ -15,10 +15,11 @@ import (
 	"geekai/store"
 	"geekai/store/model"
 	"geekai/utils"
-	"github.com/go-redis/redis/v8"
 	"strings"
 	"time"

+	"github.com/go-redis/redis/v8"
+
 	"gorm.io/gorm"
 )

@@ -26,24 +27,36 @@ import (
 type Service struct {
 	client          *Client // MJ Client
 	taskQueue       *store.RedisQueue
-	notifyQueue     *store.RedisQueue
 	db              *gorm.DB
-	Clients         *types.LMap[uint, *types.WsClient] // UserId => Client
 	uploaderManager *oss.UploaderManager
+	userService     *service.UserService
 }

-func NewService(redisCli *redis.Client, db *gorm.DB, client *Client, manager *oss.UploaderManager) *Service {
+func NewService(redisCli *redis.Client, db *gorm.DB, client *Client, manager *oss.UploaderManager, userService *service.UserService) *Service {
 	return &Service{
 		db:              db,
 		taskQueue:       store.NewRedisQueue("MidJourney_Task_Queue", redisCli),
-		notifyQueue:     store.NewRedisQueue("MidJourney_Notify_Queue", redisCli),
 		client:          client,
-		Clients:         types.NewLMap[uint, *types.WsClient](),
 		uploaderManager: manager,
+		userService:     userService,
 	}
 }

 func (s *Service) Run() {
+	// 将数据库中未提交的人物加载到队列
+	var jobs []model.MidJourneyJob
+	s.db.Where("task_id", "").Where("progress", 0).Find(&jobs)
+	for _, v := range jobs {
+		var task types.MjTask
+		err := utils.JsonDecode(v.TaskInfo, &task)
+		if err != nil {
+			logger.Errorf("decode task info with error: %v", err)
+			continue
+		}
+		task.Id = v.Id
+		s.PushTask(task)
+	}
+
 	logger.Info("Starting MidJourney job consumer for service")
 	go func() {
 		for {
@@ -56,7 +69,7 @@ func (s *Service) Run() {

 			// translate prompt
 			if utils.HasChinese(task.Prompt) {
-				content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.TranslatePromptTemplate, task.Prompt), "gpt-4o-mini")
+				content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.TranslatePromptTemplate, task.Prompt), task.TranslateModelId)
 				if err == nil {
 					task.Prompt = content
 				} else {
@@ -65,7 +78,7 @@ func (s *Service) Run() {
 			}
 			// translate negative prompt
 			if task.NegPrompt != "" && utils.HasChinese(task.NegPrompt) {
-				content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.TranslatePromptTemplate, task.NegPrompt), "gpt-4o-mini")
+				content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.TranslatePromptTemplate, task.NegPrompt), task.TranslateModelId)
 				if err == nil {
 					task.NegPrompt = content
 				} else {
@@ -119,7 +132,6 @@ func (s *Service) Run() {
 				// update the task progress
 				s.db.Updates(&job)
 				// 任务失败，通知前端
-				s.notifyQueue.RPush(service.NotifyMessage{UserId: task.UserId, JobId: int(job.Id), Message: service.TaskStatusFailed})
 				continue
 			}
 			logger.Infof("任务提交成功：%+v", res)
@@ -158,26 +170,6 @@ func GetImageHash(action string) string {
 	return split[len(split)-1]
 }

-func (s *Service) CheckTaskNotify() {
-	go func() {
-		for {
-			var message service.NotifyMessage
-			err := s.notifyQueue.LPop(&message)
-			if err != nil {
-				continue
-			}
-			cli := s.Clients.Get(uint(message.UserId))
-			if cli == nil {
-				continue
-			}
-			err = cli.Send([]byte(message.Message))
-			if err != nil {
-				continue
-			}
-		}
-	}()
-}
-
 func (s *Service) DownloadImages() {
 	go func() {
 		var items []model.MidJourneyJob
@@ -199,7 +191,7 @@ func (s *Service) DownloadImages() {
 				if strings.HasPrefix(v.OrgURL, "https://cdn.discordapp.com") {
 					proxy = true
 				}
-				imgURL, err := s.uploaderManager.GetUploadHandler().PutUrlFile(v.OrgURL, proxy)
+				imgURL, err := s.uploaderManager.GetUploadHandler().PutUrlFile(v.OrgURL, ".png", proxy)

 				if err != nil {
 					logger.Errorf("error with download image %s, %v", v.OrgURL, err)
@@ -210,15 +202,6 @@ func (s *Service) DownloadImages() {

 				v.ImgURL = imgURL
 				s.db.Updates(&v)
-
-				cli := s.Clients.Get(uint(v.UserId))
-				if cli == nil {
-					continue
-				}
-				err = cli.Send([]byte(service.TaskStatusFinished))
-				if err != nil {
-					continue
-				}
 			}

 			time.Sleep(time.Second * 5)
@@ -229,7 +212,9 @@ func (s *Service) DownloadImages() {
 // PushTask push a new mj task in to task queue
 func (s *Service) PushTask(task types.MjTask) {
 	logger.Debugf("add a new MidJourney task to the task list: %+v", task)
-	s.taskQueue.RPush(task)
+	if err := s.taskQueue.RPush(task); err != nil {
+		logger.Errorf("push mj task to queue failed: %v", err)
+	}
 }

 // SyncTaskProgress 异步拉取任务
@@ -244,7 +229,7 @@ func (s *Service) SyncTaskProgress() {

 			for _, job := range jobs {
 				// 10 分钟还没完成的任务标记为失败
-				if time.Now().Sub(job.CreatedAt) > time.Minute*10 {
+				if time.Since(job.CreatedAt) > time.Minute*10 {
 					job.Progress = service.FailTaskProgress
 					job.ErrMsg = "任务超时"
 					s.db.Updates(&job)
@@ -264,16 +249,13 @@ func (s *Service) SyncTaskProgress() {
 						"err_msg":  task.FailReason,
 					})
 					logger.Errorf("task failed: %v", task.FailReason)
-					s.notifyQueue.RPush(service.NotifyMessage{UserId: job.UserId, JobId: int(job.Id), Message: service.TaskStatusFailed})
 					continue
 				}

 				if len(task.Buttons) > 0 {
 					job.Hash = GetImageHash(task.Buttons[0].CustomId)
 				}
-				oldProgress := job.Progress
 				job.Progress = utils.IntValue(strings.Replace(task.Progress, "%", "", 1), 0)
-				job.Prompt = task.PromptEn
 				if task.ImageUrl != "" {
 					job.OrgURL = task.ImageUrl
 				}
@@ -282,15 +264,21 @@ func (s *Service) SyncTaskProgress() {
 					logger.Errorf("error with update database: %v", err)
 					continue
 				}
+			}

-				// 通知前端更新任务进度
-				if oldProgress != job.Progress {
-					message := service.TaskStatusRunning
-					if job.Progress == 100 {
-						message = service.TaskStatusFinished
-					}
-					s.notifyQueue.RPush(service.NotifyMessage{UserId: job.UserId, JobId: int(job.Id), Message: message})
+			// 找出失败的任务，并恢复其扣减算力
+			s.db.Where("progress", service.FailTaskProgress).Where("power > ?", 0).Find(&jobs)
+			for _, job := range jobs {
+				err := s.userService.IncreasePower(job.UserId, job.Power, model.PowerLog{
+					Type:   types.PowerRefund,
+					Model:  "mid-journey",
+					Remark: fmt.Sprintf("任务失败，退回算力。任务ID：%d，Err: %s", job.Id, job.ErrMsg),
+				})
+				if err != nil {
+					continue
 				}
+				// 更新任务状态
+				s.db.Model(&job).UpdateColumn("power", 0)
 			}

 			time.Sleep(time.Second * 5)
--- a/api/service/oss/aliyun_oss.go
+++ b/api/service/oss/aliyun_oss.go
@@ -84,7 +84,7 @@ func (s AliYunOss) PutFile(ctx *gin.Context, name string) (File, error) {
 	}, nil
 }

-func (s AliYunOss) PutUrlFile(fileURL string, useProxy bool) (string, error) {
+func (s AliYunOss) PutUrlFile(fileURL string, ext string, useProxy bool) (string, error) {
 	var fileData []byte
 	var err error
 	if useProxy {
@@ -99,8 +99,10 @@ func (s AliYunOss) PutUrlFile(fileURL string, useProxy bool) (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("error with parse image URL: %v", err)
 	}
-	fileExt := utils.GetImgExt(parse.Path)
-	objectKey := fmt.Sprintf("%s/%d%s", s.config.SubDir, time.Now().UnixMicro(), fileExt)
+	if ext == "" {
+		ext = filepath.Ext(parse.Path)
+	}
+	objectKey := fmt.Sprintf("%s/%d%s", s.config.SubDir, time.Now().UnixMicro(), ext)
 	// 上传文件字节数据
 	err = s.bucket.PutObject(objectKey, bytes.NewReader(fileData))
 	if err != nil {
--- a/api/service/oss/localstorage.go
+++ b/api/service/oss/localstorage.go
@@ -12,11 +12,12 @@ import (
 	"fmt"
 	"geekai/core/types"
 	"geekai/utils"
-	"github.com/gin-gonic/gin"
 	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/gin-gonic/gin"
 )

 type LocalStorage struct {
@@ -37,7 +38,7 @@ func (s LocalStorage) PutFile(ctx *gin.Context, name string) (File, error) {
 		return File{}, fmt.Errorf("error with get form: %v", err)
 	}

-	path, err := utils.GenUploadPath(s.config.BasePath, file.Filename, false)
+	path, err := utils.GenUploadPath(s.config.BasePath, file.Filename, "")
 	if err != nil {
 		return File{}, fmt.Errorf("error with generate filename: %s", err.Error())
 	}
@@ -57,13 +58,13 @@ func (s LocalStorage) PutFile(ctx *gin.Context, name string) (File, error) {
 	}, nil
 }

-func (s LocalStorage) PutUrlFile(fileURL string, useProxy bool) (string, error) {
+func (s LocalStorage) PutUrlFile(fileURL string, ext string, useProxy bool) (string, error) {
 	parse, err := url.Parse(fileURL)
 	if err != nil {
 		return "", fmt.Errorf("error with parse image URL: %v", err)
 	}
 	filename := filepath.Base(parse.Path)
-	filePath, err := utils.GenUploadPath(s.config.BasePath, filename, true)
+	filePath, err := utils.GenUploadPath(s.config.BasePath, filename, ext)
 	if err != nil {
 		return "", fmt.Errorf("error with generate image dir: %v", err)
 	}
@@ -85,7 +86,7 @@ func (s LocalStorage) PutBase64(base64Img string) (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("error decoding base64:%v", err)
 	}
-	filePath, err := utils.GenUploadPath(s.config.BasePath, "", true)
+	filePath, _ := utils.GenUploadPath(s.config.BasePath, "", ".png")
 	err = os.WriteFile(filePath, imageData, 0644)
 	if err != nil {
 		return "", fmt.Errorf("error writing to file:%v", err)
--- a/api/service/oss/minio_oss.go
+++ b/api/service/oss/minio_oss.go
@@ -44,7 +44,7 @@ func NewMiniOss(appConfig *types.AppConfig) (MiniOss, error) {
 	return MiniOss{config: config, client: minioClient, proxyURL: appConfig.ProxyURL}, nil
 }

-func (s MiniOss) PutUrlFile(fileURL string, useProxy bool) (string, error) {
+func (s MiniOss) PutUrlFile(fileURL string, ext string, useProxy bool) (string, error) {
 	var fileData []byte
 	var err error
 	if useProxy {
@@ -59,8 +59,10 @@ func (s MiniOss) PutUrlFile(fileURL string, useProxy bool) (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("error with parse image URL: %v", err)
 	}
-	fileExt := filepath.Ext(parse.Path)
-	filename := fmt.Sprintf("%s/%d%s", s.config.SubDir, time.Now().UnixMicro(), fileExt)
+	if ext == "" {
+		ext = filepath.Ext(parse.Path)
+	}
+	filename := fmt.Sprintf("%s/%d%s", s.config.SubDir, time.Now().UnixMicro(), ext)
 	info, err := s.client.PutObject(
 		context.Background(),
 		s.config.Bucket,
@@ -86,10 +88,10 @@ func (s MiniOss) PutFile(ctx *gin.Context, name string) (File, error) {
 	}
 	defer fileReader.Close()

-	fileExt := utils.GetImgExt(file.Filename)
+	fileExt := filepath.Ext(file.Filename)
 	filename := fmt.Sprintf("%s/%d%s", s.config.SubDir, time.Now().UnixMicro(), fileExt)
 	info, err := s.client.PutObject(ctx, s.config.Bucket, filename, fileReader, file.Size, minio.PutObjectOptions{
-		ContentType: file.Header.Get("Content-Type"),
+		ContentType: file.Header.Get("Body-Type"),
 	})
 	if err != nil {
 		return File{}, fmt.Errorf("error uploading to MinIO: %v", err)
--- a/api/service/oss/qiniu_oss.go
+++ b/api/service/oss/qiniu_oss.go
@@ -93,7 +93,7 @@ func (s QinNiuOss) PutFile(ctx *gin.Context, name string) (File, error) {

 }

-func (s QinNiuOss) PutUrlFile(fileURL string, useProxy bool) (string, error) {
+func (s QinNiuOss) PutUrlFile(fileURL string, ext string, useProxy bool) (string, error) {
 	var fileData []byte
 	var err error
 	if useProxy {
@@ -108,8 +108,10 @@ func (s QinNiuOss) PutUrlFile(fileURL string, useProxy bool) (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("error with parse image URL: %v", err)
 	}
-	fileExt := utils.GetImgExt(parse.Path)
-	key := fmt.Sprintf("%s/%d%s", s.config.SubDir, time.Now().UnixMicro(), fileExt)
+	if ext == "" {
+		ext = filepath.Ext(parse.Path)
+	}
+	key := fmt.Sprintf("%s/%d%s", s.config.SubDir, time.Now().UnixMicro(), ext)
 	ret := storage.PutRet{}
 	extra := storage.PutExtra{}
 	// 上传文件字节数据
--- a/api/service/oss/uploader.go
+++ b/api/service/oss/uploader.go
@@ -23,7 +23,7 @@ type File struct {
 }
 type Uploader interface {
 	PutFile(ctx *gin.Context, name string) (File, error)
-	PutUrlFile(url string, useProxy bool) (string, error)
+	PutUrlFile(url string, ext string, useProxy bool) (string, error)
 	PutBase64(imageData string) (string, error)
 	Delete(fileURL string) error
 }
--- a/api/service/payment/alipay_service.go
+++ b/api/service/payment/alipay_service.go
@@ -43,10 +43,8 @@ func NewAlipayService(appConfig *types.AppConfig) (*AlipayService, error) {

 	//client.DebugSwitch = gopay.DebugOn // 开启调试模式
 	client.SetLocation(alipay.LocationShanghai). // 设置时区，不设置或出错均为默认服务器时间
-		SetCharset(alipay.UTF8). // 设置字符编码，不设置默认 utf-8
-		SetSignType(alipay.RSA2). // 设置签名类型，不设置默认 RSA2
-		SetReturnUrl(config.ReturnURL). // 设置返回URL
-		SetNotifyUrl(config.NotifyURL)
+							SetCharset(alipay.UTF8). // 设置字符编码，不设置默认 utf-8
+							SetSignType(alipay.RSA2) // 设置签名类型，不设置默认 RSA2

 	if err = client.SetCertSnByPath(config.PublicKey, config.RootCert, config.AlipayPublicKey); err != nil {
 		return nil, fmt.Errorf("error with load payment public key: %v", err)
@@ -55,23 +53,31 @@ func NewAlipayService(appConfig *types.AppConfig) (*AlipayService, error) {
 	return &AlipayService{config: &config, client: client}, nil
 }

-func (s *AlipayService) PayUrlMobile(outTradeNo string, amount string, subject string) (string, error) {
-	bm := make(gopay.BodyMap)
-	bm.Set("subject", subject)
-	bm.Set("out_trade_no", outTradeNo)
-	bm.Set("quit_url", s.config.ReturnURL)
-	bm.Set("total_amount", amount)
-	bm.Set("product_code", "QUICK_WAP_WAY")
-	return s.client.TradeWapPay(context.Background(), bm)
+type AlipayParams struct {
+	OutTradeNo string `json:"out_trade_no"`
+	Subject    string `json:"subject"`
+	TotalFee   string `json:"total_fee"`
+	ReturnURL  string `json:"return_url"`
+	NotifyURL  string `json:"notify_url"`
 }

-func (s *AlipayService) PayUrlPc(outTradeNo string, amount string, subject string) (string, error) {
+func (s *AlipayService) PayMobile(params AlipayParams) (string, error) {
 	bm := make(gopay.BodyMap)
-	bm.Set("subject", subject)
-	bm.Set("out_trade_no", outTradeNo)
-	bm.Set("total_amount", amount)
+	bm.Set("subject", params.Subject)
+	bm.Set("out_trade_no", params.OutTradeNo)
+	bm.Set("quit_url", params.ReturnURL)
+	bm.Set("total_amount", params.TotalFee)
+	bm.Set("product_code", "QUICK_WAP_WAY")
+	return s.client.SetNotifyUrl(params.NotifyURL).SetReturnUrl(params.ReturnURL).TradeWapPay(context.Background(), bm)
+}
+
+func (s *AlipayService) PayPC(params AlipayParams) (string, error) {
+	bm := make(gopay.BodyMap)
+	bm.Set("subject", params.Subject)
+	bm.Set("out_trade_no", params.OutTradeNo)
+	bm.Set("total_amount", params.TotalFee)
 	bm.Set("product_code", "FAST_INSTANT_TRADE_PAY")
-	return s.client.TradePagePay(context.Background(), bm)
+	return s.client.SetNotifyUrl(params.NotifyURL).SetReturnUrl(params.ReturnURL).TradePagePay(context.Background(), bm)
 }

 // TradeVerify 交易验证
--- a/api/service/payment/geekpay_service.go
+++ b/api/service/payment/geekpay_service.go
@@ -0,0 +1,139 @@
+package payment
+
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// * 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 (
+	"crypto/tls"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"geekai/core/types"
+	"geekai/utils"
+	"io"
+	"net/http"
+	"net/url"
+	"sort"
+	"strings"
+	"time"
+)
+
+// GeekPayService Geek 支付服务
+type GeekPayService struct {
+	config *types.GeekPayConfig
+}
+
+func NewJPayService(appConfig *types.AppConfig) *GeekPayService {
+	return &GeekPayService{
+		config: &appConfig.GeekPayConfig,
+	}
+}
+
+type GeekPayParams struct {
+	Method     string `json:"method"`       // 接口类型
+	Device     string `json:"device"`       // 设备类型
+	Type       string `json:"type"`         // 支付方式
+	OutTradeNo string `json:"out_trade_no"` // 商户订单号
+	Name       string `json:"name"`         // 商品名称
+	Money      string `json:"money"`        // 商品金额
+	ClientIP   string `json:"clientip"`     //用户IP地址
+	SubOpenId  string `json:"sub_openid"`   // 微信用户 openid，仅小程序支付需要
+	SubAppId   string `json:"sub_appid"`    // 小程序 AppId，仅小程序支付需要
+	NotifyURL  string `json:"notify_url"`
+	ReturnURL  string `json:"return_url"`
+}
+
+// Pay 支付订单
+func (s *GeekPayService) Pay(params GeekPayParams) (*GeekPayResp, error) {
+	p := map[string]string{
+		"pid": s.config.AppId,
+		//"method":       params.Method,
+		"device":       params.Device,
+		"type":         params.Type,
+		"out_trade_no": params.OutTradeNo,
+		"name":         params.Name,
+		"money":        params.Money,
+		"clientip":     params.ClientIP,
+		"notify_url":   params.NotifyURL,
+		"return_url":   params.ReturnURL,
+		"timestamp":    fmt.Sprintf("%d", time.Now().Unix()),
+	}
+	p["sign"] = s.Sign(p)
+	p["sign_type"] = "MD5"
+	return s.sendRequest(s.config.ApiURL, p)
+}
+
+func (s *GeekPayService) Sign(params map[string]string) string {
+	// 按字母顺序排序参数
+	var keys []string
+	for k := range params {
+		if params[k] == "" || k == "sign" || k == "sign_type" {
+			continue
+		}
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+
+	// 构建待签名字符串
+	var signStr strings.Builder
+	for _, k := range keys {
+		signStr.WriteString(k)
+		signStr.WriteString("=")
+		signStr.WriteString(params[k])
+		signStr.WriteString("&")
+	}
+	signString := strings.TrimSuffix(signStr.String(), "&") + s.config.PrivateKey
+
+	return utils.Md5(signString)
+}
+
+type GeekPayResp struct {
+	Code      int    `json:"code"`
+	Msg       string `json:"msg"`
+	TradeNo   string `json:"trade_no"`
+	PayURL    string `json:"payurl"`
+	QrCode    string `json:"qrcode"`
+	UrlScheme string `json:"urlscheme"` // 小程序跳转支付链接
+}
+
+func (s *GeekPayService) sendRequest(endpoint string, params map[string]string) (*GeekPayResp, error) {
+	form := url.Values{}
+	for k, v := range params {
+		form.Add(k, v)
+	}
+
+	apiURL := fmt.Sprintf("%s/mapi.php", endpoint)
+	logger.Infof(apiURL)
+
+	tr := &http.Transport{
+		TLSClientConfig: &tls.Config{
+			InsecureSkipVerify: true, // 取消 SSL 证书验证
+		},
+	}
+	client := &http.Client{Transport: tr}
+	resp, err := client.PostForm(apiURL, form)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(resp.Body)
+	logger.Debugf(string(body))
+	if err != nil {
+		return nil, err
+	}
+
+	var r GeekPayResp
+	err = json.Unmarshal(body, &r)
+	if err != nil {
+		return nil, errors.New("当前支付渠道暂不支持")
+	}
+	if r.Code != 1 {
+		return nil, errors.New(r.Msg)
+	}
+	return &r, nil
+}
--- a/api/service/payment/hupipay_serive.go
+++ b/api/service/payment/hupipay_serive.go
@@ -37,7 +37,7 @@ func NewHuPiPay(config *types.AppConfig) *HuPiPayService {
 	}
 }

-type HuPiPayReq struct {
+type HuPiPayParams struct {
 	AppId        string `json:"appid"`
 	Version      string `json:"version"`
 	TradeOrderId string `json:"trade_order_id"`
@@ -53,7 +53,7 @@ type HuPiPayReq struct {
 	WapUrl       string `json:"wap_url"`
 }

-type HuPiResp struct {
+type HuPiPayResp struct {
 	Openid    interface{} `json:"openid"`
 	UrlQrcode string      `json:"url_qrcode"`
 	URL       string      `json:"url"`
@@ -62,7 +62,7 @@ type HuPiResp struct {
 }

 // Pay 执行支付请求操作
-func (s *HuPiPayService) Pay(params HuPiPayReq) (HuPiResp, error) {
+func (s *HuPiPayService) Pay(params HuPiPayParams) (HuPiPayResp, error) {
 	data := url.Values{}
 	simple := strconv.FormatInt(time.Now().Unix(), 10)
 	params.AppId = s.appId
@@ -80,22 +80,22 @@ func (s *HuPiPayService) Pay(params HuPiPayReq) (HuPiResp, error) {
 	apiURL := fmt.Sprintf("%s/payment/do.html", s.apiURL)
 	resp, err := http.PostForm(apiURL, data)
 	if err != nil {
-		return HuPiResp{}, fmt.Errorf("error with requst api: %v", err)
+		return HuPiPayResp{}, fmt.Errorf("error with requst api: %v", err)
 	}
 	defer resp.Body.Close()
 	all, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return HuPiResp{}, fmt.Errorf("error with reading response: %v", err)
+		return HuPiPayResp{}, fmt.Errorf("error with reading response: %v", err)
 	}

-	var res HuPiResp
+	var res HuPiPayResp
 	err = utils.JsonDecode(string(all), &res)
 	if err != nil {
-		return HuPiResp{}, fmt.Errorf("error with decode payment result: %v", err)
+		return HuPiPayResp{}, fmt.Errorf("error with decode payment result: %v", err)
 	}

 	if res.ErrCode != 0 {
-		return HuPiResp{}, fmt.Errorf("error with generate pay url: %s", res.ErrMsg)
+		return HuPiPayResp{}, fmt.Errorf("error with generate pay url: %s", res.ErrMsg)
 	}

 	return res, nil
@@ -127,10 +127,10 @@ func (s *HuPiPayService) Sign(params url.Values) string {
 }

 // Check 校验订单状态
-func (s *HuPiPayService) Check(tradeNo string) error {
+func (s *HuPiPayService) Check(outTradeNo string) error {
 	data := url.Values{}
 	data.Add("appid", s.appId)
-	data.Add("open_order_id", tradeNo)
+	data.Add("out_trade_order", outTradeNo)
 	stamp := strconv.FormatInt(time.Now().Unix(), 10)
 	data.Add("time", stamp)
 	data.Add("nonce_str", stamp)
--- a/api/service/payment/payjs_service.go
+++ b/api/service/payment/payjs_service.go
@@ -1,153 +0,0 @@
-package payment
-
-// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// * 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 (
-	"crypto/md5"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"geekai/core/types"
-	"geekai/utils"
-	"io"
-	"net/http"
-	"net/url"
-	"sort"
-	"strings"
-)
-
-type JPayService struct {
-	config *types.JPayConfig
-}
-
-func NewJPayService(appConfig *types.AppConfig) *JPayService {
-	return &JPayService{
-		config: &appConfig.JPayConfig,
-	}
-}
-
-type JPayReq struct {
-	TotalFee   int    `json:"total_fee"`
-	OutTradeNo string `json:"out_trade_no"`
-	Subject    string `json:"body"`
-	NotifyURL  string `json:"notify_url"`
-	ReturnURL  string `json:"callback_url"`
-}
-type JPayReps struct {
-	OutTradeNo string `json:"out_trade_no"`
-	OrderId    string `json:"payjs_order_id"`
-	ReturnCode int    `json:"return_code"`
-	ReturnMsg  string `json:"return_msg"`
-	Sign       string `json:"Sign"`
-	TotalFee   string `json:"total_fee"`
-	CodeUrl    string `json:"code_url,omitempty"`
-	Qrcode     string `json:"qrcode,omitempty"`
-}
-
-func (r JPayReps) IsOK() bool {
-	return r.ReturnMsg == "SUCCESS"
-}
-
-func (js *JPayService) Pay(param JPayReq) JPayReps {
-	param.NotifyURL = js.config.NotifyURL
-	var p = url.Values{}
-	encode := utils.JsonEncode(param)
-	m := make(map[string]interface{})
-	_ = utils.JsonDecode(encode, &m)
-	for k, v := range m {
-		p.Add(k, fmt.Sprintf("%v", v))
-	}
-	p.Add("mchid", js.config.AppId)
-
-	p.Add("sign", js.sign(p))
-
-	cli := http.Client{}
-	apiURL := fmt.Sprintf("%s/api/native", js.config.ApiURL)
-	r, err := cli.PostForm(apiURL, p)
-	if err != nil {
-		return JPayReps{ReturnMsg: err.Error()}
-	}
-	defer r.Body.Close()
-	bs, err := io.ReadAll(r.Body)
-	if err != nil {
-		return JPayReps{ReturnMsg: err.Error()}
-	}
-
-	var data JPayReps
-	err = utils.JsonDecode(string(bs), &data)
-	if err != nil {
-		return JPayReps{ReturnMsg: err.Error()}
-	}
-	return data
-}
-
-func (js *JPayService) PayH5(p url.Values) string {
-	p.Add("mchid", js.config.AppId)
-	p.Add("sign", js.sign(p))
-	return fmt.Sprintf("%s/api/cashier?%s", js.config.ApiURL, p.Encode())
-}
-
-func (js *JPayService) sign(params url.Values) string {
-	params.Del(`sign`)
-	var keys = make([]string, 0, 0)
-	for key := range params {
-		if params.Get(key) != `` {
-			keys = append(keys, key)
-		}
-	}
-	sort.Strings(keys)
-
-	var pList = make([]string, 0, 0)
-	for _, key := range keys {
-		var value = strings.TrimSpace(params.Get(key))
-		if len(value) > 0 {
-			pList = append(pList, key+"="+value)
-		}
-	}
-	var src = strings.Join(pList, "&")
-	src += "&key=" + js.config.PrivateKey
-
-	md5bs := md5.Sum([]byte(src))
-	md5res := hex.EncodeToString(md5bs[:])
-	return strings.ToUpper(md5res)
-}
-
-// TradeVerify 查询订单支付状态
-// @param tradeNo 支付平台交易 ID
-func (js *JPayService) TradeVerify(tradeNo string) error {
-	apiURL := fmt.Sprintf("%s/api/check", js.config.ApiURL)
-	params := url.Values{}
-	params.Add("payjs_order_id", tradeNo)
-	params.Add("sign", js.sign(params))
-	data := strings.NewReader(params.Encode())
-	resp, err := http.Post(apiURL, "application/x-www-form-urlencoded", data)
-	if err != nil {
-		return fmt.Errorf("error with http reqeust: %v", err)
-	}
-	defer resp.Body.Close()
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return fmt.Errorf("error with reading response: %v", err)
-	}
-
-	var r struct {
-		ReturnCode int `json:"return_code"`
-		Status     int `json:"status"`
-	}
-	err = utils.JsonDecode(string(body), &r)
-	if err != nil {
-		return fmt.Errorf("error with decode response: %v", err)
-	}
-
-	if r.ReturnCode == 1 && r.Status == 1 {
-		return nil
-	} else {
-		logger.Errorf("PayJs 支付验证响应：%s", string(body))
-		return errors.New("order not paid")
-	}
-}
--- a/api/service/payment/wepay_service.go
+++ b/api/service/payment/wepay_service.go
@@ -46,18 +46,27 @@ func NewWechatService(appConfig *types.AppConfig) (*WechatPayService, error) {
 	return &WechatPayService{config: &config, client: client}, nil
 }

-func (s *WechatPayService) PayUrlNative(outTradeNo string, amount int, subject string) (string, error) {
+type WechatPayParams struct {
+	OutTradeNo string `json:"out_trade_no"`
+	TotalFee   int    `json:"total_fee"`
+	Subject    string `json:"subject"`
+	ClientIP   string `json:"client_ip"`
+	ReturnURL  string `json:"return_url"`
+	NotifyURL  string `json:"notify_url"`
+}
+
+func (s *WechatPayService) PayUrlNative(params WechatPayParams) (string, error) {
 	expire := time.Now().Add(10 * time.Minute).Format(time.RFC3339)
 	// 初始化 BodyMap
 	bm := make(gopay.BodyMap)
 	bm.Set("appid", s.config.AppId).
 		Set("mchid", s.config.MchId).
-		Set("description", subject).
-		Set("out_trade_no", outTradeNo).
+		Set("description", params.Subject).
+		Set("out_trade_no", params.OutTradeNo).
 		Set("time_expire", expire).
-		Set("notify_url", s.config.NotifyURL).
+		Set("notify_url", params.NotifyURL).
 		SetBodyMap("amount", func(bm gopay.BodyMap) {
-			bm.Set("total", amount).
+			bm.Set("total", params.TotalFee).
 				Set("currency", "CNY")
 		})

@@ -71,22 +80,22 @@ func (s *WechatPayService) PayUrlNative(outTradeNo string, amount int, subject s
 	return wxRsp.Response.CodeUrl, nil
 }

-func (s *WechatPayService) PayUrlH5(outTradeNo string, amount int, subject string, ip string) (string, error) {
+func (s *WechatPayService) PayUrlH5(params WechatPayParams) (string, error) {
 	expire := time.Now().Add(10 * time.Minute).Format(time.RFC3339)
 	// 初始化 BodyMap
 	bm := make(gopay.BodyMap)
 	bm.Set("appid", s.config.AppId).
 		Set("mchid", s.config.MchId).
-		Set("description", subject).
-		Set("out_trade_no", outTradeNo).
+		Set("description", params.Subject).
+		Set("out_trade_no", params.OutTradeNo).
 		Set("time_expire", expire).
-		Set("notify_url", s.config.NotifyURL).
+		Set("notify_url", params.NotifyURL).
 		SetBodyMap("amount", func(bm gopay.BodyMap) {
-			bm.Set("total", amount).
+			bm.Set("total", params.TotalFee).
 				Set("currency", "CNY")
 		}).
 		SetBodyMap("scene_info", func(bm gopay.BodyMap) {
-			bm.Set("payer_client_ip", ip).
+			bm.Set("payer_client_ip", params.ClientIP).
 				SetBodyMap("h5_info", func(bm gopay.BodyMap) {
 					bm.Set("type", "Wap")
 				})
--- a/api/service/sd/service.go
+++ b/api/service/sd/service.go
@@ -16,9 +16,10 @@ import (
 	"geekai/store"
 	"geekai/store/model"
 	"geekai/utils"
-	"github.com/go-redis/redis/v8"
 	"time"

+	"github.com/go-redis/redis/v8"
+
 	"github.com/imroc/req/v3"
 	"gorm.io/gorm"
 )
@@ -30,26 +31,35 @@ var logger = logger2.GetLogger()
 type Service struct {
 	httpClient    *req.Client
 	taskQueue     *store.RedisQueue
-	notifyQueue   *store.RedisQueue
 	db            *gorm.DB
 	uploadManager *oss.UploaderManager
-	leveldb       *store.LevelDB
-	Clients       *types.LMap[uint, *types.WsClient] // UserId => Client
+	userService   *service.UserService
 }

-func NewService(db *gorm.DB, manager *oss.UploaderManager, levelDB *store.LevelDB, redisCli *redis.Client) *Service {
+func NewService(db *gorm.DB, manager *oss.UploaderManager, redisCli *redis.Client, userService *service.UserService) *Service {
 	return &Service{
 		httpClient:    req.C(),
 		taskQueue:     store.NewRedisQueue("StableDiffusion_Task_Queue", redisCli),
-		notifyQueue:   store.NewRedisQueue("StableDiffusion_Queue", redisCli),
 		db:            db,
-		leveldb:       levelDB,
-		Clients:       types.NewLMap[uint, *types.WsClient](),
 		uploadManager: manager,
+		userService:   userService,
 	}
 }

 func (s *Service) Run() {
+	// 将数据库中未提交的人物加载到队列
+	var jobs []model.SdJob
+	s.db.Where("progress", 0).Find(&jobs)
+	for _, v := range jobs {
+		var task types.SdTask
+		err := utils.JsonDecode(v.TaskInfo, &task)
+		if err != nil {
+			logger.Errorf("decode task info with error: %v", err)
+			continue
+		}
+		task.Id = int(v.Id)
+		s.PushTask(task)
+	}
 	logger.Infof("Starting Stable-Diffusion job consumer")
 	go func() {
 		for {
@@ -62,7 +72,7 @@ func (s *Service) Run() {

 			// translate prompt
 			if utils.HasChinese(task.Params.Prompt) {
-				content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.RewritePromptTemplate, task.Params.Prompt), "gpt-4o-mini")
+				content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.TranslatePromptTemplate, task.Params.Prompt), task.TranslateModelId)
 				if err == nil {
 					task.Params.Prompt = content
 				} else {
@@ -72,7 +82,7 @@ func (s *Service) Run() {

 			// translate negative prompt
 			if task.Params.NegPrompt != "" && utils.HasChinese(task.Params.NegPrompt) {
-				content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.TranslatePromptTemplate, task.Params.NegPrompt), "gpt-4o-mini")
+				content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.TranslatePromptTemplate, task.Params.NegPrompt), task.TranslateModelId)
 				if err == nil {
 					task.Params.NegPrompt = content
 				} else {
@@ -89,8 +99,6 @@ func (s *Service) Run() {
 					"progress": service.FailTaskProgress,
 					"err_msg":  err.Error(),
 				})
-				// 通知前端，任务失败
-				s.notifyQueue.RPush(service.NotifyMessage{UserId: task.UserId, JobId: task.Id, Message: service.TaskStatusFailed})
 				continue
 			}
 		}
@@ -126,9 +134,8 @@ type Txt2ImgResp struct {

 // TaskProgressResp 任务进度响应实体
 type TaskProgressResp struct {
-	Progress     float64 `json:"progress"`
-	EtaRelative  float64 `json:"eta_relative"`
-	CurrentImage string  `json:"current_image"`
+	Progress    float64 `json:"progress"`
+	EtaRelative float64 `json:"eta_relative"`
 }

 // Txt2Img 文生图 API
@@ -164,7 +171,7 @@ func (s *Service) Txt2Img(task types.SdTask) error {
 	}

 	apiURL := fmt.Sprintf("%s/sdapi/v1/txt2img", apiKey.ApiURL)
-	logger.Debugf("send image request to %s", apiURL)
+	logger.Infof("send image request to %s", apiURL)
 	// send a request to sd api endpoint
 	go func() {
 		response, err := s.httpClient.R().
@@ -213,21 +220,12 @@ func (s *Service) Txt2Img(task types.SdTask) error {

 			// task finished
 			s.db.Model(&model.SdJob{Id: uint(task.Id)}).UpdateColumn("progress", 100)
-			s.notifyQueue.RPush(service.NotifyMessage{UserId: task.UserId, JobId: task.Id, Message: service.TaskStatusFinished})
-			// 从 leveldb 中删除预览图片数据
-			_ = s.leveldb.Delete(task.Params.TaskId)
 			return nil
 		default:
-			err, resp := s.checkTaskProgress(apiKey)
+			resp, err := s.checkTaskProgress(apiKey)
 			// 更新任务进度
 			if err == nil && resp.Progress > 0 {
 				s.db.Model(&model.SdJob{Id: uint(task.Id)}).UpdateColumn("progress", int(resp.Progress*100))
-				// 发送更新状态信号
-				s.notifyQueue.RPush(service.NotifyMessage{UserId: task.UserId, JobId: task.Id, Message: service.TaskStatusRunning})
-				// 保存预览图片数据
-				if resp.CurrentImage != "" {
-					_ = s.leveldb.Put(task.Params.TaskId, resp.CurrentImage)
-				}
 			}
 			time.Sleep(time.Second)
 		}
@@ -236,7 +234,7 @@ func (s *Service) Txt2Img(task types.SdTask) error {
 }

 // 执行任务
-func (s *Service) checkTaskProgress(apiKey model.ApiKey) (error, *TaskProgressResp) {
+func (s *Service) checkTaskProgress(apiKey model.ApiKey) (*TaskProgressResp, error) {
 	apiURL := fmt.Sprintf("%s/sdapi/v1/progress?skip_current_image=false", apiKey.ApiURL)
 	var res TaskProgressResp
 	response, err := s.httpClient.R().
@@ -244,39 +242,20 @@ func (s *Service) checkTaskProgress(apiKey model.ApiKey) (error, *TaskProgressRe
 		SetSuccessResult(&res).
 		Get(apiURL)
 	if err != nil {
-		return err, nil
+		return nil, err
 	}
 	if response.IsErrorState() {
-		return fmt.Errorf("error http code status: %v", response.Status), nil
+		return nil, fmt.Errorf("error http code status: %v", response.Status)
 	}

-	return nil, &res
+	return &res, nil
 }

 func (s *Service) PushTask(task types.SdTask) {
 	logger.Debugf("add a new MidJourney task to the task list: %+v", task)
-	s.taskQueue.RPush(task)
-}
-
-func (s *Service) CheckTaskNotify() {
-	go func() {
-		logger.Info("Running Stable-Diffusion task notify checking ...")
-		for {
-			var message service.NotifyMessage
-			err := s.notifyQueue.LPop(&message)
-			if err != nil {
-				continue
-			}
-			client := s.Clients.Get(uint(message.UserId))
-			if client == nil {
-				continue
-			}
-			err = client.Send([]byte(message.Message))
-			if err != nil {
-				continue
-			}
-		}
-	}()
+	if err := s.taskQueue.RPush(task); err != nil {
+		logger.Errorf("push sd task to queue failed: %v", err)
+	}
 }

 // CheckTaskStatus 检查任务状态，自动删除过期或者失败的任务
@@ -293,12 +272,27 @@ func (s *Service) CheckTaskStatus() {

 			for _, job := range jobs {
 				// 5 分钟还没完成的任务标记为失败
-				if time.Now().Sub(job.CreatedAt) > time.Minute*5 {
+				if time.Since(job.CreatedAt) > time.Minute*5 {
 					job.Progress = service.FailTaskProgress
 					job.ErrMsg = "任务超时"
 					s.db.Updates(&job)
 				}
 			}
+
+			// 找出失败的任务，并恢复其扣减算力
+			s.db.Where("progress", service.FailTaskProgress).Where("power > ?", 0).Find(&jobs)
+			for _, job := range jobs {
+				err := s.userService.IncreasePower(job.UserId, job.Power, model.PowerLog{
+					Type:   types.PowerRefund,
+					Model:  "stable-diffusion",
+					Remark: fmt.Sprintf("任务失败，退回算力。任务ID：%d， Err: %s", job.Id, job.ErrMsg),
+				})
+				if err != nil {
+					continue
+				}
+				// 更新任务状态
+				s.db.Model(&job).UpdateColumn("power", 0)
+			}
 			time.Sleep(time.Second * 5)
 		}
 	}()
--- a/api/service/smtp_sms_service.go
+++ b/api/service/smtp_sms_service.go
@@ -29,7 +29,7 @@ func NewSmtpService(appConfig *types.AppConfig) *SmtpService {

 func (s *SmtpService) SendVerifyCode(to string, code int) error {
 	subject := fmt.Sprintf("%s 注册验证码", s.config.AppName)
-	body := fmt.Sprintf("您正在注册 %s 账户，注册验证码为 %d，请不要告诉他人。如非本人操作，请忽略此邮件。", s.config.AppName, code)
+	body := fmt.Sprintf("【%s】：您的验证码为 %d，请不要告诉他人。如非本人操作，请忽略此邮件。", s.config.AppName, code)

 	auth := smtp.PlainAuth("", s.config.From, s.config.Password, s.config.Host)
 	if s.config.UseTls {
--- a/api/service/suno/service.go
+++ b/api/service/suno/service.go
@@ -18,10 +18,11 @@ import (
 	"geekai/store"
 	"geekai/store/model"
 	"geekai/utils"
-	"github.com/go-redis/redis/v8"
 	"io"
 	"time"

+	"github.com/go-redis/redis/v8"
+
 	"github.com/imroc/req/v3"
 	"gorm.io/gorm"
 )
@@ -34,44 +35,40 @@ type Service struct {
 	uploadManager *oss.UploaderManager
 	taskQueue     *store.RedisQueue
 	notifyQueue   *store.RedisQueue
-	Clients       *types.LMap[uint, *types.WsClient] // UserId => Client
+	userService   *service.UserService
 }

-func NewService(db *gorm.DB, manager *oss.UploaderManager, redisCli *redis.Client) *Service {
+func NewService(db *gorm.DB, manager *oss.UploaderManager, redisCli *redis.Client, userService *service.UserService) *Service {
 	return &Service{
 		httpClient:    req.C().SetTimeout(time.Minute * 3),
 		db:            db,
 		taskQueue:     store.NewRedisQueue("Suno_Task_Queue", redisCli),
 		notifyQueue:   store.NewRedisQueue("Suno_Notify_Queue", redisCli),
-		Clients:       types.NewLMap[uint, *types.WsClient](),
 		uploadManager: manager,
+		userService:   userService,
 	}
 }

 func (s *Service) PushTask(task types.SunoTask) {
 	logger.Infof("add a new Suno task to the task list: %+v", task)
-	s.taskQueue.RPush(task)
+	if err := s.taskQueue.RPush(task); err != nil {
+		logger.Errorf("push suno task to queue failed: %v", err)
+	}
 }

 func (s *Service) Run() {
 	// 将数据库中未提交的人物加载到队列
 	var jobs []model.SunoJob
-	s.db.Where("task_id", "").Find(&jobs)
+	s.db.Where("task_id", "").Where("progress", 0).Find(&jobs)
 	for _, v := range jobs {
-		s.PushTask(types.SunoTask{
-			Id:           v.Id,
-			Channel:      v.Channel,
-			UserId:       v.UserId,
-			Type:         v.Type,
-			Title:        v.Title,
-			RefTaskId:    v.RefTaskId,
-			RefSongId:    v.RefSongId,
-			Prompt:       v.Prompt,
-			Tags:         v.Tags,
-			Model:        v.ModelName,
-			Instrumental: v.Instrumental,
-			ExtendSecs:   v.ExtendSecs,
-		})
+		var task types.SunoTask
+		err := utils.JsonDecode(v.TaskInfo, &task)
+		if err != nil {
+			logger.Errorf("decode task info with error: %v", err)
+			continue
+		}
+		task.Id = v.Id
+		s.PushTask(task)
 	}
 	logger.Info("Starting Suno job consumer...")
 	go func() {
@@ -96,10 +93,11 @@ func (s *Service) Run() {
 					"err_msg":  err.Error(),
 					"progress": service.FailTaskProgress,
 				})
-				s.notifyQueue.RPush(service.NotifyMessage{UserId: task.UserId, JobId: int(task.Id), Message: service.TaskStatusFailed})
 				continue
 			}

+			logger.Infof("任务提交成功: %+v", r)
+
 			// 更新任务信息
 			s.db.Model(&model.SunoJob{Id: task.Id}).UpdateColumns(map[string]interface{}{
 				"task_id": r.Data,
@@ -133,20 +131,20 @@ func (s *Service) Create(task types.SunoTask) (RespVo, error) {
 		"continue_clip_id":  task.RefSongId,
 		"continue_at":       task.ExtendSecs,
 		"make_instrumental": task.Instrumental,
+		"mv":                task.Model,
 	}
 	// 灵感模式
 	if task.Type == 1 {
 		reqBody["gpt_description_prompt"] = task.Prompt
 	} else { // 自定义模式
-		reqBody["prompt"] = task.Prompt
+		reqBody["prompt"] = task.Lyrics
 		reqBody["tags"] = task.Tags
-		reqBody["mv"] = task.Model
 		reqBody["title"] = task.Title
 	}

 	var res RespVo
 	apiURL := fmt.Sprintf("%s/suno/submit/music", apiKey.ApiURL)
-	logger.Debugf("API URL: %s, request body: %+v", apiURL, reqBody)
+	logger.Debugf("API URL: %s, request body: %s", apiURL, utils.JsonEncode(reqBody))
 	r, err := req.C().R().
 		SetHeader("Authorization", "Bearer "+apiKey.Value).
 		SetBody(reqBody).
@@ -262,27 +260,6 @@ func (s *Service) Upload(task types.SunoTask) (RespVo, error) {
 	return res, nil
 }

-func (s *Service) CheckTaskNotify() {
-	go func() {
-		logger.Info("Running Suno task notify checking ...")
-		for {
-			var message service.NotifyMessage
-			err := s.notifyQueue.LPop(&message)
-			if err != nil {
-				continue
-			}
-			client := s.Clients.Get(uint(message.UserId))
-			if client == nil {
-				continue
-			}
-			err = client.Send([]byte(message.Message))
-			if err != nil {
-				continue
-			}
-		}
-	}()
-}
-
 func (s *Service) DownloadFiles() {
 	go func() {
 		var items []model.SunoJob
@@ -295,14 +272,14 @@ func (s *Service) DownloadFiles() {
 			for _, v := range items {
 				// 下载图片和音频
 				logger.Infof("try download cover image: %s", v.CoverURL)
-				coverURL, err := s.uploadManager.GetUploadHandler().PutUrlFile(v.CoverURL, true)
+				coverURL, err := s.uploadManager.GetUploadHandler().PutUrlFile(v.CoverURL, ".png", true)
 				if err != nil {
 					logger.Errorf("download image with error: %v", err)
 					continue
 				}

 				logger.Infof("try download audio: %s", v.AudioURL)
-				audioURL, err := s.uploadManager.GetUploadHandler().PutUrlFile(v.AudioURL, true)
+				audioURL, err := s.uploadManager.GetUploadHandler().PutUrlFile(v.AudioURL, ".mp3", true)
 				if err != nil {
 					logger.Errorf("download audio with error: %v", err)
 					continue
@@ -311,7 +288,6 @@ func (s *Service) DownloadFiles() {
 				v.AudioURL = audioURL
 				v.Progress = 100
 				s.db.Updates(&v)
-				s.notifyQueue.RPush(service.NotifyMessage{UserId: v.UserId, JobId: int(v.Id), Message: service.TaskStatusFinished})
 			}

 			time.Sleep(time.Second * 10)
@@ -377,15 +353,27 @@ func (s *Service) SyncTaskProgress() {
 						}
 					}
 					tx.Commit()
-
 				} else if task.Data.FailReason != "" {
 					job.Progress = service.FailTaskProgress
 					job.ErrMsg = task.Data.FailReason
 					s.db.Updates(&job)
-					s.notifyQueue.RPush(service.NotifyMessage{UserId: job.UserId, JobId: int(job.Id), Message: service.TaskStatusFailed})
 				}
 			}

+			// 找出失败的任务，并恢复其扣减算力
+			s.db.Where("progress", service.FailTaskProgress).Where("power > ?", 0).Find(&jobs)
+			for _, job := range jobs {
+				err := s.userService.IncreasePower(job.UserId, job.Power, model.PowerLog{
+					Type:   types.PowerRefund,
+					Model:  job.ModelName,
+					Remark: fmt.Sprintf("Suno 任务失败，退回算力。任务ID：%s，Err:%s", job.TaskId, job.ErrMsg),
+				})
+				if err != nil {
+					continue
+				}
+				// 更新任务状态
+				s.db.Model(&job).UpdateColumn("power", 0)
+			}
 			time.Sleep(time.Second * 10)
 		}
 	}()
--- a/api/service/types.go
+++ b/api/service/types.go
@@ -8,10 +8,139 @@ const (
 )

 type NotifyMessage struct {
-	UserId  int    `json:"user_id"`
-	JobId   int    `json:"job_id"`
-	Message string `json:"message"`
+	UserId   int    `json:"user_id"`
+	ClientId string `json:"client_id"`
+	JobId    int    `json:"job_id"`
+	Message  string `json:"message"`
+	Type     string `json:"type"`
 }

-const RewritePromptTemplate = "Please rewrite the following text into AI painting prompt words, and please try to add detailed description of the picture, painting style, scene, rendering effect, picture light and other creative elements. Just output the final prompt word directly. Do not output any explanation lines. The text to be rewritten is: [%s]"
 const TranslatePromptTemplate = "Translate the following painting prompt words into English keyword phrases. Without any explanation, directly output the keyword phrases separated by commas. The content to be translated is: [%s]"
+
+const ImagePromptOptimizeTemplate = `
+以下是一条 AI 提示词示例，用于优化和扩写绘图提示词：
+
+请你作为一名专业的 AI 绘图提示词优化专家，基于用户提供的简单绘图描述，生成一份详细、专业且富有创意的 AI 绘图提示词指令。在优化过程中，你需要做到以下几点：
+
+  1. 深入理解用户描述的核心意图和关键元素，挖掘潜在的细节和情感氛围，将其融入到提示词中。
+  2. 丰富画面细节，包括但不限于场景背景、人物特征、物体属性、光影效果、色彩搭配等，使画面更加生动逼真。
+  3. 运用专业的艺术风格术语，如超现实主义、印象派、赛博朋克等，为画面增添独特的艺术魅力。
+  4. 考虑构图和视角，如俯视、仰视、特写、全景等，提升画面的视觉冲击力。
+  5. 确保提示词指令清晰、准确、完整，便于 AI 绘图模型理解和生成高质量图像。最终输出的提示词应简洁明了，避免冗余信息，以逗号分隔各个元素，突出重点，
+让用户能够直接复制使用，从而帮助用户将简单的想法转化为精美绝伦的画作。
+  6. 不管用户输入的是什么语言，你务必要用英文输出优化后的提示词。
+  7. 直接输出优化后的提示词，不要输出其他任何五官内容。
+
+下面是一个提示词优化示例：
+===示例开始===
+原始指令 ：一个穿着红色连衣裙的少女在花园里浇花，阳光明媚。
+
+优化后的 AI 绘图提示词指令：一位年轻美丽的少女，约 16 - 18 岁，有着柔顺的黑色长发，披散在肩上，面容精致，眼神温柔而专注。她穿着一条复古风格的红色连衣裙，裙子上有精致的褶皱和白色的蕾丝花边，裙摆轻轻飘动。少女站在一个充满生机的花园中，花园里种满了各种各样的鲜花，有娇艳的玫瑰、淡雅的百合、缤纷的郁金香等，花朵色彩鲜艳，绿叶繁茂。她手持一个银色的 watering can（浇水壶），正在细心地给一朵盛开的玫瑰浇水。阳光从画面的右侧洒下，形成明亮而温暖的光晕，照亮了少女和整个花园，营造出一种宁静、美好的氛围，画面采用写实风格，光影效果逼真，色彩鲜明且富有层次感，构图以少女为中心，前景是盛开的花朵，背景是花园的树木和篱笆，整体画面充满诗意和浪漫气息。
+===示例结束===
+
+现在用户输入的原始提示词为:【%s】 
+`
+
+const LyricPromptTemplate = `
+你是一位才华横溢的作曲家，拥有丰富的情感和细腻的笔触，你对文字有着独特的感悟力，能将各种情感和意境巧妙地融入歌词中。
+请以【%s】为主题创作一首歌曲，歌曲时间不要太短，3分钟左右，不要输出任何解释性的内容。
+下面是一个标准的歌词输出模板：
+歌曲名称
+
+[Verse]
+[歌词]
+
+[Verse 2]
+[歌词]
+
+[Chorus]
+[歌词]
+
+[Verse 3]
+[歌词]
+
+[Bridge]
+[歌词]
+
+[Chorus]
+[歌词]
+
+[Verse 4]
+[歌词]
+
+[Bridge]
+假如此刻眼泪能倒流
+让我学会微笑不掩忧
+一次次的碎片堆积的愁
+最终也会开成希望的秋
+
+[Chorus]
+假如我还能牵你的手
+天空也许会更蔚蓝悠游
+曾经那些未完成的错过
+愿能变成今天的收获
+`
+
+const VideoPromptTemplate = `## 任务描述
+你是一位优秀AI视频创作专家，擅长编写专业的AI视频提示词，现在你的任务是对用户输入的简单视频描述提示词进行专业优化和扩写，使其转化为详细的、具备专业影视画面感的 AI 生成视频提示词指令。需涵盖风格、主体元素、环境氛围、细节特征、人物状态（若有）、镜头运用及整体氛围营造等方面，以生动形象、富有感染力且精准的描述，引导 AI 生成高质量的视频内容。下面是一个示例：
+===示例开始===
+输入： “汽车在沙漠功能上行驶”，
+输出： “纪实摄影风格，一辆尘土飞扬的复古越野车在无垠的沙漠公路上疾驰，车身线条硬朗，漆面斑驳，透露出岁月的痕迹。驾驶室内的司机戴着墨镜，专注地握着方向盘，眼神坚定地望向前方。夕阳的余晖洒在车身上，沙漠的沙丘在远处延绵起伏，一片金黄。广角镜头捕捉到车辆行驶时扬起的沙尘，营造出动感与冒险的氛围。远景全貌，强调速度感与环境辽阔。”
+===示例结束===
+
+## 输出要求：
+1. 直接输出扩写后的提示词就好，不要输出其他任何不相关信息
+2. 如果用户用中文提问，你就用中文回答，如果用英文提问，你也必须用英文回答。
+3. 请确保提示词的长度长度在1000个字以内。
+
+=====
+用户的输入的视频主题是：【%s】
+`
+
+const MetaPromptTemplate = `
+Given a task description or existing prompt, produce a detailed system prompt to guide a language model in completing the task effectively.
+
+Please remember, the final output must be the same language with user’s input.
+
+# Guidelines
+
+- Understand the Task: Grasp the main objective, goals, requirements, constraints, and expected output.
+- Minimal Changes: If an existing prompt is provided, improve it only if it's simple. For complex prompts, enhance clarity and add missing elements without altering the original structure.
+- Reasoning Before Conclusions**: Encourage reasoning steps before any conclusions are reached. ATTENTION! If the user provides examples where the reasoning happens afterward, REVERSE the order! NEVER START EXAMPLES WITH CONCLUSIONS!
+    - Reasoning Order: Call out reasoning portions of the prompt and conclusion parts (specific fields by name). For each, determine the ORDER in which this is done, and whether it needs to be reversed.
+    - Conclusion, classifications, or results should ALWAYS appear last.
+- Examples: Include high-quality examples if helpful, using placeholders [in brackets] for complex elements.
+   - What kinds of examples may need to be included, how many, and whether they are complex enough to benefit from placeholders.
+- Clarity and Conciseness: Use clear, specific language. Avoid unnecessary instructions or bland statements.
+- Formatting: Use markdown features for readability. DO NOT USE  CODE BLOCKS UNLESS SPECIFICALLY REQUESTED.
+- Preserve User Prompt: If the input task or prompt includes extensive guidelines or examples, preserve them entirely, or as closely as possible. If they are vague, consider breaking down into sub-steps. Keep any details, guidelines, examples, variables, or placeholders provided by the user.
+- Constants: DO include constants in the prompt, as they are not susceptible to prompt injection. Such as guides, rubrics, and examples.
+- Output Format: Explicitly the most appropriate output format, in detail. This should include length and syntax (e.g. short sentence, paragraph, JSON, etc.)
+- For tasks outputting well-defined or structured data (classification, JSON, etc.) bias toward outputting a JSON.
+- JSON should never be wrapped in code blocks unless explicitly requested.
+
+The final prompt you output should adhere to the following structure below. Do not include any additional commentary, only output the completed system prompt. SPECIFICALLY, do not include any additional messages at the start or end of the prompt. (e.g. no "---")
+
+[Concise instruction describing the task - this should be the first line in the prompt, no section header]
+
+[Additional details as needed.]
+
+[Optional sections with headings or bullet points for detailed steps.]
+
+# Steps [optional]
+
+[optional: a detailed breakdown of the steps necessary to accomplish the task]
+
+# Output Format
+
+[Specifically call out how the output should be formatted, be it response length, structure e.g. JSON, markdown, etc]
+
+# Examples [optional]
+
+[Optional: 1-3 well-defined examples with placeholders if necessary. Clearly mark where examples start and end, and what the input and output are. User placeholders as necessary.]
+[If the examples are shorter than what a realistic example is expected to be, make a reference with () explaining how real examples should be longer / shorter / different. AND USE PLACEHOLDERS! ]
+
+# Notes [optional]
+
+[optional: edge cases, details, and an area to call or repeat out specific important considerations]
+`
--- a/api/service/user_service.go
+++ b/api/service/user_service.go
@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"geekai/core/types"
 	"geekai/store/model"
-	"gorm.io/gorm"
 	"sync"
 	"time"
+
+	"gorm.io/gorm"
 )

 type UserService struct {
@@ -19,7 +20,7 @@ func NewUserService(db *gorm.DB) *UserService {
 }

 // IncreasePower 增加用户算力
-func (s *UserService) IncreasePower(userId int, power int, log model.PowerLog) error {
+func (s *UserService) IncreasePower(userId uint, power int, log model.PowerLog) error {
 	s.lock.Lock()
 	defer s.lock.Unlock()

@@ -51,7 +52,7 @@ func (s *UserService) IncreasePower(userId int, power int, log model.PowerLog) e
 }

 // DecreasePower 减少用户算力
-func (s *UserService) DecreasePower(userId int, power int, log model.PowerLog) error {
+func (s *UserService) DecreasePower(userId uint, power int, log model.PowerLog) error {
 	s.lock.Lock()
 	defer s.lock.Unlock()

--- a/api/service/video/luma.go
+++ b/api/service/video/luma.go
@@ -1,330 +0,0 @@
-package video
-
-// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// * 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 (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"geekai/core/types"
-	logger2 "geekai/logger"
-	"geekai/service"
-	"geekai/service/oss"
-	"geekai/store"
-	"geekai/store/model"
-	"geekai/utils"
-	"github.com/go-redis/redis/v8"
-	"io"
-	"time"
-
-	"github.com/imroc/req/v3"
-	"gorm.io/gorm"
-)
-
-var logger = logger2.GetLogger()
-
-type Service struct {
-	httpClient    *req.Client
-	db            *gorm.DB
-	uploadManager *oss.UploaderManager
-	taskQueue     *store.RedisQueue
-	notifyQueue   *store.RedisQueue
-	Clients       *types.LMap[uint, *types.WsClient] // UserId => Client
-}
-
-func NewService(db *gorm.DB, manager *oss.UploaderManager, redisCli *redis.Client) *Service {
-	return &Service{
-		httpClient:    req.C().SetTimeout(time.Minute * 3),
-		db:            db,
-		taskQueue:     store.NewRedisQueue("Video_Task_Queue", redisCli),
-		notifyQueue:   store.NewRedisQueue("Video_Notify_Queue", redisCli),
-		Clients:       types.NewLMap[uint, *types.WsClient](),
-		uploadManager: manager,
-	}
-}
-
-func (s *Service) PushTask(task types.VideoTask) {
-	logger.Infof("add a new Video task to the task list: %+v", task)
-	s.taskQueue.RPush(task)
-}
-
-func (s *Service) Run() {
-	// 将数据库中未提交的人物加载到队列
-	var jobs []model.VideoJob
-	s.db.Where("task_id", "").Where("progress", 0).Find(&jobs)
-	for _, v := range jobs {
-		var params types.VideoParams
-		if err := utils.JsonDecode(v.Params, &params); err != nil {
-			logger.Errorf("unmarshal params failed: %v", err)
-			continue
-		}
-		s.PushTask(types.VideoTask{
-			Id:      v.Id,
-			Channel: v.Channel,
-			UserId:  v.UserId,
-			Type:    v.Type,
-			TaskId:  v.TaskId,
-			Prompt:  v.Prompt,
-			Params:  params,
-		})
-	}
-	logger.Info("Starting Video job consumer...")
-	go func() {
-		for {
-			var task types.VideoTask
-			err := s.taskQueue.LPop(&task)
-			if err != nil {
-				logger.Errorf("taking task with error: %v", err)
-				continue
-			}
-			var r LumaRespVo
-			r, err = s.LumaCreate(task)
-			if err != nil {
-				logger.Errorf("create task with error: %v", err)
-				err = s.db.Model(&model.VideoJob{Id: task.Id}).UpdateColumns(map[string]interface{}{
-					"err_msg":   err.Error(),
-					"progress":  service.FailTaskProgress,
-					"cover_url": "/images/failed.jpg",
-				}).Error
-				if err != nil {
-					logger.Errorf("update task with error: %v", err)
-				}
-				s.notifyQueue.RPush(service.NotifyMessage{UserId: task.UserId, JobId: int(task.Id), Message: service.TaskStatusFailed})
-				continue
-			}
-
-			// 更新任务信息
-			err = s.db.Model(&model.VideoJob{Id: task.Id}).UpdateColumns(map[string]interface{}{
-				"task_id":    r.Id,
-				"channel":    r.Channel,
-				"prompt_ext": r.Prompt,
-			}).Error
-			if err != nil {
-				logger.Errorf("update task with error: %v", err)
-				s.PushTask(task)
-			}
-		}
-	}()
-}
-
-type LumaRespVo struct {
-	Id                  string      `json:"id"`
-	Prompt              string      `json:"prompt"`
-	State               string      `json:"state"`
-	CreatedAt           time.Time   `json:"created_at"`
-	Video               interface{} `json:"video"`
-	Liked               interface{} `json:"liked"`
-	EstimateWaitSeconds interface{} `json:"estimate_wait_seconds"`
-	Channel             string      `json:"channel,omitempty"`
-}
-
-func (s *Service) LumaCreate(task types.VideoTask) (LumaRespVo, error) {
-	// 读取 API KEY
-	var apiKey model.ApiKey
-	session := s.db.Session(&gorm.Session{}).Where("type", "luma").Where("enabled", true)
-	if task.Channel != "" {
-		session = session.Where("api_url", task.Channel)
-	}
-	tx := session.Order("last_used_at DESC").First(&apiKey)
-	if tx.Error != nil {
-		return LumaRespVo{}, errors.New("no available API KEY for Luma")
-	}
-
-	reqBody := map[string]interface{}{
-		"user_prompt":   task.Prompt,
-		"expand_prompt": task.Params.PromptOptimize,
-		"loop":          task.Params.Loop,
-		"image_url":     task.Params.StartImgURL,
-		"image_end_url": task.Params.EndImgURL,
-	}
-	var res LumaRespVo
-	apiURL := fmt.Sprintf("%s/luma/generations", apiKey.ApiURL)
-	logger.Debugf("API URL: %s, request body: %+v", apiURL, reqBody)
-	r, err := req.C().R().
-		SetHeader("Authorization", "Bearer "+apiKey.Value).
-		SetBody(reqBody).
-		Post(apiURL)
-	if err != nil {
-		return LumaRespVo{}, fmt.Errorf("请求 API 出错：%v", err)
-	}
-
-	if r.StatusCode != 200 && r.StatusCode != 201 {
-		return LumaRespVo{}, fmt.Errorf("请求 API 出错：%d, %s", r.StatusCode, r.String())
-	}
-
-	body, _ := io.ReadAll(r.Body)
-	err = json.Unmarshal(body, &res)
-	if err != nil {
-		return LumaRespVo{}, fmt.Errorf("解析API数据失败：%v, %s", err, string(body))
-	}
-
-	// update the last_use_at for api key
-	apiKey.LastUsedAt = time.Now().Unix()
-	session.Updates(&apiKey)
-	res.Channel = apiKey.ApiURL
-	return res, nil
-}
-
-func (s *Service) CheckTaskNotify() {
-	go func() {
-		logger.Info("Running Suno task notify checking ...")
-		for {
-			var message service.NotifyMessage
-			err := s.notifyQueue.LPop(&message)
-			if err != nil {
-				continue
-			}
-			client := s.Clients.Get(uint(message.UserId))
-			if client == nil {
-				continue
-			}
-			err = client.Send([]byte(message.Message))
-			if err != nil {
-				continue
-			}
-		}
-	}()
-}
-
-func (s *Service) DownloadFiles() {
-	go func() {
-		var items []model.VideoJob
-		for {
-			res := s.db.Where("progress", 102).Find(&items)
-			if res.Error != nil {
-				continue
-			}
-
-			for _, v := range items {
-				if v.WaterURL == "" {
-					continue
-				}
-
-				logger.Infof("try download video: %s", v.WaterURL)
-				videoURL, err := s.uploadManager.GetUploadHandler().PutUrlFile(v.WaterURL, true)
-				if err != nil {
-					logger.Errorf("download video with error: %v", err)
-					continue
-				}
-				logger.Infof("download video success: %s", videoURL)
-				v.WaterURL = videoURL
-
-				if v.VideoURL != "" {
-					logger.Infof("try download no water video: %s", v.VideoURL)
-					videoURL, err = s.uploadManager.GetUploadHandler().PutUrlFile(v.VideoURL, true)
-					if err != nil {
-						logger.Errorf("download video with error: %v", err)
-						continue
-					}
-				}
-				logger.Info("download no water video success: %s", videoURL)
-				v.VideoURL = videoURL
-				v.Progress = 100
-				s.db.Updates(&v)
-				s.notifyQueue.RPush(service.NotifyMessage{UserId: v.UserId, JobId: int(v.Id), Message: service.TaskStatusFinished})
-			}
-
-			time.Sleep(time.Second * 10)
-		}
-	}()
-}
-
-// SyncTaskProgress 异步拉取任务
-func (s *Service) SyncTaskProgress() {
-	go func() {
-		var jobs []model.VideoJob
-		for {
-			res := s.db.Where("progress < ?", 100).Where("task_id <> ?", "").Find(&jobs)
-			if res.Error != nil {
-				continue
-			}
-
-			for _, job := range jobs {
-				task, err := s.QueryLumaTask(job.TaskId, job.Channel)
-				if err != nil {
-					logger.Errorf("query task with error: %v", err)
-					// 更新任务信息
-					s.db.Model(&model.VideoJob{Id: job.Id}).UpdateColumns(map[string]interface{}{
-						"progress": service.FailTaskProgress, // 102 表示资源未下载完成,
-						"err_msg":  err.Error(),
-					})
-					continue
-				}
-
-				logger.Debugf("task: %+v", task)
-				if task.State == "completed" { // 更新任务信息
-					data := map[string]interface{}{
-						"progress":   102, // 102 表示资源未下载完成,
-						"water_url":  task.Video.Url,
-						"raw_data":   utils.JsonEncode(task),
-						"prompt_ext": task.Prompt,
-					}
-					if task.Video.DownloadUrl != "" {
-						data["video_url"] = task.Video.DownloadUrl
-					}
-					err = s.db.Model(&model.VideoJob{Id: job.Id}).UpdateColumns(data).Error
-					if err != nil {
-						logger.Errorf("更新数据库失败：%v", err)
-						continue
-					}
-				}
-
-			}
-
-			time.Sleep(time.Second * 10)
-		}
-	}()
-}
-
-type LumaTaskVo struct {
-	Id    string      `json:"id"`
-	Liked interface{} `json:"liked"`
-	State string      `json:"state"`
-	Video struct {
-		Url         string `json:"url"`
-		Width       int    `json:"width"`
-		Height      int    `json:"height"`
-		DownloadUrl string `json:"download_url"`
-	} `json:"video"`
-	Prompt              string      `json:"prompt"`
-	CreatedAt           time.Time   `json:"created_at"`
-	EstimateWaitSeconds interface{} `json:"estimate_wait_seconds"`
-}
-
-func (s *Service) QueryLumaTask(taskId string, channel string) (LumaTaskVo, error) {
-	// 读取 API KEY
-	var apiKey model.ApiKey
-	err := s.db.Session(&gorm.Session{}).Where("type", "luma").
-		Where("api_url", channel).
-		Where("enabled", true).
-		Order("last_used_at DESC").First(&apiKey).Error
-	if err != nil {
-		return LumaTaskVo{}, errors.New("no available API KEY for Luma")
-	}
-
-	apiURL := fmt.Sprintf("%s/luma/generations/%s", apiKey.ApiURL, taskId)
-	var res LumaTaskVo
-	r, err := req.C().R().SetHeader("Authorization", "Bearer "+apiKey.Value).Get(apiURL)
-
-	if err != nil {
-		return LumaTaskVo{}, fmt.Errorf("请求 API 失败：%v", err)
-	}
-	defer r.Body.Close()
-
-	if r.StatusCode != 200 {
-		return LumaTaskVo{}, fmt.Errorf("API 返回失败：%v", r.String())
-	}
-
-	body, _ := io.ReadAll(r.Body)
-	err = json.Unmarshal(body, &res)
-	if err != nil {
-		return LumaTaskVo{}, fmt.Errorf("解析API数据失败：%v, %s", err, string(body))
-	}
-
-	return res, nil
-}
--- a/api/service/video/video.go
+++ b/api/service/video/video.go
@@ -0,0 +1,663 @@
+package video
+
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// * 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 (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"geekai/core/types"
+	logger2 "geekai/logger"
+	"geekai/service"
+	"geekai/service/oss"
+	"geekai/store"
+	"geekai/store/model"
+	"geekai/utils"
+	"io"
+	"net/http"
+	"time"
+
+	"github.com/go-redis/redis/v8"
+
+	"github.com/imroc/req/v3"
+	"gorm.io/gorm"
+)
+
+var logger = logger2.GetLogger()
+
+type Service struct {
+	httpClient    *req.Client
+	db            *gorm.DB
+	uploadManager *oss.UploaderManager
+	taskQueue     *store.RedisQueue
+	userService   *service.UserService
+}
+
+func NewService(db *gorm.DB, manager *oss.UploaderManager, redisCli *redis.Client, userService *service.UserService) *Service {
+	return &Service{
+		httpClient:    req.C().SetTimeout(time.Minute * 3),
+		db:            db,
+		taskQueue:     store.NewRedisQueue("Video_Task_Queue", redisCli),
+		uploadManager: manager,
+		userService:   userService,
+	}
+}
+
+func (s *Service) PushTask(task types.VideoTask) {
+	logger.Infof("add a new Video task to the task list: %+v", task)
+	if err := s.taskQueue.RPush(task); err != nil {
+		logger.Errorf("push video task to queue failed: %v", err)
+	}
+}
+
+func (s *Service) Run() {
+	// 将数据库中未提交的任务加载到队列
+	var jobs []model.VideoJob
+	s.db.Where("task_id", "").Where("progress", 0).Find(&jobs)
+	for _, v := range jobs {
+		var task types.VideoTask
+		err := utils.JsonDecode(v.TaskInfo, &task)
+		if err != nil {
+			logger.Errorf("decode task info with error: %v", err)
+			continue
+		}
+		task.Id = v.Id
+		s.PushTask(task)
+	}
+	logger.Info("Starting Video job consumer...")
+	go func() {
+		for {
+			var task types.VideoTask
+			err := s.taskQueue.LPop(&task)
+			if err != nil {
+				logger.Errorf("taking task with error: %v", err)
+				continue
+			}
+
+			if task.Type == types.VideoLuma {
+				// translate prompt
+				if utils.HasChinese(task.Prompt) {
+					content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.TranslatePromptTemplate, task.Prompt), task.TranslateModelId)
+					if err == nil {
+						task.Prompt = content
+					} else {
+						logger.Warnf("error with translate prompt: %v", err)
+					}
+				}
+				var r LumaRespVo
+				r, err = s.LumaCreate(task)
+				if err != nil {
+					logger.Errorf("create task with error: %v", err)
+					err = s.db.Model(&model.VideoJob{Id: task.Id}).UpdateColumns(map[string]interface{}{
+						"err_msg":   err.Error(),
+						"progress":  service.FailTaskProgress,
+						"cover_url": "/images/failed.jpg",
+					}).Error
+					if err != nil {
+						logger.Errorf("update task with error: %v", err)
+					}
+					continue
+				}
+
+				// 更新任务信息
+				err = s.db.Model(&model.VideoJob{Id: task.Id}).UpdateColumns(map[string]interface{}{
+					"task_id":    r.Id,
+					"channel":    r.Channel,
+					"prompt_ext": r.Prompt,
+				}).Error
+				if err != nil {
+					logger.Errorf("update task with error: %v", err)
+					s.PushTask(task)
+				}
+			} else if task.Type == types.VideoKeLing {
+				var r KeLingRespVo
+				r, err = s.KeLingCreate(task)
+				logger.Debugf("ke ling create task result: %+v", r)
+
+				if err != nil {
+					logger.Errorf("create task with error: %v", err)
+					err = s.db.Model(&model.VideoJob{Id: task.Id}).UpdateColumns(map[string]interface{}{
+						"err_msg":   err.Error(),
+						"progress":  service.FailTaskProgress,
+						"cover_url": "/images/failed.jpg",
+					}).Error
+					if err != nil {
+						logger.Errorf("update task with error: %v", err)
+					}
+					continue
+				}
+
+				// 更新任务信息
+				err = s.db.Model(&model.VideoJob{Id: task.Id}).UpdateColumns(map[string]interface{}{
+					"task_id":    r.Data.TaskID,
+					"channel":    r.Channel,
+					"prompt_ext": task.Prompt,
+				}).Error
+				if err != nil {
+					logger.Errorf("update task with error: %v", err)
+					s.PushTask(task)
+				}
+			}
+
+		}
+	}()
+}
+
+func (s *Service) DownloadFiles() {
+	go func() {
+		var items []model.VideoJob
+		for {
+			res := s.db.Where("progress", 102).Find(&items)
+			if res.Error != nil {
+				continue
+			}
+
+			for _, v := range items {
+				if v.WaterURL == "" {
+					continue
+				}
+
+				logger.Infof("try download video: %s", v.WaterURL)
+				videoURL, err := s.uploadManager.GetUploadHandler().PutUrlFile(v.WaterURL, ".mp4", true)
+				if err != nil {
+					logger.Errorf("download video with error: %v", err)
+					continue
+				}
+				logger.Infof("download video success: %s", videoURL)
+				v.WaterURL = videoURL
+
+				if v.VideoURL != "" {
+					logger.Infof("try download no water video: %s", v.VideoURL)
+					videoURL, err = s.uploadManager.GetUploadHandler().PutUrlFile(v.VideoURL, ".mp4", true)
+					if err != nil {
+						logger.Errorf("download video with error: %v", err)
+						continue
+					}
+				}
+				logger.Infof("download no water video success: %s", videoURL)
+				v.VideoURL = videoURL
+				v.Progress = 100
+				s.db.Updates(&v)
+
+				// Convert TaskInfo to VideoTask
+				var videoTask types.VideoTask
+				if err := json.Unmarshal([]byte(v.TaskInfo), &videoTask); err != nil {
+					logger.Errorf("failed to unmarshal task info to VideoTask: %v", err)
+					continue
+				}
+
+			}
+
+			time.Sleep(time.Second * 10)
+		}
+	}()
+}
+
+// SyncTaskProgress 异步拉取任务
+func (s *Service) SyncTaskProgress() {
+	go func() {
+		var jobs []model.VideoJob
+		for {
+			res := s.db.Where("progress < ?", 100).Where("task_id <> ?", "").Find(&jobs)
+			if res.Error != nil {
+				continue
+			}
+
+			for _, job := range jobs {
+				if job.Type == types.VideoLuma {
+					task, err := s.QueryLumaTask(job.TaskId, job.Channel)
+					if err != nil {
+						logger.Errorf("query task with error: %v", err)
+						// 更新任务信息
+						s.db.Model(&model.VideoJob{Id: job.Id}).UpdateColumns(map[string]interface{}{
+							"progress":  service.FailTaskProgress, // 102 表示资源未下载完成,
+							"err_msg":   err.Error(),
+							"cover_url": "/images/failed.jpg",
+						})
+						continue
+					}
+
+					logger.Debugf("task: %+v", task)
+					if task.State == "completed" { // 更新任务信息
+						data := map[string]interface{}{
+							"progress":   102, // 102 表示资源未下载完成,
+							"water_url":  task.Video.Url,
+							"raw_data":   utils.JsonEncode(task),
+							"prompt_ext": task.Prompt,
+							"cover_url":  task.Thumbnail.Url,
+						}
+						if task.Video.DownloadUrl != "" {
+							data["video_url"] = task.Video.DownloadUrl
+						}
+						err = s.db.Model(&model.VideoJob{Id: job.Id}).UpdateColumns(data).Error
+						if err != nil {
+							logger.Errorf("更新数据库失败：%v", err)
+							continue
+						}
+					}
+				} else if job.Type == types.VideoKeLing {
+					// Convert TaskInfo to VideoTask
+					var videoTask types.VideoTask
+					if err := json.Unmarshal([]byte(job.TaskInfo), &videoTask); err != nil {
+						logger.Errorf("failed to unmarshal task info to VideoTask: %v", err)
+						continue
+					}
+
+					// Type assert task.Params to KeLingVideoParams
+					paramsMap, ok := videoTask.Params.(map[string]interface{})
+					if !ok {
+						continue
+					}
+
+					// Convert map to KeLingVideoParams
+					paramsBytes, err := json.Marshal(paramsMap)
+					if err != nil {
+						continue
+					}
+
+					var params types.KeLingVideoParams
+					if err := json.Unmarshal(paramsBytes, &params); err != nil {
+						continue
+					}
+
+					task, err := s.QueryKeLingTask(job.TaskId, job.Channel, params.TaskType)
+					if err != nil {
+						logger.Errorf("query task with error: %v", err)
+						// 更新任务信息
+						s.db.Model(&model.VideoJob{Id: job.Id}).UpdateColumns(map[string]interface{}{
+							"progress":  service.FailTaskProgress, // 102 表示资源未下载完成,
+							"err_msg":   err.Error(),
+							"cover_url": "/images/failed.jpg",
+						})
+						continue
+					}
+
+					logger.Debugf("task: %+v", task)
+					if task.TaskStatus == "succeed" { // 更新任务信息
+						data := map[string]interface{}{
+							"progress":   102, // 102 表示资源未下载完成,
+							"water_url":  task.TaskResult.Videos[0].URL,
+							"raw_data":   utils.JsonEncode(task),
+							"prompt_ext": job.Prompt,
+							"cover_url":  "",
+						}
+						if len(task.TaskResult.Videos) > 0 {
+							data["video_url"] = task.TaskResult.Videos[0].URL
+						}
+						err = s.db.Model(&model.VideoJob{Id: job.Id}).UpdateColumns(data).Error
+						if err != nil {
+							logger.Errorf("更新数据库失败：%v", err)
+							continue
+						}
+					} else if task.TaskStatus == "failed" {
+						// 更新任务信息
+						s.db.Model(&model.VideoJob{Id: job.Id}).UpdateColumns(map[string]interface{}{
+							"progress":  service.FailTaskProgress,
+							"err_msg":   task.TaskStatusMsg,
+							"cover_url": "/images/failed.jpg",
+						})
+					}
+				}
+
+			}
+
+			// 找出失败的任务，并恢复其扣减算力
+			s.db.Where("progress", service.FailTaskProgress).Where("power > ?", 0).Find(&jobs)
+			for _, job := range jobs {
+				err := s.userService.IncreasePower(job.UserId, job.Power, model.PowerLog{
+					Type:   types.PowerRefund,
+					Model:  job.Type,
+					Remark: fmt.Sprintf("%s 任务失败，退回算力。任务ID：%s，Err:%s", job.Type, job.TaskId, job.ErrMsg),
+				})
+				if err != nil {
+					continue
+				}
+				// 更新任务状态
+				s.db.Model(&job).UpdateColumn("power", 0)
+			}
+			time.Sleep(time.Second * 10)
+		}
+	}()
+}
+
+type LumaTaskVo struct {
+	Id    string      `json:"id"`
+	Liked interface{} `json:"liked"`
+	State string      `json:"state"`
+	Video struct {
+		Url         string `json:"url"`
+		Width       int    `json:"width"`
+		Height      int    `json:"height"`
+		Thumbnail   string `json:"thumbnail"`
+		DownloadUrl string `json:"download_url"`
+	} `json:"video"`
+	Prompt    string `json:"prompt"`
+	UserId    string `json:"user_id"`
+	BatchId   string `json:"batch_id"`
+	Thumbnail struct {
+		Url    string `json:"url"`
+		Width  int    `json:"width"`
+		Height int    `json:"height"`
+	} `json:"thumbnail"`
+	VideoRaw struct {
+		Url    string `json:"url"`
+		Width  int    `json:"width"`
+		Height int    `json:"height"`
+	} `json:"video_raw"`
+	CreatedAt string `json:"created_at"`
+	LastFrame struct {
+		Url    string `json:"url"`
+		Width  int    `json:"width"`
+		Height int    `json:"height"`
+	} `json:"last_frame"`
+}
+
+type LumaRespVo struct {
+	Id                  string      `json:"id"`
+	Prompt              string      `json:"prompt"`
+	State               string      `json:"state"`
+	QueueState          interface{} `json:"queue_state"`
+	CreatedAt           string      `json:"created_at"`
+	Video               interface{} `json:"video"`
+	VideoRaw            interface{} `json:"video_raw"`
+	Liked               interface{} `json:"liked"`
+	EstimateWaitSeconds interface{} `json:"estimate_wait_seconds"`
+	Thumbnail           interface{} `json:"thumbnail"`
+	Channel             string      `json:"channel,omitempty"`
+}
+
+func (s *Service) LumaCreate(task types.VideoTask) (LumaRespVo, error) {
+	// 读取 API KEY
+	var apiKey model.ApiKey
+	session := s.db.Session(&gorm.Session{}).Where("type", "luma").Where("enabled", true)
+	if task.Channel != "" {
+		session = session.Where("api_url", task.Channel)
+	}
+	tx := session.Order("last_used_at DESC").First(&apiKey)
+	if tx.Error != nil {
+		return LumaRespVo{}, errors.New("no available API KEY for Luma")
+	}
+
+	// Type assert task.Params to LumaVideoParams
+	paramsMap, ok := task.Params.(map[string]interface{})
+	if !ok {
+		return LumaRespVo{}, errors.New("invalid params type for Luma video task")
+	}
+
+	// Convert map to LumaVideoParams
+	paramsBytes, err := json.Marshal(paramsMap)
+	if err != nil {
+		return LumaRespVo{}, fmt.Errorf("failed to marshal params: %v", err)
+	}
+
+	var params types.LumaVideoParams
+	if err := json.Unmarshal(paramsBytes, &params); err != nil {
+		return LumaRespVo{}, fmt.Errorf("failed to unmarshal params: %v", err)
+	}
+
+	reqBody := map[string]interface{}{
+		"user_prompt":   task.Prompt,
+		"expand_prompt": params.PromptOptimize,
+		"loop":          params.Loop,
+		"image_url":     params.StartImgURL, // 图生视频
+		"image_end_url": params.EndImgURL,   // 图生视频
+	}
+
+	var res LumaRespVo
+	apiURL := fmt.Sprintf("%s/luma/generations", apiKey.ApiURL)
+	logger.Debugf("API URL: %s, request body: %+v", apiURL, reqBody)
+	r, err := req.C().R().
+		SetHeader("Authorization", "Bearer "+apiKey.Value).
+		SetBody(reqBody).
+		Post(apiURL)
+	if err != nil {
+		return LumaRespVo{}, fmt.Errorf("请求 API 出错：%v", err)
+	}
+
+	if r.StatusCode != 200 && r.StatusCode != 201 {
+		return LumaRespVo{}, fmt.Errorf("请求 API 出错：%d, %s", r.StatusCode, r.String())
+	}
+
+	body, _ := io.ReadAll(r.Body)
+	err = json.Unmarshal(body, &res)
+	if err != nil {
+		return LumaRespVo{}, fmt.Errorf("解析API数据失败：%v, %s", err, string(body))
+	}
+
+	// update the last_use_at for api key
+	apiKey.LastUsedAt = time.Now().Unix()
+	session.Updates(&apiKey)
+	res.Channel = apiKey.ApiURL
+	return res, nil
+}
+
+func (s *Service) QueryLumaTask(taskId string, channel string) (LumaTaskVo, error) {
+	// 读取 API KEY
+	var apiKey model.ApiKey
+	err := s.db.Session(&gorm.Session{}).Where("type", "luma").
+		Where("api_url", channel).
+		Where("enabled", true).
+		Order("last_used_at DESC").First(&apiKey).Error
+	if err != nil {
+		return LumaTaskVo{}, errors.New("no available API KEY for Luma")
+	}
+
+	apiURL := fmt.Sprintf("%s/luma/generations/%s", apiKey.ApiURL, taskId)
+	var res LumaTaskVo
+	r, err := req.C().R().SetHeader("Authorization", "Bearer "+apiKey.Value).Get(apiURL)
+
+	if err != nil {
+		return LumaTaskVo{}, fmt.Errorf("请求 API 失败：%v", err)
+	}
+	defer r.Body.Close()
+
+	if r.StatusCode != 200 {
+		return LumaTaskVo{}, fmt.Errorf("API 返回失败：%v", r.String())
+	}
+
+	body, _ := io.ReadAll(r.Body)
+	err = json.Unmarshal(body, &res)
+	if err != nil {
+		return LumaTaskVo{}, fmt.Errorf("解析API数据失败：%v, %s", err, string(body))
+	}
+
+	return res, nil
+}
+
+type KeLingRespVo struct {
+	Code      int    `json:"code"`
+	Message   string `json:"message"`
+	RequestID string `json:"request_id"`
+	Data      struct {
+		TaskID     string `json:"task_id"`
+		TaskStatus string `json:"task_status"`
+		CreatedAt  int64  `json:"created_at"`
+		UpdatedAt  int64  `json:"updated_at"`
+	} `json:"data"`
+	Channel string `json:"channel,omitempty"`
+}
+
+func (s *Service) KeLingCreate(task types.VideoTask) (KeLingRespVo, error) {
+	var apiKey model.ApiKey
+	session := s.db.Session(&gorm.Session{}).Where("type", "keling").Where("enabled", true)
+	if task.Channel != "" {
+		session = session.Where("api_url", task.Channel)
+	}
+	tx := session.Order("last_used_at DESC").First(&apiKey)
+	if tx.Error != nil {
+		return KeLingRespVo{}, errors.New("no available API KEY for keling")
+	}
+
+	// Type assert task.Params to KeLingVideoParams
+	paramsMap, ok := task.Params.(map[string]interface{})
+	if !ok {
+		return KeLingRespVo{}, errors.New("invalid params type for KeLing video task")
+	}
+
+	// Convert map to KeLingVideoParams
+	paramsBytes, err := json.Marshal(paramsMap)
+	if err != nil {
+		return KeLingRespVo{}, fmt.Errorf("failed to marshal params: %v", err)
+	}
+
+	var params types.KeLingVideoParams
+	if err := json.Unmarshal(paramsBytes, &params); err != nil {
+		return KeLingRespVo{}, fmt.Errorf("failed to unmarshal params: %v", err)
+	}
+
+	// 2. 构建API请求参数
+	payload := map[string]interface{}{
+		"model_name":      params.Model,
+		"prompt":          task.Prompt,
+		"negative_prompt": params.NegPrompt,
+		"cfg_scale":       params.CfgScale,
+		"mode":            params.Mode,
+		"aspect_ratio":    params.AspectRatio,
+		"duration":        params.Duration,
+	}
+
+	// 只有当 CameraControl 的类型不为空时,才处理摄像机控制参数
+	if params.CameraControl.Type != "" {
+		cameraControl := map[string]interface{}{
+			"type": params.CameraControl.Type,
+		}
+
+		// 只有在 simple 类型时才添加 config 参数
+		if params.CameraControl.Type == "simple" {
+			cameraControl["config"] = params.CameraControl.Config
+		}
+
+		payload["camera_control"] = cameraControl
+	}
+
+	// 处理图生视频
+	if params.TaskType == "image2video" {
+		payload["image"] = params.Image
+		payload["image_tail"] = params.ImageTail
+	}
+
+	jsonPayload, err := json.Marshal(payload)
+	if err != nil {
+		return KeLingRespVo{}, fmt.Errorf("failed to marshal payload: %v", err)
+	}
+
+	// 3. 准备HTTP请求
+	url := fmt.Sprintf("%s/kling/v1/videos/%s", apiKey.ApiURL, params.TaskType)
+	req, err := http.NewRequest("POST", url, bytes.NewReader(jsonPayload))
+	if err != nil {
+		return KeLingRespVo{}, fmt.Errorf("failed to create request: %v", err)
+	}
+
+	req.Header.Set("Authorization", "Bearer "+apiKey.Value)
+	req.Header.Set("Content-Type", "application/json")
+
+	// 4. 发送请求
+	client := &http.Client{Timeout: time.Duration(30) * time.Second}
+	resp, err := client.Do(req)
+	if err != nil {
+		return KeLingRespVo{}, fmt.Errorf("failed to send request: %v", err)
+	}
+	defer resp.Body.Close()
+
+	// 5. 处理响应
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return KeLingRespVo{}, fmt.Errorf("failed to read response: %v", err)
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return KeLingRespVo{}, fmt.Errorf("API error (status %d): %s", resp.StatusCode, string(body))
+	}
+
+	var apiResponse = KeLingRespVo{}
+	if err := json.Unmarshal(body, &apiResponse); err != nil {
+		return KeLingRespVo{}, fmt.Errorf("failed to parse response: %v", err)
+	}
+	// 设置 API 通道
+	apiResponse.Channel = apiKey.ApiURL
+	return apiResponse, nil
+}
+
+// VideoCallbackData 表示视频生成任务的回调数据
+type VideoCallbackData struct {
+	TaskID        string     `json:"task_id"`
+	TaskStatus    string     `json:"task_status"`
+	TaskStatusMsg string     `json:"task_status_msg"`
+	CreatedAt     int64      `json:"created_at"`
+	UpdatedAt     int64      `json:"updated_at"`
+	TaskResult    TaskResult `json:"task_result"`
+}
+
+type TaskResult struct {
+	Images []CallBackImageResult `json:"images,omitempty"`
+	Videos []CallBackVideoResult `json:"videos,omitempty"`
+}
+
+type CallBackImageResult struct {
+	Index int    `json:"index"`
+	URL   string `json:"url"`
+}
+
+type CallBackVideoResult struct {
+	ID       string `json:"id"`
+	URL      string `json:"url"`
+	Duration string `json:"duration"`
+}
+
+func (s *Service) QueryKeLingTask(taskId string, channel string, action string) (VideoCallbackData, error) {
+	var apiKey model.ApiKey
+	err := s.db.Session(&gorm.Session{}).Where("type", "keling").
+		//Where("api_url", channel).
+		Where("enabled", true).
+		Order("last_used_at DESC").First(&apiKey).Error
+	if err != nil {
+		return VideoCallbackData{}, errors.New("no available API KEY for keling")
+	}
+
+	url := fmt.Sprintf("%s/kling/v1/videos/%s/%s", apiKey.ApiURL, action, taskId)
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return VideoCallbackData{}, fmt.Errorf("failed to create request: %w", err)
+	}
+
+	req.Header.Set("Authorization", "Bearer "+apiKey.Value)
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{}
+	res, err := client.Do(req)
+	if err != nil {
+		return VideoCallbackData{}, fmt.Errorf("failed to execute request: %w", err)
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		return VideoCallbackData{}, fmt.Errorf("unexpected status code: %d", res.StatusCode)
+	}
+
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return VideoCallbackData{}, fmt.Errorf("failed to read response body: %w", err)
+	}
+
+	var response struct {
+		Code    int               `json:"code"`
+		Message string            `json:"message"`
+		Data    VideoCallbackData `json:"data"`
+	}
+
+	if err := json.Unmarshal(body, &response); err != nil {
+		return VideoCallbackData{}, fmt.Errorf("failed to unmarshal response: %w", err)
+	}
+
+	if response.Code != 0 {
+		return VideoCallbackData{}, fmt.Errorf("API error: %s", response.Message)
+	}
+
+	return response.Data, nil
+}
--- a/api/service/xxl_job_service.go
+++ b/api/service/xxl_job_service.go
@@ -9,14 +9,11 @@ package service

 import (
 	"context"
-	"fmt"
 	"geekai/core/types"
 	logger2 "geekai/logger"
-	"geekai/store/model"
-	"geekai/utils"
+
 	"github.com/xxl-job/xxl-job-executor-go"
 	"gorm.io/gorm"
-	"time"
 )

 var logger = logger2.GetLogger()
@@ -46,97 +43,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.Info("执行清理未支付订单...")
-	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()
-	}
-
-	if config.OrderPayTimeout == 0 { // 默认未支付订单的生命周期为 30 分钟
-		config.OrderPayTimeout = 1800
-	}
-	timeout := time.Now().Unix() - int64(config.OrderPayTimeout)
-	start := utils.Stamp2str(timeout)
-	// 这里不是用软删除，而是永久删除订单
-	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会员算力
-// 自动将 VIP 会员的算力补充到每月赠送的最大值
-func (e *XXLJobExecutor) ResetVipPower(cxt context.Context, param *xxl.RunReq) (msg string) {
-	logger.Info("开始进行月底账号盘点...")
-	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()
-	}
-
-	if config.DailyPower <= 0 {
-		return "success"
-	}
-
-	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.DailyPower),
-				CreatedAt: time.Now(),
-			})
-		}
-		counter++
-		totalPower += power
-	}
-	logger.Infof("今日派发算力结束！累计派发 %d 人，累计派发算力：%d", counter, totalPower)
+	
 	return "success"
 }

--- a/api/static/audio/2a22a7d227c444f7b69710bd9327acee43457b460cf362331a06474a1b9cc82e.mp3
+++ b/api/static/audio/2a22a7d227c444f7b69710bd9327acee43457b460cf362331a06474a1b9cc82e.mp3
--- a/api/static/audio/5b17e861d45e57d6bb49a7268115e20b07d35c527d6db45b911707a4d985251e.mp3
+++ b/api/static/audio/5b17e861d45e57d6bb49a7268115e20b07d35c527d6db45b911707a4d985251e.mp3
--- a/api/static/audio/66f89a741101a0a523ca6c6eb596c3ded47c723be27ba6acba076449fd4203ed.mp3
+++ b/api/static/audio/66f89a741101a0a523ca6c6eb596c3ded47c723be27ba6acba076449fd4203ed.mp3
--- a/api/static/audio/b2ffb7b1f51c48cb5744554ece5be09049b05f2ac8f23a7c25e1d2ddb337ea07.mp3
+++ b/api/static/audio/b2ffb7b1f51c48cb5744554ece5be09049b05f2ac8f23a7c25e1d2ddb337ea07.mp3
--- a/api/static/audio/c423597a2cb4ca7faa2962c10c547a8f07c200f8282229c1506c96e922504e91.mp3
+++ b/api/static/audio/c423597a2cb4ca7faa2962c10c547a8f07c200f8282229c1506c96e922504e91.mp3
--- a/api/static/audio/ea3a312e1b03d3833aa631af8b4b5c74e24e8ee5b38f0ae946e73e9125a905a0.mp3
+++ b/api/static/audio/ea3a312e1b03d3833aa631af8b4b5c74e24e8ee5b38f0ae946e73e9125a905a0.mp3
--- a/api/static/audio/eee981117cf345a51f08049d6976b46c04442045c785fea6ede43e8c5fde0733.mp3
+++ b/api/static/audio/eee981117cf345a51f08049d6976b46c04442045c785fea6ede43e8c5fde0733.mp3
--- a/api/store/model/admin_user.go
+++ b/api/store/model/admin_user.go
@@ -1,11 +1,22 @@
 package model

+import (
+	"time"
+)
+
 type AdminUser struct {
-	BaseModel
-	Username    string
-	Password    string
-	Salt        string // 密码盐
-	Status      bool   `gorm:"default:true"` // 当前状态
-	LastLoginAt int64  // 最后登录时间
-	LastLoginIp string // 最后登录 IP
+	Id           uint       `gorm:"column:id;primaryKey;autoIncrement" json:"id"`
+	Username     string    `gorm:"column:username;type:varchar(30);uniqueIndex;not null;comment:用户名" json:"username"`
+	Password     string    `gorm:"column:password;type:char(64);not null;comment:密码" json:"password"`
+	Salt         string    `gorm:"column:salt;type:char(12);not null;comment:密码盐" json:"salt"`
+	Status       bool       `gorm:"column:status;type:tinyint(1);not null;comment:当前状态" json:"status"`
+	LastLoginAt  int64       `gorm:"column:last_login_at;type:int;not null;comment:最后登录时间" json:"last_login_at"`
+	LastLoginIp  string    `gorm:"column:last_login_ip;type:char(16);not null;comment:最后登录 IP" json:"last_login_ip"`
+	CreatedAt    time.Time `gorm:"column:created_at;type:datetime;not null;comment:创建时间" json:"created_at"`
+	UpdatedAt    time.Time `gorm:"column:updated_at;type:datetime;not null;comment:更新时间" json:"updated_at"`
+}
+
+// TableName 表名
+func (m *AdminUser) TableName() string {
+	return "chatgpt_admin_users"
 }
--- a/api/store/model/api_key.go
+++ b/api/store/model/api_key.go
@@ -1,13 +1,24 @@
 package model

+import (
+	"time"
+)
+
 // ApiKey OpenAI API 模型
 type ApiKey struct {
-	BaseModel
-	Name       string
-	Type       string // 用途 chat => 聊天，img => 绘图
-	Value      string // API Key 的值
-	ApiURL     string // 当前 KEY 的 API 地址
-	Enabled    bool   // 是否启用
-	ProxyURL   string // 代理地址
-	LastUsedAt int64  // 最后使用时间
+	Id         uint       `gorm:"column:id;primaryKey;autoIncrement" json:"id"`
+	Name       string    `gorm:"column:name;type:varchar(30);comment:名称" json:"name"`
+	Value      string    `gorm:"column:value;type:varchar(255);not null;comment:API KEY value" json:"value"`
+	Type       string    `gorm:"column:type;type:varchar(10);default:chat;not null;comment:用途（chat=>聊天，img=>图片）" json:"type"`
+	LastUsedAt int64       `gorm:"column:last_used_at;type:int;not null;comment:最后使用时间" json:"last_used_at"`
+	ApiURL     string    `gorm:"column:api_url;type:varchar(255);comment:API 地址" json:"api_url"`
+	Enabled    bool       `gorm:"column:enabled;type:tinyint(1);comment:是否启用" json:"enabled"`
+	ProxyURL   string    `gorm:"column:proxy_url;type:varchar(100);comment:代理地址" json:"proxy_url"`
+	CreatedAt  time.Time `gorm:"column:created_at;type:datetime;not null" json:"created_at"`
+	UpdatedAt  time.Time `gorm:"column:updated_at;type:datetime;not null" json:"updated_at"`
+}
+
+// TableName 表名
+func (m *ApiKey) TableName() string {
+	return "chatgpt_api_keys"
 }
--- a/api/store/model/app_type.go
+++ b/api/store/model/app_type.go
@@ -0,0 +1,17 @@
+package model
+
+import "time"
+
+type AppType struct {
+	Id        uint       `gorm:"column:id;primaryKey;autoIncrement" json:"id"`
+	Name      string    `gorm:"column:name;type:varchar(50);not null;comment:名称" json:"name"`
+	Icon      string    `gorm:"column:icon;type:varchar(255);not null;comment:图标URL" json:"icon"`
+	SortNum   int       `gorm:"column:sort_num;type:tinyint;not null;comment:排序" json:"sort_num"`
+	Enabled   bool       `gorm:"column:enabled;type:tinyint(1);not null;comment:是否启用" json:"enabled"`
+	CreatedAt time.Time `gorm:"column:created_at;type:datetime;not null" json:"created_at"`
+}
+
+// TableName 表名
+func (m *AppType) TableName() string {
+	return "chatgpt_app_types"
+}
--- a/Show More
+++ b/Show More