build

- 触摸设备取消拖动选中文件

.github/workflows/publish.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - "pro"
-      - "dev"
 
 jobs:
   check-version:

.gitignore

@@ -1,32 +1,63 @@
+# Dependencies
 /node_modules
+/vendor
+
+# Build and temporary files
+/build
 /public/hot
 /public/tmp
+/tmp
+
+# Uploads and user-generated content
 /public/summary
 /public/uploads/*
 /public/.well-known
 /public/.user.ini
-/storage/*.key
+
+# Storage and configuration
 /config/LICENSE
-/vendor
-/build
-/tmp
-._*
+/storage/*.key
+
+# Environment and configuration
 .env
+vars.yaml
+
+# IDE and editor files
+.cursor/*
+!.cursor/rules/
+!.cursor/rules/**
 .idea
 .vscode
-.vagrant
 .windsurfrules
-.phpunit.result.cache
+
+# Development tools
+.vagrant
 Homestead.json
 Homestead.yaml
+
+# Development file
+/index.html
+
+# Testing
+.phpunit.result.cache
+test.*
+
+# Logs and debug files
 npm-debug.log
 yarn-error.log
-test.*
+
+# Lock files
+dootask.lock
 package-lock.json
+
+# Laravel/Swoole specific
 laravels-timer-process.pid
-.DS_Store
-vars.yaml
 laravels.conf
 laravels.pid
+
+# System files
+._*
+.DS_Store
+
+# Documentation
 README_LOCAL.md
-dootask.lock

.gitpod.yml

@@ -1,13 +0,0 @@
-# This configuration file was automatically generated by Gitpod.
-# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
-# and commit this file to your remote git repository to share the goodness with others.
-
-tasks:
-  - init: sudo ./cmd install
-    command: ./cmd dev
-
-ports:
-  - port: 2222
-    visibility: public
-  - port: 22222
-    visibility: public

AGENTS.md

@@ -0,0 +1,127 @@
+# DooTask 项目说明
+
+## 一、项目总览
+
+- **项目定位**：DooTask 是一套开源的任务 / 项目管理系统，支持看板、任务、子任务、评论、对话、文件、报表等协作能力。
+- **后端技术栈**
+  - 基于 Laravel（运行在 LaravelS / Swoole 常驻进程上），代码集中在 `app/`、`routes/`、`config/` 等目录。
+  - 数据库通过 Laravel Eloquent 模型访问，所有表结构变更必须通过 migration 完成，禁止直接手工改库。
+- **前端技术栈**
+  - 主 Web 前端基于 Vue2 + Vite，代码集中在 `resources/assets/js`。
+  - 打包与开发通过根目录的 `./cmd` 脚本间接调用 Vite。
+- **桌面端**
+  - 使用 Electron 作为桌面壳，核心业务逻辑仍在 Web 前端与 Laravel 后端中。
+
+更多安装、升级、迁移说明见根目录 `README.md`。
+
+## 二、开发与运行（命令约定）
+
+- 开发 / 构建命令统一通过根目录的 `./cmd` 脚本执行，以保证与 Docker / 容器环境一致：
+  - 启动服务：`./cmd up`
+  - 停止服务：`./cmd down`
+  - 重启服务：`./cmd reup` 或 `./cmd restart`
+  - Laravel 工具：`./cmd artisan ...`
+  - 前端开发：`./cmd dev`
+  - 前端构建：`./cmd prod` 或 `./cmd build`
+  - 其他工具：`./cmd composer ...`、`./cmd php ...`、`./cmd doc` 等
+- 在示例、脚本与回答中，优先使用 `./cmd ...` 形式，而不是直接调用 `php`、`composer`、`npm` 等命令。
+
+## 三、代码结构（后端 + 前端）
+
+- **Controller（`app/Http/Controllers`）**
+  - 负责路由入口、参数接收与基础校验，编排调用模型 / 模块，并组装 API 响应。
+  - 原则：控制器尽量保持「薄」，复杂业务逻辑不要堆积在控制器中。
+  - 业务异常优先使用 `App\Exceptions\ApiException` 抛出，由全局 Handler 统一转换为标准 JSON 响应。
+
+- **Model（`app/Models`）**
+  - 负责数据表结构映射、关系（relations）、访问器 / 修改器、自定义查询 Scope 等「数据层」逻辑。
+  - 避免在模型方法中塞入大量跨业务的流程控制逻辑，复杂业务应下沉到模块中。
+
+- **Module（`app/Module`）**
+  - 承载跨控制器 / 跨模型的业务逻辑与独立功能子域，例如：
+    - 外部服务集成：`AgoraIO/*`、`ZincSearch/*` 等；
+    - 通用工具：`Lock.php`、`TextExtractor.php`、`Image.php` 等；
+    - 项目 / 任务 / 对话等领域里的复杂协作逻辑。
+  - 原则：
+    - 新增较复杂的业务功能时，优先考虑创建 / 扩展 Module，而不是在 Controller 或 Model 中堆砌流程。
+    - Module 尽量保持单一职责与可复用，命名能直接反映其业务或能力作用。
+
+- **运行环境注意事项（LaravelS / Swoole）**
+  - 避免在静态属性、单例、全局变量中存储请求级状态或可变数据，防止请求间数据串联和内存泄漏。
+  - 不要假设构造函数、服务提供者或 `boot()` 方法会在每个请求重新执行；涉及配置、路由等改动时，通常需要通过 `./cmd php restart` 或容器重启后才能生效。
+  - 编写长连接、定时任务、WebSocket 等长生命周期逻辑时，优先复用现有模式，并避免长时间阻塞协程 / 事件循环的操作。
+
+- **前端（`resources/assets/js`，Vue2 + Vite）**
+  - 结构大致包括：
+    - `app.js`、`App.vue`：应用入口与根组件；
+    - `components/`：通用与业务组件（任务看板、文件预览、聊天等）；
+    - `pages/`：页面级组件（登录、项目、任务视图、消息、报表等）；
+    - `store/`：Vuex 全局状态管理；
+    - `routes.js`：前端路由配置。
+  - 构建与开发：
+    - 开发模式：使用 `./cmd dev` 或类似子命令，内部通过 Vite 启动开发服务器。
+    - 生产构建：使用 `./cmd prod` 或 `./cmd build`，内部通过 Vite 产出前端静态资源。
+  - 与后端接口协作：
+    - 接口调用默认通过已有的 Vuex 封装发起请求，新增接口时优先扩展集中封装，而不是在组件中直接散落 `axios/fetch`。
+
+- **Electron**
+  - Electron 主要作为桌面入口壳，核心业务逻辑仍在 Web/Vue2 前端与 PHP/Laravel 后端。
+  - 日常开发与调试优先使用 `./cmd electron ...`；需要构建 App 端资源时使用 `./cmd appbuild`。
+  - 原则：优先保证 Web 端行为正确，再通过 Electron 壳复用 Web 逻辑；桌面专有能力（本地文件、托盘等）需在代码中明确边界。
+
+## 四、在本项目中使用 Graphiti 作为长期记忆
+
+- **角色与 group_id**
+  - Graphiti 作为本项目的「长期记忆层」，用于持久化：
+    - 用户偏好（Preferences）、工作流程 / 习惯（Procedures）、重要约束（Requirements）、关键事实 / 关系（Facts）。
+  - 目标是：跨对话、跨任务保持一致的行为和决策，而不是简单堆积信息。
+  - 本项目统一使用的 `group_id`：`dootask-main`。
+
+- **任务开始前（读）**
+  - 在进行实质性工作（写代码、设计方案、做大改动）前，应先通过 Graphiti 查询已有记忆：
+    - 使用节点搜索（如 `search_nodes`）在 `group_id = "dootask-main"` 下查找与当前任务相关的 Preference / Procedure / Requirement；
+    - 使用事实搜索（如 `search_facts`）查找相关事实与实体关系；
+    - 查询语句中可包含：任务类型（Bug 修复 / 重构 / 新功能等）、涉及模块（任务、项目、对话、WebSocket、报表等）以及关键字 `dootask`。
+  - 发现与当前任务高度相关的偏好 / 流程 / 约束时，应优先遵守；如存在冲突，应在回答中说明并做合理选择。
+
+- **什么时候写入 Graphiti（写）**
+  - **偏好（Preferences）**：用户表达持续性偏好时（语言、输出格式、技术选型等），应尽快写入；
+  - **流程 / 习惯（Procedures）**：形成「以后都按这个流程来」的稳定开发 / 发布 / 调试流程时，应记录为可复用步骤；
+  - **约束 / 决策（Requirements）**：项目长期有效的决策，如不再支持某版本、某模块的架构约定等；
+  - **事实 / 关系（Facts）**：模块边界约定、服务之间的调用关系、与外部系统（如 AgoraIO、ZincSearch）集成方式等。
+  - 写入建议：
+    - 默认使用 `source: "text"`，在 `episode_body` 中用简洁结构化自然语言描述背景、类型、范围、具体内容；
+    - 需要结构化数据时可用 `source: "json"`，保证 `episode_body` 是合法 JSON 字符串；
+    - 所有写入默认使用 `group_id: "dootask-main"`。
+
+- **更新与更正**
+  - 偏好 / 流程发生变化时，新增一条 episode 说明新约定，并标明这是对旧习惯的更新，后续以最新、最明确的为准；
+  - 用户要求「忘记」某些记忆时，可通过删除或更正相关 episode / 关系的方式处理；
+  - 尽量通过新增 episode 记录「更正 / 废弃说明」，而不是直接改写历史事实。
+
+- **在工作中的使用方式**
+  - 尊重已存偏好：编码风格、回答结构、工具选择等应对齐已知偏好；
+  - 遵循已有流程：若图谱中已有与当前任务匹配的 Procedure，应尽量按步骤执行；
+  - 利用事实：理解系统行为、模块边界、历史决策时优先查已存 Facts，减少重新摸索；
+  - 如 Graphiti 与当前代码实际冲突，应以代码实际为准，并视情况新增 episode 更新事实。
+
+- **不要写入 Graphiti 的内容**
+  - 含敏感信息（密钥、密码、隐私数据等）；
+  - 只与当前一次任务相关、未来不会复用的临时信息（调试日志、一次性命令输出等）；
+  - 体量巨大的原始数据（完整日志、长脚本全文等），应只存摘要和关键结论。
+
+- **最佳实践小结**
+  - 先查再做：在提出方案或改动架构前，优先查阅 Graphiti 中已有的设计、偏好和约束；
+  - 能复用就沉淀：只要发现某个偏好 / 流程 / 约束未来会反复用到，就尽快写入 Graphiti，而不是只放在当前对话里；
+  - 保持项目内外一致：确保 Graphiti 中的记忆与实际代码长期保持一致，避免「记忆漂移」。
+
+## 五、前端弹窗文案
+
+- 在前端 Vue 代码中调用 `$A.modalXXX`、`$A.messageXXX`、`$A.noticeXXX` 时，这些方法内部会统一处理 `$L` 翻译，调用方默认不要再额外包一层 `$L`。
+- 仅当 `modalXXX` 特殊场景显式传入 `language: false`（关闭内部自动翻译）时，才由调用方在传入前自行决定是否使用 `$L` 处理文案。
+
+## 六、AI 回复风格与语言偏好
+
+- 总体说明与重要总结（尤其是最终回答的 recap 部分），在不影响技术表达准确性的前提下，应优先使用简体中文进行回复。
+- 如用户在对话中明确要求使用其他语言（例如英文），则以用户的显式指令为最高优先级。
+- 当本次协作的改动已经较为完整且自然形成一个提交单元时，应在最终回答中附带一条或数条推荐的 Git 提交 message，方便用户直接复制使用。

app/Http/Controllers/Api/ApproveController.php

@@ -3,10 +3,10 @@
 namespace App\Http\Controllers\Api;
 
 use Request;
-use Session;
 use Response;
 use Madzipper;
 use Carbon\Carbon;
+use App\Module\Down;
 use App\Models\User;
 use App\Module\Base;
 use App\Module\Doo;
@@ -41,7 +41,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {get} api/approve/verifyToken          01. 验证APi登录
+     * @api {get} api/approve/verifyToken 验证APi登录
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -63,7 +63,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {post} api/approve/procdef/all          02. 查询流程定义
+     * @api {post} api/approve/procdef/all 查询流程定义
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -90,7 +90,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {get} api/approve/procdef/del          03. 删除流程定义
+     * @api {get} api/approve/procdef/del 删除流程定义
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -116,7 +116,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {post} api/approve/process/start          04. 启动流程（审批中）
+     * @api {post} api/approve/process/start 启动流程（审批中）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -179,7 +179,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {post} api/approve/process/addGlobalComment          05. 添加全局评论
+     * @api {post} api/approve/process/addGlobalComment 添加全局评论
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -224,7 +224,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {post} api/approve/task/complete          06. 审批
+     * @api {post} api/approve/task/complete 审批
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -304,7 +304,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {post} api/approve/task/withdraw          07. 撤回
+     * @api {post} api/approve/task/withdraw 撤回
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -349,7 +349,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {post} api/approve/process/findTask          08. 查询需要我审批的流程（审批中）
+     * @api {post} api/approve/process/findTask 查询需要我审批的流程（审批中）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -392,7 +392,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {post} api/approve/process/startByMyselfAll          09. 查询我启动的流程（全部）
+     * @api {post} api/approve/process/startByMyselfAll 查询我启动的流程（全部）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -435,7 +435,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {post} api/approve/process/startByMyself          10. 查询我启动的流程（审批中）
+     * @api {post} api/approve/process/startByMyself 查询我启动的流程（审批中）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -473,7 +473,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {post} api/approve/process/findProcNotify          11. 查询抄送我的流程（审批中）
+     * @api {post} api/approve/process/findProcNotify 查询抄送我的流程（审批中）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -517,7 +517,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {get} api/approve/identitylink/findParticipant          12. 查询流程实例的参与者（审批中）
+     * @api {get} api/approve/identitylink/findParticipant 查询流程实例的参与者（审批中）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -552,7 +552,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {post} api/approve/procHistory/findTask          13. 查询需要我审批的流程（已结束）
+     * @api {post} api/approve/procHistory/findTask 查询需要我审批的流程（已结束）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -595,7 +595,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {post} api/approve/procHistory/startByMyself          14. 查询我启动的流程（已结束）
+     * @api {post} api/approve/procHistory/startByMyself 查询我启动的流程（已结束）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -633,7 +633,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {post} api/approve/procHistory/findProcNotify          15. 查询抄送我的流程（已结束）
+     * @api {post} api/approve/procHistory/findProcNotify 查询抄送我的流程（已结束）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -677,7 +677,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {get} api/approve/identitylinkHistory/findParticipant          16. 查询流程实例的参与者（已结束）
+     * @api {get} api/approve/identitylinkHistory/findParticipant 查询流程实例的参与者（已结束）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -712,7 +712,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {get} api/approve/process/detail          17. 根据流程ID查询流程详情
+     * @api {get} api/approve/process/detail 根据流程ID查询流程详情
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -734,7 +734,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {post} api/approve/export          18. 导出数据
+     * @api {post} api/approve/export 导出数据
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -775,7 +775,8 @@ class ApproveController extends AbstractController
         }
         $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid);
         //
-        go(function () use ($data, $user, $botUser, $dialog) {
+        $doo = Doo::load();
+        go(function () use ($doo, $data, $user, $botUser, $dialog) {
             Coroutine::sleep(1);
             //
             $content = [];
@@ -802,30 +803,30 @@ class ApproveController extends AbstractController
             $res = Base::arrayKeyToUnderline($process['data']);
             //
             $headings = [];
-            $headings[] = Doo::translate('申请编号');
-            $headings[] = Doo::translate('标题');
-            $headings[] = Doo::translate('申请状态');
-            $headings[] = Doo::translate('发起时间');
-            $headings[] = Doo::translate('完成时间');
-            $headings[] = Doo::translate('发起人工号');
-            $headings[] = Doo::translate('发起人User ID');
-            $headings[] = Doo::translate('发起人姓名');
-            $headings[] = Doo::translate('发起人部门');
-            $headings[] = Doo::translate('发起人部门ID');
-            $headings[] = Doo::translate('部门负责人');
-            $headings[] = Doo::translate('历史审批人');
-            $headings[] = Doo::translate('历史办理人');
-            $headings[] = Doo::translate('审批记录');
-            $headings[] = Doo::translate('当前处理人');
-            $headings[] = Doo::translate('审批节点');
-            $headings[] = Doo::translate('审批人数');
-            $headings[] = Doo::translate('审批耗时');
-            $headings[] = Doo::translate('假期类型');
-            $headings[] = Doo::translate('开始时间');
-            $headings[] = Doo::translate('结束时间');
-            $headings[] = Doo::translate('时长');
-            $headings[] = Doo::translate('请假事由');
-            $headings[] = Doo::translate('请假单位');
+            $headings[] = $doo->translate('申请编号');
+            $headings[] = $doo->translate('标题');
+            $headings[] = $doo->translate('申请状态');
+            $headings[] = $doo->translate('发起时间');
+            $headings[] = $doo->translate('完成时间');
+            $headings[] = $doo->translate('发起人工号');
+            $headings[] = $doo->translate('发起人User ID');
+            $headings[] = $doo->translate('发起人姓名');
+            $headings[] = $doo->translate('发起人部门');
+            $headings[] = $doo->translate('发起人部门ID');
+            $headings[] = $doo->translate('部门负责人');
+            $headings[] = $doo->translate('历史审批人');
+            $headings[] = $doo->translate('历史办理人');
+            $headings[] = $doo->translate('审批记录');
+            $headings[] = $doo->translate('当前处理人');
+            $headings[] = $doo->translate('审批节点');
+            $headings[] = $doo->translate('审批人数');
+            $headings[] = $doo->translate('审批耗时');
+            $headings[] = $doo->translate('假期类型');
+            $headings[] = $doo->translate('开始时间');
+            $headings[] = $doo->translate('结束时间');
+            $headings[] = $doo->translate('时长');
+            $headings[] = $doo->translate('请假事由');
+            $headings[] = $doo->translate('请假单位');
             //
             $datas = [];
             foreach ($res as $val) {
@@ -845,12 +846,12 @@ class ApproveController extends AbstractController
                 // 计算审批耗时
                 $startTime = Carbon::parse($val['start_time'])->timestamp;
                 $endTime = $val['end_time'] ? Carbon::parse($val['end_time'])->timestamp : time();
-                $approval_time = Doo::translate(Timer::timeDiff($startTime, $endTime)); // 审批耗时
+                $approval_time = $doo->translate(Timer::timeDiff($startTime, $endTime)); // 审批耗时
                 // 计算时长
                 $varStartTime = Carbon::parse($val['var']['start_time']);
                 $varEndTime = Carbon::parse($val['var']['end_time']);
                 $duration = $varEndTime->floatDiffInHours($varStartTime);
-                $duration_unit = Doo::translate('小时'); // 时长单位
+                $duration_unit = $doo->translate('小时'); // 时长单位
                 $datas[] = [
                     $val['id'], // 申请编号
                     $val['proc_def_name'], // 标题
@@ -891,7 +892,7 @@ class ApproveController extends AbstractController
                 return;
             }
             //
-            $title = Doo::translate("审批记录");
+            $title = $doo->translate("审批记录");
             $sheets = [
                 BillExport::create()->setTitle($title)->setHeadings($headings)->setData($datas)->setStyles(["A1:Y1" => ["font" => ["bold" => true]]])
             ];
@@ -924,11 +925,10 @@ class ApproveController extends AbstractController
             }
             //
             if (file_exists($zipPath)) {
-                $base64 = base64_encode(Base::array2string([
+                $key = Down::cache_encode([
                     'file' => $zipFile,
-                ]));
-                $fileUrl = Base::fillUrl('api/approve/down?key=' . urlencode($base64));
-                Session::put('approve::export:userid', $user->userid);
+                ]);
+                $fileUrl = Base::fillUrl('api/approve/down?key=' . $key);
                 WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
                     'type' => 'file_download',
                     'title' => '导出审批数据已完成',
@@ -970,7 +970,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {get} api/approve/down          19. 下载导出的审批数据
+     * @api {get} api/approve/down 下载导出的审批数据
      *
      * @apiVersion 1.0.0
      * @apiGroup approve
@@ -982,15 +982,10 @@ class ApproveController extends AbstractController
      */
     public function down()
     {
-        $userid = Session::get('approve::export:userid');
-        if (empty($userid)) {
-            return Base::ajaxError("请求已过期，请重新导出！", [], 0, 502);
-        }
-        //
-        $array = Base::string2array(base64_decode(urldecode(Request::input('key'))));
+        $array = Down::cache_decode();
         $file = $array['file'];
         if (empty($file) || !file_exists(storage_path($file))) {
-            return Base::ajaxError("文件不存在！", [], 0, 502);
+            return Base::ajaxError("文件不存在！", [], 0, 403);
         }
         return Response::download(storage_path($file));
     }
@@ -1197,7 +1192,7 @@ class ApproveController extends AbstractController
 
 
     /**
-     * @api {get} api/approve/user/status          20. 获取用户审批状态
+     * @api {get} api/approve/user/status 获取用户审批状态
      *
      * @apiVersion 1.0.0
      * @apiGroup approve
@@ -1217,7 +1212,7 @@ class ApproveController extends AbstractController
     }
 
     /**
-     * @api {get} api/approve/process/doto          21. 查询需要我审批的流程数量
+     * @api {get} api/approve/process/doto 查询需要我审批的流程数量
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0

app/Http/Controllers/Api/AssistantController.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Models\User;
+use App\Module\AI;
+use App\Module\Apps;
+use App\Module\Base;
+use Request;
+
+/**
+ * @apiDefine assistant
+ *
+ * 助手
+ */
+class AssistantController extends AbstractController
+{
+    public function __construct()
+    {
+        Apps::isInstalledThrow('ai');
+    }
+
+    /**
+     * @api {post} api/assistant/auth 生成授权码
+     *
+     * @apiDescription 需要token身份，生成 AI 流式会话的 stream_key
+     * @apiVersion 1.0.0
+     * @apiGroup assistant
+     * @apiName auth
+     *
+     * @apiParam {String} model_type  模型类型
+     * @apiParam {String} model_name  模型名称
+     * @apiParam {JSON} context       上下文数组
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     * @apiSuccess {String} data.stream_key 流式会话凭证
+     */
+    public function auth()
+    {
+        $user = User::auth();
+        $user->checkChatInformation();
+
+        $modelType = trim(Request::input('model_type', ''));
+        $modelName = trim(Request::input('model_name', ''));
+        $contextInput = Request::input('context', []);
+
+        return AI::createStreamKey($modelType, $modelName, $contextInput);
+    }
+
+    /**
+     * @api {get} api/assistant/models 获取AI模型
+     *
+     * @apiDescription 获取所有AI机器人模型设置
+     * @apiVersion 1.0.0
+     * @apiGroup assistant
+     * @apiName models
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function models()
+    {
+        $setting = Base::setting('aibotSetting');
+        $setting = array_filter($setting, function ($value, $key) {
+            return str_ends_with($key, '_models') || str_ends_with($key, '_model');
+        }, ARRAY_FILTER_USE_BOTH);
+
+        return Base::retSuccess('success', $setting ?: json_decode('{}'));
+    }
+}

app/Http/Controllers/Api/ComplaintController.php

@@ -10,18 +10,18 @@ use App\Models\WebSocketDialog;
 use App\Models\WebSocketDialogMsg;
 
 /**
- * @apiDefine dialog
+ * @apiDefine complaint
  *
  * 投诉
  */
 class ComplaintController extends AbstractController
 {
     /**
-     * @api {get} api/complaint/lists          01. 获取举报投诉列表
+     * @api {get} api/complaint/lists 获取举报投诉列表
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
-     * @apiGroup dialog
+     * @apiGroup complaint
      * @apiName lists
      *
      * @apiParam {Number} [type]              类型
@@ -33,6 +33,34 @@ class ComplaintController extends AbstractController
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
      * @apiSuccess {Object} data    返回数据
+     *
+     * @apiSuccessExample {json} Success-Response-Data:
+     *  {
+     *      "current_page": 1,
+     *      "data": [
+     *          {
+     *              "id": 1,
+     *              "dialog_id": 100,
+     *              "userid": 1,
+     *              "type": 1,
+     *              "reason": "举报原因",
+     *              "imgs": [],
+     *              "status": 0,
+     *              "created_at": "2025-01-01 00:00:00",
+     *              "updated_at": "2025-01-01 00:00:00"
+     *          }
+     *      ],
+     *      "first_page_url": "http://example.com/api/complaint/lists?page=1",
+     *      "from": 1,
+     *      "last_page": 1,
+     *      "last_page_url": "http://example.com/api/complaint/lists?page=1",
+     *      "next_page_url": null,
+     *      "path": "http://example.com/api/complaint/lists",
+     *      "per_page": 50,
+     *      "prev_page_url": null,
+     *      "to": 1,
+     *      "total": 1
+     *  }
      */
     public function lists()
     {
@@ -56,21 +84,25 @@ class ComplaintController extends AbstractController
     }
 
     /**
-     * @api {get} api/complaint/submit          02. 举报投诉
+     * @api {post} api/complaint/submit 举报投诉
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
-     * @apiGroup dialog
+     * @apiGroup complaint
      * @apiName submit
      *
-     * @apiParam {Number} dialog_id         对话ID
-     * @apiParam {Number} type              类型
-     * @apiParam {String} reason            原因
-     * @apiParam {String} imgs              图片
+     * @apiBody {Number} dialog_id         对话ID
+     * @apiBody {Number} type              类型
+     * @apiBody {String} reason            原因
+     * @apiBody {Object[]} [imgs]          图片数组（可选）
+     * @apiBody {String} imgs.path         图片路径
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
      * @apiSuccess {Object} data    返回数据
+     *
+     * @apiSuccessExample {json} Success-Response-Data:
+     *  []
      */
     public function submit()
     {
@@ -125,19 +157,22 @@ class ComplaintController extends AbstractController
     }
 
     /**
-     * @api {get} api/complaint/action          03. 举报投诉 - 操作
+     * @api {post} api/complaint/action 举报投诉 - 操作
      *
-     * @apiDescription 需要token身份
+     * @apiDescription 需要token身份（管理员权限）
      * @apiVersion 1.0.0
-     * @apiGroup dialog
+     * @apiGroup complaint
      * @apiName action
      *
-     * @apiParam {Number} id                ID
-     * @apiParam {Number} type              类型
+     * @apiBody {Number} id                投诉ID
+     * @apiBody {String} type              操作类型：handle=已处理，delete=删除
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
      * @apiSuccess {Object} data    返回数据
+     *
+     * @apiSuccessExample {json} Success-Response-Data:
+     *  []
      */
     public function action()
     {

app/Http/Controllers/Api/FileController.php

@@ -11,11 +11,12 @@ use App\Models\FileContent;
 use App\Models\FileLink;
 use App\Models\FileUser;
 use App\Models\User;
+use App\Models\UserRecentItem;
 use App\Module\Base;
+use App\Module\Down;
 use App\Module\Timer;
 use App\Module\Ihttp;
 use Response;
-use Session;
 use Swoole\Coroutine;
 use Carbon\Carbon;
 use Redirect;
@@ -30,7 +31,7 @@ use ZipArchive;
 class FileController extends AbstractController
 {
     /**
-     * @api {get} api/file/lists          01. 获取文件列表
+     * @api {get} api/file/lists 获取文件列表
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -53,7 +54,7 @@ class FileController extends AbstractController
     }
 
     /**
-     * @api {get} api/file/one          02. 获取单条数据
+     * @api {get} api/file/one 获取单条数据
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -63,6 +64,9 @@ class FileController extends AbstractController
      * @apiParam {Number|String} id
      * - Number 文件ID（需要登录）
      * - String 链接码（不需要登录，用于预览）
+     * @apiParam {String} [with_url]            是否返回文件访问URL
+     * - no: 不返回（默认）
+     * - yes: 返回content_url字段
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -71,11 +75,12 @@ class FileController extends AbstractController
     public function one()
     {
         $id = Request::input('id');
+        $with_url = Request::input('with_url', 'no');
         //
         $permission = 0;
         if (Base::isNumber($id)) {
             $user = User::auth();
-            $file = File::permissionFind(intval($id), $user, 0, $permission);
+            $file = File::permissionFind(intval($id), $user, $with_url === 'yes' ? 1 : 0, $permission);
         } elseif ($id) {
             $fileLink = FileLink::whereCode($id)->first();
             $file = $fileLink?->file;
@@ -87,6 +92,12 @@ class FileController extends AbstractController
                 }
                 return Base::retError($msg, $data);
             }
+
+            // 如果文件不允许游客访问，则需要登录
+            if (!$file->guest_access) {
+                User::auth();
+            }
+
             $fileLink->increment("num");
         } else {
             return Base::retError('参数错误');
@@ -94,11 +105,17 @@ class FileController extends AbstractController
         //
         $array = $file->toArray();
         $array['permission'] = $permission;
+
+        // 如果请求返回文件URL
+        if ($with_url === 'yes') {
+            $array['content_url'] = FileContent::getFileUrl($file->id);
+        }
+
         return Base::retSuccess('success', $array);
     }
 
     /**
-     * @api {get} api/file/search          03. 搜索文件列表
+     * @api {get} api/file/search 搜索文件列表
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -134,7 +151,11 @@ class FileController extends AbstractController
             $builder->where("id", $id);
         }
         if ($key) {
-            $builder->where("name", "like", "%{$key}%");
+            if (!$id && Base::isNumber($key)) {
+                $builder->where("id", $key);
+            } else {
+                $builder->where("name", "like", "%{$key}%");
+            }
         }
         $array = $builder->take($take)->get()->toArray();
         // 搜索共享的
@@ -171,7 +192,7 @@ class FileController extends AbstractController
     }
 
     /**
-     * @api {get} api/file/add          04. 添加、修改文件(夹)
+     * @api {get} api/file/add 添加、修改文件(夹)
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -197,8 +218,8 @@ class FileController extends AbstractController
         $pid = intval(Request::input('pid'));
         if (mb_strlen($name) < 2) {
             return Base::retError('文件名称不可以少于2个字');
-        } elseif (mb_strlen($name) > 32) {
-            return Base::retError('文件名称最多只能设置32个字');
+        } elseif (mb_strlen($name) > 100) {
+            return Base::retError('文件名称最多只能设置100个字');
         }
         $tmpName = preg_replace("/[\\\\\/:*?\"<>|]/", '', $name);
         if ($tmpName != $name) {
@@ -280,7 +301,7 @@ class FileController extends AbstractController
     }
 
     /**
-     * @api {get} api/file/copy          05. 复制文件(夹)
+     * @api {get} api/file/copy 复制文件(夹)
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -341,7 +362,7 @@ class FileController extends AbstractController
     }
 
     /**
-     * @api {get} api/file/move          06. 移动文件(夹)
+     * @api {get} api/file/move 移动文件(夹)
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -416,7 +437,7 @@ class FileController extends AbstractController
     }
 
     /**
-     * @api {get} api/file/remove          07. 删除文件(夹)
+     * @api {get} api/file/remove 删除文件(夹)
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -455,7 +476,7 @@ class FileController extends AbstractController
     }
 
     /**
-     * @api {get} api/file/content          08. 获取文件内容
+     * @api {get} api/file/content 获取文件内容
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -519,6 +540,16 @@ class FileController extends AbstractController
             $builder->whereId($history_id);
         }
         $content = $builder->orderByDesc('id')->first();
+        if (isset($user)) {
+            UserRecentItem::record(
+                $user->userid,
+                UserRecentItem::TYPE_FILE,
+                $file->id,
+                UserRecentItem::SOURCE_FILESYSTEM,
+                intval($file->pid)
+            );
+        }
+
         if ($down === 'preview') {
             return Redirect::to(FileContent::formatPreview($file, $content?->content));
         }
@@ -526,7 +557,7 @@ class FileController extends AbstractController
     }
 
     /**
-     * @api {get} api/file/content/save          09. 保存文件内容
+     * @api {get} api/file/content/save 保存文件内容
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -621,9 +652,9 @@ class FileController extends AbstractController
     }
 
     /**
-     * @api {get} api/file/office/token          10. 获取token
+     * @api {get} api/file/office/token 获取token
      *
-     * @apiDescription 需要token身份
+     * @apiDescription 用于生成office在线编辑的token
      * @apiVersion 1.0.0
      * @apiGroup file
      * @apiName office__token
@@ -636,8 +667,6 @@ class FileController extends AbstractController
      */
     public function office__token()
     {
-        User::auth();
-        //
         File::isNeedInstallApp('office');
         //
         $config = Request::input('config');
@@ -648,7 +677,7 @@ class FileController extends AbstractController
     }
 
     /**
-     * @api {get} api/file/content/office          11. 保存文件内容（office）
+     * @api {get} api/file/content/office 保存文件内容（office）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -704,7 +733,7 @@ class FileController extends AbstractController
     }
 
     /**
-     * @api {get} api/file/content/upload          12. 保存文件内容（上传文件）
+     * @api {get} api/file/content/upload 保存文件内容（上传文件）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -732,7 +761,7 @@ class FileController extends AbstractController
     }
 
     /**
-     * @api {get} api/file/content/history          13. 获取内容历史
+     * @api {get} api/file/content/history 获取内容历史
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -764,7 +793,7 @@ class FileController extends AbstractController
     }
 
     /**
-     * @api {get} api/file/content/restore          14. 恢复文件历史
+     * @api {get} api/file/content/restore 恢复文件历史
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -806,7 +835,7 @@ class FileController extends AbstractController
     }
 
     /**
-     * @api {get} api/file/share          15. 获取共享信息
+     * @api {get} api/file/share 获取共享信息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -842,7 +871,7 @@ class FileController extends AbstractController
     }
 
     /**
-     * @api {get} api/file/share/update          16. 设置共享
+     * @api {get} api/file/share/update 设置共享
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -932,7 +961,7 @@ class FileController extends AbstractController
     }
 
     /**
-     * @api {get} api/file/share/out          17. 退出共享
+     * @api {get} api/file/share/out 退出共享
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -966,7 +995,7 @@ class FileController extends AbstractController
     }
 
     /**
-     * @api {get} api/file/link          18. 获取链接
+     * @api {get} api/file/link 获取链接
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -977,6 +1006,9 @@ class FileController extends AbstractController
      * @apiParam {String} refresh           刷新链接
      * - no: 只获取（默认）
      * - yes: 刷新链接，之前的将失效
+     * @apiParam {String} guest_access      是否允许游客访问
+     * - no: 不允许（默认）
+     * - yes: 允许游客访问
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -988,15 +1020,22 @@ class FileController extends AbstractController
         //
         $id = intval(Request::input('id'));
         $refresh = Request::input('refresh', 'no');
+        $guestAccess = Request::input('guest_access', 'no');
         //
         $file = File::permissionFind($id, $user);
+        
+        // 更新文件的游客访问权限
+        $file->guest_access = $guestAccess === 'yes' ? 1 : 0;
+        $file->save();
+        
         $fileLink = $file->getShareLink($user->userid, $refresh == 'yes');
+        $fileLink['guest_access'] = $file->guest_access;
         //
         return Base::retSuccess('success', $fileLink);
     }
 
     /**
-     * @api {get} api/file/download/pack          19. 打包文件
+     * @api {get} api/file/download/pack 打包文件
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1012,17 +1051,11 @@ class FileController extends AbstractController
      */
     public function download__pack()
     {
-        $key = Request::input('key');
-        if ($key) {
-            $userid = Session::get('file::pack:userid');
-            if (empty($userid)) {
-                return Base::ajaxError("请求已过期，请重新导出！", [], 0, 502);
-            }
-            //
-            $array = Base::string2array(base64_decode(urldecode($key)));
+        if (Request::has('key')) {
+            $array = Down::cache_decode();
             $file = $array['file'];
             if (empty($file) || !file_exists(storage_path($file))) {
-                return Base::ajaxError("文件不存在！", [], 0, 502);
+                return Base::ajaxError("文件不存在！", [], 0, 403);
             }
             return Response::download(storage_path($file));
         }
@@ -1087,11 +1120,10 @@ class FileController extends AbstractController
             return Base::retError('文件总大小已超过1GB，请分批下载');
         }
 
-        $base64 = base64_encode(Base::array2string([
+        $key = Down::cache_encode([
             'file' => $zipFile,
-        ]));
-        $fileUrl = Base::fillUrl('api/file/download/pack?key=' . urlencode($base64));
-        Session::put('file::pack:userid', $user->userid);
+        ]);
+        $fileUrl = Base::fillUrl('api/file/download/pack?key=' . $key);
 
         $zip = new \ZipArchive();
         Base::makeDir(dirname($zipPath));
@@ -1100,17 +1132,18 @@ class FileController extends AbstractController
             return Base::retError('创建压缩文件失败');
         }
 
-        go(function () use ($zipPath, $fileUrl, $zip, $files, $fileName, $botUser, $dialog) {
+        $userid = $user->userid;
+        go(function () use ($userid, $zipPath, $fileUrl, $zip, $files, $fileName, $botUser, $dialog) {
             Coroutine::sleep(0.1);
             // 压缩进度
             $progress = 0;
-            $zip->registerProgressCallback(0.05, function ($ratio) use ($fileUrl, $fileName, &$progress) {
+            $zip->registerProgressCallback(0.05, function ($ratio) use ($userid, $fileUrl, $fileName, &$progress) {
                 $progress = round($ratio * 100);
-                File::filePushMsg('compress', [
+                File::pushMsgSimple('compress', [
                     'name' => $fileName,
                     'url' => $fileUrl,
                     'progress' => $progress
-                ]);
+                ], $userid);
             });
             //
             foreach ($files as $file) {
@@ -1119,11 +1152,11 @@ class FileController extends AbstractController
             $zip->close();
             //
             if ($progress < 100) {
-                File::filePushMsg('compress', [
+                File::pushMsgSimple('compress', [
                     'name' => $fileName,
                     'url' => $fileUrl,
                     'progress' => 100
-                ]);
+                ], $userid);
             }
             //
             WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [

app/Http/Controllers/Api/ReportController.php

@@ -6,6 +6,7 @@ use App\Exceptions\ApiException;
 use App\Models\AbstractModel;
 use App\Models\ProjectTask;
 use App\Models\Report;
+use App\Models\ReportAnalysis;
 use App\Models\ReportLink;
 use App\Models\ReportReceive;
 use App\Models\User;
@@ -28,7 +29,7 @@ use Illuminate\Support\Facades\Validator;
 class ReportController extends AbstractController
 {
     /**
-     * @api {get} api/report/my          01. 我发送的汇报
+     * @api {get} api/report/my 我发送的汇报
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -75,7 +76,7 @@ class ReportController extends AbstractController
     }
 
     /**
-     * @api {get} api/report/receive          02. 我接收的汇报
+     * @api {get} api/report/receive 我接收的汇报
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -143,7 +144,7 @@ class ReportController extends AbstractController
     }
 
     /**
-     * @api {get} api/report/store          03. 保存并发送工作汇报
+     * @api {get} api/report/store 保存并发送工作汇报
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -282,7 +283,7 @@ class ReportController extends AbstractController
     }
 
     /**
-     * @api {get} api/report/template          04. 生成汇报模板
+     * @api {get} api/report/template 生成汇报模板
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -326,6 +327,13 @@ class ReportController extends AbstractController
             $start_time->startOfWeek();
             $end_time = Carbon::instance($start_time)->endOfWeek();
         }
+        // 周报时预计算下一周期时间范围（下周）
+        $next_start_time = null;
+        $next_end_time = null;
+        if ($type === Report::WEEKLY) {
+            $next_start_time = Carbon::instance($start_time)->copy()->addWeek();
+            $next_end_time = Carbon::instance($end_time)->copy()->addWeek();
+        }
 
         // 生成唯一标识
         $sign = Report::generateSign($type, 0, Carbon::instance($start_time));
@@ -361,6 +369,10 @@ class ReportController extends AbstractController
             ->get();
         if ($complete_task->isNotEmpty()) {
             foreach ($complete_task as $task) {
+                // 排除取消态任务：不将已取消任务计入“已完成工作”
+                if (ProjectTask::isCanceledFlowName($task->flow_item_name)) {
+                    continue;
+                }
                 $complete_at = Carbon::parse($task->complete_at);
                 $remark = $type == Report::WEEKLY ? ('<div style="text-align:center">[' . Doo::translate('周' . ['日', '一', '二', '三', '四', '五', '六'][$complete_at->dayOfWeek]) . ']</div>') : '&nbsp;';
                 $completeDatas[] = [
@@ -376,18 +388,7 @@ class ReportController extends AbstractController
 
         // 未完成的任务
         $unfinishedDatas = [];
-        $unfinished_task = ProjectTask::query()
-            ->join("projects", "projects.id", "=", "project_tasks.project_id")
-            ->whereNull("projects.archived_at")
-            ->whereNull("project_tasks.complete_at")
-            ->whereNotNull("project_tasks.start_at")
-            ->where("project_tasks.end_at", "<", $end_time->toDateTimeString())
-            ->whereHas("taskUser", function ($query) use ($user) {
-                $query->where("userid", $user->userid);
-            })
-            ->select("project_tasks.*")
-            ->orderByDesc("project_tasks.id")
-            ->get();
+        $unfinished_task = ProjectTask::buildUnfinishedTaskQuery($user->userid, $start_time, $end_time, true)->get();
         if ($unfinished_task->isNotEmpty()) {
             foreach ($unfinished_task as $task) {
                 empty($task->end_at) || $end_at = Carbon::parse($task->end_at);
@@ -407,8 +408,10 @@ class ReportController extends AbstractController
         if ($type === Report::WEEKLY) {
             $title = $user->nickname . "的周报[" . $start_time->format("m/d") . "-" . $end_time->format("m/d") . "]";
             $title .= "[" . $start_time->month . "月第" . $start_time->weekOfMonth . "周]";
+            $unfinishedTitle = '本周未完成的工作';
         } else {
             $title = $user->nickname . "的日报[" . $start_time->format("Y/m/d") . "]";
+            $unfinishedTitle = '今日未完成的工作';
         }
         $title = Doo::translate($title);
 
@@ -421,22 +424,44 @@ class ReportController extends AbstractController
         ])->render();
 
         $contents[] = '<p>&nbsp;</p>';
-        $contents[] = '<h2>' . Doo::translate('未完成的工作') . '</h2>';
+        $contents[] = '<h2>' . Doo::translate($unfinishedTitle) . '</h2>';
         $contents[] = view('report', [
             'labels' => $labels,
             'datas' => $unfinishedDatas,
         ])->render();
 
         if ($type === Report::WEEKLY) {
+            // 下周拟定计划：基于下周时间范围预生成候选任务
+            $nextPlanDatas = [];
+            if ($next_start_time && $next_end_time) {
+                $next_tasks = ProjectTask::buildUnfinishedTaskQuery($user->userid, $next_start_time, $next_end_time, false)->get();
+                if ($next_tasks->isNotEmpty()) {
+                    foreach ($next_tasks as $task) {
+                        $planTime = '-';
+                        if ($task->start_at || $task->end_at) {
+                            $startText = $task->start_at ? Carbon::parse($task->start_at)->format('Y-m-d H:i') : '';
+                            $endText = $task->end_at ? Carbon::parse($task->end_at)->format('Y-m-d H:i') : '';
+                            $planTime = trim($startText . ($endText ? (' ~ ' . $endText) : ''));
+                        }
+                        $nextPlanDatas[] = [
+                            '[' . $task->project->name . '] ' . $task->name,
+                            $planTime,
+                            $task->taskUser->where("owner", 1)->map(function ($item) {
+                                return User::userid2nickname($item->userid);
+                            })->implode(", "),
+                        ];
+                    }
+                }
+            }
             $contents[] = '<p>&nbsp;</p>';
-            $contents[] = "<h2>" . Doo::translate("下周拟定计划") . "[" . $start_time->addWeek()->format("m/d") . "-" . $end_time->addWeek()->format("m/d") . "]</h2>";
+            $contents[] = "<h2>" . Doo::translate("下周拟定计划") . "[" . $next_start_time->format("m/d") . "-" . $next_end_time->format("m/d") . "]</h2>";
             $contents[] = view('report', [
                 'labels' => [
                     Doo::translate('计划描述'),
                     Doo::translate('计划时间'),
                     Doo::translate('负责人'),
                 ],
-                'datas' => [],
+                'datas' => $nextPlanDatas,
             ])->render();
         }
 
@@ -454,7 +479,7 @@ class ReportController extends AbstractController
     }
 
     /**
-     * @api {get} api/report/detail          05. 报告详情
+     * @api {get} api/report/detail 报告详情
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -501,11 +526,113 @@ class ReportController extends AbstractController
             $one->report_link = $link;
             $link->increment("num");
         }
+        $analysis = ReportAnalysis::query()
+            ->whereRid($one->id)
+            ->whereUserid($user->userid)
+            ->first();
+        if ($analysis) {
+            $updatedAt = $analysis->updated_at ? $analysis->updated_at->toDateTimeString() : null;
+            $one->setAttribute('ai_analysis', [
+                'id' => $analysis->id,
+                'text' => $analysis->analysis_text,
+                'model' => $analysis->model,
+                'updated_at' => $updatedAt,
+            ]);
+        } else {
+            $one->setAttribute('ai_analysis', null);
+        }
+
         return Base::retSuccess("success", $one);
     }
 
     /**
-     * @api {get} api/report/mark          06. 标记已读/未读
+     * @api {post} api/report/analysave 保存工作汇报 AI 分析
+     *
+     * @apiDescription 需要token身份，仅支持报告提交人或接收人保存分析
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName analysave
+     *
+     * @apiParam {Number} id            报告ID
+     * @apiParam {String} text          分析内容（Markdown）
+     * @apiParam {String} [model]       分析使用的模型标识（可选）
+     *
+     * @apiSuccess {Number} ret         返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg         返回信息（错误描述）
+     * @apiSuccess {Object} data        返回数据
+     * @apiSuccess {Number} data.id     分析记录ID
+     * @apiSuccess {String} data.text   分析内容（Markdown）
+     * @apiSuccess {String} data.updated_at 最近更新时间
+     */
+    public function analysave(): array
+    {
+        $user = User::auth();
+        $id = intval(Request::input("id"));
+        if ($id <= 0) {
+            return Base::retError("缺少ID参数");
+        }
+        $text = trim((string)Request::input('text', ''));
+        if ($text === '') {
+            return Base::retError("分析内容不能为空");
+        }
+        $model = trim((string)Request::input('model', ''));
+
+        $report = Report::getOne($id);
+        if (!$this->userCanAccessReport($report, $user)) {
+            return Base::retError("无权访问该工作汇报");
+        }
+
+        $analysis = ReportAnalysis::query()
+            ->whereRid($report->id)
+            ->whereUserid($user->userid)
+            ->first();
+
+        if (!$analysis) {
+            $analysis = ReportAnalysis::fillInstance([
+                'rid' => $report->id,
+                'userid' => $user->userid,
+            ]);
+        }
+
+        $viewerRole = $user->profession ?: (is_array($user->identity) && !empty($user->identity) ? implode('/', $user->identity) : null);
+        $focusMeta = null;
+        $focus = Request::input('focus');
+        if (is_array($focus)) {
+            $focusMeta = array_filter(array_map('trim', $focus));
+        } elseif (is_string($focus) && trim($focus) !== '') {
+            $focusMeta = [trim($focus)];
+        }
+
+        $meta = array_filter([
+            'viewer_role' => $viewerRole,
+            'viewer_name' => $user->nickname ?? null,
+            'focus' => $focusMeta,
+        ], function ($value) {
+            if (is_array($value)) {
+                return !empty($value);
+            }
+            return $value !== null && $value !== '';
+        });
+
+        $analysis->updateInstance([
+            'model' => $model,
+            'analysis_text' => $text,
+            'meta' => $meta,
+        ]);
+        $analysis->save();
+
+        $analysis->refresh();
+
+        return Base::retSuccess("success", [
+            'id' => $analysis->id,
+            'text' => $analysis->analysis_text,
+            'model' => $analysis->model,
+            'updated_at' => $analysis->updated_at ? $analysis->updated_at->toDateTimeString() : null,
+        ]);
+    }
+
+    /**
+     * @api {get} api/report/mark 标记已读/未读
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -548,7 +675,7 @@ class ReportController extends AbstractController
     }
 
     /**
-     * @api {get} api/report/share          07. 分享报告到消息
+     * @api {get} api/report/share 分享报告到消息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -610,7 +737,7 @@ class ReportController extends AbstractController
     }
 
     /**
-     * @api {get} api/report/last_submitter          08. 获取最后一次提交的接收人
+     * @api {get} api/report/last_submitter 获取最后一次提交的接收人
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -628,7 +755,7 @@ class ReportController extends AbstractController
     }
 
     /**
-     * @api {get} api/report/unread          09. 获取未读
+     * @api {get} api/report/unread 获取未读
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -653,7 +780,7 @@ class ReportController extends AbstractController
     }
 
     /**
-     * @api {get} api/report/read          10. 标记汇报已读，可批量
+     * @api {get} api/report/read 标记汇报已读，可批量
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -691,4 +818,22 @@ class ReportController extends AbstractController
         }
         return Base::retSuccess("success", $data);
     }
+
+    /**
+     * 判断当前用户是否有权限查看/分析指定工作汇报
+     * @param Report $report
+     * @param User $user
+     * @return bool
+     */
+    protected function userCanAccessReport(Report $report, User $user): bool
+    {
+        if ($report->userid === $user->userid) {
+            return true;
+        }
+
+        return ReportReceive::query()
+            ->whereRid($report->id)
+            ->whereUserid($user->userid)
+            ->exists();
+    }
 }

app/Http/Controllers/Api/SystemController.php

@@ -5,8 +5,9 @@ namespace App\Http\Controllers\Api;
 use App\Models\UserDevice;
 use App\Models\WebSocketDialog;
 use App\Models\WebSocketDialogMsg;
+use App\Module\AI;
+use App\Module\Down;
 use Request;
-use Session;
 use Response;
 use Madzipper;
 use Carbon\Carbon;
@@ -15,7 +16,6 @@ use App\Models\User;
 use App\Module\Base;
 use App\Module\Timer;
 use App\Models\Setting;
-use App\Module\Extranet;
 use LdapRecord\Container;
 use App\Module\BillExport;
 use Guanguans\Notify\Factory;
@@ -35,7 +35,7 @@ class SystemController extends AbstractController
 {
 
     /**
-     * @api {get} api/system/setting          01. 获取设置、保存设置
+     * @api {get} api/system/setting 获取设置、保存设置
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -44,7 +44,7 @@ class SystemController extends AbstractController
      * @apiParam {String} type
      * - get: 获取（默认）
      * - all: 获取所有（需要管理员权限）
-     * - save: 保存设置（参数：['reg', 'reg_identity', 'reg_invite', 'temp_account_alias', 'login_code', 'password_policy', 'project_invite', 'chat_information', 'anon_message', 'voice2text', 'translation', 'convert_video', 'compress_video', 'e2e_message', 'auto_archived', 'archived_day', 'task_visible', 'task_default_time', 'all_group_mute', 'all_group_autoin', 'user_private_chat_mute', 'user_group_chat_mute', 'system_alias', 'system_welcome', 'image_compress', 'image_quality', 'image_save_local']）
+     * - save: 保存设置（参数：['reg', 'reg_identity', 'reg_invite', 'temp_account_alias', 'login_code', 'password_policy', 'project_invite', 'chat_information', 'anon_message', 'convert_video', 'compress_video', 'e2e_message', 'auto_archived', 'archived_day', 'task_visible', 'task_default_time', 'task_user_limit', 'all_group_mute', 'all_group_autoin', 'user_private_chat_mute', 'user_group_chat_mute', 'system_alias', 'system_welcome', 'image_compress', 'image_quality', 'image_save_local']）
 
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -71,8 +71,6 @@ class SystemController extends AbstractController
                     'project_invite',
                     'chat_information',
                     'anon_message',
-                    'voice2text',
-                    'translation',
                     'convert_video',
                     'compress_video',
                     'e2e_message',
@@ -82,6 +80,7 @@ class SystemController extends AbstractController
                     'archived_day',
                     'task_visible',
                     'task_default_time',
+                    'task_user_limit',
                     'all_group_mute',
                     'all_group_autoin',
                     'user_private_chat_mute',
@@ -106,12 +105,6 @@ class SystemController extends AbstractController
                     return Base::retError('自动归档时间不可大于100天！');
                 }
             }
-            if ($all['voice2text'] == 'open' && !Setting::AIOpen()) {
-                return Base::retError('开启语音转文字功能需要在应用中开启 ChatGPT AI 机器人。');
-            }
-            if ($all['translation'] == 'open' && !Setting::AIOpen()) {
-                return Base::retError('开启翻译功能需要在应用中开启 ChatGPT AI 机器人。');
-            }
             if ($all['system_alias'] == env('APP_NAME')) {
                 $all['system_alias'] = '';
             }
@@ -138,8 +131,6 @@ class SystemController extends AbstractController
         $setting['project_invite'] = $setting['project_invite'] ?: 'open';
         $setting['chat_information'] = $setting['chat_information'] ?: 'optional';
         $setting['anon_message'] = $setting['anon_message'] ?: 'open';
-        $setting['voice2text'] = $setting['voice2text'] ?: 'close';
-        $setting['translation'] = $setting['translation'] ?: 'close';
         $setting['convert_video'] = $setting['convert_video'] ?: 'close';
         $setting['compress_video'] = $setting['compress_video'] ?: 'close';
         $setting['e2e_message'] = $setting['e2e_message'] ?: 'close';
@@ -158,11 +149,11 @@ class SystemController extends AbstractController
         $setting['server_timezone'] = config('app.timezone');
         $setting['server_version'] = Base::getVersion();
         //
-        return Base::retSuccess('success', $setting ?: json_decode('{}'));
+        return Base::retSuccess($type == 'save' ? '保存成功' : 'success', $setting ?: json_decode('{}'));
     }
 
     /**
-     * @api {get} api/system/setting/email          02. 获取邮箱设置、保存邮箱设置（限管理员）
+     * @api {get} api/system/setting/email 获取邮箱设置、保存邮箱设置（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -228,11 +219,11 @@ class SystemController extends AbstractController
             $setting = array_intersect_key($setting, array_flip(['reg_verify']));
         }
         //
-        return Base::retSuccess('success', $setting ?: json_decode('{}'));
+        return Base::retSuccess($type == 'save' ? '保存成功' : 'success', $setting ?: json_decode('{}'));
     }
 
     /**
-     * @api {get} api/system/setting/meeting          03. 获取会议设置、保存会议设置（限管理员）
+     * @api {get} api/system/setting/meeting 获取会议设置、保存会议设置（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -282,11 +273,21 @@ class SystemController extends AbstractController
             $setting['api_secret'] = substr($setting['api_secret'], 0, 4) . str_repeat('*', strlen($setting['api_secret']) - 8) . substr($setting['api_secret'], -4);
         }
         //
-        return Base::retSuccess('success', $setting ?: json_decode('{}'));
+        return Base::retSuccess($type == 'save' ? '保存成功' : 'success', $setting ?: json_decode('{}'));
     }
 
     /**
-     * @api {get} api/system/setting/aibot          04. 获取会议设置、保存AI机器人设置（限管理员）
+     * AI助手设置（限管理员）
+     *
+     * @deprecated 已废弃方法，仅保留路由占位，后续版本中移除
+     */
+    public function setting__ai()
+    {
+        Base::checkClientVersion('1.4.35');
+    }
+
+    /**
+     * @api {get} api/system/setting/aibot 获取AI设置、保存AI机器人设置（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -340,70 +341,31 @@ class SystemController extends AbstractController
             }
         }
         //
-        return Base::retSuccess('success', $setting ?: json_decode('{}'));
+        return Base::retSuccess($type == 'save' ? '保存成功' : 'success', $setting ?: json_decode('{}'));
     }
 
     /**
-     * @api {get} api/system/setting/aibot_models          05. 获取AI模型
+     * 获取AI模型
      *
-     * @apiDescription 获取所有AI机器人模型设置
-     * @apiVersion 1.0.0
-     * @apiGroup system
-     * @apiName aibot_models
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
+     * @deprecated 已废弃方法，仅保留路由占位，后续版本中移除
      */
     public function setting__aibot_models()
     {
-        $setting = Base::setting('aibotSetting');
-        $setting = array_filter($setting, function($value, $key) {
-            return str_ends_with($key, '_models') || str_ends_with($key, '_model');
-        }, ARRAY_FILTER_USE_BOTH);
-        return Base::retSuccess('success', $setting ?: json_decode('{}'));
+        Base::checkClientVersion('1.4.35');
     }
 
     /**
-     * @api {get} api/system/setting/aibot_defmodels          06. 获取AI默认模型
+     * 获取AI默认模型
      *
-     * @apiDescription 获取AI机器人默认模型
-     * @apiVersion 1.0.0
-     * @apiGroup system
-     * @apiName setting__aibot_defmodels
-     *
-     * @apiParam {String} type          AI类型
-     * @apiParam {String} [base_url]    基础URL（仅 type=ollama 时有效）
-     * @apiParam {String} [key]         Key（仅 type=ollama 时有效）
-     * @apiParam {String} [agency]      使用代理（仅 type=ollama 时有效）
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
+     * @deprecated 已废弃方法，仅保留路由占位，后续版本中移除
      */
     public function setting__aibot_defmodels()
     {
-        $type = trim(Request::input('type'));
-        if ($type == 'ollama') {
-            $baseUrl = trim(Request::input('base_url'));
-            $key = trim(Request::input('key'));
-            $agency = trim(Request::input('agency'));
-            if (empty($baseUrl)) {
-                return Base::retError('请先填写 Base URL');
-            }
-            return Extranet::ollamaModels($baseUrl, $key, $agency);
-        }
-        $models = Setting::AIDefaultModels($type);
-        if (empty($models)) {
-            return Base::retError('未找到默认模型');
-        }
-        return Base::retSuccess('success', [
-            'models' => $models
-        ]);
+        Base::checkClientVersion('1.4.35');
     }
 
     /**
-     * @api {get} api/system/setting/checkin          07. 获取签到设置、保存签到设置（限管理员）
+     * @api {get} api/system/setting/checkin 获取签到设置、保存签到设置（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -439,8 +401,13 @@ class SystemController extends AbstractController
                     'face_remark',
                     'face_retip',
                     'locat_remark',
+                    'locat_map_type',
                     'locat_bd_lbs_key',
                     'locat_bd_lbs_point', // 格式：{"lng":116.404, "lat":39.915, "radius":500}
+                    'locat_amap_key',
+                    'locat_amap_point', // 格式：{"lng":116.404, "lat":39.915, "radius":500}
+                    'locat_tencent_key',
+                    'locat_tencent_point', // 格式：{"lng":116.404, "lat":39.915, "radius":500}
                     'manual_remark',
                     'modes',
                     'key',
@@ -458,14 +425,25 @@ class SystemController extends AbstractController
                 }
                 if (is_array($all['modes'])) {
                     if (in_array('locat', $all['modes'])) {
-                        if (empty($all['locat_bd_lbs_key'])) {
-                            return Base::retError('请填写百度地图AK');
+                        $mapTypes = [
+                            'baidu' => ['key' => 'locat_bd_lbs_key', 'point' => 'locat_bd_lbs_point', 'msg' => '请填写百度地图AK'],
+                            'amap' => ['key' => 'locat_amap_key', 'point' => 'locat_amap_point', 'msg' => '请填写高德地图Key'],
+                            'tencent' => ['key' => 'locat_tencent_key', 'point' => 'locat_tencent_point', 'msg' => '请填写腾讯地图Key'],
+                        ];
+                        $type = $all['locat_map_type'];
+                        if (!isset($mapTypes[$type])) {
+                            return Base::retError('请选择地图类型');
                         }
-                        if (!is_array($all['locat_bd_lbs_point'])) {
+                        $conf = $mapTypes[$type];
+                        if (empty($all[$conf['key']])) {
+                            return Base::retError($conf['msg']);
+                        }
+                        if (!is_array($all[$conf['point']])) {
                             return Base::retError('请选择允许签到位置');
                         }
-                        $all['locat_bd_lbs_point']['radius'] = intval($all['locat_bd_lbs_point']['radius']);
-                        if (empty($all['locat_bd_lbs_point']['lng']) || empty($all['locat_bd_lbs_point']['lat']) || empty($all['locat_bd_lbs_point']['radius'])) {
+                        $all[$conf['point']]['radius'] = intval($all[$conf['point']]['radius']);
+                        $point = $all[$conf['point']];
+                        if (empty($point['lng']) || empty($point['lat']) || empty($point['radius'])) {
                             return Base::retError('请选择有效的签到位置');
                         }
                     }
@@ -497,7 +475,10 @@ class SystemController extends AbstractController
         $setting['face_remark'] = $setting['face_remark'] ?: Doo::translate('考勤机');
         $setting['face_retip'] = $setting['face_retip'] ?: 'open';
         $setting['locat_remark'] = $setting['locat_remark'] ?: Doo::translate('定位签到');
+        $setting['locat_map_type'] = $setting['locat_map_type'] ?: 'baidu';
         $setting['locat_bd_lbs_point'] = is_array($setting['locat_bd_lbs_point']) ? $setting['locat_bd_lbs_point'] : ['radius' => 500];
+        $setting['locat_amap_point'] = is_array($setting['locat_amap_point']) ? $setting['locat_amap_point'] : ['radius' => 500];
+        $setting['locat_tencent_point'] = is_array($setting['locat_tencent_point']) ? $setting['locat_tencent_point'] : ['radius' => 500];
         $setting['manual_remark'] = $setting['manual_remark'] ?: Doo::translate('手动签到');
         $setting['time'] = $setting['time'] ? Base::json2array($setting['time']) : ['09:00', '18:00'];
         $setting['advance'] = intval($setting['advance']) ?: 120;
@@ -511,11 +492,11 @@ class SystemController extends AbstractController
             $setting['cmd'] = base64_encode($setting['cmd']);
         }
         //
-        return Base::retSuccess('success', $setting ?: json_decode('{}'));
+        return Base::retSuccess($type == 'save' ? '保存成功' : 'success', $setting ?: json_decode('{}'));
     }
 
     /**
-     * @api {get} api/system/setting/apppush          08. 获取APP推送设置、保存APP推送设置（限管理员）
+     * @api {get} api/system/setting/apppush 获取APP推送设置、保存APP推送设置（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -556,11 +537,11 @@ class SystemController extends AbstractController
         //
         $setting['push'] = $setting['push'] ?: 'close';
         //
-        return Base::retSuccess('success', $setting ?: json_decode('{}'));
+        return Base::retSuccess($type == 'save' ? '保存成功' : 'success', $setting ?: json_decode('{}'));
     }
 
     /**
-     * @api {get} api/system/setting/thirdaccess          09. 第三方帐号（限管理员）
+     * @api {get} api/system/setting/thirdaccess 第三方帐号（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -626,11 +607,11 @@ class SystemController extends AbstractController
         $setting['ldap_port'] = intval($setting['ldap_port']) ?: 389;
         $setting['ldap_sync_local'] = $setting['ldap_sync_local'] ?: 'close';
         //
-        return Base::retSuccess('success', $setting ?: json_decode('{}'));
+        return Base::retSuccess($type == 'save' ? '保存成功' : 'success', $setting ?: json_decode('{}'));
     }
 
     /**
-     * @api {get} api/system/setting/file          10. 文件设置（限管理员）
+     * @api {get} api/system/setting/file 文件设置（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -666,11 +647,11 @@ class SystemController extends AbstractController
             $setting = Base::setting('fileSetting');
         }
         //
-        return Base::retSuccess('success', $setting ?: json_decode('{}'));
+        return Base::retSuccess($type == 'save' ? '保存成功' : 'success', $setting ?: json_decode('{}'));
     }
 
     /**
-     * @api {get} api/system/demo          11. 获取演示帐号
+     * @api {get} api/system/demo 获取演示帐号
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -694,7 +675,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/priority          12. 任务优先级
+     * @api {post} api/system/priority 任务优先级
      *
      * @apiDescription 获取任务优先级、保存任务优先级
      * @apiVersion 1.0.0
@@ -739,11 +720,52 @@ class SystemController extends AbstractController
             $setting = Base::setting('priority');
         }
         //
-        return Base::retSuccess('success', $setting);
+        return Base::retSuccess($type == 'save' ? '保存成功' : 'success', $setting);
     }
 
     /**
-     * @api {post} api/system/column/template          13. 创建项目模板
+     * @api {post} api/system/microapp_menu 自定义应用菜单
+     *
+     * @apiDescription 获取或保存自定义微应用菜单，仅管理员可配置
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName microapp_menu
+     *
+     * @apiParam {String} type
+     * - get: 获取（默认）
+     * - save: 保存（限管理员）
+     * @apiParam {Array} list   菜单列表，格式：[{id,name,version,menu_items}]
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function microapp_menu()
+    {
+        $type = trim(Request::input('type'));
+        $user = User::auth();
+        if ($type == 'save') {
+            User::auth('admin');
+            $list = Request::input('list');
+            if (empty($list) || !is_array($list)) {
+                $list = [];
+            }
+            $apps = Setting::normalizeCustomMicroApps($list);
+            $setting = Base::setting('microapp_menu', $apps);
+            $setting = Setting::formatCustomMicroAppsForResponse($setting);
+        } else {
+            $setting = Base::setting('microapp_menu');
+            if (!is_array($setting)) {
+                $setting = [];
+            }
+            $setting = Setting::filterCustomMicroAppsForUser($setting, $user);
+            $setting = Setting::formatCustomMicroAppsForResponse($setting);
+        }
+        return Base::retSuccess($type == 'save' ? '保存成功' : 'success', $setting);
+    }
+
+    /**
+     * @api {post} api/system/column/template 创建项目模板
      *
      * @apiDescription 获取创建项目模板、保存创建项目模板
      * @apiVersion 1.0.0
@@ -786,11 +808,11 @@ class SystemController extends AbstractController
             $setting = Base::setting('columnTemplate');
         }
         //
-        return Base::retSuccess('success', $setting);
+        return Base::retSuccess($type == 'save' ? '保存成功' : 'success', $setting);
     }
 
     /**
-     * @api {post} api/system/license          14. License
+     * @api {post} api/system/license License
      *
      * @apiDescription 获取License信息、保存License（限管理员）
      * @apiVersion 1.0.0
@@ -856,11 +878,11 @@ class SystemController extends AbstractController
             ];
         }
         //
-        return Base::retSuccess('success', $data);
+        return Base::retSuccess($type == 'save' ? '保存成功' : 'success', $data ?: json_decode('{}'));
     }
 
     /**
-     * @api {get} api/system/get/info          15. 获取终端详细信息
+     * @api {get} api/system/get/info 获取终端详细信息
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -879,8 +901,6 @@ class SystemController extends AbstractController
         }
         return Base::retSuccess('success', [
             'ip' => Base::getIp(),
-            'ip-info' => Extranet::getIpInfo(Base::getIp()),
-            'ip-gcj02' => Extranet::getIpGcj02(Base::getIp()),
             'ip-iscn' => Base::isCnIp(Base::getIp()),
             'header' => Request::header(),
             'token' => Doo::userToken(),
@@ -889,7 +909,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ip          16. 获取IP地址
+     * @api {get} api/system/get/ip 获取IP地址
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -904,7 +924,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/cnip          17. 是否中国IP地址
+     * @api {get} api/system/get/cnip 是否中国IP地址
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -921,41 +941,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ipgcj02          18. 获取IP地址经纬度
-     *
-     * @apiVersion 1.0.0
-     * @apiGroup system
-     * @apiName get__ipgcj02
-     *
-     * @apiParam {String} ip        IP值
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function get__ipgcj02() {
-        return Extranet::getIpGcj02(Request::input("ip"));
-    }
-
-    /**
-     * @api {get} api/system/get/ipinfo          19. 获取IP地址详细信息
-     *
-     * @apiVersion 1.0.0
-     * @apiGroup system
-     * @apiName get__ipinfo
-     *
-     * @apiParam {String} ip        IP值
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function get__ipinfo() {
-        return Extranet::getIpInfo(Request::input("ip"));
-    }
-
-    /**
-     * @api {post} api/system/imgupload          20. 上传图片
+     * @api {post} api/system/imgupload 上传图片
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1021,7 +1007,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/imgview          21. 浏览图片空间
+     * @api {get} api/system/get/imgview 浏览图片空间
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1118,7 +1104,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/fileupload          22. 上传文件
+     * @api {post} api/system/fileupload 上传文件
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1162,7 +1148,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/updatelog          23. 获取更新日志
+     * @api {get} api/system/get/updatelog 获取更新日志
      *
      * @apiDescription 获取更新日志
      * @apiVersion 1.0.0
@@ -1205,7 +1191,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/email/check          24. 邮件发送测试（限管理员）
+     * @api {get} api/system/email/check 邮件发送测试（限管理员）
      *
      * @apiDescription 测试配置邮箱是否能发送邮件
      * @apiVersion 1.0.0
@@ -1251,7 +1237,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/checkin/export          25. 导出签到数据（限管理员）
+     * @api {get} api/system/checkin/export 导出签到数据（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -1303,18 +1289,19 @@ class SystemController extends AbstractController
         }
         $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid);
         //
-        go(function () use ($secondStart, $secondEnd, $time, $userid, $date, $user, $botUser, $dialog) {
+        $doo = Doo::load();
+        go(function () use ($doo, $secondStart, $secondEnd, $time, $userid, $date, $user, $botUser, $dialog) {
             Coroutine::sleep(1);
             //
             $headings = [];
-            $headings[] = Doo::translate('签到人');
-            $headings[] = Doo::translate('签到日期');
-            $headings[] = Doo::translate('班次时间');
-            $headings[] = Doo::translate('首次签到时间');
-            $headings[] = Doo::translate('首次签到结果');
-            $headings[] = Doo::translate('最后签到时间');
-            $headings[] = Doo::translate('最后签到结果');
-            $headings[] = Doo::translate('参数数据');
+            $headings[] = $doo->translate('签到人');
+            $headings[] = $doo->translate('签到日期');
+            $headings[] = $doo->translate('班次时间');
+            $headings[] = $doo->translate('首次签到时间');
+            $headings[] = $doo->translate('首次签到结果');
+            $headings[] = $doo->translate('最后签到时间');
+            $headings[] = $doo->translate('最后签到结果');
+            $headings[] = $doo->translate('参数数据');
             //
             $content = [];
             $content[] = [
@@ -1350,12 +1337,12 @@ class SystemController extends AbstractController
                     if (Timer::time() < $startT + $secondStart) {
                         $firstResult = "-";
                     } else {
-                        $firstResult = Doo::translate("正常");
+                        $firstResult = $doo->translate("正常");
                         if (empty($firstTimestamp)) {
-                            $firstResult = Doo::translate("缺卡");
+                            $firstResult = $doo->translate("缺卡");
                             $styles["E{$index}"] = ["font" => ["color" => ["rgb" => "ff0000"]]];
                         } elseif ($firstTimestamp > $startT + $secondStart) {
-                            $firstResult = Doo::translate("迟到");
+                            $firstResult = $doo->translate("迟到");
                             $styles["E{$index}"] = ["font" => ["color" => ["rgb" => "436FF6"]]];
                         }
                     }
@@ -1363,12 +1350,12 @@ class SystemController extends AbstractController
                         $lastResult = "-";
                         $lastTimestamp = 0;
                     } else {
-                        $lastResult = Doo::translate("正常");
+                        $lastResult = $doo->translate("正常");
                         if (empty($lastTimestamp) || $lastTimestamp === $firstTimestamp) {
-                            $lastResult = Doo::translate("缺卡");
+                            $lastResult = $doo->translate("缺卡");
                             $styles["G{$index}"] = ["font" => ["color" => ["rgb" => "ff0000"]]];
                         } elseif ($lastTimestamp < $startT + $secondEnd) {
-                            $lastResult = Doo::translate("早退");
+                            $lastResult = $doo->translate("早退");
                             $styles["G{$index}"] = ["font" => ["color" => ["rgb" => "436FF6"]]];
                         }
                     }
@@ -1411,7 +1398,7 @@ class SystemController extends AbstractController
             } else {
                 $fileName .= '的签到记录';
             }
-            $fileName = Doo::translate($fileName) . '_' . Timer::time() . '.xlsx';
+            $fileName = $doo->translate($fileName) . '_' . Timer::time() . '.xlsx';
             $filePath = "temp/checkin/export/" . date("Ym", Timer::time());
             $export = new BillMultipleExport($sheets);
             $res = $export->store($filePath . "/" . $fileName);
@@ -1439,11 +1426,10 @@ class SystemController extends AbstractController
             }
             //
             if (file_exists($zipPath)) {
-                $base64 = base64_encode(Base::array2string([
+                $key = Down::cache_encode([
                     'file' => $zipFile,
-                ]));
-                $fileUrl = Base::fillUrl('api/system/checkin/down?key=' . urlencode($base64));
-                Session::put('checkin::export:userid', $user->userid);
+                ]);
+                $fileUrl = Base::fillUrl('api/system/checkin/down?key=' . $key);
                 WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
                     'type' => 'file_download',
                     'title' => '导出签到数据已完成',
@@ -1473,7 +1459,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/checkin/down          26. 下载导出的签到数据
+     * @api {get} api/system/checkin/down 下载导出的签到数据
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -1485,21 +1471,16 @@ class SystemController extends AbstractController
      */
     public function checkin__down()
     {
-        $userid = Session::get('checkin::export:userid');
-        if (empty($userid)) {
-            return Base::ajaxError("请求已过期，请重新导出！", [], 0, 502);
-        }
-        //
-        $array = Base::string2array(base64_decode(urldecode(Request::input('key'))));
+        $array = Down::cache_decode();
         $file = $array['file'];
         if (empty($file) || !file_exists(storage_path($file))) {
-            return Base::ajaxError("文件不存在！", [], 0, 502);
+            return Base::ajaxError("文件不存在！", [], 0, 403);
         }
         return Response::download(storage_path($file));
     }
 
     /**
-     * @api {get} api/system/version          27. 获取版本号
+     * @api {get} api/system/version 获取版本号
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -1545,7 +1526,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/prefetch          28. 预加载的资源
+     * @api {get} api/system/prefetch 预加载的资源
      *
      * @apiVersion 1.0.0
      * @apiGroup system

app/Http/Controllers/Api/apidoc.md

@@ -0,0 +1,378 @@
+# apiDoc 参数标签说明（完整速查）
+
+apiDoc 使用内联注释为 RESTful API 自动生成文档。
+以下为所有官方支持的参数与其说明。
+
+---
+
+## @api
+**定义 API 方法的基本信息**
+
+```js
+@api {method} path title
+```
+
+- **method**：请求方法，如 `GET`、`POST`、`PUT`、`DELETE` 等  
+- **path**：请求路径，例如 `/user/:id`  
+- **title**：简短标题（显示在文档中）
+
+📘 示例：
+```js
+@api {get} /user/:id Get user info
+```
+
+---
+
+## @apiBody
+**定义请求体参数**
+
+```js
+@apiBody [{type}] [field=defaultValue] [description]
+```
+
+- `{type}` 参数类型（如 String, Number, Object, String[]）
+- `[field]` 可选字段（方括号表示可选）
+- `=defaultValue` 默认值
+- `description` 参数说明
+
+📘 示例：
+```js
+@apiBody {String} lastname Mandatory Lastname.
+@apiBody {Object} [address] Optional address object.
+@apiBody {String} [address[city]] Optional city.
+```
+
+---
+
+## @apiDefine
+**定义可复用的文档块**
+
+```js
+@apiDefine name [title] [description]
+```
+
+- `name`：唯一标识  
+- `title`：简短标题  
+- `description`：多行描述  
+
+📘 示例：
+```js
+@apiDefine MyError
+@apiError UserNotFound The <code>id</code> of the User was not found.
+```
+
+---
+
+## @apiDeprecated
+**标记接口为弃用状态**
+
+```js
+@apiDeprecated [text]
+```
+
+- `text`：提示文本，可带链接到新方法
+
+📘 示例：
+```js
+@apiDeprecated use now (#User:GetDetails)
+```
+
+---
+
+## @apiDescription
+**描述接口详细说明**
+
+```js
+@apiDescription text
+```
+
+📘 示例：
+```js
+@apiDescription This is the Description.
+It is multiline capable.
+```
+
+---
+
+## @apiError
+**定义错误返回参数**
+
+```js
+@apiError [(group)] [{type}] field [description]
+```
+
+📘 示例：
+```js
+@apiError UserNotFound The id of the User was not found.
+```
+
+---
+
+## @apiErrorExample
+**定义错误返回示例**
+
+```js
+@apiErrorExample [{type}] [title]
+example
+```
+
+📘 示例：
+```js
+@apiErrorExample {json} Error-Response:
+    HTTP/1.1 404 Not Found
+    { "error": "UserNotFound" }
+```
+
+---
+
+## @apiExample
+**定义接口使用示例**
+
+```js
+@apiExample [{type}] title
+example
+```
+
+📘 示例：
+```js
+@apiExample {curl} Example usage:
+    curl -i http://localhost/user/4711
+```
+
+---
+
+## @apiGroup
+**定义所属分组**
+
+```js
+@apiGroup name
+```
+
+📘 示例：
+```js
+@apiGroup User
+```
+
+---
+
+## @apiHeader
+**定义请求头参数**
+
+```js
+@apiHeader [(group)] [{type}] [field=defaultValue] [description]
+```
+
+📘 示例：
+```js
+@apiHeader {String} access-key Users unique access-key.
+```
+
+---
+
+## @apiHeaderExample
+**定义请求头示例**
+
+```js
+@apiHeaderExample [{type}] [title]
+example
+```
+
+📘 示例：
+```js
+@apiHeaderExample {json} Header-Example:
+    {
+      "Accept-Encoding": "gzip, deflate"
+    }
+```
+
+---
+
+## @apiIgnore
+**忽略当前文档块**
+
+```js
+@apiIgnore [hint]
+```
+
+📘 示例：
+```js
+@apiIgnore Not finished method
+```
+
+---
+
+## @apiName
+**定义接口唯一名称**
+
+```js
+@apiName name
+```
+
+📘 示例：
+```js
+@apiName GetUser
+```
+
+---
+
+## @apiParam
+**定义请求参数**
+
+```js
+@apiParam [(group)] [{type}] [field=defaultValue] [description]
+```
+
+📘 示例：
+```js
+@apiParam {Number} id Users unique ID.
+@apiParam {String} [firstname] Optional firstname.
+@apiParam {String} country="DE" Mandatory with default.
+```
+
+---
+
+## @apiParamExample
+**定义参数请求示例**
+
+```js
+@apiParamExample [{type}] [title]
+example
+```
+
+📘 示例：
+```js
+@apiParamExample {json} Request-Example:
+    { "id": 4711 }
+```
+
+---
+
+## @apiPermission
+**定义权限要求**
+
+```js
+@apiPermission name
+```
+
+📘 示例：
+```js
+@apiPermission admin
+```
+
+---
+
+## @apiPrivate
+**标记接口为私有（可过滤）**
+
+```js
+@apiPrivate
+```
+
+---
+
+## @apiQuery
+**定义查询参数（?query）**
+
+```js
+@apiQuery [{type}] [field=defaultValue] [description]
+```
+
+📘 示例：
+```js
+@apiQuery {Number} id Users unique ID.
+@apiQuery {String} [sort="asc"] Sort order.
+```
+
+---
+
+## @apiSampleRequest
+**定义接口测试请求 URL**
+
+```js
+@apiSampleRequest url
+```
+
+📘 示例：
+```js
+@apiSampleRequest http://test.github.com/some_path/
+```
+
+---
+
+## @apiSuccess
+**定义成功返回参数**
+
+```js
+@apiSuccess [(group)] [{type}] field [description]
+```
+
+📘 示例：
+```js
+@apiSuccess {String} firstname Firstname of the User.
+@apiSuccess {String} lastname  Lastname of the User.
+```
+
+---
+
+## @apiSuccessExample
+**定义成功返回示例**
+
+```js
+@apiSuccessExample [{type}] [title]
+example
+```
+
+📘 示例：
+```js
+@apiSuccessExample {json} Success-Response:
+    HTTP/1.1 200 OK
+    { "firstname": "John", "lastname": "Doe" }
+```
+
+---
+
+## @apiUse
+**引用定义块（@apiDefine）**
+
+```js
+@apiUse name
+```
+
+📘 示例：
+```js
+@apiDefine MySuccess
+@apiSuccess {String} firstname User firstname.
+
+@apiUse MySuccess
+```
+
+---
+
+## @apiVersion
+**定义接口版本**
+
+```js
+@apiVersion version
+```
+
+📘 示例：
+```js
+@apiVersion 1.6.2
+```
+
+---
+
+# 附录：常用标签速查表
+
+| 标签 | 作用 | 示例 |
+|------|------|------|
+| `@api` | 定义接口 | `@api {get} /user/:id` |
+| `@apiName` | 唯一名称 | `@apiName GetUser` |
+| `@apiGroup` | 所属分组 | `@apiGroup User` |
+| `@apiParam` | 请求参数 | `@apiParam {Number} id Users unique ID.` |
+| `@apiBody` | 请求体参数 | `@apiBody {String} name Username.` |
+| `@apiQuery` | 查询参数 | `@apiQuery {String} keyword Search term.` |
+| `@apiHeader` | Header 参数 | `@apiHeader {String} token Auth token.` |
+| `@apiSuccess` | 成功返回字段 | `@apiSuccess {String} name Username.` |
+| `@apiError` | 错误返回字段 | `@apiError NotFound User not found.` |
+| `@apiVersion` | 版本号 | `@apiVersion 1.0.0` |

app/Http/Controllers/Api/apidoc.php

@@ -1,89 +1,137 @@
 <?php
 
 /**
- * 给apidoc项目增加顺序编号
+ * 给apidoc项目增加顺序编号 / 支持恢复
  */
 
 @error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
 
-$path = dirname(__FILE__). '/';
-$lists = scandir($path);
-//
-foreach ($lists AS $item) {
-    $fillPath = $path . $item;
-    if (str_ends_with($fillPath, 'Controller.php')) {
-        $content = file_get_contents($fillPath);
-        preg_match_all("/\* @api \{(.+?)\} (.*?)\n/i", $content, $matchs);
-        $i = 1;
-        foreach ($matchs[2] AS $key=>$text) {
-            if (in_array(strtolower($matchs[1][$key]), array('get', 'post'))) {
-                $expl = explode(" ", __sRemove($text));
-                $end = $expl[1];
-                if ($expl[2]) {
-                    $end = '';
-                    foreach ($expl AS $k=>$v) { if ($k >= 2) { $end.= " ".$v; } }
-                }
-                $newtext = "* @api {".$matchs[1][$key]."} ".$expl[0]."          ".__zeroFill($i, 2).". ".trim($end);
-                $content = str_replace("* @api {".$matchs[1][$key]."} ".$text, $newtext, $content);
-                $i++;
-                //
-                echo $newtext;
-                echo "\r\n";
-            }
-        }
-        if ($i > 1) {
-            file_put_contents($fillPath, $content);
-        }
-    }
-}
-echo "Success \n";
+const NUMBER_WIDTH = 2;
 
-/** ************************************************************** */
-/** ************************************************************** */
-/** ************************************************************** */
+$isRestore = isset($argv[1]) && strtolower($argv[1]) === 'restore';
 
-/**
- * 替换所有空格
- * @param $str
- * @return mixed
- */
-function __sRemove($str) {
-    $str = str_replace("  ", " ", $str);
-    if (__strExists($str, "  ")) {
-        return __sRemove($str);
-    }
-    return $str;
+$basePath = dirname(__FILE__) . '/';
+$controllerFiles = glob($basePath . '*Controller.php');
+
+if (!$controllerFiles) {
+    echo "No Controller.php files found\n";
+    exit(0);
 }
 
+foreach ($controllerFiles as $filePath) {
+    $original = file_get_contents($filePath);
+    [$updated, $linesChanged] = processFile($original, $isRestore);
+
+    if (count($linesChanged) === 0) {
+        continue;
+    }
+
+    file_put_contents($filePath, $updated);
+
+    foreach ($linesChanged as $line) {
+        echo $line . "\n";
+    }
+}
+
+echo $isRestore ? "Restore Success \n" : "Success \n";
+
 /**
- * 是否包含字符
- * @param $string
- * @param $find
- * @return bool
+ * 处理单个文件内容
+ *
+ * @param string $content
+ * @param bool   $restore
+ * @return array{string, array<int, string>}
  */
-function __strExists($string, $find)
+function processFile(string $content, bool $restore): array
 {
-    return str_contains($string, $find);
+    $lineChanges = [];
+    $counter = 1;
+
+    $pattern = '/\* @api \{([^\}]+)\}\s+([^\s]+)([^\r\n]*)(\r?\n)/';
+
+    $updated = preg_replace_callback(
+        $pattern,
+        function (array $matches) use ($restore, &$counter, &$lineChanges) {
+            $method = trim($matches[1]);
+            if (!in_array(strtolower($method), ['get', 'post'], true)) {
+                return $matches[0];
+            }
+
+            $endpoint = trim($matches[2]);
+            $suffix = normalizeDescription(stripExistingNumbering($matches[3]));
+
+            if (!$restore) {
+                $numberedSuffix = formatNumber($counter) . '.';
+                if ($suffix !== '') {
+                    $numberedSuffix .= ' ' . $suffix;
+                }
+                $counter++;
+            } else {
+                $numberedSuffix = $suffix;
+            }
+
+            $newLine = renderAnnotation($method, $endpoint, $numberedSuffix);
+
+            if ($newLine !== rtrim($matches[0], "\r\n")) {
+                $lineChanges[] = $newLine;
+            }
+
+            return $newLine . $matches[4];
+        },
+        $content
+    );
+
+    if ($updated === null) {
+        return [$content, []];
+    }
+
+    return [$updated, $lineChanges];
 }
 
 /**
- * @param string $str 补零
- * @param int $length
- * @param int $after
- * @return bool|string
+ * 生成格式化后的注释行
  */
-function __zeroFill($str, $length = 0, $after = 1) {
-    if (strlen($str) >= $length) {
-        return $str;
+function renderAnnotation(string $method, string $endpoint, string $suffix = ''): string
+{
+    $line = "* @api {" . $method . "} " . $endpoint;
+
+    if ($suffix !== '') {
+        if ($suffix[0] !== ' ') {
+            $line .= ' ';
+        }
+        $line .= $suffix;
     }
-    $_str = '';
-    for ($i = 0; $i < $length; $i++) {
-        $_str .= '0';
-    }
-    if ($after) {
-        $_ret = substr($_str . $str, $length * -1);
-    } else {
-        $_ret = substr($str . $_str, 0, $length);
-    }
-    return $_ret;
+
+    return $line;
+}
+
+/**
+ * 移除已有编号部分
+ */
+function stripExistingNumbering(string $text): string
+{
+    $trimmed = ltrim($text);
+    $pattern = '/^\d+\.\s*/';
+    return preg_replace($pattern, '', $trimmed) ?? $trimmed;
+}
+
+/**
+ * 压缩多余空格
+ */
+function normalizeDescription(string $text): string
+{
+    $text = trim($text);
+    if ($text === '') {
+        return '';
+    }
+
+    return preg_replace('/\s+/', ' ', $text) ?? $text;
+}
+
+/**
+ * 生成固定宽度的数字
+ */
+function formatNumber(int $number): string
+{
+    return str_pad((string) $number, NUMBER_WIDTH, '0', STR_PAD_LEFT);
 }

app/Http/Controllers/IndexController.php

@@ -25,7 +25,6 @@ use App\Tasks\ZincSearchSyncTask;
 use App\Tasks\UnclaimedTaskRemindTask;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
 use Laravolt\Avatar\Avatar;
-use Swoole\Coroutine;
 
 
 /**
@@ -62,6 +61,10 @@ class IndexController extends InvokeController
             $array = Base::json2array(file_get_contents($hotFile));
             $style = null;
             $script = preg_replace("/^(\/\/(.*?))(:\d+)?\//i", "$1:" . $array['APP_DEV_PORT'] . "/", asset_main("resources/assets/js/app.js"));
+            $proxyUri = Base::liveEnv('VSCODE_PROXY_URI');
+            if (is_string($proxyUri) && preg_match('/^https?:\/\//i', $proxyUri)) {
+                $script = preg_replace('/^(https?:\/\/|\/\/)[^\/]+/', rtrim($proxyUri, '/'), $script, 1);
+            }
         } else {
             $array = Base::json2array(file_get_contents($manifestFile));
             $style = asset_main($array['resources/assets/js/app.js']['css'][0]);
@@ -255,6 +258,7 @@ class IndexController extends InvokeController
         Task::deliver(new DeleteTmpTask('file'));
         Task::deliver(new DeleteTmpTask('tmp_file', 24));
         Task::deliver(new DeleteTmpTask('user_device', 24));
+        Task::deliver(new DeleteTmpTask('umeng_log', 24 * 3));
         // 删除机器人消息
         Task::deliver(new DeleteBotMsgTask());
         // 周期任务
@@ -353,9 +357,7 @@ class IndexController extends InvokeController
                     break;
                 }
             }
-            if (empty($avaiPath)) {
-                abort(404);
-            }
+            abort_if(empty($avaiPath), 404);
             $lists = Base::recursiveFiles($dirPath, false);
             $files = [];
             foreach ($lists as $file) {
@@ -433,13 +435,9 @@ class IndexController extends InvokeController
         $path = Arr::get($data, 'path');
         $file = public_path($path);
         // 防止 ../ 穿越获取到系统文件
-        if (!str_starts_with(realpath($file), public_path())) {
-            abort(404);
-        }
-        //
-        if (!file_exists($file)) {
-            abort(404);
-        }
+        abort_if(!str_starts_with(realpath($file), public_path()), 404);
+        // 如果文件不存在，直接返回 404
+        abort_if(!file_exists($file), 404);
         //
         parse_str($data['query'], $query);
         $name = Arr::get($query, 'name');

app/Http/Middleware/WebApi.php

@@ -4,8 +4,10 @@ namespace App\Http\Middleware;
 
 @error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
 
+use App\Module\Base;
 use App\Module\Doo;
 use App\Services\RequestContext;
+use Cache;
 use Closure;
 
 class WebApi
@@ -19,8 +21,7 @@ class WebApi
      */
     public function handle($request, Closure $next)
     {
-        // 为每个请求生成唯一ID
-        $request->requestId = RequestContext::generateRequestId();
+        // 记录请求信息
         RequestContext::set('start_time', microtime(true));
         RequestContext::set('header_language', $request->header('language'));
 
@@ -30,6 +31,12 @@ class WebApi
         // 加载Doo类
         Doo::load();
 
+        // 记录 PC 端活跃时间
+        $userid = Doo::userId();
+        if ($userid > 0 && Base::isPc()) {
+            Cache::put("user_pc_active:{$userid}", time(), 60);
+        }
+
         // 解密请求内容
         $encrypt = Doo::pgpParseStr($request->header('encrypt'));
         if ($request->isMethod('post')) {
@@ -76,6 +83,6 @@ class WebApi
     public function terminate()
     {
         // 请求结束后清理上下文
-        RequestContext::clear();
+        RequestContext::clean();
     }
 }

app/Models/File.php

@@ -24,6 +24,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property int|null $size 大小(B)
  * @property int|null $userid 拥有者ID
  * @property int|null $share 是否共享
+ * @property int|null $guest_access 是否允许游客访问
  * @property int|null $pshare 所属分享ID
  * @property int|null $created_id 创建者
  * @property \Illuminate\Support\Carbon|null $created_at
@@ -44,6 +45,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @method static \Illuminate\Database\Eloquent\Builder|File whereCreatedId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereExt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|File whereGuestAccess($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereName($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File wherePid($value)
@@ -642,6 +644,29 @@ class File extends AbstractModel
         Task::deliver($task);
     }
 
+    /**
+     * 文件推送消息
+     * @param $action
+     * @param array|null $data   发送内容
+     * @param int $userid      会员ID
+     */
+    public static function pushMsgSimple($action, $data, $userid)
+    {
+        if (empty($data) || empty($userid)) {
+            return;
+        }
+        $msg = [
+            'type' => 'file',
+            'action' => $action,
+            'data' => $data,
+        ];
+        $params = [
+            'userid' => $userid,
+            'msg' => $msg
+        ];
+        Task::deliver(new PushTask($params));
+    }
+
     /**
      * 获取推送会员
      * @param $action
@@ -956,30 +981,6 @@ class File extends AbstractModel
         }
     }
 
-    /**
-     * 文件推送消息
-     * @param $action
-     * @param array|null $data   发送内容
-     * @param array $userid      会员ID
-     */
-    public static function filePushMsg($action, $data = null, $userid = null)
-    {
-        $userid = User::userid();
-        if (empty($userid)) {
-            return;
-        }
-        $msg = [
-            'type' => 'file',
-            'action' => $action,
-            'data' => $data,
-        ];
-        $params = [
-            'userid' => $userid,
-            'msg' => $msg
-        ];
-        Task::deliver(new PushTask($params));
-    }
-
     /**
      * 根据文件类型判断是否需要安装应用
      * @param $type

app/Models/FileContent.php

@@ -129,9 +129,7 @@ class FileContent extends AbstractModel
                 ],
                 default => json_decode('{}'),
             };
-            if ($download) {
-                abort(403, "This file is empty.");
-            }
+            abort_if($download, 403, "This file is empty.");
         } else {
             $path = $content['url'];
             if ($file->ext) {
@@ -147,16 +145,30 @@ class FileContent extends AbstractModel
             }
             if ($download) {
                 $filePath = public_path($path);
-                if (isset($filePath)) {
-                    return Base::DownloadFileResponse($filePath, $name);
-                } else {
-                    abort(403, "This file not support download.");
-                }
+                abort_if(!isset($filePath),403, "This file not support download.");
+                return Base::DownloadFileResponse($filePath, $name);
             }
         }
         return Base::retSuccess('success', [ 'content' => $content ]);
     }
 
+    /**
+     * 获取文件访问URL
+     * @param int $fileId 文件ID
+     * @return string|null 返回完整的文件URL，如果文件无内容则返回null
+     */
+    public static function getFileUrl($fileId)
+    {
+        $content = self::whereFid($fileId)->orderByDesc('id')->first();
+        if ($content) {
+            $contentData = Base::json2array($content->content ?: []);
+            if (!empty($contentData['url'])) {
+                return Base::fillUrl($contentData['url']);
+            }
+        }
+        return null;
+    }
+
     /**
      * 获取文件内容
      * @param $id

app/Models/Project.php

@@ -129,6 +129,7 @@ class Project extends AbstractModel
                 'projects.*',
                 'project_users.owner',
                 'project_users.top_at',
+                'project_users.sort',
             ])
             ->leftJoin('project_users', function ($leftJoin) use ($userid) {
                 $leftJoin
@@ -153,6 +154,7 @@ class Project extends AbstractModel
                 'projects.*',
                 'project_users.owner',
                 'project_users.top_at',
+                'project_users.sort',
             ])
             ->join('project_users', 'projects.id', '=', 'project_users.project_id')
             ->where('project_users.userid', $userid);
@@ -423,24 +425,25 @@ class Project extends AbstractModel
             $projectUserids = $this->relationUserids();
             foreach ($flows as $item) {
                 $id = intval($item['id']);
+                $name = trim(str_replace('|', '·', $item['name']));
                 $turns = Base::arrayRetainInt($item['turns'] ?: [], true);
                 $userids = Base::arrayRetainInt($item['userids'] ?: [], true);
                 $usertype = trim($item['usertype']);
                 $userlimit = intval($item['userlimit']);
                 $columnid = intval($item['columnid']);
                 if ($usertype == 'replace' && empty($userids)) {
-                    throw new ApiException("状态[{$item['name']}]设置错误，设置流转模式时必须填写状态负责人");
+                    throw new ApiException("状态[{$name}]设置错误，设置流转模式时必须填写状态负责人");
                 }
                 if ($usertype == 'merge' && empty($userids)) {
-                    throw new ApiException("状态[{$item['name']}]设置错误，设置剔除模式时必须填写状态负责人");
+                    throw new ApiException("状态[{$name}]设置错误，设置剔除模式时必须填写状态负责人");
                 }
                 if ($userlimit && empty($userids)) {
-                    throw new ApiException("状态[{$item['name']}]设置错误，设置限制负责人时必须填写状态负责人");
+                    throw new ApiException("状态[{$name}]设置错误，设置限制负责人时必须填写状态负责人");
                 }
                 foreach ($userids as $userid) {
                     if (!in_array($userid, $projectUserids)) {
                         $nickname = User::userid2nickname($userid);
-                        throw new ApiException("状态[{$item['name']}]设置错误，状态负责人[{$nickname}]不在项目成员内");
+                        throw new ApiException("状态[{$name}]设置错误，状态负责人[{$nickname}]不在项目成员内");
                     }
                 }
                 $flow = ProjectFlowItem::updateInsert([
@@ -448,8 +451,9 @@ class Project extends AbstractModel
                     'project_id' => $this->id,
                     'flow_id' => $projectFlow->id,
                 ], [
-                    'name' => trim($item['name']),
+                    'name' => $name,
                     'status' => trim($item['status']),
+                    'color' => trim($item['color']),
                     'sort' => intval($item['sort']),
                     'turns' => $turns,
                     'userids' => $userids,
@@ -469,7 +473,7 @@ class Project extends AbstractModel
                         $hasEnd = true;
                     }
                     if (!$isInsert) {
-                        $upTaskList[$flow->id] = $flow->status . "|" . $flow->name;
+                        $upTaskList[$flow->id] = $flow->status . "|" . $flow->name . "|" . $flow->color;
                     }
                 }
             }
@@ -590,7 +594,7 @@ class Project extends AbstractModel
             $project->save();
             //
             if ($flow == 'open') {
-                $project->addFlow(Base::json2array('[{"id":-10,"name":"待处理","status":"start","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0,"columnid":0},{"id":-11,"name":"进行中","status":"progress","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0,"columnid":0},{"id":-12,"name":"待测试","status":"test","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0,"columnid":0},{"id":-13,"name":"已完成","status":"end","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0,"columnid":0},{"id":-14,"name":"已取消","status":"end","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0,"columnid":0}]'));
+                $project->addFlow(Base::json2array('[{"id":-10,"name":"待处理","status":"start","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0,"columnid":0},{"id":-11,"name":"进行中","status":"progress","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0,"columnid":0},{"id":-12,"name":"待测试","status":"test","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0,"columnid":0},{"id":-13,"name":"已完成","status":"end","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0,"columnid":0},{"id":-14,"name":"已取消","status":"end","color":"#999999","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0,"columnid":0}]'));
             }
         });
         //

app/Models/ProjectFlowItem.php

@@ -12,6 +12,7 @@ use App\Module\Base;
  * @property int|null $flow_id 流程ID
  * @property string|null $name 名称
  * @property string|null $status 状态
+ * @property string|null $color 自定义颜色
  * @property array $turns 可流转
  * @property array $userids 状态负责人ID
  * @property string|null $usertype 流转模式
@@ -30,6 +31,7 @@ use App\Module\Base;
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem query()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereColor($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereColumnid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereFlowId($value)

app/Models/ProjectPermission.php

@@ -128,8 +128,8 @@ class ProjectPermission extends AbstractModel
     /**
      * 更新项目权限
      *
-     * @param  int  $projectId
-     * @param  array  $permissions
+     * @param int $projectId
+     * @param $newPermissions
      * @return ProjectPermission
      */
     public static function updatePermissions($projectId, $newPermissions)
@@ -146,9 +146,9 @@ class ProjectPermission extends AbstractModel
 
     /**
      * 检查用户是否有执行特定动作的权限
-     * @param string $action 动作名称
      * @param Project $project 项目实例
-     * @param ProjectTask $task 任务实例
+     * @param string $action 动作名称
+     * @param ProjectTask|null $task 任务实例
      * @return bool
      */
     public static function userTaskPermission(Project $project, $action, ProjectTask $task = null)

app/Models/ProjectTag.php

@@ -10,6 +10,7 @@ namespace App\Models;
  * @property string $name 标签名称
  * @property string|null $desc 标签描述
  * @property string|null $color 颜色
+ * @property int $sort 排序
  * @property int $userid 创建人
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
@@ -29,6 +30,7 @@ namespace App\Models;
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTag whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTag whereName($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTag whereProjectId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTag whereSort($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTag whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTag whereUserid($value)
  * @mixin \Eloquent
@@ -36,7 +38,6 @@ namespace App\Models;
 class ProjectTag extends AbstractModel
 {
     protected $hidden = [
-        'created_at',
         'updated_at',
     ];
 
@@ -50,6 +51,7 @@ class ProjectTag extends AbstractModel
         'name',
         'desc',
         'color',
+        'sort',
         'userid'
     ];
 

app/Models/ProjectTask.php

@@ -12,7 +12,6 @@ use App\Tasks\PushTask;
 use App\Exceptions\ApiException;
 use App\Observers\ProjectTaskObserver;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
-use League\HTMLToMarkdown\HtmlConverter;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
@@ -157,7 +156,7 @@ class ProjectTask extends AbstractModel
             return;
         }
         if (!isset($this->appendattrs['sub_num'])) {
-            $builder = self::whereParentId($this->id)->whereNull('archived_at');
+            $builder = self::whereParentId($this->id);
             $this->appendattrs['sub_num'] = $builder->count();
             $this->appendattrs['sub_complete'] = $builder->whereNotNull('complete_at')->count();
             //
@@ -397,6 +396,7 @@ class ProjectTask extends AbstractModel
         $userid     = User::userid();
         $visibility = $data['visibility_appoint'] ?? $data['visibility'];
         $visibility_userids = $data['visibility_appointor'] ?: [];
+        $taskUserLimit = intval(Base::settingFind('system', 'task_user_limit'));
         //
         if (ProjectTask::whereProjectId($project_id)
                 ->whereNull('project_tasks.complete_at')
@@ -456,8 +456,8 @@ class ProjectTask extends AbstractModel
             if (ProjectTask::authData($uid)
                     ->whereNull('project_tasks.complete_at')
                     ->whereNull('project_tasks.archived_at')
-                    ->count() > 500) {
-                throw new ApiException(User::userid2nickname($uid) . '负责或参与的未完成任务最多不能超过500个');
+                    ->count() > $taskUserLimit) {
+                throw new ApiException(User::userid2nickname($uid) . '负责或参与的未完成任务最多不能超过' . $taskUserLimit . '个');
             }
             $tmpArray[] = $uid;
         }
@@ -486,7 +486,7 @@ class ProjectTask extends AbstractModel
             foreach ($projectFlowItem as $item) {
                 if ($item->status == 'start') {
                     $task->flow_item_id = $item->id;
-                    $task->flow_item_name = $item->status . "|" . $item->name;
+                    $task->flow_item_name = $item->status . "|" . $item->name . "|" . $item->color;
                     $owner = array_merge($owner, $item->userids);
                     break;
                 }
@@ -650,7 +650,7 @@ class ProjectTask extends AbstractModel
                     $data['column_id'] = $newFlowItem->columnid;
                 }
                 $this->flow_item_id = $newFlowItem->id;
-                $this->flow_item_name = $newFlowItem->status . "|" . $newFlowItem->name;
+                $this->flow_item_name = $newFlowItem->status . "|" . $newFlowItem->name . "|" . $newFlowItem->color;
                 $this->addLog("修改{任务}状态", [
                     'flow' => $flowData,
                     'change' => [$currentFlowItem?->name, $newFlowItem->name]
@@ -1144,9 +1144,14 @@ class ProjectTask extends AbstractModel
      */
     public function copyTask()
     {
-        return AbstractModel::transaction(function() {
-            // 复制任务
-            $task = $this->replicate();
+        $source = $this->fresh(['content', 'taskFile', 'taskUser']);
+        if (!$source) {
+            throw new ApiException('任务不存在');
+        }
+
+        return AbstractModel::transaction(function () use ($source) {
+            // 复制任务（使用最新数据，避免复制临时字段）
+            $task = $source->replicate();
             $task->dialog_id = 0;
             $task->archived_at = null;
             $task->archived_userid = 0;
@@ -1155,21 +1160,21 @@ class ProjectTask extends AbstractModel
             $task->created_at = Carbon::now();
             $task->save();
             // 复制任务内容
-            if ($this->content) {
-                $tmp = $this->content->replicate();
+            if ($source->content) {
+                $tmp = $source->content->replicate();
                 $tmp->task_id = $task->id;
                 $tmp->created_at = Carbon::now();
                 $tmp->save();
             }
             // 复制任务附件
-            foreach ($this->taskFile as $taskFile) {
+            foreach ($source->taskFile as $taskFile) {
                 $tmp = $taskFile->replicate();
                 $tmp->task_id = $task->id;
                 $tmp->created_at = Carbon::now();
                 $tmp->save();
             }
             // 复制任务成员
-            foreach ($this->taskUser as $taskUser) {
+            foreach ($source->taskUser as $taskUser) {
                 $tmp = $taskUser->replicate();
                 $tmp->task_id = $task->id;
                 $tmp->task_pid = $task->id;
@@ -1556,8 +1561,9 @@ class ProjectTask extends AbstractModel
      * @param string $action
      * @param array|self $data      发送内容，默认为[id, parent_id, project_id, column_id, dialog_id]
      * @param array $userid         指定会员，默认为项目所有成员
+     * @param bool $ignoreSelf      是否忽略当前连接
      */
-    public function pushMsg($action, $data = null, $userid = null)
+    public function pushMsg($action, $data = null, $userid = null, $ignoreSelf = true)
     {
         if (!$this->project) {
             return;
@@ -1569,77 +1575,91 @@ class ProjectTask extends AbstractModel
                 'project_id' => $this->project_id,
                 'column_id' => $this->column_id,
                 'dialog_id' => $this->dialog_id,
+                'visibility' => $this->visibility,
             ];
         } elseif ($data instanceof self) {
             $data = $data->toArray();
         }
-        //
+
+        // 获取接收会员
         if ($userid === null) {
             $userids = $this->project->relationUserids();
         } else {
             $userids = is_array($userid) ? $userid : [$userid];
         }
-        //
-        $array = [];
-        if (Arr::exists($data, 'owner') || Arr::exists($data, 'assist')) {
-            $taskUser = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($data['id'])->get();
-            // 负责人
-            $owners = $taskUser->where('owner', 1)->pluck('userid')->toArray();
-            $owners = array_intersect($userids, $owners);
-            if ($owners) {
-                $array[] = [
-                    'userid' => array_values($owners),
-                    'data' => array_merge($data, [
-                        'owner' => 1,
-                        'assist' => 1,
-                    ])
-                ];
-            }
-            // 协助人
-            $assists = $taskUser->where('owner', 0)->pluck('userid')->toArray();
-            $assists = array_intersect($userids, $assists);
-            if ($assists) {
-                $array[] = [
-                    'userid' => array_values($assists),
-                    'data' => array_merge($data, [
-                        'owner' => 0,
-                        'assist' => 1,
-                    ])
-                ];
-            }
-            // 其他人
-            switch ($data['visibility']) {
-                case 1:
-                    // 项目人员，除了负责人、协助人项目其他人
-                    $userids = array_diff($userids, $owners, $assists);
-                    break;
-                case 2:
-                    // 任务人员，除了负责人、协助人
-                    $userids = [];
-                    break;
-                case 3:
-                    // 指定成员
-                    $specifys = ProjectTaskVisibilityUser::select(['userid'])->whereTaskId($data['id'])->pluck('userid')->toArray();
-                    $userids = array_diff($specifys, $owners, $assists);
-                    break;
-                default:
-                    $userids = [];
-                    break;
-            }
-            if ($userids) {
-                $array[] = [
-                    'userid' => array_values($userids),
-                    'data' => array_merge($data, [
-                        'owner' => 0,
-                        'assist' => 0,
-                    ])
-                ];
-            }
+        $userids = array_values(array_unique(array_map('intval', $userids)));
+        if (empty($userids)) {
+            return;
         }
-        //
+
+        // 按可见性分组推送
+        $taskUser = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($data['id'])->get();
+        $ownerList = $taskUser->where('owner', 1)->pluck('userid')->toArray();
+        $assistList = $taskUser->where('owner', 0)->pluck('userid')->toArray();
+
+        $ownerUsers = array_values(array_intersect($userids, $ownerList));
+        $assistUsers = array_values(array_diff(array_intersect($userids, $assistList), $ownerUsers));
+
+        $array = [];
+
+        // 负责人
+        if ($ownerUsers) {
+            $array[] = [
+                'userid' => $ownerUsers,
+                'data' => array_merge($data, [
+                    'owner' => 1,
+                    'assist' => 0,
+                ])
+            ];
+        }
+
+        // 协助人
+        if ($assistUsers) {
+            $array[] = [
+                'userid' => $assistUsers,
+                'data' => array_merge($data, [
+                    'owner' => 0,
+                    'assist' => 1,
+                ])
+            ];
+        }
+
+        // 其他人
+        $otherUsers = [];
+        switch (intval($data['visibility'])) {
+            case 1:
+                // 项目人员：除了负责人、协助人项目其他人
+                $otherUsers = array_diff($userids, $ownerUsers, $assistUsers);
+                break;
+            case 2:
+                // 任务人员：除了负责人、协助人
+                // $otherUsers = [];
+                break;
+            case 3:
+                // 指定成员
+                $specifys = ProjectTaskVisibilityUser::select(['userid'])->whereTaskId($data['id'])->pluck('userid')->toArray();
+                $otherUsers = array_diff(array_intersect($userids, $specifys), $ownerUsers, $assistUsers);
+                break;
+        }
+
+        if ($otherUsers) {
+            $array[] = [
+                'userid' => array_values($otherUsers),
+                'data' => array_merge($data, [
+                    'owner' => 0,
+                    'assist' => 0,
+                ])
+            ];
+        }
+
+        if (empty($array)) {
+            return;
+        }
+
+        // 推送
         foreach ($array as $item) {
             $params = [
-                'ignoreFd' => Request::header('fd'),
+                'ignoreFd' => $ignoreSelf ? Request::header('fd') : null,
                 'userid' => $item['userid'],
                 'msg' => [
                     'type' => 'projectTask',
@@ -1908,7 +1928,7 @@ class ProjectTask extends AbstractModel
                 // 更新任务流程
                 $flowItem = projectFlowItem::whereProjectId($projectId)->whereId($flowItemId)->first();
                 $this->flow_item_id = $flowItemId;
-                $this->flow_item_name = $flowItem->status . "|" . $flowItem->name;
+                $this->flow_item_name = $flowItem->status . "|" . $flowItem->name . "|" . $flowItem->color;
                 if ($flowItem->status == 'end') {
                     $this->completeTask(Carbon::now(), $flowItem->name);
                 } else {
@@ -1929,67 +1949,6 @@ class ProjectTask extends AbstractModel
         return true;
     }
 
-    /**
-     * 生成AI上下文
-     * @return array
-     */
-    public function AIContext()
-    {
-        $contexts = [];
-        if ($this->archived_at) {
-            $contexts[] = "任务状态：已归档";
-            $contexts[] = "归档时间：" . $this->archived_at;
-        } elseif ($this->complete_at) {
-            $contexts[] = "任务状态：已完成";
-            $contexts[] = "完成时间：" . $this->complete_at;
-        } elseif ($this->end_at && Carbon::parse($this->end_at)->lt(Carbon::now())) {
-            $contexts[] = "任务状态：已过期";
-            $contexts[] = "任务截止时间：" . $this->end_at;
-        } else {
-            $contexts[] = "任务状态：进行中";
-            if ($this->start_at) {
-                $contexts[] = "任务开始时间：" . $this->start_at;
-            }
-            if ($this->end_at) {
-                $contexts[] = "任务截止时间：" . $this->end_at;
-            }
-        }
-        $contexts[] = "当前系统时间：" . Carbon::now()->toDateTimeString();
-        if ($this->content) {
-            $taskDesc = $this->content?->getContentInfo();
-            if ($taskDesc) {
-                $converter = new HtmlConverter(['strip_tags' => true]);
-                $descContent = Base::cutStr($converter->convert($taskDesc['content']), 2000);
-                $contexts[] = <<<EOF
-                    任务描述：
-                    ```md
-                    {$descContent}
-                    ```
-                    EOF;
-            }
-        }
-        $subTask = ProjectTask::select(['id', 'name', 'complete_at', 'end_at'])->whereParentId($this->id)->get();
-        if ($subTask->isNotEmpty()) {
-            $subTaskContent = $subTask->map(function($item) {
-                if ($item->complete_at) {
-                    $status = " （已完成）";
-                } elseif ($item->end_at && Carbon::parse($item->end_at)->lt(Carbon::now())) {
-                    $status = " （已过期）";
-                } else {
-                    $status = " （进行中）";
-                }
-                return "  - {$item->name} {$status}";
-            })->join("\n");
-            if ($subTaskContent) {
-                $contexts[] = <<<EOF
-                    子任务列表：
-                    {$subTaskContent}
-                    EOF;
-            }
-        }
-        return $contexts;
-    }
-
     /**
      * 获取任务
      * @param $task_id
@@ -2051,4 +2010,64 @@ class ProjectTask extends AbstractModel
         //
         return $task;
     }
+
+    /**
+     * 构建指定周期内的未完成任务查询（用于周报/日报等）
+     * @param int $userid
+     * @param Carbon $start_time
+     * @param Carbon $end_time
+     * @param bool $includeUpdatedForNoPlan 无计划时间任务是否按周期内更新时间一并纳入
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public static function buildUnfinishedTaskQuery(int $userid, Carbon $start_time, Carbon $end_time, bool $includeUpdatedForNoPlan = true)
+    {
+        return self::query()
+            ->join("projects", "projects.id", "=", "project_tasks.project_id")
+            ->whereNull("projects.archived_at")
+            ->whereNull("project_tasks.complete_at")
+            ->whereHas("taskUser", function ($query) use ($userid) {
+                $query->where("userid", $userid);
+            })
+            ->where(function ($query) use ($start_time, $end_time, $includeUpdatedForNoPlan) {
+                // 1) 有计划时间：计划时间与给定周期 [start_time, end_time] 有交集
+                $query->where(function ($q1) use ($start_time, $end_time) {
+                    $q1->whereNotNull('project_tasks.start_at')
+                        ->whereNotNull('project_tasks.end_at')
+                        ->where(function ($q2) use ($start_time, $end_time) {
+                            $q2->whereBetween('project_tasks.start_at', [$start_time->toDateTimeString(), $end_time->toDateTimeString()])
+                                ->orWhereBetween('project_tasks.end_at', [$start_time->toDateTimeString(), $end_time->toDateTimeString()])
+                                ->orWhere(function ($q3) use ($start_time, $end_time) {
+                                    $q3->where('project_tasks.start_at', '<=', $start_time->toDateTimeString())
+                                        ->where('project_tasks.end_at', '>=', $end_time->toDateTimeString());
+                                });
+                        });
+                });
+                // 2) 无计划时间
+                $query->orWhere(function ($q1) use ($start_time, $end_time, $includeUpdatedForNoPlan) {
+                    $q1->whereNull('project_tasks.start_at')
+                        ->whereNull('project_tasks.end_at')
+                        ->where(function ($q2) use ($start_time, $end_time, $includeUpdatedForNoPlan) {
+                            $q2->whereBetween('project_tasks.created_at', [$start_time->toDateTimeString(), $end_time->toDateTimeString()]);
+                            if ($includeUpdatedForNoPlan) {
+                                $q2->orWhereBetween('project_tasks.updated_at', [$start_time->toDateTimeString(), $end_time->toDateTimeString()]);
+                            }
+                        });
+                });
+            })
+            ->select("project_tasks.*")
+            ->orderByDesc("project_tasks.id");
+    }
+
+    /**
+     * 判断工作流名称是否为取消态（多语言）
+     * @param string|null $flowItemName
+     * @return bool
+     */
+    public static function isCanceledFlowName(?string $flowItemName): bool
+    {
+        if (empty($flowItemName)) {
+            return false;
+        }
+        return preg_match('/已取消|Cancelled|취소됨|キャンセル済み|Abgebrochen|Annulé|Dibatalkan|Отменено/', $flowItemName) === 1;
+    }
 }

app/Models/ProjectTaskRelation.php

@@ -0,0 +1,154 @@
+<?php
+
+namespace App\Models;
+
+use App\Module\Base;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+/**
+ * App\Models\ProjectTaskRelation
+ *
+ * @property int $id
+ * @property int $task_id 任务ID
+ * @property int $related_task_id 关联任务ID
+ * @property string $direction 关系方向: mention/mentioned_by
+ * @property int|null $dialog_id 来源会话ID
+ * @property int|null $msg_id 来源消息ID
+ * @property int|null $userid 提及人
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\ProjectTask|null $relatedTask
+ * @property-read \App\Models\ProjectTask|null $task
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskRelation newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskRelation newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskRelation query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskRelation whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskRelation whereDialogId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskRelation whereDirection($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskRelation whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskRelation whereMsgId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskRelation whereRelatedTaskId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskRelation whereTaskId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskRelation whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskRelation whereUserid($value)
+ * @mixin \Eloquent
+ */
+class ProjectTaskRelation extends AbstractModel
+{
+    public const DIRECTION_MENTION = 'mention';
+    public const DIRECTION_MENTIONED_BY = 'mentioned_by';
+
+    protected $fillable = [
+        'task_id',
+        'related_task_id',
+        'direction',
+        'dialog_id',
+        'msg_id',
+        'userid',
+    ];
+
+    public function task(): BelongsTo
+    {
+        return $this->belongsTo(ProjectTask::class, 'task_id');
+    }
+
+    public function relatedTask(): BelongsTo
+    {
+        return $this->belongsTo(ProjectTask::class, 'related_task_id');
+    }
+
+    public static function recordMentionsFromMessage(WebSocketDialogMsg $msg): void
+    {
+        if ($msg->type !== 'text') {
+            return;
+        }
+
+        $payload = $msg->msg;
+        if (!is_array($payload)) {
+            $payload = Base::json2array($msg->getRawOriginal('msg'));
+        }
+
+        $text = $payload['text'] ?? '';
+        if (!$text || !preg_match_all('/<span class="mention task" data-id="(\d+)">#?(.*?)<\/span>/i', $text, $matches)) {
+            return;
+        }
+
+        $targetIds = array_values(array_unique(array_filter(array_map('intval', $matches[1] ?? []))));
+        if (empty($targetIds)) {
+            return;
+        }
+
+        $sourceTasks = ProjectTask::with('project')->whereDialogId($msg->dialog_id)->get();
+        if ($sourceTasks->isEmpty()) {
+            return;
+        }
+
+        $targetTasks = ProjectTask::with('project')->whereIn('id', $targetIds)->get()->keyBy('id');
+        if ($targetTasks->isEmpty()) {
+            return;
+        }
+
+        $pushTasks = [];
+        foreach ($sourceTasks as $sourceTask) {
+            foreach ($targetIds as $targetId) {
+                if ($targetId === $sourceTask->id) {
+                    continue;
+                }
+
+                $targetTask = $targetTasks->get($targetId);
+                if (!$targetTask) {
+                    continue;
+                }
+
+                $mentionRelation = static::updateOrCreate(
+                    [
+                        'task_id' => $sourceTask->id,
+                        'related_task_id' => $targetTask->id,
+                        'direction' => self::DIRECTION_MENTION,
+                    ],
+                    [
+                        'dialog_id' => $msg->dialog_id,
+                        'msg_id' => $msg->id,
+                        'userid' => $msg->userid,
+                    ]
+                );
+
+                if ($mentionRelation->wasRecentlyCreated || $mentionRelation->wasChanged()) {
+                    $pushTasks[$sourceTask->id] = $sourceTask;
+                }
+
+                $reverseRelation = static::updateOrCreate(
+                    [
+                        'task_id' => $targetTask->id,
+                        'related_task_id' => $sourceTask->id,
+                        'direction' => self::DIRECTION_MENTIONED_BY,
+                    ],
+                    [
+                        'dialog_id' => $msg->dialog_id,
+                        'msg_id' => $msg->id,
+                        'userid' => $msg->userid,
+                    ]
+                );
+
+                if ($reverseRelation->wasRecentlyCreated || $reverseRelation->wasChanged()) {
+                    $pushTasks[$targetTask->id] = $targetTask;
+                }
+            }
+        }
+
+        foreach ($pushTasks as $task) {
+            $task->loadMissing('project');
+            if (!$task->project) {
+                continue;
+            }
+
+            $task->pushMsg('relation', null, null, false);
+        }
+    }
+}

app/Models/ProjectTaskUser.php

@@ -68,7 +68,18 @@ class ProjectTaskUser extends AbstractModel
                     $item->save();
                 }
                 if ($item->projectTask) {
-                    $item->projectTask->addLog("移交{任务}身份", ['userid' => [$originalUserid, ' => ', $newUserid]], 0, 1);
+                    $item->projectTask->addLog("移交{任务}身份", [
+                        'change' => [
+                            [
+                                'type' => 'user',
+                                'data' => $originalUserid,
+                            ],
+                            [
+                                'type' => 'user',
+                                'data' => $newUserid,
+                            ]
+                        ],
+                    ], 0, 1);
                     if (!in_array($item->task_pid, $tastIds)) {
                         $tastIds[] = $item->task_pid;
                         $item->projectTask->syncDialogUser();

app/Models/ProjectUser.php

@@ -12,6 +12,7 @@ use App\Module\Base;
  * @property int|null $userid 成员ID
  * @property int|null $owner 是否负责人
  * @property \Illuminate\Support\Carbon|null $top_at 置顶时间
+ * @property int|null $sort 排序(ASC)
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\Project|null $project
@@ -28,6 +29,7 @@ use App\Module\Base;
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereOwner($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereProjectId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereSort($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereTopAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereUserid($value)
@@ -74,7 +76,18 @@ class ProjectUser extends AbstractModel
                         $item->project->name = "【{$name}】{$item->project->name}";
                         $item->project->save();
                     }
-                    $item->project->addLog("移交项目身份", ['userid' => [$originalUserid, ' => ', $newUserid]]);
+                    $item->project->addLog("移交项目身份", [
+                        'change' => [
+                            [
+                                'type' => 'user',
+                                'data' => $originalUserid
+                            ],
+                            [
+                                'type' => 'user',
+                                'data' => $newUserid
+                            ],
+                        ],
+                    ]);
                     $item->project->syncDialogUser();
                     $projectIds[] = $item->project_id;
                 }

app/Models/Report.php

@@ -11,6 +11,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 use JetBrains\PhpStorm\Pure;
 
 /**
@@ -78,6 +79,16 @@ class Report extends AbstractModel
             ->withPivot("receive_at", "read");
     }
 
+    public function aiAnalyses(): HasMany
+    {
+        return $this->hasMany(ReportAnalysis::class, 'rid');
+    }
+
+    public function aiAnalysis(): HasOne
+    {
+        return $this->hasOne(ReportAnalysis::class, 'rid');
+    }
+
     public function sendUser()
     {
         return $this->hasOne(User::class, "userid", "userid");

app/Models/ReportAnalysis.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class ReportAnalysis extends AbstractModel
+{
+    protected $table = 'report_ai_analyses';
+
+    protected $fillable = [
+        'rid',
+        'userid',
+        'model',
+        'analysis_text',
+        'meta',
+    ];
+
+    protected $casts = [
+        'meta' => 'array',
+    ];
+
+    public function report(): BelongsTo
+    {
+        return $this->belongsTo(Report::class, 'rid');
+    }
+}

app/Models/Setting.php

@@ -6,6 +6,7 @@ use App\Exceptions\ApiException;
 use App\Module\Base;
 use App\Module\Doo;
 use App\Module\Timer;
+use App\Module\AI;
 use Carbon\Carbon;
 
 /**
@@ -48,21 +49,25 @@ class Setting extends AbstractModel
         }
         $value = Base::json2array($value);
         switch ($this->name) {
+            // 系统设置
             case 'system':
                 $value['system_alias'] = $value['system_alias'] ?: env('APP_NAME');
                 $value['image_compress'] = $value['image_compress'] ?: 'open';
                 $value['image_quality'] = min(100, max(0, intval($value['image_quality']) ?: 90));
                 $value['image_save_local'] = $value['image_save_local'] ?: 'open';
+                $value['task_user_limit'] = min(2000, max(1, intval($value['task_user_limit']) ?: 500));
                 if (!is_array($value['task_default_time']) || count($value['task_default_time']) != 2 || !Timer::isTime($value['task_default_time'][0]) || !Timer::isTime($value['task_default_time'][1])) {
                     $value['task_default_time'] = ['09:00', '18:00'];
                 }
                 break;
 
+            // 文件设置
             case 'fileSetting':
                 $value['permission_pack_type'] = $value['permission_pack_type'] ?: 'all';
                 $value['permission_pack_userids'] = is_array($value['permission_pack_userids']) ? $value['permission_pack_userids'] : [];
                 break;
 
+            // AI 机器人设置
             case 'aibotSetting':
                 if ($value['claude_token'] && empty($value['claude_key'])) {
                     $value['claude_key'] = $value['claude_token'];
@@ -80,13 +85,10 @@ class Setting extends AbstractModel
                                     $content = explode("\n", $content);
                                     $content = array_filter($content);
                                 }
-                                if (empty($content)) {
-                                    $content = self::AIDefaultModels($aiName);
-                                }
-                                $content = implode("\n", $content);
+                                $content = is_array($content) ? implode("\n", $content) : '';
                                 break;
                             case 'model':
-                                $models = Setting::AIModels2Array($array[$key . 's'], true);
+                                $models = Setting::AIBotModels2Array($array[$key . 's'], true);
                                 $content = in_array($content, $models) ? $content : ($models[0] ?? '');
                                 break;
                             case 'temperature':
@@ -105,112 +107,46 @@ class Setting extends AbstractModel
     }
 
     /**
-     * 是否开启AI
-     * @param $ai
+     * 是否开启 AI 助手
      * @return bool
      */
-    public static function AIOpen($ai = 'openai')
+    public static function AIOpen()
     {
-        $array = Base::setting('aibotSetting');
-        return !!$array[$ai . '_key'];
+        $setting = Base::setting('aibotSetting');
+        if (!is_array($setting) || empty($setting)) {
+            return false;
+        }
+        foreach (AI::TEXT_MODEL_PRIORITY as $vendor) {
+            if (self::isAIBotVendorEnabled($setting, $vendor)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**
-     * AI默认模型
-     * @param string $ai
-     * @return array
+     * 判断 AI 机器人厂商是否启用
+     * @param array $setting
+     * @param string $vendor
+     * @return bool
      */
-    public static function AIDefaultModels($ai = 'openai')
+    protected static function isAIBotVendorEnabled(array $setting, string $vendor): bool
     {
-        return match ($ai) {
-            'openai' => [
-                'gpt-4.1 | GPT-4.1',
-                'gpt-4o | GPT-4o',
-                'gpt-4 | GPT-4',
-                'gpt-4o-mini | GPT-4o Mini',
-                'gpt-4-turbo | GPT-4 Turbo',
-                'o3 (thinking) | GPT-o3',
-                'o1 | GPT-o1',
-                'o4-mini | GPT-o4 Mini',
-                'o3-mini | GPT-o3 Mini',
-                'o1-mini | GPT-o1 Mini',
-                'gpt-3.5-turbo | GPT-3.5 Turbo',
-                'gpt-3.5-turbo-16k | GPT-3.5 Turbo 16K',
-                'gpt-3.5-turbo-0125 | GPT-3.5 Turbo 0125',
-                'gpt-3.5-turbo-1106 | GPT-3.5 Turbo 1106'
-            ],
-            'claude' => [
-                'claude-opus-4-0 (thinking) | Claude Opus 4',
-                'claude-sonnet-4-0 (thinking) | Claude Sonnet 4',
-                'claude-3-7-sonnet-latest (thinking) | Claude Sonnet 3.7',
-                'claude-3-5-sonnet-latest | Claude Sonnet 3.5',
-                'claude-3-5-haiku-latest | Claude Haiku 3.5',
-                'claude-3-opus-latest | Claude Opus 3'
-            ],
-            'deepseek' => [
-                'deepseek-chat | DeepSeek V3',
-                'deepseek-reasoner | DeepSeek R1'
-            ],
-            'gemini' => [
-                'gemini-2.5-pro-preview-05-06 (thinking) | Gemini 2.5 Pro Preview',
-                'gemini-2.0-flash | Gemini 2.0 Flash',
-                'gemini-2.0-flash-lite | Gemini 2.0 Flash-Lite',
-                'gemini-1.5-flash | Gemini 1.5 Flash',
-                'gemini-1.5-flash-8b | Gemini 1.5 Flash 8B',
-                'gemini-1.5-pro | Gemini 1.5 Pro',
-                'gemini-1.0-pro | Gemini 1.0 Pro'
-            ],
-            'grok' => [
-                'grok-3-latest | Grok 3',
-                'grok-3-fast-latest | Grok 3 Fast',
-                'grok-3-mini-latest | Grok 3 Mini',
-                'grok-3-mini-fast-latest | Grok 3 Mini Fast',
-                'grok-2-vision-latest | Grok 2 Vision',
-                'grok-2-latest | Grok 2',
-            ],
-            'zhipu' => [
-                'glm-4 | GLM-4',
-                'glm-4-plus | GLM-4 Plus',
-                'glm-4-air | GLM-4 Air',
-                'glm-4-airx | GLM-4 AirX',
-                'glm-4-long | GLM-4 Long',
-                'glm-4-flash | GLM-4 Flash',
-                'glm-4v | GLM-4V',
-                'glm-4v-plus | GLM-4V Plus',
-                'glm-3-turbo | GLM-3 Turbo'
-            ],
-            'qianwen' => [
-                'qwen-max | QWEN Max',
-                'qwen-max-latest | QWEN Max Latest',
-                'qwen-turbo | QWEN Turbo',
-                'qwen-turbo-latest | QWEN Turbo Latest',
-                'qwen-plus | QWEN Plus',
-                'qwen-plus-latest | QWEN Plus Latest',
-                'qwen-long | QWEN Long'
-            ],
-            'wenxin' => [
-                'ernie-4.0-8k | Ernie 4.0 8K',
-                'ernie-4.0-8k-latest | Ernie 4.0 8K Latest',
-                'ernie-4.0-turbo-128k | Ernie 4.0 Turbo 128K',
-                'ernie-4.0-turbo-8k | Ernie 4.0 Turbo 8K',
-                'ernie-3.5-128k | Ernie 3.5 128K',
-                'ernie-3.5-8k | Ernie 3.5 8K',
-                'ernie-speed-128k | Ernie Speed 128K',
-                'ernie-speed-8k | Ernie Speed 8K',
-                'ernie-lite-8k | Ernie Lite 8K',
-                'ernie-tiny-8k | Ernie Tiny 8K'
-            ],
-            default => [],
+        $key = trim((string)($setting[$vendor . '_key'] ?? ''));
+        return match ($vendor) {
+            'ollama' => $key !== '' || !empty($setting['ollama_base_url']),
+            'wenxin' => $key !== '' && !empty($setting['wenxin_secret']),
+            default => $key !== '',
         };
     }
 
     /**
-     * AI模型转数组
+     * AI 机器人模型转数组
      * @param $models
      * @param bool $retValue
      * @return array
      */
-    public static function AIModels2Array($models, $retValue = false)
+    public static function AIBotModels2Array($models, $retValue = false)
     {
         $list = is_array($models) ? $models : explode("\n", $models);
         $array = [];
@@ -229,6 +165,213 @@ class Setting extends AbstractModel
         return $array;
     }
 
+    /**
+     * 规范自定义微应用配置
+     * @param array $list
+     * @return array
+     */
+    public static function normalizeCustomMicroApps($list)
+    {
+        if (!is_array($list)) {
+            return [];
+        }
+        $apps = [];
+        foreach ($list as $item) {
+            $app = self::normalizeCustomMicroAppItem($item);
+            if ($app) {
+                $apps[] = $app;
+            }
+        }
+        return $apps;
+    }
+
+    /**
+     * 根据用户身份过滤可见的自定义微应用
+     * @param array $apps
+     * @param \App\Models\User|null $user
+     * @return array
+     */
+    public static function filterCustomMicroAppsForUser(array $apps, $user)
+    {
+        if (empty($apps)) {
+            return [];
+        }
+        $isAdmin = $user ? $user->isAdmin() : false;
+        $userId = $user ? intval($user->userid) : 0;
+        $filtered = [];
+        foreach ($apps as $app) {
+            $visible = self::normalizeCustomMicroVisible($app['visible_to'] ?? ['admin']);
+            if (!self::isCustomMicroVisibleTo($visible, $isAdmin, $userId)) {
+                continue;
+            }
+            if (empty($app['menu_items']) || !is_array($app['menu_items'])) {
+                continue;
+            }
+            $menus = array_values(array_filter($app['menu_items'], function ($menu) use ($isAdmin, $userId) {
+                if (!isset($menu['visible_to'])) {
+                    return true;
+                }
+                $visible = self::normalizeCustomMicroVisible($menu['visible_to']);
+                return self::isCustomMicroVisibleTo($visible, $isAdmin, $userId);
+            }));
+            if (empty($menus)) {
+                continue;
+            }
+            $app['menu_items'] = $menus;
+            $filtered[] = $app;
+        }
+        return $filtered;
+    }
+
+    /**
+     * 将存储结构转换成 appstore 接口同款格式
+     * @param array $apps
+     * @return array
+     */
+    public static function formatCustomMicroAppsForResponse(array $apps)
+    {
+        return array_values(array_map(function ($app) {
+            unset($app['visible_to']);
+            if (!empty($app['menu_items']) && is_array($app['menu_items'])) {
+                $app['menu_items'] = array_values(array_map(function ($menu) {
+                    $menu['keep_alive'] = isset($menu['keep_alive']) ? (bool)$menu['keep_alive'] : true;
+                    $menu['disable_scope_css'] = (bool)($menu['disable_scope_css'] ?? false);
+                    $menu['auto_dark_theme'] = isset($menu['auto_dark_theme']) ? (bool)$menu['auto_dark_theme'] : true;
+                    $menu['transparent'] = (bool)($menu['transparent'] ?? false);
+                    if (isset($menu['visible_to'])) {
+                        unset($menu['visible_to']);
+                    }
+                    return $menu;
+                }, $app['menu_items']));
+            }
+            return $app;
+        }, $apps));
+    }
+
+    /**
+     * 规范自定义微应用
+     * @param array $item
+     * @return array|null
+     */
+    protected static function normalizeCustomMicroAppItem($item)
+    {
+        if (!is_array($item)) {
+            return null;
+        }
+        $id = trim($item['id'] ?? '');
+        if ($id === '') {
+            return null;
+        }
+        $name = Base::newTrim($item['name'] ?? '');
+        $version = Base::newTrim($item['version'] ?? '') ?: 'custom';
+        $menuItems = [];
+        if (isset($item['menu_items']) && is_array($item['menu_items'])) {
+            $menuItems = $item['menu_items'];
+        } elseif (isset($item['menu']) && is_array($item['menu'])) {
+            $menuItems = [$item['menu']];
+        }
+        if (empty($menuItems)) {
+            return null;
+        }
+        $normalizedMenus = [];
+        foreach ($menuItems as $menu) {
+            $formattedMenu = self::normalizeCustomMicroMenuItem($menu, $name ?: $id);
+            if ($formattedMenu) {
+                $normalizedMenus[] = $formattedMenu;
+            }
+        }
+        if (empty($normalizedMenus)) {
+            return null;
+        }
+        return Base::newTrim([
+            'id' => $id,
+            'name' => $name,
+            'version' => $version,
+            'menu_items' => $normalizedMenus,
+            'visible_to' => self::normalizeCustomMicroVisible($item['visible_to'] ?? 'admin'),
+        ]);
+    }
+
+    /**
+     * 规范自定义微应用菜单项
+     * @param array $menu
+     * @param string $fallbackLabel
+     * @return array|null
+     */
+    protected static function normalizeCustomMicroMenuItem($menu, $fallbackLabel = '')
+    {
+        if (!is_array($menu)) {
+            return null;
+        }
+        $url = trim($menu['url'] ?? '');
+        if ($url === '') {
+            return null;
+        }
+        $location = trim($menu['location'] ?? 'application');
+        $label = trim($menu['label'] ?? $fallbackLabel);
+        $type = strtolower(trim($menu['type'] ?? 'iframe'));
+        $payload = [
+            'location' => $location,
+            'label' => $label,
+            'icon' => Base::newTrim($menu['icon'] ?? ''),
+            'url' => $url,
+            'type' => $type,
+            'keep_alive' => isset($menu['keep_alive']) ? (bool)$menu['keep_alive'] : true,
+            'disable_scope_css' => (bool)($menu['disable_scope_css'] ?? false),
+            'auto_dark_theme' => isset($menu['auto_dark_theme']) ? (bool)$menu['auto_dark_theme'] : true,
+            'transparent' => (bool)($menu['transparent'] ?? false),
+        ];
+        if (!empty($menu['background'])) {
+            $payload['background'] = Base::newTrim($menu['background']);
+        }
+        if (!empty($menu['capsule']) && is_array($menu['capsule'])) {
+            $payload['capsule'] = Base::newTrim($menu['capsule']);
+        }
+        return $payload;
+    }
+
+    /**
+     * 规范自定义微应用可见范围
+     * @param mixed $value
+     * @return array
+     */
+    protected static function normalizeCustomMicroVisible($value)
+    {
+        if (is_array($value)) {
+            $list = array_filter(array_map('trim', $value));
+        } else {
+            $list = array_filter(array_map('trim', explode(',', (string)$value)));
+        }
+        if (empty($list)) {
+            return ['admin'];
+        }
+        if (in_array('all', $list)) {
+            return ['all'];
+        }
+        return array_values($list);
+    }
+
+    /**
+     * 判断自定义微应用是否可见
+     * @param array $visible
+     * @param bool $isAdmin
+     * @param int $userId
+     * @return bool
+     */
+    protected static function isCustomMicroVisibleTo(array $visible, bool $isAdmin, int $userId)
+    {
+        if (in_array('all', $visible)) {
+            return true;
+        }
+        if ($isAdmin && in_array('admin', $visible)) {
+            return true;
+        }
+        if ($userId > 0 && in_array((string)$userId, $visible, true)) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * 验证邮箱地址（过滤忽略地址）
      * @param $array

app/Models/UmengAlias.php

@@ -70,6 +70,9 @@ class UmengAlias extends AbstractModel
             return;
         }
 
+        $instance = null;
+        $responsePayload = null;
+
         try {
             switch ($first['platform']) {
                 case 'ios':
@@ -81,8 +84,11 @@ class UmengAlias extends AbstractModel
                 default:
                     return;
             }
-            $instance->send($first['data']);
+            $responsePayload = $instance->send($first['data']);
         } catch (\Exception $e) {
+            $responsePayload = [
+                'error' => $e->getMessage(),
+            ];
             $first['retry'] = intval($first['retry'] ?? 0) + 1;
             if ($first['retry'] > 3) {
                 info("[PushMsg] fail: " . $e->getMessage());
@@ -91,6 +97,12 @@ class UmengAlias extends AbstractModel
                 self::$waitSend[] = $first;
             }
         } finally {
+            if ($instance !== null) {
+                UmengLog::create([
+                    'request' => Base::array2json($first['data']),
+                    'response' => Base::array2json($responsePayload),
+                ]);
+            }
             self::sendTask();
         }
     }
@@ -153,7 +165,7 @@ class UmengAlias extends AbstractModel
         $description = $array['description'] ?: 'no description';               // 描述
         $extra = is_array($array['extra']) ? $array['extra'] : [];              // 额外参数
         $seconds = intval($array['seconds']) ?: 86400;                          // 有效时间（单位：秒）
-        $badge = intval($array['badge']) ?: 0;                                  // 角标数（iOS）
+        $badge = intval($array['badge']) ?: 0;                                  // 角标数
         //
         switch ($platform) {
             case 'ios':
@@ -203,6 +215,7 @@ class UmengAlias extends AbstractModel
                                 'title' => $title,
                                 'after_open' => 'go_app',
                                 'play_sound' => true,
+                                'set_badge' => min(99, $badge),
                             ],
                         ], $extra),
                         'type' => 'customizedcast',
@@ -213,13 +226,19 @@ class UmengAlias extends AbstractModel
                         'policy' => [
                             'expire_time' => Carbon::now()->addSeconds($seconds)->toDateTimeString(),
                         ],
+                        'category' => 1,
                         'channel_properties' => [
+                            'main_activity' => 'com.dootask.task.WelcomeActivity',
                             'oppo_channel_id' => 'dootask',
                             'vivo_category' => 'IM',
                             'huawei_channel_importance' => 'NORMAL',
                             'huawei_channel_category' => 'IM',
                             'channel_fcm' => 0,
                         ],
+                        'local_properties' => [
+                            'importance' => 'IMPORTANCE_DEFAULT',
+                            'category' => 'CATEGORY_MESSAGE',
+                        ]
                     ]
                 ]);
                 break;

app/Models/UmengLog.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\UmengLog
+ *
+ * @property int $id
+ * @property string|null $request 请求参数
+ * @property string|null $response 推送返回
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengLog newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengLog newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengLog query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengLog whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengLog whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengLog whereRequest($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengLog whereResponse($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengLog whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
+class UmengLog extends AbstractModel
+{
+    protected $guarded = [];
+}

app/Models/User.php

@@ -2,10 +2,10 @@
 
 namespace App\Models;
 
-
 use App\Exceptions\ApiException;
 use App\Module\Base;
 use App\Module\Doo;
+use App\Module\Apps;
 use App\Module\Table\OnlineData;
 use App\Services\RequestContext;
 use Cache;
@@ -15,15 +15,18 @@ use Carbon\Carbon;
  * App\Models\User
  *
  * @property int $userid
- * @property array $identity
- * @property array $department
+ * @property array $identity 身份
+ * @property array $department 所属部门
  * @property string|null $az A-Z
  * @property string|null $pinyin 拼音（主要用于搜索）
- * @property string|null $email
+ * @property string|null $email 邮箱
  * @property string|null $tel 联系电话
- * @property string $nickname
- * @property string|null $profession
- * @property string $userimg
+ * @property string $nickname 昵称
+ * @property string|null $profession 职位/职称
+ * @property \Illuminate\Support\Carbon|null $birthday 生日
+ * @property string|null $address 地址
+ * @property string|null $introduction 个人简介
+ * @property string $userimg 头像
  * @property string|null $encrypt
  * @property string|null $password 登录密码
  * @property int|null $changepass 登录需要修改密码
@@ -34,7 +37,7 @@ use Carbon\Carbon;
  * @property \Illuminate\Support\Carbon|null $line_at 最后在线时间（接口）
  * @property int|null $task_dialog_id 最后打开的任务会话ID
  * @property string|null $created_ip 注册IP
- * @property \Illuminate\Support\Carbon|null $disable_at
+ * @property \Illuminate\Support\Carbon|null $disable_at 禁用时间（离职时间）
  * @property int|null $email_verity 邮箱是否已验证
  * @property int|null $bot 是否机器人
  * @property string|null $lang 语言首选项
@@ -173,10 +176,9 @@ class User extends AbstractModel
         return UserDepartment::where('owner_userid', $this->userid)->exists();
     }
 
-
     /**
      * 获取机器人所有者
-     * @return int|mixed
+     * @return int
      */
     public function getBotOwner()
     {
@@ -184,9 +186,9 @@ class User extends AbstractModel
             return 0;
         }
         $key = "userBotOwner::" . $this->userid;
-        return Cache::remember($key, now()->addMonth(), function() {
+        return intval(Cache::remember($key, now()->addMonth(), function() {
             return intval(UserBot::whereBotId($this->userid)->value('userid')) ?: $this->userid;
-        });
+        }));
     }
 
     /**
@@ -312,7 +314,7 @@ class User extends AbstractModel
      */
     public function deleteUser($reason)
     {
-        return AbstractModel::transaction(function () use ($reason) {
+        $ret = AbstractModel::transaction(function () use ($reason) {
             // 删除原因
             $userDelete = UserDelete::createInstance([
                 'operator' => User::userid(),
@@ -333,6 +335,10 @@ class User extends AbstractModel
             //
             return $this->delete();
         });
+        if ($ret) {
+            Apps::dispatchUserHook($this, 'user_offboard', 'delete');
+        }
+        return $ret;
     }
 
     /**
@@ -406,7 +412,9 @@ class User extends AbstractModel
                 $dialog?->joinGroup($user->userid, 0);
             }
         }
-        return $user->find($user->userid);
+        $createdUser = $user->find($user->userid);
+        Apps::dispatchUserHook($createdUser, 'user_onboard', 'onboard');
+        return $createdUser;
     }
 
     /**
@@ -537,6 +545,22 @@ class User extends AbstractModel
         return $userinfo->token = $token;
     }
 
+    /**
+     * 生成无设备的 token（主要用于接口调用，此 token 不检查设备是否存在）
+     * @param self $userinfo
+     * @param $ttl
+     * @return mixed
+     */
+    public static function generateTokenNoDevice($userinfo, $ttl)
+    {
+        $key = 'user_token_no_device_' . $userinfo->userid;
+        return Cache::remember($key, $ttl, function () use ($userinfo, $ttl) {
+            $token = Doo::tokenEncode($userinfo->userid, $userinfo->email, $userinfo->encrypt);
+            Cache::put(UserDevice::ck(md5($token)), $userinfo->userid, $ttl);
+            return $token;
+        });
+    }
+
     /**
      * userid 获取 基础信息
      * @param int $userid 会员ID
@@ -723,11 +747,11 @@ class User extends AbstractModel
             }
         }
         if ($update) {
-            $botUser->updateInstance($update);
-            if (isset($update['nickname'])) {
+            if (isset($update['nickname']) && $botUser->nickname != $update['nickname']) {
                 $botUser->az = Base::getFirstCharter($botUser->nickname);
                 $botUser->pinyin = Base::cn2pinyin($botUser->nickname);
             }
+            $botUser->updateInstance($update);
             $botUser->save();
         }
         return $botUser;
@@ -736,18 +760,17 @@ class User extends AbstractModel
     /**
      * 是否机器人
      * @param $userid
-     * @return bool|mixed
+     * @return bool
      */
     public static function isBot($userid)
     {
         if (empty($userid)) {
             return false;
         }
-        $userid = intval($userid);
-        if (RequestContext::has("isBot_" . $userid)) {
-            return RequestContext::get("isBot_" . $userid);
-        }
-        return (bool)User::find($userid)?->bot;
+        // 这个不会有变化，所以可以使用永久缓存
+        return (bool)Cache::rememberForever('is-bot-user-' . $userid, function () use ($userid) {
+            return (bool)User::find($userid)?->bot;
+        });
     }
 
     /**

app/Models/UserAppSort.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\UserAppSort
+ *
+ * @property int $id
+ * @property int $userid 用户ID
+ * @property array|null $sorts 排序配置
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|UserAppSort newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserAppSort newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserAppSort query()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserAppSort whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserAppSort whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserAppSort whereSorts($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserAppSort whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserAppSort whereUserid($value)
+ * @mixin \Eloquent
+ */
+class UserAppSort extends AbstractModel
+{
+    protected $fillable = [
+        'userid',
+        'sorts',
+    ];
+
+    protected $casts = [
+        'sorts' => 'array',
+    ];
+
+    /**
+     * 获取用户排序配置
+     * @param int $userid
+     * @return array
+     */
+    public static function getSorts(int $userid): array
+    {
+        $record = static::whereUserid($userid)->first();
+        if (!$record) {
+            return self::normalizeSorts([]);
+        }
+        return self::normalizeSorts($record->sorts);
+    }
+
+    /**
+     * 保存排序配置
+     * @param int $userid
+     * @param array $sorts
+     * @return static
+     */
+    public static function saveSorts(int $userid, array $sorts): self
+    {
+        return static::updateOrCreate(
+            ['userid' => $userid],
+            ['sorts' => self::normalizeSorts($sorts)]
+        );
+    }
+
+    /**
+     * 规范化排序数据
+     * @param mixed $sorts
+     * @return array
+     */
+    public static function normalizeSorts($sorts): array
+    {
+        $result = [
+            'base' => [],
+            'admin' => [],
+        ];
+        if (!is_array($sorts)) {
+            return $result;
+        }
+        foreach (['base', 'admin'] as $group) {
+            $list = $sorts[$group] ?? [];
+            if (!is_array($list)) {
+                $list = [];
+            }
+            $normalized = [];
+            foreach ($list as $value) {
+                if (!is_string($value)) {
+                    continue;
+                }
+                $value = trim($value);
+                if ($value === '') {
+                    continue;
+                }
+                $normalized[] = $value;
+            }
+            $result[$group] = array_values(array_unique($normalized));
+        }
+        return $result;
+    }
+}

app/Models/UserBot.php

@@ -4,11 +4,12 @@ namespace App\Models;
 
 use App\Module\Base;
 use App\Module\Doo;
-use App\Module\Extranet;
+use App\Module\Ihttp;
 use App\Module\Timer;
 use App\Tasks\JokeSoupTask;
 use Cache;
 use Carbon\Carbon;
+use Throwable;
 
 /**
  * App\Models\UserBot
@@ -20,6 +21,7 @@ use Carbon\Carbon;
  * @property \Illuminate\Support\Carbon|null $clear_at 下一次清理时间
  * @property string|null $webhook_url 消息webhook地址
  * @property int|null $webhook_num 消息webhook请求次数
+ * @property array|null $webhook_events Webhook事件配置
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
@@ -44,6 +46,86 @@ use Carbon\Carbon;
  */
 class UserBot extends AbstractModel
 {
+    public const WEBHOOK_EVENT_MESSAGE = 'message';
+    public const WEBHOOK_EVENT_DIALOG_OPEN = 'dialog_open';
+    public const WEBHOOK_EVENT_MEMBER_JOIN = 'member_join';
+    public const WEBHOOK_EVENT_MEMBER_LEAVE = 'member_leave';
+
+    protected $casts = [
+        'webhook_events' => 'array',
+    ];
+
+    /**
+     * 获取 webhook 事件配置
+     *
+     * @param mixed $value
+     * @return array
+     */
+    public function getWebhookEventsAttribute(mixed $value): array
+    {
+        if ($value === null || $value === '') {
+            return self::normalizeWebhookEvents(null, true);
+        }
+        return self::normalizeWebhookEvents($value, false);
+    }
+
+    /**
+     * 设置 webhook 事件配置
+     *
+     * @param mixed $value
+     * @return void
+     */
+    public function setWebhookEventsAttribute(mixed $value): void
+    {
+        $useFallback = $value === null;
+        $this->attributes['webhook_events'] = Base::array2json(self::normalizeWebhookEvents($value, $useFallback));
+    }
+
+    /**
+     * 判断是否需要触发指定 webhook 事件
+     *
+     * @param string $event
+     * @return bool
+     */
+    public function shouldDispatchWebhook(string $event): bool
+    {
+        if (!$this->webhook_url) {
+            return false;
+        }
+        if (!preg_match('/^https?:\/\//', $this->webhook_url)) {
+            return false;
+        }
+        return in_array($event, $this->webhook_events ?? [], true);
+    }
+
+    /**
+     * 发送 webhook
+     *
+     * @param string $event
+     * @param array $data
+     * @param int $timeout
+     * @return array|null
+     */
+    public function dispatchWebhook(string $event, array $data, int $timeout = 30): ?array
+    {
+        if (!$this->shouldDispatchWebhook($event)) {
+            return null;
+        }
+
+        try {
+            $data['event'] = $event;
+            $result = Ihttp::ihttp_post($this->webhook_url, $data, $timeout);
+            $this->increment('webhook_num');
+            return $result;
+        } catch (Throwable $th) {
+            info(Base::array2json([
+                'webhook_url' => $this->webhook_url,
+                'data' => $data,
+                'error' => $th->getMessage(),
+            ]));
+            return null;
+        }
+    }
 
     /**
      * 判断是否系统机器人
@@ -97,39 +179,33 @@ class UserBot extends AbstractModel
     {
         switch ($email) {
             case 'check-in@bot.system':
-                $menu = [
-                    /*[
-                        'key' => 'it',
-                        'label' => Doo::translate('IT资讯')
-                    ], [
-                        'key' => '36ke',
-                        'label' => Doo::translate('36氪')
-                    ], [
-                        'key' => '60s',
-                        'label' => Doo::translate('60s读世界')
-                    ], [
-                        'key' => 'joke',
-                        'label' => Doo::translate('开心笑话')
-                    ], [
-                        'key' => 'soup',
-                        'label' => Doo::translate('心灵鸡汤')
-                    ]*/
-                ];
+                $menu = [];
                 $setting = Base::setting('checkinSetting');
                 if ($setting['open'] !== 'open') {
                     return $menu;
                 }
                 if (in_array('locat', $setting['modes']) && Base::isEEUIApp()) {
-                    $menu[] = [
-                        'key' => 'locat-checkin',
-                        'label' => Doo::translate('定位签到'),
-                        'config' => [
-                            'key' => $setting['locat_bd_lbs_key'],
-                            'lng' => $setting['locat_bd_lbs_point']['lng'],
-                            'lat' => $setting['locat_bd_lbs_point']['lat'],
-                            'radius' => $setting['locat_bd_lbs_point']['radius'],
-                        ]
+                    $mapTypes = [
+                        'baidu' => ['key' => 'locat_bd_lbs_key', 'point' => 'locat_bd_lbs_point', 'msg' => '请填写百度地图AK'],
+                        'amap' => ['key' => 'locat_amap_key', 'point' => 'locat_amap_point', 'msg' => '请填写高德地图Key'],
+                        'tencent' => ['key' => 'locat_tencent_key', 'point' => 'locat_tencent_point', 'msg' => '请填写腾讯地图Key'],
                     ];
+                    $type = $setting['locat_map_type'];
+                    if (isset($mapTypes[$type])) {
+                        $conf = $mapTypes[$type];
+                        $point = $setting[$conf['point']];
+                        $menu[] = [
+                            'key' => 'locat-checkin',
+                            'label' => Doo::translate('定位签到'),
+                            'config' => [
+                                'type' => $type,
+                                'key' => $setting[$conf['key']],
+                                'lng' => $point['lng'],
+                                'lat' => $point['lat'],
+                                'radius' => intval($point['radius']),
+                            ]
+                        ];
+                    }
                 }
                 if (in_array('manual', $setting['modes'])) {
                     $menu[] = [
@@ -180,28 +256,8 @@ class UserBot extends AbstractModel
                 ];
 
             default:
-                if (preg_match('/^ai-(.*?)@bot\.system$/', $email, $match)) {
-                    if (!Base::judgeClientVersion('0.42.62')) {
-                        return [
-                            'key' => '%3A.clear',
-                            'label' => Doo::translate('清空上下文')
-                        ];
-                    }
-                    $aibotSetting = Base::setting('aibotSetting');
-                    $aibotModel = $aibotSetting[$match[1] . '_model'];
-                    $aibotModels = Setting::AIModels2Array($aibotSetting[$match[1] . '_models']);
-                    if (empty($aibotModels)) {
-                        return [];
-                    }
-                    return [
-                        [
-                            'key' => '~ai-model-select',
-                            'label' => Doo::translate('选择模型'),
-                            'config' => [
-                                'model' => $aibotModel,
-                                'models' => $aibotModels
-                            ]
-                        ],
+                if (preg_match('/^(ai-|user-session-)(.*?)@bot\.system$/', $email, $match)) {
+                    $menus = [
                         [
                             'key' => '~ai-session-create',
                             'label' => Doo::translate('开启新会话'),
@@ -211,6 +267,27 @@ class UserBot extends AbstractModel
                             'label' => Doo::translate('历史会话'),
                         ]
                     ];
+                    if ($match[1] === "ai-") {
+                        $aibotSetting = Base::setting('aibotSetting');
+                        $aibotModel = $aibotSetting[$match[2] . '_model'];
+                        $aibotModels = Setting::AIBotModels2Array($aibotSetting[$match[2] . '_models']);
+                        if ($aibotModels) {
+                            $menus = array_merge(
+                                [
+                                    [
+                                        'key' => '~ai-model-select',
+                                        'label' => Doo::translate('选择模型'),
+                                        'config' => [
+                                            'model' => $aibotModel,
+                                            'models' => $aibotModels
+                                        ]
+                                    ]
+                                ],
+                                $menus
+                            );
+                        }
+                    }
+                    return $menus;
                 }
                 return [];
         }
@@ -239,7 +316,6 @@ class UserBot extends AbstractModel
                 return '暂未开放手动签到。';
             }
             UserBot::checkinBotCheckin('manual-' . $userid, Timer::time(), true);
-            return null;
         } elseif ($command === 'locat-checkin') {
             $setting = Base::setting('checkinSetting');
             if ($setting['open'] !== 'open') {
@@ -251,16 +327,14 @@ class UserBot extends AbstractModel
             if (empty($extra)) {
                 return '当前客户端版本低（所需版本≥v0.39.75）。';
             }
-            if ($extra['type'] === 'bd') {
+            if (in_array($extra['type'], ['baidu', 'amap', 'tencent'])) {
                 // todo 判断距离
             } else {
                 return '错误的定位签到。';
             }
             UserBot::checkinBotCheckin('locat-' . $userid, Timer::time(), true);
-            return null;
-        } else {
-            return Extranet::checkinBotQuickMsg($command);
         }
+        return null;
     }
 
     /**
@@ -445,11 +519,12 @@ class UserBot extends AbstractModel
 
     /**
      * 创建我的机器人
-     * @param $userid
-     * @param $botName
+     * @param int $userid               创建人userid
+     * @param string $botName           机器人名称
+     * @param bool $sessionSupported    是否支持会话
      * @return array
      */
-    public static function newbot($userid, $botName)
+    public static function newBot($userid, $botName, $sessionSupported = false)
     {
         if (User::select(['users.*'])
                 ->join('user_bots', 'users.userid', '=', 'user_bots.bot_id')
@@ -461,7 +536,8 @@ class UserBot extends AbstractModel
         if (strlen($botName) < 2 || strlen($botName) > 20) {
             return Base::retError("机器人名称由2-20个字符组成。");
         }
-        $data = User::botGetOrCreate("user-" . Base::generatePassword(), [
+        $botType = ($sessionSupported ? "user-session-" : "user-normal-") . Base::generatePassword();
+        $data = User::botGetOrCreate($botType, [
             'nickname' => $botName
         ], $userid);
         if (empty($data)) {
@@ -469,6 +545,14 @@ class UserBot extends AbstractModel
         }
         $dialog = WebSocketDialog::checkUserDialog($data, $userid);
         if ($dialog) {
+            if ($sessionSupported) {
+                $dialogSession = WebSocketDialogSession::create([
+                    'dialog_id' => $dialog->id,
+                ]);
+                $dialogSession->save();
+                $dialog->session_id = $dialogSession->id;
+                $dialog->save();
+            }
             WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
                 'type' => '/hello',
                 'title' => '创建成功。',
@@ -477,4 +561,42 @@ class UserBot extends AbstractModel
         }
         return Base::retSuccess("创建成功。", $data);
     }
+
+    /**
+     * 获取可选的 webhook 事件
+     *
+     * @return string[]
+     */
+    public static function webhookEventOptions(): array
+    {
+        return [
+            self::WEBHOOK_EVENT_MESSAGE,
+            self::WEBHOOK_EVENT_DIALOG_OPEN,
+            self::WEBHOOK_EVENT_MEMBER_JOIN,
+            self::WEBHOOK_EVENT_MEMBER_LEAVE,
+        ];
+    }
+
+    /**
+     * 标准化 webhook 事件配置
+     *
+     * @param mixed $events
+     * @param bool $useFallback
+     * @return array
+     */
+    public static function normalizeWebhookEvents(mixed $events, bool $useFallback = true): array
+    {
+        if (is_string($events)) {
+            $events = Base::json2array($events);
+        }
+        if ($events === null) {
+            $events = [];
+        }
+        if (!is_array($events)) {
+            $events = [$events];
+        }
+        $events = array_filter(array_map('strval', $events));
+        $events = array_values(array_intersect($events, self::webhookEventOptions()));
+        return $events ?: ($useFallback ? [self::WEBHOOK_EVENT_MESSAGE] : []);
+    }
 }

app/Models/UserDelete.php

@@ -13,7 +13,7 @@ use App\Module\Base;
  * @property int|null $userid 用户id
  * @property string|null $email 邮箱帐号
  * @property string|null $reason 注销原因
- * @property string $cache 会员资料缓存
+ * @property string|null $cache 会员资料缓存
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()

app/Models/UserDepartment.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Exceptions\ApiException;
+use Cache;
 
 /**
  * App\Models\UserDepartment
@@ -168,4 +169,67 @@ class UserDepartment extends AbstractModel
             }
         });
     }
+
+    /**
+     * 递归获取所有子部门ID
+     * @param int $departmentId
+     * @return array
+     */
+    public static function getAllSubDepartmentIds($departmentId)
+    {
+        $subIds = [];
+        $directSubs = self::whereParentId($departmentId)->pluck('id')->toArray();
+        
+        foreach ($directSubs as $subId) {
+            $subIds[] = $subId;
+            // 递归获取子部门的子部门
+            $subSubIds = self::getAllSubDepartmentIds($subId);
+            $subIds = array_merge($subIds, $subSubIds);
+        }
+        
+        return array_unique($subIds);
+    }
+
+    /**
+     * 获取部门基本信息（缓存时间1小时）
+     * @param int|array $ids
+     * @return \Illuminate\Support\Collection|static|null
+     */
+    public static function getDepartmentsByIds($ids)
+    {
+        $ids = is_array($ids) ? $ids : [$ids];
+        $departments = collect();
+        $uncachedIds = [];
+
+        foreach ($ids as $id) {
+            $cacheKey = "department_info_{$id}";
+            $department = Cache::get($cacheKey);
+            if ($department) {
+                $departments->push($department);
+            } else {
+                $uncachedIds[] = $id;
+            }
+        }
+
+        if (!empty($uncachedIds)) {
+            $dbDepartments = self::select(['id', 'name', 'parent_id', 'owner_userid'])->whereIn('id', $uncachedIds)->get();
+            foreach ($dbDepartments as $department) {
+                $cacheKey = "department_info_{$department->id}";
+                Cache::put($cacheKey, $department, 60 * 60); // 1小时
+                $departments->push($department);
+            }
+        }
+
+        // 保持返回顺序与传入ids一致
+        $departments = $departments->keyBy('id');
+        $result = collect();
+        foreach ($ids as $id) {
+            if ($departments->has($id)) {
+                $result->push($departments->get($id));
+            }
+        }
+
+        return is_array($ids) ? $result : $result->first();
+    }
+
 }

app/Models/UserDevice.php

@@ -4,6 +4,7 @@ namespace App\Models;
 
 use App\Module\Base;
 use App\Module\Doo;
+use App\Module\Lock;
 use Cache;
 use Carbon\Carbon;
 use DeviceDetector\DeviceDetector;
@@ -78,7 +79,7 @@ class UserDevice extends AbstractModel
      * @param string $hash
      * @return string
      */
-    private static function ck(string $hash): string
+    public static function ck(string $hash): string
     {
         return "user_devices:{$hash}";
     }
@@ -218,13 +219,8 @@ class UserDevice extends AbstractModel
             self::record();
             return $hash;
         }
-        // 没有记录，尝试创建一个（防止升级后所有登录都失效，保证留一个可以保持登录） // todo 后期删除
-        return AbstractModel::transaction(function () use ($hash, $userid) {
-            if (self::whereUserid($userid)->withoutTrashed()->lockForUpdate()->exists()) {
-                return null;
-            }
-            return self::record() ? $hash : null;
-        });
+        // 没有记录
+        return null;
     }
 
     /**
@@ -234,46 +230,48 @@ class UserDevice extends AbstractModel
      */
     public static function record(string $token = null): ?self
     {
-        return AbstractModel::transaction(function () use ($token) {
-            if (empty($token)) {
-                $token = Doo::userToken();
-                $userid = Doo::userId();
-                $expiredAt = Doo::userExpiredAt();
-            } else {
-                $info = Doo::tokenDecode($token);
-                $userid = $info['userid'] ?? 0;
-                $expiredAt = $info['expired_at'];
-            }
-
-            $hash = md5($token);
-            $row = self::whereHash($hash)->lockForUpdate()->first();
-            if (empty($row)) {
-                // 生成一个新的设备记录
-                $row = self::createInstance([
-                    'userid' => $userid,
-                    'hash' => $hash,
-                ]);
-                if (!$row->save()) {
-                    return null;
-                }
-                // 删除多余的设备记录
-                $currentDeviceCount = self::whereUserid($userid)->count();
-                if ($currentDeviceCount > self::$deviceLimit) {
-                    $rows = self::whereUserid($userid)->orderBy('id')->take($currentDeviceCount - self::$deviceLimit)->get();
-                    foreach ($rows as $row) {
-                        UserDevice::forget($row);
+        if (empty($token)) {
+            $token = Doo::userToken();
+            $userid = Doo::userId();
+            $expiredAt = Doo::userExpiredAt();
+        } else {
+            $info = Doo::tokenDecode($token);
+            $userid = $info['userid'] ?? 0;
+            $expiredAt = $info['expired_at'];
+        }
+        $hash = md5($token);
+        //
+        return Lock::withLock("userDeviceRecord:{$hash}", function () use ($expiredAt, $userid, $hash, $token) {
+            return AbstractModel::transaction(function () use ($expiredAt, $userid, $hash, $token) {
+                $row = self::whereHash($hash)->first();
+                if (empty($row)) {
+                    // 生成一个新的设备记录
+                    $row = self::createInstance([
+                        'userid' => $userid,
+                        'hash' => $hash,
+                    ]);
+                    if (!$row->save()) {
+                        return null;
+                    }
+                    // 删除多余的设备记录
+                    $currentDeviceCount = self::whereUserid($userid)->count();
+                    if ($currentDeviceCount > self::$deviceLimit) {
+                        $rows = self::whereUserid($userid)->orderBy('id')->take($currentDeviceCount - self::$deviceLimit)->get();
+                        foreach ($rows as $row) {
+                            UserDevice::forget($row);
+                        }
                     }
                 }
-            }
-            $row->expired_at = $expiredAt;
-            if (Request::hasHeader('version')) {
-                $deviceInfo = array_merge(Base::json2array($row->detail), self::getDeviceInfo($_SERVER['HTTP_USER_AGENT'] ?? ''));
-                $row->detail = Base::array2json($deviceInfo);
-            }
-            $row->save();
+                $row->expired_at = $expiredAt;
+                if (Request::hasHeader('version')) {
+                    $deviceInfo = array_merge(Base::json2array($row->detail), self::getDeviceInfo($_SERVER['HTTP_USER_AGENT'] ?? ''));
+                    $row->detail = Base::array2json($deviceInfo);
+                }
+                $row->save();
 
-            Cache::put(self::ck($hash), $row->userid, now()->addHour());
-            return $row;
+                Cache::put(self::ck($hash), $row->userid, now()->addHour());
+                return $row;
+            });
         });
     }
 

app/Models/UserFavorite.php

@@ -0,0 +1,340 @@
+<?php
+
+namespace App\Models;
+
+use Carbon\Carbon;
+use App\Models\File;
+
+/**
+ * App\Models\UserFavorite
+ *
+ * @property int $id
+ * @property int|null $userid 用户ID
+ * @property string|null $favoritable_type 收藏类型(比如：task/project/file/message)
+ * @property int|null $favoritable_id 收藏对象ID
+ * @property string $remark 收藏备注
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $favoritable
+ * @property-read \App\Models\User|null $user
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserFavorite newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserFavorite newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserFavorite query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserFavorite whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserFavorite whereFavoritableId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserFavorite whereFavoritableType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserFavorite whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserFavorite whereRemark($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserFavorite whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserFavorite whereUserid($value)
+ * @mixin \Eloquent
+ */
+class UserFavorite extends AbstractModel
+{
+    const TYPE_TASK = 'task';
+    const TYPE_PROJECT = 'project';
+    const TYPE_FILE = 'file';
+    const TYPE_MESSAGE = 'message';
+
+    protected $fillable = [
+        'userid',
+        'favoritable_type',
+        'favoritable_id',
+        'remark',
+    ];
+
+    /**
+     * 关联用户
+     */
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'userid', 'userid');
+    }
+
+    /**
+     * 多态关联
+     */
+    public function favoritable()
+    {
+        return $this->morphTo();
+    }
+
+    /**
+     * 切换收藏状态
+     * @param int $userid 用户ID
+     * @param string $type 收藏类型
+     * @param int $id 收藏对象ID
+     * @return array ['favorited' => bool, 'action' => 'added'|'removed']
+     */
+    public static function toggleFavorite($userid, $type, $id)
+    {
+        $favorite = self::whereUserid($userid)
+            ->whereFavoritableType($type)
+            ->whereFavoritableId($id)
+            ->first();
+
+        if ($favorite) {
+            // 取消收藏
+            $favorite->delete();
+            return ['favorited' => false, 'action' => 'removed', 'remark' => ''];
+        }
+
+        // 添加收藏
+        $favorite = self::create([
+            'userid' => $userid,
+            'favoritable_type' => $type,
+            'favoritable_id' => $id,
+        ]);
+
+        return ['favorited' => true, 'action' => 'added', 'remark' => $favorite->remark ?? ''];
+    }
+
+    /**
+     * 更新收藏备注
+     * @param int $userid
+     * @param string $type
+     * @param int $id
+     * @param string $remark
+     * @return static|null
+     */
+    public static function updateRemark($userid, $type, $id, $remark)
+    {
+        $favorite = self::whereUserid($userid)
+            ->whereFavoritableType($type)
+            ->whereFavoritableId($id)
+            ->first();
+
+        if (!$favorite) {
+            return null;
+        }
+
+        $favorite->remark = $remark;
+        $favorite->save();
+
+        return $favorite;
+    }
+
+    /**
+     * 检查是否已收藏
+     * @param int $userid 用户ID
+     * @param string $type 收藏类型
+     * @param int $id 收藏对象ID
+     * @return bool
+     */
+    public static function isFavorited($userid, $type, $id)
+    {
+        return self::whereUserid($userid)
+            ->whereFavoritableType($type)
+            ->whereFavoritableId($id)
+            ->exists();
+    }
+
+    /**
+     * 获取用户收藏列表
+     * @param int $userid 用户ID
+     * @param string|null $type 收藏类型过滤
+     * @param int $page 页码
+     * @param int $pageSize 每页数量
+     * @return array
+     */
+    public static function getUserFavorites($userid, $type = null, $page = 1, $pageSize = 20)
+    {
+        $query = self::whereUserid($userid)->orderByDesc('created_at');
+
+        if ($type) {
+            $query->whereFavoritableType($type);
+        }
+
+        $favorites = $query->paginate($pageSize, ['*'], 'page', $page);
+
+        $data = [
+            'tasks' => [],
+            'projects' => [],
+            'files' => [],
+            'messages' => []
+        ];
+
+        // 分组收集ID
+        $taskIds = [];
+        $projectIds = [];
+        $fileIds = [];
+        $messageIds = [];
+
+        foreach ($favorites->items() as $favorite) {
+            switch ($favorite->favoritable_type) {
+                case self::TYPE_TASK:
+                    $taskIds[] = $favorite->favoritable_id;
+                    break;
+                case self::TYPE_PROJECT:
+                    $projectIds[] = $favorite->favoritable_id;
+                    break;
+                case self::TYPE_FILE:
+                    $fileIds[] = $favorite->favoritable_id;
+                    break;
+                case self::TYPE_MESSAGE:
+                    $messageIds[] = $favorite->favoritable_id;
+                    break;
+            }
+        }
+
+        // 批量查询具体数据
+        if (!empty($taskIds)) {
+            $tasks = ProjectTask::select([
+                'project_tasks.id', 
+                'project_tasks.name', 
+                'project_tasks.project_id', 
+                'project_tasks.complete_at', 
+                'project_tasks.created_at',
+                'project_tasks.flow_item_id',
+                'project_tasks.flow_item_name',
+                'projects.name as project_name'
+            ])
+            ->leftJoin('projects', 'project_tasks.project_id', '=', 'projects.id')
+            ->whereIn('project_tasks.id', $taskIds)
+            ->get()
+            ->keyBy('id');
+            
+            foreach ($favorites->items() as $favorite) {
+                if ($favorite->favoritable_type === self::TYPE_TASK && isset($tasks[$favorite->favoritable_id])) {
+                    $task = $tasks[$favorite->favoritable_id];
+                    
+                    // 解析 flow_item_name 字段（格式：status|name|color）
+                    $flowItemParts = explode('|', $task->flow_item_name ?: '');
+                    $flowItemStatus = $flowItemParts[0] ?? '';
+                    $flowItemName = $flowItemParts[1] ?? $task->flow_item_name;
+                    $flowItemColor = $flowItemParts[2] ?? '';
+                    
+                    $data['tasks'][] = [
+                        'id' => $task->id,
+                        'name' => $task->name,
+                        'project_id' => $task->project_id,
+                        'project_name' => $task->project_name,
+                        'complete_at' => $task->complete_at,
+                        'flow_item_id' => $task->flow_item_id,
+                        'flow_item_name' => $flowItemName,
+                        'flow_item_status' => $flowItemStatus,
+                        'flow_item_color' => $flowItemColor,
+                        'favorited_at' => Carbon::parse($favorite->created_at)->format('Y-m-d H:i:s'),
+                        'remark' => $favorite->remark,
+                    ];
+                }
+            }
+        }
+
+        if (!empty($projectIds)) {
+            $projects = Project::select([
+                'id', 'name', 'desc', 'archived_at', 'created_at'
+            ])->whereIn('id', $projectIds)->get()->keyBy('id');
+            
+            foreach ($favorites->items() as $favorite) {
+                if ($favorite->favoritable_type === self::TYPE_PROJECT && isset($projects[$favorite->favoritable_id])) {
+                    $project = $projects[$favorite->favoritable_id];
+                    $data['projects'][] = [
+                        'id' => $project->id,
+                        'name' => $project->name,
+                        'desc' => $project->desc,
+                        'archived_at' => $project->archived_at,
+                        'favorited_at' => Carbon::parse($favorite->created_at)->format('Y-m-d H:i:s'),
+                        'remark' => $favorite->remark,
+                    ];
+                }
+            }
+        }
+
+        if (!empty($fileIds)) {
+            $files = File::select([
+                'id', 'name', 'ext', 'size', 'pid', 'created_at'
+            ])->whereIn('id', $fileIds)->get()->keyBy('id');
+            
+            foreach ($favorites->items() as $favorite) {
+                if ($favorite->favoritable_type === self::TYPE_FILE && isset($files[$favorite->favoritable_id])) {
+                    $file = $files[$favorite->favoritable_id];
+                    $fileData = File::handleImageUrl(array_merge(
+                        $file->only(['id', 'ext']),
+                        [
+                            'name' => $file->name,
+                            'size' => $file->size,
+                            'pid' => $file->pid,
+                        ]
+                    ));
+                    $data['files'][] = [
+                        'id' => $file->id,
+                        'name' => $file->name,
+                        'ext' => $file->ext,
+                        'size' => $file->size,
+                        'pid' => $file->pid,
+                        'image_url' => $fileData['image_url'] ?? null,
+                        'image_width' => $fileData['image_width'] ?? null,
+                        'image_height' => $fileData['image_height'] ?? null,
+                        'favorited_at' => Carbon::parse($favorite->created_at)->format('Y-m-d H:i:s'),
+                        'remark' => $favorite->remark,
+                    ];
+                }
+            }
+        }
+
+        if (!empty($messageIds)) {
+            $messages = WebSocketDialogMsg::select([
+                'id', 'dialog_id', 'userid', 'type', 'msg', 'created_at'
+            ])->whereIn('id', $messageIds)->get()->keyBy('id');
+            
+            foreach ($favorites->items() as $favorite) {
+                if ($favorite->favoritable_type === self::TYPE_MESSAGE && isset($messages[$favorite->favoritable_id])) {
+                    $message = $messages[$favorite->favoritable_id];
+                    
+                    // 使用 previewMsg 获取消息预览文本
+                    $previewText = '';
+                    if ($message->msg && is_array($message->msg)) {
+                        $previewText = WebSocketDialogMsg::previewMsg($message);
+                    }
+                    
+                    // 如果没有预览文本，使用消息类型作为标题
+                    if (empty($previewText)) {
+                        $previewText = '[' . ucfirst($message->type) . ']';
+                    }
+                    
+                    $data['messages'][] = [
+                        'id' => $message->id,
+                        'name' => $previewText,
+                        'dialog_id' => $message->dialog_id,
+                        'userid' => $message->userid,
+                        'type' => $message->type,
+                        'favorited_at' => Carbon::parse($favorite->created_at)->format('Y-m-d H:i:s'),
+                        'remark' => $favorite->remark,
+                    ];
+                }
+            }
+        }
+
+        return [
+            'data' => $data,
+            'total' => $favorites->total(),
+            'current_page' => $favorites->currentPage(),
+            'per_page' => $favorites->perPage(),
+            'last_page' => $favorites->lastPage(),
+        ];
+    }
+
+    /**
+     * 清理用户收藏
+     * @param int $userid 用户ID
+     * @param string|null $type 收藏类型，null表示全部类型
+     * @return int 删除的记录数
+     */
+    public static function cleanUserFavorites($userid, $type = null)
+    {
+        $query = self::whereUserid($userid);
+        
+        if ($type) {
+            $query->whereFavoritableType($type);
+        }
+        
+        return $query->delete();
+    }
+}

app/Models/UserRecentItem.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Models;
+
+use Carbon\Carbon;
+
+/**
+ * App\Models\UserRecentItem
+ *
+ * @property int $id
+ * @property int $userid 用户ID
+ * @property string $target_type 目标类型(task/file/task_file/message_file 等)
+ * @property int $target_id 目标ID
+ * @property string $source_type 来源类型(project/filesystem/project_task/dialog 等)
+ * @property int $source_id 来源ID
+ * @property \Illuminate\Support\Carbon|null $browsed_at 浏览时间
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserRecentItem newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserRecentItem newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserRecentItem query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserRecentItem whereBrowsedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserRecentItem whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserRecentItem whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserRecentItem whereSourceId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserRecentItem whereSourceType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserRecentItem whereTargetId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserRecentItem whereTargetType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserRecentItem whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserRecentItem whereUserid($value)
+ * @mixin \Eloquent
+ */
+class UserRecentItem extends AbstractModel
+{
+    public const TYPE_TASK = 'task';
+    public const TYPE_FILE = 'file';
+    public const TYPE_TASK_FILE = 'task_file';
+    public const TYPE_MESSAGE_FILE = 'message_file';
+
+    public const SOURCE_PROJECT = 'project';
+    public const SOURCE_FILESYSTEM = 'filesystem';
+    public const SOURCE_PROJECT_TASK = 'project_task';
+    public const SOURCE_DIALOG = 'dialog';
+
+    protected $fillable = [
+        'userid',
+        'target_type',
+        'target_id',
+        'source_type',
+        'source_id',
+        'browsed_at',
+    ];
+
+    protected $dates = [
+        'browsed_at',
+    ];
+
+    public static function record(int $userid, string $targetType, int $targetId, string $sourceType = '', int $sourceId = 0): self
+    {
+        return self::updateOrCreate(
+            [
+                'userid' => $userid,
+                'target_type' => $targetType,
+                'target_id' => $targetId,
+                'source_type' => $sourceType,
+                'source_id' => $sourceId,
+            ],
+            [
+                'browsed_at' => Carbon::now(),
+            ]
+        );
+    }
+}

app/Models/UserTag.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class UserTag extends AbstractModel
+{
+    protected $table = 'user_tags';
+
+    protected $fillable = [
+        'user_id',
+        'name',
+        'created_by',
+        'updated_by',
+    ];
+
+    public function creator(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'created_by', 'userid')
+            ->select(['userid', 'nickname']);
+    }
+
+    public function recognitions(): HasMany
+    {
+        return $this->hasMany(UserTagRecognition::class, 'tag_id');
+    }
+
+    public function canManage(User $viewer): bool
+    {
+        return $viewer->isAdmin()
+            || $viewer->userid === $this->user_id
+            || $viewer->userid === $this->created_by;
+    }
+
+    public static function listWithMeta(int $targetUserId, ?User $viewer): array
+    {
+        $query = static::query()
+            ->where('user_id', $targetUserId)
+            ->with(['creator'])
+            ->withCount(['recognitions as recognition_total'])
+            ->orderByDesc('recognition_total')
+            ->orderBy('id');
+
+        $tags = $query->get();
+
+        $viewerId = $viewer?->userid ?? 0;
+        $viewerIsAdmin = $viewer?->isAdmin() ?? false;
+        $viewerIsOwner = $viewerId > 0 && $viewerId === $targetUserId;
+
+        $recognizedIds = [];
+        if ($viewerId > 0 && $tags->isNotEmpty()) {
+            $recognizedIds = UserTagRecognition::query()
+                ->where('user_id', $viewerId)
+                ->whereIn('tag_id', $tags->pluck('id'))
+                ->pluck('tag_id')
+                ->all();
+        }
+        $recognizedLookup = array_flip($recognizedIds);
+
+        $list = $tags->map(function (self $tag) use ($viewerId, $viewerIsAdmin, $viewerIsOwner, $recognizedLookup) {
+            $canManage = $viewerIsAdmin || $viewerIsOwner || $viewerId === $tag->created_by;
+
+            return [
+                'id' => $tag->id,
+                'user_id' => $tag->user_id,
+                'name' => $tag->name,
+                'created_by' => $tag->created_by,
+                'created_by_name' => $tag->creator?->nickname ?: '',
+                'recognition_total' => (int) $tag->recognition_total,
+                'recognized' => isset($recognizedLookup[$tag->id]),
+                'can_edit' => $canManage,
+                'can_delete' => $canManage,
+            ];
+        })->values()->toArray();
+
+        return [
+            'list' => $list,
+            'top' => array_slice($list, 0, 10),
+            'total' => count($list),
+        ];
+    }
+}

app/Models/UserTagRecognition.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class UserTagRecognition extends AbstractModel
+{
+    protected $table = 'user_tag_recognitions';
+
+    protected $fillable = [
+        'tag_id',
+        'user_id',
+    ];
+
+    public function tag(): BelongsTo
+    {
+        return $this->belongsTo(UserTag::class, 'tag_id');
+    }
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'user_id', 'userid')
+            ->select(['userid', 'nickname']);
+    }
+}

app/Models/UserTaskBrowse.php

@@ -0,0 +1,138 @@
+<?php
+
+namespace App\Models;
+
+use Carbon\Carbon;
+
+/**
+ * App\Models\UserTaskBrowse
+ *
+ * @property int $id
+ * @property int|null $userid 用户ID
+ * @property int|null $task_id 任务ID
+ * @property \Illuminate\Support\Carbon|null $browsed_at 浏览时间
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\ProjectTask|null $task
+ * @property-read \App\Models\User|null $user
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTaskBrowse newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTaskBrowse newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTaskBrowse query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTaskBrowse whereBrowsedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTaskBrowse whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTaskBrowse whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTaskBrowse whereTaskId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTaskBrowse whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTaskBrowse whereUserid($value)
+ * @mixin \Eloquent
+ */
+class UserTaskBrowse extends AbstractModel
+{
+    protected $fillable = [
+        'userid',
+        'task_id', 
+        'browsed_at',
+    ];
+
+    protected $dates = [
+        'browsed_at',
+    ];
+
+    /**
+     * 关联用户
+     */
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'userid', 'userid');
+    }
+
+    /**
+     * 关联任务
+     */
+    public function task()
+    {
+        return $this->belongsTo(ProjectTask::class, 'task_id', 'id');
+    }
+
+    /**
+     * 记录用户浏览任务
+     * @param int $userid 用户ID
+     * @param int $task_id 任务ID
+     * @return UserTaskBrowse
+     */
+    public static function recordBrowse($userid, $task_id)
+    {
+        $record = self::updateOrCreate(
+            [
+                'userid' => $userid,
+                'task_id' => $task_id,
+            ],
+            [
+                'browsed_at' => Carbon::now(),
+            ]
+        );
+
+        UserRecentItem::record(
+            $userid,
+            UserRecentItem::TYPE_TASK,
+            $task_id,
+            UserRecentItem::SOURCE_PROJECT,
+            0
+        );
+
+        return $record;
+    }
+
+    /**
+     * 获取用户浏览历史
+     * @param int $userid 用户ID  
+     * @param int $limit 获取数量
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public static function getUserBrowseHistory($userid, $limit = 20)
+    {
+        return self::with(['task' => function ($query) {
+                $query->select([
+                    'id', 'name', 'project_id', 'column_id', 'parent_id',
+                    'flow_item_id', 'flow_item_name', 
+                    'complete_at', 'archived_at'
+                ]);
+            }])
+            ->whereUserid($userid)
+            ->whereHas('task', function ($query) {
+                // 只获取存在且未被删除的任务
+                $query->whereNull('archived_at');
+            })
+            ->orderByDesc('browsed_at')
+            ->limit($limit)
+            ->get();
+    }
+
+    /**
+     * 清理用户浏览历史
+     * @param int $userid 用户ID
+     * @param int $keepCount 保留数量，0表示全部删除
+     * @return int 删除的记录数
+     */
+    public static function cleanUserBrowseHistory($userid, $keepCount = 100)
+    {
+        if ($keepCount === 0) {
+            return self::whereUserid($userid)->delete();
+        }
+
+        $keepIds = self::whereUserid($userid)
+            ->orderByDesc('browsed_at')
+            ->limit($keepCount)
+            ->pluck('id');
+
+        return self::whereUserid($userid)
+            ->whereNotIn('id', $keepIds)
+            ->delete();
+    }
+}

app/Models/WebSocket.php

@@ -10,6 +10,7 @@ namespace App\Models;
  * @property string $key
  * @property string|null $fd
  * @property string|null $path
+ * @property string|null $platform 平台类型：android, ios, win, mac, web
  * @property int|null $userid
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
@@ -27,6 +28,7 @@ namespace App\Models;
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocket whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocket whereKey($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocket wherePath($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocket wherePlatform($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocket whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocket whereUserid($value)
  * @mixin \Eloquent

app/Models/WebSocketDialog.php

@@ -530,6 +530,7 @@ class WebSocketDialog extends AbstractModel
                         }
                     }
                     //
+                    $item->operator_id = User::userid();
                     $item->delete();
                     //
                     if ($pushMsg) {
@@ -551,6 +552,42 @@ class WebSocketDialog extends AbstractModel
         $this->pushMsg("groupUpdate", $data);
     }
 
+    /**
+     * 推送成员事件到机器人 webhook
+     * @param string $event
+     * @param int $memberId
+     * @param int $operatorId
+     * @return void
+     */
+    public function dispatchMemberWebhook(string $event, int $memberId, int $operatorId): void
+    {
+        $botIds = $this->dialogUser()->where('bot', 1)->pluck('userid')->toArray();
+        if (empty($botIds)) {
+            return;
+        }
+
+        $userBots = UserBot::whereIn('bot_id', $botIds)->get();
+        if ($userBots->isEmpty()) {
+            return;
+        }
+
+        $member = User::find($memberId, ['userid', 'nickname', 'email', 'bot'])?->toArray();
+        $operator = $operatorId === $memberId ? $member : User::find($operatorId, ['userid', 'nickname', 'email', 'bot'])?->toArray();
+
+        $payload = [
+            'dialog_id' => $this->id,
+            'dialog_type' => $this->type,
+            'group_type' => $this->group_type,
+            'dialog_name' => $this->getGroupName(),
+            'member' => $member,
+            'operator' => $operator,
+        ];
+
+        foreach ($userBots as $userBot) {
+            $userBot->dispatchWebhook($event, $payload, 10);
+        }
+    }
+
     /**
      * 删除会话
      * @return bool
@@ -705,6 +742,48 @@ class WebSocketDialog extends AbstractModel
         return WebSocketDialogUser::whereDialogId($this->id)->where('userid', '>', 0)->count() === 1;
     }
 
+    /**
+     * 检查是否支持创建会话
+     * @return bool
+     */
+    public function isSessionDialog()
+    {
+        // 这个不会有变化，所以可以使用永久缓存
+        return Cache::rememberForever('is-session-dialog-' . $this->id, function () {
+            if ($this->type !== 'user') {
+                return false;
+            }
+            $data = $this->dialogUserBuilder()->get();
+            foreach ($data as $item) {
+                if (preg_match('/^(ai-|user-session-)(.*?)@bot\.system$/', $item->email)) {
+                    return true;
+                }
+            }
+            return false;
+        });
+    }
+
+    /**
+     * 检查是否是AI对话
+     * @return bool
+     */
+    public function isAiDialog()
+    {
+        // 这个不会有变化，所以可以使用永久缓存
+        return Cache::rememberForever('is-ai-dialog-' . $this->id, function () {
+            if ($this->type !== 'user') {
+                return false;
+            }
+            $data = $this->dialogUserBuilder()->get();
+            foreach ($data as $item) {
+                if (preg_match('/^ai-(.*?)@bot\.system$/', $item->email)) {
+                    return true;
+                }
+            }
+            return false;
+        });
+    }
+
     /**
      * 获取对话（同时检验对话身份）
      * @param $dialog_id
@@ -778,6 +857,7 @@ class WebSocketDialog extends AbstractModel
                     WebSocketDialogUser::createInstance([
                         'dialog_id' => $dialog->id,
                         'userid' => $value,
+                        'bot' => User::isBot($value) ? 1 : 0,
                         'important' => !in_array($group_type, ['user', 'all']),
                         'last_at' => in_array($group_type, ['user', 'department', 'all']) ? Carbon::now() : null,
                     ])->save();
@@ -814,17 +894,17 @@ class WebSocketDialog extends AbstractModel
             WebSocketDialogUser::createInstance([
                 'dialog_id' => $dialog->id,
                 'userid' => $user->userid,
+                'bot' => User::isBot($user->userid) ? 1 : 0,
             ])->save();
             WebSocketDialogUser::createInstance([
                 'dialog_id' => $dialog->id,
                 'userid' => $receiver,
+                'bot' => User::isBot($receiver) ? 1 : 0,
             ])->save();
             //
             if ($user->isAiBot() || User::find($receiver)?->isAiBot()) {
                 $session = WebSocketDialogSession::create([
                     'dialog_id' => $dialog->id,
-                    'status' => 1,
-                    'title' => '',
                 ]);
                 $session->save();
                 $dialog->session_id = $session->id;

app/Models/WebSocketDialogMsg.php

@@ -2,11 +2,13 @@
 
 namespace App\Models;
 
+use Cache;
 use Carbon\Carbon;
 use App\Module\Base;
 use App\Module\Doo;
 use App\Module\Image;
 use App\Tasks\PushTask;
+use App\Models\ProjectTaskRelation;
 use App\Exceptions\ApiException;
 use App\Tasks\WebSocketDialogMsgTask;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
@@ -315,6 +317,24 @@ class WebSocketDialogMsg extends AbstractModel
         return Base::retSuccess('success', $resData);
     }
 
+    /**
+     * 是否完成所有待办
+     * @param bool $noCache 是否禁止缓存
+     * @return int 1=已完成 0=未完成
+     */
+    public function isTodoDone(?bool $noCache = false): int
+    {
+        if ($noCache) {
+            Cache::forget('todo_done_' . $this->id);
+        }
+        if ($this->todo <= 0) {
+            return 1;
+        }
+        return (int) Cache::remember('todo_done_' . $this->id, Carbon::now()->addDays(), function () {
+            return WebSocketDialogMsgTodo::whereMsgId($this->id)->whereDoneAt(null)->exists() ? 0 : 1;
+        });
+    }
+
     /**
      * 标注、取消标注
      * @param int $sender       标注的会员ID
@@ -367,23 +387,15 @@ class WebSocketDialogMsg extends AbstractModel
         if (in_array($this->type, ['tag', 'todo', 'notice'])) {
             return Base::retError('此消息不支持设待办');
         }
+        $dialog = WebSocketDialog::find($this->dialog_id);
         $current = WebSocketDialogMsgTodo::whereMsgId($this->id)->pluck('userid')->toArray();
         $cancel = array_diff($current, $userids);
         $setup = array_diff($userids, $current);
         //
         $this->todo = $setup || count($current) > count($cancel) ? $sender : 0;
         $this->save();
-        $upData = [
-            'id' => $this->id,
-            'todo' => $this->todo,
-            'dialog_id' => $this->dialog_id,
-        ];
-        $dialog = WebSocketDialog::find($this->dialog_id);
         //
-        $retData = [
-            'add' => [],
-            'update' => $upData
-        ];
+        $addData = [];
         if ($cancel) {
             $res = self::sendMsg(null, $this->dialog_id, 'todo', [
                 'action' => 'remove',
@@ -395,7 +407,7 @@ class WebSocketDialogMsg extends AbstractModel
                 ]
             ], $sender);
             if (Base::isSuccess($res)) {
-                $retData['add'][] = $res['data'];
+                $addData[] = $res['data'];
                 WebSocketDialogMsgTodo::whereMsgId($this->id)->whereIn('userid', $cancel)->delete();
             }
         }
@@ -410,7 +422,7 @@ class WebSocketDialogMsg extends AbstractModel
                 ]
             ], $sender);
             if (Base::isSuccess($res)) {
-                $retData['add'][] = $res['data'];
+                $addData[] = $res['data'];
                 $useridList = $dialog->dialogUser->pluck('userid')->toArray();
                 foreach ($setup as $userid) {
                     if (!in_array($userid, $useridList)) {
@@ -425,8 +437,18 @@ class WebSocketDialogMsg extends AbstractModel
             }
         }
         //
+        $upData = [
+            'id' => $this->id,
+            'todo' => $this->todo,
+            'todo_done' => $this->isTodoDone(true),
+            'dialog_id' => $this->dialog_id,
+        ];
         $dialog->pushMsg('update', $upData);
-        return Base::retSuccess($this->todo ? '设置成功' : '取消成功', $retData);
+        //
+        return Base::retSuccess($this->todo ? '设置成功' : '取消成功', [
+            'add' => $addData,
+            'update' => $upData,
+        ]);
     }
 
     /**
@@ -456,27 +478,10 @@ class WebSocketDialogMsg extends AbstractModel
                 'parent_id' => $this->id,           // 转发的消息ID
                 'parent_userid' => $this->userid,   // 转发的消息会员ID
                 'show' => $showSource,              // 是否显示原发送者信息
+                'leave' => $leaveMessage ? 1 : 0,   // 是否留言（用于判断是否发给AI）
             ];
             $msgs = [];
-            $already = [];
-            if ($dialogids) {
-                if (!is_array($dialogids)) {
-                    $dialogids = [$dialogids];
-                }
-                foreach ($dialogids as $dialogid) {
-                    $res = self::sendMsg('forward-' . $forwardId, $dialogid, $this->type, $msgData, $user->userid);
-                    if (Base::isSuccess($res)) {
-                        $msgs[] = $res['data'];
-                        $already[] = $dialogid;
-                    }
-                    if ($leaveMessage) {
-                        $res = self::sendMsg(null, $dialogid, 'text', ['text' => $leaveMessage], $user->userid);
-                        if (Base::isSuccess($res)) {
-                            $msgs[] = $res['data'];
-                        }
-                    }
-                }
-            }
+            $dialogs = [];
             if ($userids) {
                 if (!is_array($userids)) {
                     $userids = [$userids];
@@ -486,17 +491,35 @@ class WebSocketDialogMsg extends AbstractModel
                         continue;
                     }
                     $dialog = WebSocketDialog::checkUserDialog($user, $userid);
-                    if ($dialog && !in_array($dialog->id, $already)) {
-                        $res = self::sendMsg('forward-' . $forwardId, $dialog->id, $this->type, $msgData, $user->userid);
-                        if (Base::isSuccess($res)) {
-                            $msgs[] = $res['data'];
-                        }
-                        if ($leaveMessage) {
-                            $res = self::sendMsg(null, $dialog->id, 'text', ['text' => $leaveMessage], $user->userid);
-                            if (Base::isSuccess($res)) {
-                                $msgs[] = $res['data'];
-                            }
-                        }
+                    if ($dialog) {
+                        $dialogs[$dialog->id] = $dialog;
+                    }
+                }
+            }
+            if ($dialogids) {
+                if (!is_array($dialogids)) {
+                    $dialogids = [$dialogids];
+                }
+                foreach ($dialogids as $dialogid) {
+                    if (isset($dialogs[$dialogid])) {
+                        continue;
+                    }
+                    $dialog = WebSocketDialog::find($dialogid);
+                    if ($dialog) {
+                        $dialogs[$dialog->id] = $dialog;
+                    }
+                }
+            }
+            foreach ($dialogs as $dialog) {
+                $res = self::sendMsg('forward-' . $forwardId, $dialog->id, $this->type, $msgData, $user->userid);
+                if (Base::isSuccess($res)) {
+                    $msgs[] = $res['data'];
+                }
+                if ($leaveMessage) {
+                    $action = $dialog->isAiDialog() ? "reply-{$res['data']['id']}" : null;
+                    $res = self::sendMsg($action, $dialog->id, 'text', ['text' => $leaveMessage], $user->userid);
+                    if (Base::isSuccess($res)) {
+                        $msgs[] = $res['data'];
                     }
                 }
             }
@@ -655,7 +678,7 @@ class WebSocketDialogMsg extends AbstractModel
      * @param bool $preserveHtml    保留html格式
      * @return string|string[]|null
      */
-    private static function previewTextMsg($msgData, $preserveHtml = false)
+    public static function previewTextMsg($msgData, $preserveHtml = false)
     {
         $text = $msgData['text'] ?? '';
         if (!$text) return '';
@@ -664,8 +687,15 @@ class WebSocketDialogMsg extends AbstractModel
             if (preg_match('/:::\s*reasoning\s+/', $text)) {
                 return Doo::translate('思考中...');
             }
-            $text = Base::markdown2html($text);
-            $text = self::previewConvertTaskList($text);
+            $title = '';
+            if (preg_match('/^#{1,2}\s+(.+)/m', $text, $matches)) {
+                $title = trim($matches[1]);
+            }
+            if ($title) {
+                $text = $title;
+            } else {
+                $text = Base::markdown2html($text);
+            }
         }
         $text = preg_replace("/<img\s+class=\"emoticon\"[^>]*?alt=\"(\S+)\"[^>]*?>/", "[$1]", $text);
         $text = preg_replace("/<img\s+class=\"emoticon\"[^>]*?>/", "[" . Doo::translate('动画表情') . "]", $text);
@@ -680,36 +710,6 @@ class WebSocketDialogMsg extends AbstractModel
         return $text;
     }
 
-    /**
-     * 转换任务列表
-     * @param $text
-     * @return array|string|string[]|null
-     */
-    private static function previewConvertTaskList($text) {
-        $pattern = '/:::\s*(create-task-list|create-subtask-list)(.*?):::/s';
-        $replacement = function($matches) {
-            $content = $matches[2];
-            $lines = explode("\n", trim($content));
-            $result = [];
-            $currentTitle = '';
-            foreach ($lines as $line) {
-                $line = trim($line);
-                if (empty($line)) continue;
-
-                if (preg_match('/^title:\s*(.+)$/', $line, $titleMatch)) {
-                    $currentTitle = $titleMatch[1];
-                    $result[] = $currentTitle;
-                } elseif (preg_match('/^desc:\s*(.+)$/', $line, $descMatch)) {
-                    if (!empty($currentTitle)) {
-                        $result[] = $descMatch[1];
-                    }
-                }
-            }
-            return implode("\n", $result);
-        };
-        return preg_replace_callback($pattern, $replacement, $text);
-    }
-
     /**
      * 预览文件消息
      * @param $msg
@@ -821,6 +821,89 @@ class WebSocketDialogMsg extends AbstractModel
         return $msg;
     }
 
+    /**
+     * 提取消息内容
+     * 根据消息类型（文件、文本等）提取相应的内容文本
+     *
+     * @param int $maxLength 最大长度，超过则截取，0表示不限制
+     * @return string 提取出的消息文本内容
+     */
+    public function extractMessageContent(int $maxLength = 0): string
+    {
+        $reserves = [];
+        switch ($this->type) {
+            case "file":
+                // 提取文件消息
+                $result = " 文件：{$this->msg['name']}（大小：{$this->msg['size']}B，URL：{$this->msg['path']}） ";
+                break;
+
+            case "text":
+                // 提取文本消息
+                $result = $this->msg['text'] ?: '';
+                if (empty($result)) {
+                    return '';
+                }
+
+                // 提取快捷键
+                if (preg_match("/<span[^>]*?data-quick-key=([\"'])([^\"']+?)\\1[^>]*?>(.*?)<\/span>/is", $result, $match)) {
+                    $command = $match[2] ?? '';
+                    $command = preg_replace("/^%3A\.?/", ":", $command);
+                    $command = trim($command);
+                    if ($command) {
+                        return $command;
+                    }
+                }
+
+                // 提及任务、文件、报告
+                $result = preg_replace_callback_array([
+                    // 用户
+                    "/<span class=\"mention user\" data-id=\"(\d+)\">(.*?)<\/span>/" => function ($match) {
+                        return "";
+                    },
+
+                    // 任务
+                    "/<span class=\"mention task\" data-id=\"(\d+)\">#?(.*?)<\/span>/" => function ($match) {
+                        return " 任务：{$match[2]} (任务ID：{$match[1]}) ";
+                    },
+
+                    // 文件
+                    "/<a class=\"mention file\" href=\"([^\"']+?)\"[^>]*?>~?(.*?)<\/a>/" => function ($match) use (&$reserves) {
+                        $idOrCode = "";
+                        if (preg_match("/single\/file\/(.*?)$/", $match[1], $subMatch)) {
+                            $idOrCode = " (" . (Base::isNumber($subMatch[1]) ? "文件ID：{$subMatch[1]}" : "文件分享码：{$subMatch[1]}") . ")";
+                        }
+                        return " 文件：{$match[2]}{$idOrCode} ";
+                    },
+
+                    // 报告
+                    "/<a class=\"mention report\" href=\"([^\"']+?)\"[^>]*?>%?(.*?)<\/a>/" => function ($match) use (&$reserves) {
+                        $idOrCode = "";
+                        if (preg_match("/single\/report\/detail\/(.*?)$/", $match[1], $subMatch)) {
+                            $idOrCode = " (" . (Base::isNumber($subMatch[1]) ? "报告ID：{$subMatch[1]}" : "报告分享码：{$subMatch[1]}") . ")";
+                        }
+                        return " 工作汇报：{$match[2]}{$idOrCode} ";
+                    },
+                ], $result);
+
+                // 转成 markdown
+                if ($this->msg['type'] !== 'md') {
+                    $result = Base::html2markdown($result);
+                }
+                break;
+
+            default:
+                // 其他类型消息不处理
+                return '';
+        }
+
+        // 截取最大长度
+        if ($maxLength > 0 && mb_strlen($result) > $maxLength) {
+            $result = mb_substr($result, 0, $maxLength);
+        }
+
+        return $result;
+    }
+
     /**
      * 处理文本消息内容，用于发送前
      * @param $text
@@ -1197,6 +1280,7 @@ class WebSocketDialogMsg extends AbstractModel
             ];
             $dialogMsg->updateInstance($updateData);
             $dialogMsg->generateKeyAndSave($search_key);
+            ProjectTaskRelation::recordMentionsFromMessage($dialogMsg);
             //
             WebSocketDialogUser::whereDialogId($dialog->id)->whereUserid($sender)->whereHide(1)->change([
                 'hide' => 0,    // 修改消息时，显示会话（仅自己）
@@ -1263,6 +1347,7 @@ class WebSocketDialogMsg extends AbstractModel
                     'updated_at' => Carbon::now()->toDateTimeString('millisecond'),
                 ]);
             });
+            ProjectTaskRelation::recordMentionsFromMessage($dialogMsg);
             //
             $task = new WebSocketDialogMsgTask($dialogMsg->id);
             if ($push_self) {
@@ -1328,7 +1413,6 @@ class WebSocketDialogMsg extends AbstractModel
         });
     }
 
-
     /**
      * 将被@的人加入群
      * @param WebSocketDialog $dialog 对话

app/Models/WebSocketDialogMsgRead.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
 
 /**
  * App\Models\WebSocketDialogMsgRead
@@ -76,24 +77,74 @@ class WebSocketDialogMsgRead extends AbstractModel
      */
     public static function onlyMarkRead($list)
     {
-        $dialogMsg = [];
+        if (empty($list)) {
+            return;
+        }
+
+        $collection = collect($list);
+        if ($collection->isEmpty()) {
+            return;
+        }
+
+        $now = Carbon::now();
+        $ids = [];
+        $msgCounts = [];
+
         /** @var WebSocketDialogMsgRead $item */
-        foreach ($list as $item) {
-            $item->read_at = Carbon::now();
-            $item->save();
-            if (isset($dialogMsg[$item->msg_id])) {
-                $dialogMsg[$item->msg_id]['readNum']++;
-            } else {
-                $dialogMsg[$item->msg_id] = [
-                    'dialogMsg' => $item->webSocketDialogMsg,
-                    'readNum' => 1
-                ];
+        foreach ($collection as $item) {
+            $ids[] = $item->id;
+            if ($item->msg_id) {
+                $msgCounts[$item->msg_id] = ($msgCounts[$item->msg_id] ?? 0) + 1;
             }
         }
-        foreach ($dialogMsg as $item) {
-            if ($item['dialogMsg']) {
-                $item['dialogMsg']->increment('read', $item['readNum']);
+
+        if (!empty($ids)) {
+            DB::table((new self())->getTable())
+                ->whereIn('id', $ids)
+                ->whereNull('read_at')
+                ->update(['read_at' => $now]);
+        }
+
+        if (!empty($msgCounts)) {
+            $cases = [];
+            $bindings = [];
+            foreach ($msgCounts as $msgId => $num) {
+                $cases[] = 'WHEN ? THEN ?';
+                $bindings[] = $msgId;
+                $bindings[] = $num;
             }
+            $msgIds = array_keys($msgCounts);
+            $bindings = array_merge($bindings, $msgIds);
+            $placeholders = implode(',', array_fill(0, count($msgIds), '?'));
+            $table = DB::getTablePrefix() . (new WebSocketDialogMsg())->getTable();
+            $sql = "UPDATE {$table} SET `read` = `read` + CASE `id` " . implode(' ', $cases) . " END WHERE `deleted_at` IS NULL AND `id` IN ({$placeholders})";
+            DB::update($sql, $bindings);
         }
     }
+
+    /**
+     * 标记指定会话的历史消息为已读
+     * @param int $dialogId
+     * @param int $sessionId
+     * @param int $chunkSize
+     * @return void
+     */
+    public static function markSessionMessagesAsRead(int $dialogId, int $sessionId, int $chunkSize = 100): void
+    {
+        if ($dialogId <= 0 || $sessionId <= 0) {
+            return;
+        }
+
+        self::whereDialogId($dialogId)
+            ->whereNull('read_at')
+            ->whereIn('msg_id', function ($query) use ($dialogId, $sessionId) {
+                $query->select('id')
+                    ->from((new WebSocketDialogMsg())->getTable())
+                    ->where('dialog_id', $dialogId)
+                    ->where('session_id', $sessionId);
+            })
+            ->chunkById($chunkSize, function ($list) {
+                self::onlyMarkRead($list);
+            });
+    }
 }

app/Models/WebSocketDialogSession.php

@@ -66,15 +66,14 @@ class WebSocketDialogSession extends AbstractModel
         if ($dialogMsg->type != 'text') {
             return;
         }
+        if ($dialogMsg->msg['text'] === '...') {
+            return;
+        }
         $cacheKey = 'dialog_session_title_' . $sessionId;
         if (Cache::has($cacheKey)) {
             return;
         }
-        $originalTitle = $dialogMsg->key ?: $dialogMsg->msg['text'] ?: 'Untitled';
-        $title = Base::cutStr($originalTitle, 100);
-        if ($title == '...') {
-            return;
-        }
+        $title = $dialogMsg->key ?: WebSocketDialogMsg::previewTextMsg($dialogMsg->msg) ?: 'Untitled';
         $session = self::whereId($sessionId)->first();
         if (!$session) {
             return;
@@ -82,6 +81,6 @@ class WebSocketDialogSession extends AbstractModel
         $session->title = $title;
         $session->save();
         Cache::forever($cacheKey, true);
-        Task::deliver(new UpdateSessionTitleViaAiTask($session->id, $originalTitle));
+        Task::deliver(new UpdateSessionTitleViaAiTask($session->id, $dialogMsg->msg['text']));
     }
 }

app/Module/AI.php

@@ -0,0 +1,741 @@
+<?php
+
+namespace App\Module;
+
+use App\Models\Setting;
+use Cache;
+use Carbon\Carbon;
+
+/**
+ * AI 助手模块
+ */
+class AI
+{
+    public const TEXT_MODEL_PRIORITY = [
+        'openai',
+        'claude',
+        'deepseek',
+        'gemini',
+        'grok',
+        'ollama',
+        'zhipu',
+        'qianwen',
+        'wenxin'
+    ];
+    protected const OPENAI_DEFAULT_MODEL = 'gpt-5.1-mini';
+
+    protected $post = [];
+    protected $headers = [];
+    protected $urlPath = '';
+    protected $timeout = 30;
+    protected $providerConfig = null;
+
+    /**
+     * 构造函数
+     * @param array $post
+     * @param array $headers
+     */
+    public function __construct($post = [], $headers = [])
+    {
+        $this->post = $post ?? [];
+        $this->headers = $headers ?? [];
+    }
+
+    /**
+     * 设置请求参数
+     * @param array $post
+     */
+    public function setPost($post)
+    {
+        $this->post = array_merge($this->post, $post);
+    }
+
+    /**
+     * 设置请求头
+     * @param array $headers
+     */
+    public function setHeaders($headers)
+    {
+        $this->headers = array_merge($this->headers, $headers);
+    }
+
+    /**
+     * 设置请求路径
+     * @param string $urlPath
+     */
+    public function setUrlPath($urlPath)
+    {
+        $this->urlPath = $urlPath;
+    }
+
+    /**
+     * 设置请求超时时间
+     * @param int $timeout
+     */
+    public function setTimeout($timeout)
+    {
+        $this->timeout = $timeout;
+    }
+
+    /**
+     * 指定请求所使用的模型配置
+     * @param array $provider
+     */
+    public function setProvider(array $provider)
+    {
+        $this->providerConfig = $provider;
+    }
+
+    /**
+     * 请求 AI 接口
+     * @param bool $resRaw 是否返回原始数据
+     * @return array
+     */
+    public function request($resRaw = false)
+    {
+        $provider = $this->providerConfig ?: self::resolveTextProvider();
+        if (!$provider) {
+            return Base::retError("请先配置 AI 助手");
+        }
+
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Authorization' => 'Bearer ' . $provider['api_key'],
+        ];
+        if (!empty($provider['agency'])) {
+            $headers['CURLOPT_PROXY'] = $provider['agency'];
+            $headers['CURLOPT_PROXYTYPE'] = str_contains($provider['agency'], 'socks') ? CURLPROXY_SOCKS5 : CURLPROXY_HTTP;
+        }
+        $headers = array_merge($headers, $this->headers);
+
+        $baseUrl = $provider['base_url'] ?: 'https://api.openai.com/v1';
+        $url = $baseUrl . ($this->urlPath ?: '/chat/completions');
+
+        $result = Ihttp::ihttp_request($url, $this->post, $headers, $this->timeout);
+        if (Base::isError($result)) {
+            return Base::retError("AI 接口请求失败", $result);
+        }
+        $result = $result['data'];
+
+        if (!$resRaw) {
+            $resData = Base::json2array($result);
+            if (empty($resData['choices'])) {
+                return Base::retError("AI 接口返回数据格式错误", $resData);
+            }
+            $result = $resData['choices'][0]['message']['content'];
+            $result = trim($result);
+            if (empty($result)) {
+                return Base::retError("AI 接口返回数据为空");
+            }
+        }
+
+        return Base::retSuccess("success", $result);
+    }
+
+    /**
+     * 生成 AI 流式会话凭证
+     * @param string $modelType
+     * @param string $modelName
+     * @param mixed $contextInput
+     * @return array
+     */
+    public static function createStreamKey($modelType, $modelName, $contextInput = [])
+    {
+        $modelType = trim((string)$modelType);
+        $modelName = trim((string)$modelName);
+
+        if ($modelType === '' || $modelName === '') {
+            return Base::retError('参数错误');
+        }
+
+        if (is_string($contextInput)) {
+            $decoded = json_decode($contextInput, true);
+            if (json_last_error() === JSON_ERROR_NONE) {
+                $contextInput = $decoded;
+            }
+        }
+
+        if (!is_array($contextInput)) {
+            return Base::retError('context 参数格式错误');
+        }
+
+        $context = [];
+        foreach ($contextInput as $item) {
+            if (!is_array($item) || count($item) < 2) {
+                continue;
+            }
+            $role = trim((string)($item[0] ?? ''));
+            $message = trim((string)($item[1] ?? ''));
+            if ($role === '' || $message === '') {
+                continue;
+            }
+            $context[] = [$role, $message];
+        }
+
+        $contextJson = json_encode($context, JSON_UNESCAPED_UNICODE);
+        if ($contextJson === false) {
+            return Base::retError('context 参数格式错误');
+        }
+
+        $setting = Base::setting('aibotSetting');
+        if (!is_array($setting)) {
+            $setting = [];
+        }
+
+        $apiKey = Base::val($setting, $modelType . '_key');
+        if ($modelType === 'wenxin') {
+            $wenxinSecret = Base::val($setting, 'wenxin_secret');
+            if ($wenxinSecret) {
+                $apiKey = trim(($apiKey ?: '') . ':' . $wenxinSecret);
+            }
+        }
+        if ($modelType === 'ollama' && empty($apiKey)) {
+            $apiKey = Base::strRandom(6);
+        }
+        if (empty($apiKey)) {
+            return Base::retError('模型未启用');
+        }
+
+        $remoteModelType = match ($modelType) {
+            'qianwen' => 'qwen',
+            default => $modelType,
+        };
+
+        $authParams = [
+            'api_key' => $apiKey,
+            'model_type' => $remoteModelType,
+            'model_name' => $modelName,
+            'context' => $contextJson,
+        ];
+
+        $baseUrl = trim((string)($setting[$modelType . '_base_url'] ?? ''));
+        if ($baseUrl !== '') {
+            $authParams['base_url'] = $baseUrl;
+        }
+
+        $agency = trim((string)($setting[$modelType . '_agency'] ?? ''));
+        if ($agency !== '') {
+            $authParams['agency'] = $agency;
+        }
+
+        $thinkPatterns = [
+            "/^(.+?)(\s+|\s*[_-]\s*)(think|thinking|reasoning)\s*$/",
+            "/^(.+?)\s*\(\s*(think|thinking|reasoning)\s*\)\s*$/"
+        ];
+        $thinkMatch = [];
+        foreach ($thinkPatterns as $pattern) {
+            if (preg_match($pattern, $authParams['model_name'], $thinkMatch)) {
+                break;
+            }
+        }
+        if ($thinkMatch && !empty($thinkMatch[1])) {
+            $authParams['model_name'] = $thinkMatch[1];
+        }
+
+        $authResult = Ihttp::ihttp_request('http://nginx/ai/invoke/auth', $authParams, [
+            'Content-Type' => 'application/x-www-form-urlencoded',
+            'Authorization' => 'Bearer ' . Base::token(),
+        ], 30);
+        if (Base::isError($authResult)) {
+            return Base::retError($authResult['msg']);
+        }
+
+        $body = Base::json2array($authResult['data']);
+        if (($body['code'] ?? null) !== 200) {
+            return Base::retError(($body['error'] ?? '') ?: 'AI 接口返回异常', $body);
+        }
+
+        $streamKey = Base::val($body, 'data.stream_key');
+        if (empty($streamKey)) {
+            return Base::retError('AI 接口返回数据异常');
+        }
+
+        return Base::retSuccess('success', [
+            'stream_key' => $streamKey,
+        ]);
+    }
+
+    /** ******************************************************************************************** */
+    /** ******************************************************************************************** */
+    /** ******************************************************************************************** */
+
+    /**
+     * 通过 openAI 语音转文字
+     * @param string $filePath 语音文件路径
+     * @param array $extParams 扩展参数
+     * @param array $extHeaders 扩展请求头
+     * @param bool $noCache 是否禁用缓存
+     * @return array
+     */
+    public static function transcriptions($filePath, $extParams = [], $extHeaders = [], $noCache = false)
+    {
+        Apps::isInstalledThrow('ai');
+
+        if (!file_exists($filePath)) {
+            return Base::retError("语音文件不存在");
+        }
+        $cacheKey = "openAItranscriptions::" . md5($filePath . '_' . Base::array2json($extParams));
+        if ($noCache) {
+            Cache::forget($cacheKey);
+        }
+
+        $audioProvider = self::resolveOpenAIAudioProvider();
+        if (!$audioProvider) {
+            return Base::retError("请先在「AI 助手」设置中配置 OpenAI");
+        }
+
+        $result = Cache::remember($cacheKey, Carbon::now()->addDays(), function () use ($extParams, $extHeaders, $filePath, $audioProvider) {
+            $post = array_merge($extParams, [
+                'file' => new \CURLFile($filePath),
+                'model' => 'whisper-1',
+            ]);
+            $header = array_merge($extHeaders, [
+                'Content-Type' => 'multipart/form-data',
+            ]);
+
+            $ai = new self($post, $header);
+            $ai->setProvider($audioProvider);
+            $ai->setUrlPath('/audio/transcriptions');
+            $ai->setTimeout(15);
+
+            $res = $ai->request(true);
+            if (Base::isError($res)) {
+                return Base::retError("语音转文字失败", $res);
+            }
+            $resData = Base::json2array($res['data']);
+            if (empty($resData['text'])) {
+                return Base::retError("语音转文字失败", $resData);
+            }
+
+            return Base::retSuccess("success", [
+                'file' => $filePath,
+                'text' => $resData['text'],
+            ]);
+        });
+        if (Base::isError($result)) {
+            Cache::forget($cacheKey);
+        }
+        return $result;
+    }
+
+    /**
+     * 通过 openAI 翻译
+     * @param string $text 需要翻译的文本内容
+     * @param string $targetLanguage 目标语言（如：English, 简体中文, 日本語等）
+     * @param bool $noCache 是否禁用缓存
+     * @return array
+     */
+    public static function translations($text, $targetLanguage, $noCache = false)
+    {
+        Apps::isInstalledThrow('ai');
+
+        $cacheKey = "openAItranslations::" . md5($text . '_' . $targetLanguage);
+        if ($noCache) {
+            Cache::forget($cacheKey);
+        }
+
+        $provider = self::resolveTextProvider();
+        if (!$provider) {
+            return Base::retError("请先配置 AI 助手");
+        }
+
+        $result = Cache::remember($cacheKey, Carbon::now()->addDays(7), function () use ($text, $targetLanguage, $provider) {
+            $payload = [
+                "model" => $provider['model'],
+                "messages" => [
+                    [
+                        "role" => "system",
+                        "content" => <<<EOF
+                            你是一名资深的专业翻译专家，专门从事项目任务管理系统的多语言本地化工作。
+
+                            翻译任务：将提供的文本内容翻译为 {$targetLanguage}
+
+                            专业要求：
+                            1. 术语一致性：确保项目管理、任务管理、团队协作等专业术语的准确翻译
+                            2. 上下文理解：根据项目管理场景选择最合适的表达方式
+                            3. 格式保持：严格保持原文的格式、结构、标点符号和排版
+                            4. 语言规范：使用目标语言的标准表达，符合该语言的语法和习惯
+                            5. 专业性：体现项目管理领域的专业水准和准确性
+                            6. 简洁性：避免冗余表达，保持语言简洁明了
+
+                            注意事项：
+                            - 保留所有HTML标签、特殊符号、数字、日期格式
+                            - 对于专有名词（如软件名称、品牌名）保持原文
+                            - 确保翻译后的文本自然流畅，符合目标语言的表达习惯
+                            - 如遇到歧义表达，优先选择项目管理场景下的含义
+
+                            请直接返回翻译结果，不要包含任何解释或标记。
+                            EOF
+                    ],
+                    [
+                        "role" => "user",
+                        "content" => "请将以下内容翻译为 {$targetLanguage}：\n\n{$text}"
+                    ]
+                ],
+            ];
+            if (self::shouldSendReasoningEffort($provider)) {
+                $payload['reasoning_effort'] = 'minimal';
+            }
+            $post = json_encode($payload);
+
+            $ai = new self($post);
+            $ai->setProvider($provider);
+            $ai->setTimeout(60);
+
+            $res = $ai->request();
+            if (Base::isError($res)) {
+                return Base::retError("翻译请求失败", $res);
+            }
+            $result = $res['data'];
+            if (empty($result)) {
+                return Base::retError("翻译结果为空");
+            }
+
+            return Base::retSuccess("success", [
+                'translated_text' => $result,
+                'target_language' => $targetLanguage,
+                'translated_at' => date('Y-m-d H:i:s')
+            ]);
+        });
+
+        if (Base::isError($result)) {
+            Cache::forget($cacheKey);
+        }
+        return $result;
+    }
+
+    /**
+     * 通过 openAI 生成标题
+     * @param string $text 需要生成标题的文本内容
+     * @param bool $noCache 是否禁用缓存
+     * @return array
+     */
+    public static function generateTitle($text, $noCache = false)
+    {
+        if (!Apps::isInstalled('ai')) {
+            return Base::retError('应用「AI Assistant」未安装');
+        }
+
+        $cacheKey = "openAIGenerateTitle::" . md5($text);
+        if ($noCache) {
+            Cache::forget($cacheKey);
+        }
+
+        $provider = self::resolveTextProvider();
+        if (!$provider) {
+            return Base::retError("请先配置 AI 助手");
+        }
+
+        $result = Cache::remember($cacheKey, Carbon::now()->addHours(24), function () use ($text, $provider) {
+            $payload = [
+                "model" => $provider['model'],
+                "messages" => [
+                    [
+                        "role" => "system",
+                        "content" => <<<EOF
+                            你是一个专业的标题生成器，专门为项目任务管理系统的对话内容生成精准、简洁的标题。
+
+                            要求：
+                            1. 标题要准确概括文本的核心内容和主要意图
+                            2. 标题长度控制在5-20个字符之间
+                            3. 语言简洁明了，避免冗余词汇
+                            4. 适合在项目管理场景中使用
+                            5. 不要包含引号或特殊符号
+                            6. 如果是技术讨论，突出技术要点
+                            7. 如果是项目管理内容，突出关键动作或目标
+                            8. 如果是需求讨论，突出需求的核心点
+
+                            请直接返回标题，不要包含任何解释或其他内容。
+                            EOF
+                    ],
+                    [
+                        "role" => "user",
+                        "content" => "请为以下内容生成一个合适的标题：\n\n" . $text
+                    ]
+                ],
+            ];
+            if (self::shouldSendReasoningEffort($provider)) {
+                $payload['reasoning_effort'] = 'minimal';
+            }
+            $post = json_encode($payload);
+
+            $ai = new self($post);
+            $ai->setProvider($provider);
+            $ai->setTimeout(10);
+
+            $res = $ai->request();
+            if (Base::isError($res)) {
+                return Base::retError("标题生成失败", $res);
+            }
+            $result = $res['data'];
+            if (empty($result)) {
+                return Base::retError("生成的标题为空");
+            }
+
+            return Base::retSuccess("success", [
+                'title' => $result,
+                'length' => mb_strlen($result),
+                'generated_at' => date('Y-m-d H:i:s')
+            ]);
+        });
+
+        if (Base::isError($result)) {
+            Cache::forget($cacheKey);
+        }
+
+        return $result;
+    }
+
+    /**
+     * 通过 openAI 生成职场笑话、心灵鸡汤
+     * @param bool $noCache 是否禁用缓存
+     * @return array 返回20个笑话和20个心灵鸡汤
+     */
+    public static function generateJokeAndSoup($noCache = false)
+    {
+        if (!Apps::isInstalled('ai')) {
+            return Base::retError('应用「AI Assistant」未安装');
+        }
+
+        $cacheKey = "openAIJokeAndSoup::" . md5(date('Y-m-d'));
+        if ($noCache) {
+            Cache::forget($cacheKey);
+        }
+
+        $provider = self::resolveTextProvider();
+        if (!$provider) {
+            return Base::retError("请先配置 AI 助手");
+        }
+
+        $result = Cache::remember($cacheKey, Carbon::now()->addHours(6), function () use ($provider) {
+            $payload = [
+                "model" => $provider['model'],
+                "messages" => [
+                    [
+                        "role" => "system",
+                        "content" => <<<EOF
+                            你是一个专业的内容生成器。
+
+                            要求：
+                            1. 笑话要幽默风趣，适合职场环境，内容积极正面
+                            2. 心灵鸡汤要励志温暖，适合职场人士阅读
+                            3. 每个笑话和鸡汤都要简洁明了，尽量不超过100字
+                            4. 必须严格按照以下JSON格式返回，不要markdown格式，不要包含任何其他内容：
+
+                            {
+                                "jokes": [
+                                    "笑话内容1",
+                                    "笑话内容2",
+                                    ...
+                                ],
+                                "soups": [
+                                    "心灵鸡汤内容1",
+                                    "心灵鸡汤内容2",
+                                    ...
+                                ]
+                            }
+                            EOF
+                    ],
+                    [
+                        "role" => "user",
+                        "content" => "请生成20个职场笑话和20个心灵鸡汤"
+                    ]
+                ],
+            ];
+            if (self::shouldSendReasoningEffort($provider)) {
+                $payload['reasoning_effort'] = 'minimal';
+            }
+            $post = json_encode($payload);
+
+            $ai = new self($post);
+            $ai->setProvider($provider);
+            $ai->setTimeout(120);
+
+            $res = $ai->request();
+            if (Base::isError($res)) {
+                return Base::retError("生成失败", $res);
+            }
+
+            // 清理可能的markdown代码块标记
+            $content = $res['data'];
+            $content = preg_replace('/^\s*```json\s*/', '', $content);
+            $content = preg_replace('/\s*```\s*$/', '', $content);
+            if (empty($content)) {
+                return Base::retError("翻译结果为空");
+            }
+
+            // 解析JSON
+            $parsedData = Base::json2array($content);
+            if (!$parsedData || !isset($parsedData['jokes']) || !isset($parsedData['soups'])) {
+                return Base::retError("生成内容格式错误", $content);
+            }
+
+            // 验证数据完整性
+            if (!is_array($parsedData['jokes']) || !is_array($parsedData['soups'])) {
+                return Base::retError("生成内容格式错误", $parsedData);
+            }
+
+            // 过滤空内容并确保有内容
+            $jokes = array_filter(array_map('trim', $parsedData['jokes']));
+            $soups = array_filter(array_map('trim', $parsedData['soups']));
+
+            if (empty($jokes) || empty($soups)) {
+                return Base::retError("生成内容为空", $parsedData);
+            }
+
+            return Base::retSuccess("success", [
+                'jokes' => array_values($jokes),
+                'soups' => array_values($soups),
+                'total_jokes' => count($jokes),
+                'total_soups' => count($soups),
+                'generated_at' => date('Y-m-d H:i:s')
+            ]);
+        });
+
+        if (Base::isError($result)) {
+            Cache::forget($cacheKey);
+        }
+        return $result;
+    }
+
+    /**
+     * 选择可用的文本模型配置
+     * @return array|null
+     */
+    protected static function resolveTextProvider()
+    {
+        $setting = Base::setting('aibotSetting');
+        if (!is_array($setting)) {
+            $setting = [];
+        }
+        foreach (self::TEXT_MODEL_PRIORITY as $vendor) {
+            $config = self::buildProviderConfig($setting, $vendor);
+            if ($config) {
+                return $config;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 构建指定厂商的请求参数
+     * @param array $setting
+     * @param string $vendor
+     * @return array|null
+     */
+    protected static function buildProviderConfig(array $setting, string $vendor)
+    {
+        $key = trim((string)($setting[$vendor . '_key'] ?? ''));
+        $baseUrl = trim((string)($setting[$vendor . '_base_url'] ?? ''));
+        $agency = trim((string)($setting[$vendor . '_agency'] ?? ''));
+
+        switch ($vendor) {
+            case 'openai':
+                if ($key === '') {
+                    return null;
+                }
+                $baseUrl = $baseUrl ?: 'https://api.openai.com/v1';
+                $model = self::resolveOpenAITextModel($setting);
+                break;
+            case 'ollama':
+                if ($baseUrl === '') {
+                    return null;
+                }
+                if ($key === '') {
+                    $key = Base::strRandom(6);
+                }
+                $model = trim((string)($setting[$vendor . '_model'] ?? ''));
+                break;
+            case 'wenxin':
+                $secret = trim((string)($setting['wenxin_secret'] ?? ''));
+                if ($key === '' || $secret === '' || $baseUrl === '') {
+                    return null;
+                }
+                $key = $key . ':' . $secret;
+                $model = trim((string)($setting[$vendor . '_model'] ?? ''));
+                break;
+            default:
+                if ($key === '' || $baseUrl === '') {
+                    return null;
+                }
+                $model = trim((string)($setting[$vendor . '_model'] ?? ''));
+                break;
+        }
+
+        if ($model === '') {
+            return null;
+        }
+
+        return [
+            'vendor' => $vendor,
+            'model' => $model,
+            'api_key' => $key,
+            'base_url' => rtrim($baseUrl, '/'),
+            'agency' => $agency,
+        ];
+    }
+
+    /**
+     * 解析 OpenAI 文本模型
+     * @param array $setting
+     * @return string
+     */
+    protected static function resolveOpenAITextModel(array $setting)
+    {
+        $models = Setting::AIBotModels2Array($setting['openai_models'] ?? '', true);
+        if (in_array(self::OPENAI_DEFAULT_MODEL, $models, true)) {
+            return self::OPENAI_DEFAULT_MODEL;
+        }
+        if (!empty($setting['openai_model'])) {
+            return $setting['openai_model'];
+        }
+        return $models[0] ?? self::OPENAI_DEFAULT_MODEL;
+    }
+
+    /**
+     * OpenAI 语音模型配置
+     * @return array|null
+     */
+    protected static function resolveOpenAIAudioProvider()
+    {
+        $setting = Base::setting('aibotSetting');
+        if (!is_array($setting)) {
+            $setting = [];
+        }
+        $key = trim((string)($setting['openai_key'] ?? ''));
+        if ($key === '') {
+            return null;
+        }
+        $baseUrl = trim((string)($setting['openai_base_url'] ?? ''));
+        $baseUrl = $baseUrl ?: 'https://api.openai.com/v1';
+        $agency = trim((string)($setting['openai_agency'] ?? ''));
+
+        return [
+            'vendor' => 'openai',
+            'model' => 'whisper-1',
+            'api_key' => $key,
+            'base_url' => rtrim($baseUrl, '/'),
+            'agency' => $agency,
+        ];
+    }
+
+    /**
+     * 是否需要附加 reasoning_effort 参数
+     * @param array $provider
+     * @return bool
+     */
+    protected static function shouldSendReasoningEffort(array $provider): bool
+    {
+        if (($provider['vendor'] ?? '') !== 'openai') {
+            return false;
+        }
+        $model = $provider['model'] ?? '';
+        
+        // 匹配 gpt- 开头后跟数字的模型名称
+        if (preg_match('/^gpt-(\d+)/', $model, $matches)) {
+            return intval($matches[1]) >= 5;
+        }
+        
+        return false;
+    }
+}

app/Module/Apps.php

@@ -3,8 +3,11 @@
 namespace App\Module;
 
 use App\Exceptions\ApiException;
+use App\Models\User;
 use App\Services\RequestContext;
 use Symfony\Component\Yaml\Yaml;
+use App\Module\Base;
+use App\Module\Ihttp;
 
 class Apps
 {
@@ -44,7 +47,7 @@ class Apps
     {
         if (!self::isInstalled($appId)) {
             $name = match ($appId) {
-                'ai' => 'AI Robot',
+                'ai' => 'AI Assistant',
                 'face' => 'Face check-in',
                 'appstore' => 'AppStore',
                 'approve' => 'Approval',
@@ -57,4 +60,44 @@ class Apps
             throw new ApiException("应用「{$name}」未安装", [], 0, false);
         }
     }
+
+    /**
+     * Dispatch user lifecycle hook to appstore (onboard/offboard/delete/restore).
+     */
+    public static function dispatchUserHook(User $user, string $action, string $eventType = ''): void
+    {
+        $appKey = env('APP_KEY', '');
+        if (empty($appKey)) {
+            info('[appstore_hook] APP_KEY is empty, skip dispatchUserHook');
+            return;
+        }
+
+        $url = sprintf('http://appstore/api/v1/internal/hooks/%s', $action);
+        $payload = [
+            'user' => [
+                'id' => (string) $user->userid,
+                'email' => (string) $user->email,
+                'name' => (string) $user->nickname,
+                'role' => in_array('admin', $user->identity ?? []) ? 'admin' : 'normal',
+            ],
+        ];
+        if ($eventType !== '') {
+            $payload['event_type'] = $eventType;
+        }
+
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Authorization' => 'Bearer ' . md5($appKey),
+            'Version' => Base::getVersion(),
+        ];
+
+        $resp = Ihttp::ihttp_request($url, json_encode($payload, JSON_UNESCAPED_UNICODE), $headers, 5);
+        if (Base::isError($resp)) {
+            info('[appstore_hook] dispatch fail', [
+                'url' => $url,
+                'payload' => $payload,
+                'error' => $resp,
+            ]);
+        }
+    }
 }

app/Module/Base.php

@@ -1301,7 +1301,7 @@ class Base
     /**
      * 获取或设置
      * @param $setname          // 配置名称
-     * @param bool $array       // 保存内容
+     * @param bool|array $array // 保存内容
      * @param bool $isUpdate    // 保存内容为更新模式，默认否
      * @return array
      */
@@ -1404,11 +1404,13 @@ class Base
      */
     public static function ajaxError($msg, $data = [], $ret = 0, $abortCode = 404)
     {
-        if (Request::header('Content-Type') === 'application/json') {
-            return Base::retError($msg, $data, $ret);
-        } else {
-            abort($abortCode, $msg);
+        if (Request::header('Content-Type') !== 'application/json') {
+            $translateMsg = Doo::translate($msg);
+            abort($abortCode, $translateMsg, [
+                'X-Error-Message-Base64' => base64_encode($translateMsg),
+            ]);
         }
+        return Base::retError($msg, $data, $ret);
     }
 
     /**
@@ -1825,6 +1827,19 @@ class Base
         return $platform;
     }
 
+    /**
+     * 是否是PC端（包括 Electron 桌面端和 Web 浏览器）
+     * @param string|null $platform 平台类型，不传则自动获取
+     * @return bool
+     */
+    public static function isPc($platform = null)
+    {
+        if ($platform === null) {
+            $platform = self::platform();
+        }
+        return in_array($platform, ['win', 'mac', 'web']);
+    }
+
     /**
      * 是否是App移动端
      * @return bool
@@ -1858,12 +1873,22 @@ class Base
      * 获取每页数量
      * @param $max
      * @param $default
-     * @param string $inputName
+     * @param string|array $inputName
      * @return mixed
      */
-    public static function getPaginate($max, $default, $inputName = 'pagesize')
+    public static function getPaginate($max, $default, $inputName = ['pagesize', 'take'])
     {
-        return Min(Max(Base::nullShow(Request::input($inputName), $default), 1), $max);
+        $value = null;
+        if (!is_array($inputName)) {
+            $inputName = [$inputName];
+        }
+        foreach ($inputName as $name) {
+            if (Request::exists($name)) {
+                $value = Request::input($name);
+                break;
+            }
+        }
+        return Min(Max(Base::nullShow($value, $default), 1), $max);
     }
 
     /**
@@ -3040,7 +3065,7 @@ class Base
     {
         try {
             $converter = new CommonMarkConverter();
-            return $converter->convert($markdown);
+            return $converter->convert($markdown)->getContent();
         } catch (\League\CommonMark\Exception\CommonMarkException $e) {
             return $markdown;
         }
@@ -3049,15 +3074,73 @@ class Base
     /**
      * html 转 MD(markdown)
      * @param $html
+     * @param array $options
      * @return mixed|string
      */
-    public static function html2markdown($html)
+    public static function html2markdown($html, $options = [])
     {
         try {
-            $converter = new HtmlConverter();
+            $converter = new HtmlConverter($options);
             return $converter->convert($html);
         } catch (\Exception) {
             return $html;
         }
     }
+
+    /**
+     * 实时读取 .env 配置（不受配置缓存影响）
+     * @param string $key 配置键名
+     * @param mixed $default 默认值
+     * @return mixed
+     */
+    public static function liveEnv($key, $default = null)
+    {
+        $envFile = base_path('.env');
+        if (!file_exists($envFile)) {
+            return $default;
+        }
+
+        $envContent = file_get_contents($envFile);
+        $lines = explode("\n", $envContent);
+
+        foreach ($lines as $line) {
+            $line = trim($line);
+            
+            // 跳过注释和空行
+            if (empty($line) || str_starts_with($line, '#')) {
+                continue;
+            }
+
+            // 解析 KEY=VALUE
+            if (str_contains($line, '=')) {
+                [$envKey, $envValue] = explode('=', $line, 2);
+                $envKey = trim($envKey);
+                
+                if ($envKey === $key) {
+                    $envValue = trim($envValue);
+                    
+                    // 移除引号
+                    if (preg_match('/^(["\'])(.*)\1$/', $envValue, $matches)) {
+                        $envValue = $matches[2];
+                    }
+                    
+                    // 处理布尔值
+                    $lowerValue = strtolower($envValue);
+                    if ($lowerValue === 'true') {
+                        return true;
+                    }
+                    if ($lowerValue === 'false') {
+                        return false;
+                    }
+                    if ($lowerValue === 'null' || $lowerValue === '(null)') {
+                        return null;
+                    }
+                    
+                    return $envValue;
+                }
+            }
+        }
+
+        return $default;
+    }
 }

app/Module/ClientContext.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Module;
+
+/**
+ * 客户端上下文
+ */
+class ClientContext
+{
+    public array $context = [];
+    public float $createdAt = 0;
+    public float $updatedAt = 0;
+
+    public function __construct()
+    {
+        $this->createdAt = microtime(true);
+        $this->updatedAt = microtime(true);
+    }
+
+    /**
+     * 设置上下文
+     * @param string $key
+     * @param mixed $value
+     * @return void
+     */
+    public function set(string $key, mixed $value): void
+    {
+        $this->context[$key] = $value;
+        $this->updatedAt = microtime(true);
+    }
+
+    /**
+     * 批量设置上下文
+     * @param array $data
+     * @return void
+     */
+    public function setMultiple(array $data): void
+    {
+        foreach ($data as $key => $value) {
+            $this->context[$key] = $value;
+        }
+        $this->updatedAt = microtime(true);
+    }
+
+    /**
+     * 获取上下文
+     * @param string $key
+     * @param mixed $default
+     * @return mixed
+     */
+    public function get(string $key, mixed $default = null): mixed
+    {
+        return $this->context[$key] ?? $default;
+    }
+
+    /**
+     * 判断上下文是否存在
+     * @param string $key
+     * @return bool
+     */
+    public function has(string $key): bool
+    {
+        return isset($this->context[$key]);
+    }
+
+    /**
+     * 更新上下文
+     * @return void
+     */
+    public function update(): void
+    {
+        $this->updatedAt = microtime(true);
+    }
+
+    /**
+     * 清除上下文
+     * @return void
+     */
+    public function clear(): void
+    {
+        $this->context = [];
+    }
+}

app/Module/Doo.php

@@ -2,73 +2,40 @@
 
 namespace App\Module;
 
-use App\Exceptions\ApiException;
 use App\Models\User;
-use Cache;
-use Carbon\Carbon;
-use FFI;
+use App\Module\Interface\DooSo;
+use App\Services\RequestContext;
 
 class Doo
 {
-    private static $doo;
-    private static $userLanguage = "";
+    private const DOO_INSTANCE = 'doo_instance';
+    private const DOO_LANGUAGE = 'doo_language';
 
     /**
-     * char转为字符串
-     * @param $text
-     * @return string
-     */
-    private static function string($text): string
-    {
-        return FFI::string($text);
-    }
-
-    /**
-     * 装载
+     * 加载Doo实例
+     * - 如果已经存在，则直接返回
+     * - 否则，创建一个新的FFI实例，并初始化
      * @param $token
      * @param $language
+     * @return DooSo
      */
-    public static function load($token = null, $language = null)
+    public static function load($token = null, $language = null): DooSo
     {
-        self::$doo = FFI::cdef(<<<EOF
-                void initialize(char* work, char* token, char* lang);
-                char* license();
-                char* licenseDecode(char* license);
-                char* licenseSave(char* license);
-                int userId();
-                char* userExpiredAt();
-                char* userEmail();
-                char* userEncrypt();
-                char* userToken();
-                char* userCreate(char* email, char* password);
-                char* tokenEncode(int userid, char* email, char* encrypt, int days);
-                char* tokenDecode(char* val);
-                char* translate(char* val, char* val);
-                char* md5s(char* text, char* password);
-                char* macs();
-                char* dooSN();
-                char* version();
-                char* pgpGenerateKeyPair(char* name, char* email, char* passphrase);
-                char* pgpEncrypt(char* plainText, char* publicKey);
-                char* pgpDecrypt(char* cipherText, char* privateKey, char* passphrase);
-            EOF, "/usr/lib/doo/doo.so");
-        $token = $token ?: Base::token();
-        $language = $language ?: Base::headerOrInput('language');
-        self::$doo->initialize("/var/www", $token, $language);
-    }
-
-    /**
-     * 获取实例
-     * @param $token
-     * @param $language
-     * @return mixed
-     */
-    public static function doo($token = null, $language = null)
-    {
-        if (self::$doo == null) {
-            self::load($token, $language);
+        if (RequestContext::has(self::DOO_INSTANCE)) {
+            return RequestContext::get(self::DOO_INSTANCE);
         }
-        return self::$doo;
+
+        $request = request();
+        if ($request && method_exists($request, 'header')) {
+            $token = $token ?: Base::token();
+            $language = $language ?: Base::headerOrInput('language');
+        }
+        $instance = new DooSo($token, $language);
+
+        RequestContext::set(self::DOO_INSTANCE, $instance);
+        RequestContext::set(self::DOO_LANGUAGE, $language);
+
+        return $instance;
     }
 
     /**
@@ -77,41 +44,7 @@ class Doo
      */
     public static function license(): array
     {
-        $array = Base::json2array(self::string(self::doo()->license()));
-
-        $ips = explode(",", $array['ip']);
-        $array['ip'] = [];
-        foreach ($ips as $ip) {
-            if (Base::is_ipv4($ip)) {
-                $array['ip'][] = $ip;
-            }
-        }
-
-        $domains = explode(",", $array['domain']);
-        $array['domain'] = [];
-        foreach ($domains as $domain) {
-            if (Base::is_domain($domain)) {
-                $array['domain'][] = $domain;
-            }
-        }
-
-        $macs = explode(",", $array['mac']);
-        $array['mac'] = [];
-        foreach ($macs as $mac) {
-            if (Base::isMac($mac)) {
-                $array['mac'][] = $mac;
-            }
-        }
-
-        $emails = explode(",", $array['email']);
-        $array['email'] = [];
-        foreach ($emails as $email) {
-            if (Base::isEmail($email)) {
-                $array['email'][] = $email;
-            }
-        }
-
-        return $array;
+        return self::load()->license();
     }
 
     /**
@@ -139,26 +72,13 @@ class Doo
         return $content;
     }
 
-    /**
-     * 解析License
-     * @param $license
-     * @return array
-     */
-    public static function licenseDecode($license): array
-    {
-        return Base::json2array(self::string(self::doo()->licenseDecode($license)));
-    }
-
     /**
      * 保存License
      * @param $license
      */
     public static function licenseSave($license): void
     {
-        $res = self::string(self::doo()->licenseSave($license));
-        if ($res != 'success') {
-            throw new ApiException($res ?: 'LICENSE 保存失败');
-        }
+        self::load()->licenseSave($license);
     }
 
     /**
@@ -167,7 +87,7 @@ class Doo
      */
     public static function userId(): int
     {
-        return intval(self::doo()->userId());
+        return self::load()->userId();
     }
 
     /**
@@ -176,8 +96,7 @@ class Doo
      */
     public static function userExpired(): bool
     {
-        $expiredAt = self::userExpiredAt();
-        return $expiredAt && Carbon::parse($expiredAt)->isBefore(Carbon::now());
+        return self::load()->userExpired();
     }
 
     /**
@@ -186,8 +105,7 @@ class Doo
      */
     public static function userExpiredAt(): ?string
     {
-        $expiredAt = self::string(self::doo()->userExpiredAt());
-        return $expiredAt === 'forever' ? null : $expiredAt;
+        return self::load()->userExpiredAt();
     }
 
     /**
@@ -196,7 +114,7 @@ class Doo
      */
     public static function userEmail(): string
     {
-        return self::string(self::doo()->userEmail());
+        return self::load()->userEmail();
     }
 
     /**
@@ -205,7 +123,7 @@ class Doo
      */
     public static function userEncrypt(): string
     {
-        return self::string(self::doo()->userEncrypt());
+        return self::load()->userEncrypt();
     }
 
     /**
@@ -214,7 +132,7 @@ class Doo
      */
     public static function userToken(): string
     {
-        return self::string(self::doo()->userToken());
+        return self::load()->userToken();
     }
 
     /**
@@ -225,23 +143,7 @@ class Doo
      */
     public static function userCreate($email, $password): User|null
     {
-        $data = Base::json2array(self::string(self::doo()->userCreate($email, $password)));
-        if (Base::isError($data)) {
-            throw new ApiException($data['msg'] ?: '注册失败');
-        }
-        if (\DB::transactionLevel() > 0) {
-            try {
-                \DB::commit();
-                \DB::beginTransaction();
-            } catch (\Throwable) {
-                // do nothing
-            }
-        }
-        $user = User::whereEmail($email)->first();
-        if (empty($user)) {
-            throw new ApiException('注册失败');
-        }
-        return $user;
+        return self::load()->userCreate($email, $password);
     }
 
     /**
@@ -254,7 +156,7 @@ class Doo
      */
     public static function tokenEncode($userid, $email, $encrypt, int $days = 15): string
     {
-        return self::string(self::doo()->tokenEncode($userid, $email, $encrypt, $days));
+        return self::load()->tokenEncode($userid, $email, $encrypt, $days);
     }
 
     /**
@@ -264,40 +166,42 @@ class Doo
      */
     public static function tokenDecode($token): array
     {
-        $array = Base::json2array(self::string(self::doo()->tokenDecode($token)));
-        $array['expired_at'] = $array['expired_at'] === 'forever' ? null : $array['expired_at'];
-        return $array;
+        return self::load()->tokenDecode($token);
     }
 
     /**
      * 翻译
      * @param $text
-     * @param string $lang
+     * @param ?string $lang
      * @return string
      */
-    public static function translate($text, string $lang = ""): string
+    public static function translate($text, ?string $lang = ""): string
     {
-        return self::string(self::doo()->translate($text, $lang ?: self::$userLanguage));
+        if (empty($lang)) {
+            $lang = RequestContext::get(self::DOO_LANGUAGE);
+        }
+        return self::load()->translate($text, $lang);
     }
 
     /**
      * 设置语言
-     * @param string|integer $lang 语言 或 会员ID
+     * @param int|string $lang 语言 或 会员ID
      * @return void
      */
-    public static function setLanguage($lang) {
+    public static function setLanguage(int|string $lang): void
+    {
         if (Base::isNumber($lang)) {
             $lang = User::find(intval($lang))?->lang ?: "";
         }
-        self::$userLanguage = $lang;
+        RequestContext::set(self::DOO_LANGUAGE, $lang);
     }
 
     /**
      * 获取语言列表 或 语言名称
-     * @param string|false $lang
+     * @param bool|string $lang
      * @return string|string[]
      */
-    public static function getLanguages($lang = false)
+    public static function getLanguages(bool|string $lang = false): array|string
     {
         $array = [
             "zh" => "简体中文",
@@ -334,7 +238,7 @@ class Doo
      */
     public static function md5s($text, string $password = ""): string
     {
-        return self::string(self::doo()->md5s($text, $password));
+        return self::load()->md5s($text, $password);
     }
 
     /**
@@ -343,14 +247,7 @@ class Doo
      */
     public static function macs(): array
     {
-        $macs = explode(",", self::string(self::doo()->macs()));
-        $array = [];
-        foreach ($macs as $mac) {
-            if (Base::isMac($mac)) {
-                $array[] = $mac;
-            }
-        }
-        return $array;
+        return self::load()->macs();
     }
 
     /**
@@ -359,7 +256,7 @@ class Doo
      */
     public static function dooSN(): string
     {
-        return self::string(self::doo()->dooSN());
+        return self::load()->dooSN();
     }
 
     /**
@@ -368,7 +265,7 @@ class Doo
      */
     public static function dooVersion(): string
     {
-        return self::string(self::doo()->version());
+        return self::load()->dooVersion();
     }
 
     /**
@@ -380,7 +277,7 @@ class Doo
      */
     public static function pgpGenerateKeyPair($name, $email, string $passphrase = ""): array
     {
-        return Base::json2array(self::string(self::doo()->pgpGenerateKeyPair($name, $email, $passphrase)));
+        return self::load()->pgpGenerateKeyPair($name, $email, $passphrase);
     }
 
     /**
@@ -391,11 +288,7 @@ class Doo
      */
     public static function pgpEncrypt($plaintext, $publicKey): string
     {
-        if (strlen($publicKey) < 50) {
-            $keyCache = Base::json2array(Cache::get("KeyPair::" . $publicKey));
-            $publicKey = $keyCache['public_key'];
-        }
-        return self::string(self::doo()->pgpEncrypt($plaintext, $publicKey));
+        return self::load()->pgpEncrypt($plaintext, $publicKey);
     }
 
     /**
@@ -407,12 +300,7 @@ class Doo
      */
     public static function pgpDecrypt($encryptedText, $privateKey, $passphrase = null): string
     {
-        if (strlen($privateKey) < 50) {
-            $keyCache = Base::json2array(Cache::get("KeyPair::" . $privateKey));
-            $privateKey = $keyCache['private_key'];
-            $passphrase = $keyCache['passphrase'];
-        }
-        return self::string(self::doo()->pgpDecrypt($encryptedText, $privateKey, $passphrase));
+        return self::load()->pgpDecrypt($encryptedText, $privateKey, $passphrase);
     }
 
     /**
@@ -423,9 +311,7 @@ class Doo
      */
     public static function pgpEncryptApi($plaintext, $publicKey): string
     {
-        $content = Base::array2json($plaintext);
-        $content = self::pgpEncrypt($content, $publicKey);
-        return preg_replace("/\s*-----(BEGIN|END) PGP MESSAGE-----\s*/i", "", $content);
+        return self::load()->pgpEncryptApi($plaintext, $publicKey);
     }
 
     /**
@@ -437,9 +323,7 @@ class Doo
      */
     public static function pgpDecryptApi($encryptedText, $privateKey, $passphrase = null): array
     {
-        $content = "-----BEGIN PGP MESSAGE-----\n\n" . $encryptedText . "\n-----END PGP MESSAGE-----";
-        $content = self::pgpDecrypt($content, $privateKey, $passphrase);
-        return Base::json2array($content);
+        return self::load()->pgpDecryptApi($encryptedText, $privateKey, $passphrase);
     }
 
     /**
@@ -449,24 +333,7 @@ class Doo
      */
     public static function pgpParseStr($string): array
     {
-        $array = [
-            'encrypt_type' => '',
-            'encrypt_id' => '',
-            'client_type' => '',
-            'client_key' => '',
-        ];
-        $string = str_replace(";", "&", $string);
-        parse_str($string, $params);
-        foreach ($params as $key => $value) {
-            $key = strtolower(trim($key));
-            if ($key) {
-                $array[$key] = trim($value);
-            }
-        }
-        if ($array['client_type'] === 'pgp' && $array['client_key']) {
-            $array['client_key'] = self::pgpPublicFormat($array['client_key']);
-        }
-        return $array;
+        return self::load()->pgpParseStr($string);
     }
 
     /**
@@ -476,10 +343,6 @@ class Doo
      */
     public static function pgpPublicFormat($key): string
     {
-        $key = str_replace(["-", "_", "$"], ["+", "/", "\n"], $key);
-        if (!str_contains($key, '-----BEGIN PGP PUBLIC KEY BLOCK-----')) {
-            $key = "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n" . $key . "\n-----END PGP PUBLIC KEY BLOCK-----";
-        }
-        return $key;
+        return self::load()->pgpPublicFormat($key);
     }
 }

app/Module/Down.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Module;
+
+use Request;
+use Cache;
+
+class Down
+{
+    /**
+     * @param $data
+     * @param null $ttl
+     * @return string
+     */
+    public static function cache_encode($data, $ttl = null): string
+    {
+        $base64 = base64_encode(Base::array2string($data));
+        $key = md5($base64);
+        Cache::put("down::{$key}", $base64, $ttl ?: now()->addHour());
+        return $key;
+    }
+
+    /**
+     * @param ?string $inputName
+     * @return array
+     */
+    public static function cache_decode(?string $inputName = 'key'): array
+    {
+        $key = Request::input($inputName);
+        $base64 = Cache::get("down::{$key}");
+        if (empty($base64)) {
+            return Base::ajaxError("请求已过期，请重新导出！", [], 0, 403);
+        }
+        //
+        return Base::string2array(base64_decode($base64));
+    }
+}

app/Module/Extranet.php

@@ -4,319 +4,12 @@ namespace App\Module;
 
 use Cache;
 use Carbon\Carbon;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Config;
 
 /**
  * 外网资源请求
  */
 class Extranet
 {
-    /**
-     * 通过 openAI 语音转文字
-     * @param string $filePath
-     * @param array $extParams
-     * @return array
-     */
-    public static function openAItranscriptions($filePath, $extParams = [])
-    {
-        if (!file_exists($filePath)) {
-            return Base::retError("语音文件不存在");
-        }
-        $systemSetting = Base::setting('system');
-        $aibotSetting = Base::setting('aibotSetting');
-        if ($systemSetting['voice2text'] !== 'open' || empty($aibotSetting['openai_key'])) {
-            return Base::retError("语音转文字功能未开启");
-        }
-        $extra = [
-            'Content-Type' => 'multipart/form-data',
-            'Authorization' => 'Bearer ' . $aibotSetting['openai_key'],
-        ];
-        if ($aibotSetting['openai_agency']) {
-            $extra['CURLOPT_PROXY'] = $aibotSetting['openai_agency'];
-            $extra['CURLOPT_PROXYTYPE'] = str_contains($aibotSetting['openai_agency'], 'socks') ? CURLPROXY_SOCKS5 : CURLPROXY_HTTP;
-        }
-        $post = array_merge($extParams, [
-            'file' => new \CURLFile($filePath),
-            'model' => 'whisper-1',
-        ]);
-        $cacheKey = "openAItranscriptions::" . md5($filePath . '_' . Base::array2json($extra) . '_' . Base::array2json($extParams));
-        $result = Cache::remember($cacheKey, Carbon::now()->addDays(), function() use ($extra, $post) {
-            $res = Ihttp::ihttp_request('https://api.openai.com/v1/audio/transcriptions', $post, $extra, 15);
-            if (Base::isError($res)) {
-                return Base::retError("语音转文字失败", $res);
-            }
-            $resData = Base::json2array($res['data']);
-            if (empty($resData['text'])) {
-                return Base::retError("语音转文字失败", $resData);
-            }
-            return Base::retSuccess("success", $resData['text']);
-        });
-        if (Base::isError($result)) {
-            Cache::forget($cacheKey);
-        }
-        return $result;
-    }
-
-    /**
-     * 通过 openAI 翻译
-     * @param $text
-     * @param $targetLanguage
-     * @return array
-     */
-    public static function openAItranslations($text, $targetLanguage)
-    {
-        $systemSetting = Base::setting('system');
-        $aibotSetting = Base::setting('aibotSetting');
-        if ($systemSetting['translation'] !== 'open' || empty($aibotSetting['openai_key'])) {
-            return Base::retError("翻译功能未开启");
-        }
-        $extra = [
-            'Content-Type' => 'application/json',
-            'Authorization' => 'Bearer ' . $aibotSetting['openai_key'],
-        ];
-        if ($aibotSetting['openai_agency']) {
-            $extra['CURLOPT_PROXY'] = $aibotSetting['openai_agency'];
-            $extra['CURLOPT_PROXYTYPE'] = str_contains($aibotSetting['openai_agency'], 'socks') ? CURLPROXY_SOCKS5 : CURLPROXY_HTTP;
-        }
-        $post = json_encode([
-            "model" => "gpt-4o-mini",
-            "messages" => [
-                [
-                    "role" => "system",
-                    "content" => <<<EOF
-                        你是一名专业翻译人员，请将 <translation_original_text> 标签内的内容翻译为{$targetLanguage}。
-
-                        翻译要求：
-                        - 翻译结果需符合“项目任务管理系统”的专业术语和使用场景。
-                        - 保持原文格式、结构和排版不变。
-                        - 语言表达准确、简洁，符合项目管理领域的行业规范。
-                        - 注意专业术语的一致性和连贯性。
-                        EOF
-                ],
-                [
-                    "role" => "user",
-                    "content" => "<translation_original_text>{$text}</translation_original_text>"
-                ]
-            ]
-        ]);
-        $cacheKey = "openAItranslations::" . md5(Base::array2json($extra) . '_' . Base::array2json($post));
-        $result = Cache::remember($cacheKey, Carbon::now()->addDays(), function() use ($extra, $post) {
-            $res = Ihttp::ihttp_request('https://api.openai.com/v1/chat/completions', $post, $extra, 15);
-            if (Base::isError($res)) {
-                return Base::retError("翻译失败", $res);
-            }
-            $resData = Base::json2array($res['data']);
-            if (empty($resData['choices'])) {
-                return Base::retError("翻译失败", $resData);
-            }
-            $result = $resData['choices'][0]['message']['content'];
-            $result = preg_replace('/^\"|\"$/', '', trim($result));
-            $result = preg_replace('/<\/*translation_original_text>/', '', trim($result));
-            if (empty($result)) {
-                return Base::retError("翻译失败", $result);
-            }
-            return Base::retSuccess("success", $result);
-        });
-        if (Base::isError($result)) {
-            Cache::forget($cacheKey);
-        }
-        return $result;
-    }
-
-    /**
-     * 通过 openAI 生成标题
-     * @param $text
-     * @return array
-     */
-    public static function openAIGenerateTitle($text)
-    {
-        $aibotSetting = Base::setting('aibotSetting');
-        if (empty($aibotSetting['openai_key'])) {
-            return Base::retError("AI接口未配置");
-        }
-        $extra = [
-            'Content-Type' => 'application/json',
-            'Authorization' => 'Bearer ' . $aibotSetting['openai_key'],
-        ];
-        if ($aibotSetting['openai_agency']) {
-            $extra['CURLOPT_PROXY'] = $aibotSetting['openai_agency'];
-            $extra['CURLOPT_PROXYTYPE'] = str_contains($aibotSetting['openai_agency'], 'socks') ? CURLPROXY_SOCKS5 : CURLPROXY_HTTP;
-        }
-        $res = Ihttp::ihttp_request('https://api.openai.com/v1/chat/completions', json_encode([
-            "model" => "gpt-4o-mini",
-            "messages" => [
-                [
-                    "role" => "system",
-                    "content" => "你是一个专业的标题生成器，擅长为对话生成简洁的标题，请将提供的文本生成一个标题。"
-                ],
-                [
-                    "role" => "user",
-                    "content" => $text
-                ]
-            ]
-        ]), $extra, 15);
-        if (Base::isError($res)) {
-            return Base::retError("生成失败", $res);
-        }
-        $resData = Base::json2array($res['data']);
-        if (empty($resData['choices'])) {
-            return Base::retError("生成失败", $resData);
-        }
-        $result = $resData['choices'][0]['message']['content'];
-        $result = preg_replace('/^\"|\"$/', '', $result);
-        if (empty($result)) {
-            return Base::retError("生成失败", $result);
-        }
-        return Base::retSuccess("success", $result);
-    }
-
-    /**
-     * 获取 ollama 模型
-     * @param $baseUrl
-     * @param $key
-     * @param $agency
-     * @return array
-     */
-    public static function ollamaModels($baseUrl, $key = null, $agency = null)
-    {
-        $extra = [
-            'Content-Type' => 'application/json',
-        ];
-        if ($key) {
-            $extra['Authorization'] = 'Bearer ' . $key;
-        }
-        if ($agency) {
-            $extra['CURLOPT_PROXY'] = $agency;
-            $extra['CURLOPT_PROXYTYPE'] = str_contains($agency, 'socks') ? CURLPROXY_SOCKS5 : CURLPROXY_HTTP;
-        }
-        $res = Ihttp::ihttp_request(rtrim($baseUrl, '/') . '/api/tags', [], $extra, 15);
-        if (Base::isError($res)) {
-            return Base::retError("获取失败", $res);
-        }
-        $resData = Base::json2array($res['data']);
-        if (empty($resData['models'])) {
-            return Base::retError("获取失败", $resData);
-        }
-        $models = [];
-        foreach ($resData['models'] as $model) {
-            if ($model['name'] !== $model['model']) {
-                $models[] = "{$model['model']} | {$model['name']}";
-            } else {
-                $models[] = $model['model'];
-            }
-        }
-        return Base::retSuccess("success", [
-            'models' => $models,
-            'original' => $resData['models']
-        ]);
-    }
-
-    /**
-     * 获取IP地址经纬度
-     * @param string $ip
-     * @return array
-     */
-    public static function getIpGcj02(string $ip = ''): array
-    {
-        if (empty($ip)) {
-            $ip = Base::getIp();
-        }
-        $cacheKey = "getIpPoint::" . md5($ip);
-        $result = Cache::rememberForever($cacheKey, function () use ($ip) {
-            return Ihttp::ihttp_request("https://www.ifreesite.com/ipaddress/address.php?q=" . $ip, [], [], 12);
-        });
-        if (Base::isError($result)) {
-            Cache::forget($cacheKey);
-            return $result;
-        }
-        $data = $result['data'];
-        $lastPos = strrpos($data, ',');
-        $long = floatval(Base::getMiddle(substr($data, $lastPos + 1), null, ')'));
-        $lat = floatval(Base::getMiddle(substr($data, strrpos(substr($data, 0, $lastPos), ',') + 1), null, ','));
-        return Base::retSuccess("success", [
-            'long' => $long,
-            'lat' => $lat,
-        ]);
-    }
-
-    /**
-     * 百度接口：根据ip获取经纬度
-     * @param string $ip
-     * @return array
-     */
-    public static function getIpGcj02ByBaidu(string $ip = ''): array
-    {
-        if (empty($ip)) {
-            $ip = Base::getIp();
-        }
-
-        $cacheKey = "getIpPoint::" . md5($ip);
-        $result = Cache::rememberForever($cacheKey, function () use ($ip) {
-            $ak = Config::get('app.baidu_app_key');
-            $url = 'http://api.map.baidu.com/location/ip?ak=' . $ak . '&ip=' . $ip . '&coor=bd09ll';
-            return Ihttp::ihttp_request($url, [], [], 12);
-        });
-
-        if (Base::isError($result)) {
-            Cache::forget($cacheKey);
-            return $result;
-        }
-        $data = json_decode($result['data'], true);
-
-        // x坐标纬度, y坐标经度
-        $long = Arr::get($data, 'content.point.x');
-        $lat = Arr::get($data, 'content.point.y');
-        return Base::retSuccess("success", [
-            'long' => $long,
-            'lat' => $lat,
-        ]);
-    }
-
-    /**
-     * 获取IP地址详情
-     * @param string $ip
-     * @return array
-     */
-    public static function getIpInfo(string $ip = ''): array
-    {
-        if (empty($ip)) {
-            $ip = Base::getIp();
-        }
-        $cacheKey = "getIpInfo::" . md5($ip);
-        $result = Cache::rememberForever($cacheKey, function () use ($ip) {
-            return Ihttp::ihttp_request("http://ip.taobao.com/service/getIpInfo.php?accessKey=alibaba-inc&ip=" . $ip, [], [], 12);
-        });
-        if (Base::isError($result)) {
-            Cache::forget($cacheKey);
-            return $result;
-        }
-        $data = json_decode($result['data'], true);
-        if (!is_array($data) || intval($data['code']) != 0) {
-            Cache::forget($cacheKey);
-            return Base::retError("error ip: -1");
-        }
-        $data = $data['data'];
-        if (!is_array($data) || !isset($data['country'])) {
-            return Base::retError("error ip: -2");
-        }
-        $data['text'] = $data['country'];
-        $data['textSmall'] = $data['country'];
-        if ($data['region'] && $data['region'] != $data['country'] && $data['region'] != "XX") {
-            $data['text'] .= " " . $data['region'];
-            $data['textSmall'] = $data['region'];
-        }
-        if ($data['city'] && $data['city'] != $data['region'] && $data['city'] != "XX") {
-            $data['text'] .= " " . $data['city'];
-            $data['textSmall'] .= " " . $data['city'];
-        }
-        if ($data['county'] && $data['county'] != $data['city'] && $data['county'] != "XX") {
-            $data['text'] .= " " . $data['county'];
-            $data['textSmall'] .= " " . $data['county'];
-        }
-        return Base::retSuccess("success", $data);
-    }
-
     /**
      * 判断是否工作日
      * @param string $Ymd 年月日（如：20220102）
@@ -372,125 +65,6 @@ class Extranet
         ];
     }
 
-    /**
-     * 随机笑话接口
-     * @return string
-     */
-    public static function randJoke(): string
-    {
-        $data = self::curl("https://hmajax.itheima.net/api/randjoke");
-        $data = Base::json2array($data);
-        if ($data['message'] === '获取成功' && $text = trim($data['data'])) {
-            return $text;
-        }
-        return "";
-    }
-
-    /**
-     * 心灵鸡汤
-     * @return string
-     */
-    public static function soups(): string
-    {
-        $data = self::curl("https://hmajax.itheima.net/api/ambition");
-        $data = Base::json2array($data);
-        if ($data['message'] === '获取成功' && $text = trim($data['data'])) {
-            return $text;
-        }
-        return "";
-    }
-
-    /**
-     * 签到机器人网络内容
-     * @param $type
-     * @return string
-     */
-    public static function checkinBotQuickMsg($type): string
-    {
-        $text = "维护中...";
-        switch ($type) {
-            case "it":
-                $data = self::curl('http://vvhan.api.hitosea.com/api/hotlist?type=itNews', 3600);
-                if ($data = Base::json2array($data)) {
-                    $i = 1;
-                    $array = array_map(function ($item) use (&$i) {
-                        if ($item['title'] && $item['desc']) {
-                            return "<p>" . ($i++) . ". <strong><a href='{$item['mobilUrl']}' target='_blank'>{$item['title']}</a></strong></p><p>{$item['desc']}</p>";
-                        } else {
-                            return null;
-                        }
-                    }, $data['data']);
-                    $array = array_values(array_filter($array));
-                    if ($array) {
-                        array_unshift($array, "<p><strong>{$data['title']}</strong>（{$data['update_time']}）</p>");
-                        $text = implode("<p>&nbsp;</p>", $array);
-                    }
-                }
-                break;
-
-            case "36ke":
-                $data = self::curl('http://vvhan.api.hitosea.com/api/hotlist?type=36Ke', 3600);
-                if ($data = Base::json2array($data)) {
-                    $i = 1;
-                    $array = array_map(function ($item) use (&$i) {
-                        if ($item['title'] && $item['desc']) {
-                            return "<p>" . ($i++) . ". <strong><a href='{$item['mobilUrl']}' target='_blank'>{$item['title']}</a></strong></p><p>{$item['desc']}</p>";
-                        } else {
-                            return null;
-                        }
-                    }, $data['data']);
-                    $array = array_values(array_filter($array));
-                    if ($array) {
-                        array_unshift($array, "<p><strong>{$data['title']}</strong>（{$data['update_time']}）</p>");
-                        $text = implode("<p>&nbsp;</p>", $array);
-                    }
-                }
-                break;
-
-            case "60s":
-                $data = self::curl('http://vvhan.api.hitosea.com/api/60s?type=json', 3600);
-                if ($data = Base::json2array($data)) {
-                    $i = 1;
-                    $array = array_map(function ($item) use (&$i) {
-                        if ($item) {
-                            return "<p>" . ($i++) . ". {$item}</p>";
-                        } else {
-                            return null;
-                        }
-                    }, $data['data']);
-                    $array = array_values(array_filter($array));
-                    if ($array) {
-                        array_unshift($array, "<p><strong>{$data['name']}</strong>（{$data['time'][0]}）</p>");
-                        $text = implode("<p>&nbsp;</p>", $array);
-                    }
-                }
-                break;
-
-            case "joke":
-                $text = "笑话被掏空";
-                $data = self::curl('http://vvhan.api.hitosea.com/api/joke?type=json', 5);
-                if ($data = Base::json2array($data)) {
-                    if ($data = trim($data['joke'])) {
-                        $text = "开心笑话：{$data}";
-                    }
-                }
-                break;
-
-            case "soup":
-                $text = "鸡汤分完了";
-                $data = self::curl('https://api.ayfre.com/jt/?type=bot', 5);
-                if ($data) {
-                    $text = "心灵鸡汤：{$data}";
-                }
-                break;
-
-            default:
-                $text = "";
-                break;
-        }
-        return $text;
-    }
-
     /**
      * 获取搜狗表情包
      * @param $keyword

app/Module/Interface/DooSo.php

@@ -0,0 +1,412 @@
+<?php
+
+namespace App\Module\Interface;
+
+use App\Exceptions\ApiException;
+use App\Module\Base;
+use App\Models\User;
+use Cache;
+use Carbon\Carbon;
+use DB;
+use FFI;
+use FFI\CData;
+use FFI\Exception;
+use Throwable;
+
+class DooSo
+{
+    private mixed $so;
+
+    public function __construct($token = null, $language = null)
+    {
+        $this->so = FFI::cdef(<<<EOF
+                void initialize(char* work, char* token, char* lang);
+                char* license();
+                char* licenseDecode(char* license);
+                char* licenseSave(char* license);
+                int userId();
+                char* userExpiredAt();
+                char* userEmail();
+                char* userEncrypt();
+                char* userToken();
+                char* userCreate(char* email, char* password);
+                char* tokenEncode(int userid, char* email, char* encrypt, int days);
+                char* tokenDecode(char* val);
+                char* translate(char* val, char* val);
+                char* md5s(char* text, char* password);
+                char* macs();
+                char* dooSN();
+                char* version();
+                char* pgpGenerateKeyPair(char* name, char* email, char* passphrase);
+                char* pgpEncrypt(char* plainText, char* publicKey);
+                char* pgpDecrypt(char* cipherText, char* privateKey, char* passphrase);
+            EOF, "/usr/lib/doo/doo.so");
+        $this->so->initialize("/var/www", $token, $language);
+        return $this->so;
+    }
+
+    /**
+     * char转为字符串
+     * @param $text
+     * @return string
+     */
+    private static function string($text): string
+    {
+        if (!($text instanceof CData)) {
+            return "";
+        }
+
+        try {
+            return FFI::string($text);
+        } catch (Exception) {
+            return "";
+        }
+    }
+
+    /**
+     * License
+     * @return array
+     */
+    public function license(): array
+    {
+        $array = Base::json2array(self::string($this->so->license()));
+
+        $ips = explode(",", $array['ip']);
+        $array['ip'] = [];
+        foreach ($ips as $ip) {
+            if (Base::is_ipv4($ip)) {
+                $array['ip'][] = $ip;
+            }
+        }
+
+        $domains = explode(",", $array['domain']);
+        $array['domain'] = [];
+        foreach ($domains as $domain) {
+            if (Base::is_domain($domain)) {
+                $array['domain'][] = $domain;
+            }
+        }
+
+        $macs = explode(",", $array['mac']);
+        $array['mac'] = [];
+        foreach ($macs as $mac) {
+            if (Base::isMac($mac)) {
+                $array['mac'][] = $mac;
+            }
+        }
+
+        $emails = explode(",", $array['email']);
+        $array['email'] = [];
+        foreach ($emails as $email) {
+            if (Base::isEmail($email)) {
+                $array['email'][] = $email;
+            }
+        }
+
+        return $array;
+    }
+
+    /**
+     * 解析License
+     * @param $license
+     * @return array
+     */
+    public function licenseDecode($license): array
+    {
+        return Base::json2array(self::string($this->so->licenseDecode($license)));
+    }
+
+    /**
+     * 保存License
+     * @param $license
+     */
+    public function licenseSave($license): void
+    {
+        $res = self::string($this->so->licenseSave($license));
+        if ($res != 'success') {
+            throw new ApiException($res ?: 'LICENSE 保存失败');
+        }
+    }
+
+    /**
+     * 当前会员ID（来自请求的token）
+     * @return int
+     */
+    public function userId(): int
+    {
+        return intval($this->so->userId());
+    }
+
+    /**
+     * token是否过期（来自请求的token）
+     * @return bool
+     */
+    public function userExpired(): bool
+    {
+        $expiredAt = $this->userExpiredAt();
+        return $expiredAt && Carbon::parse($expiredAt)->isBefore(Carbon::now());
+    }
+
+    /**
+     * token过期时间（来自请求的token）
+     * @return string|null
+     */
+    public function userExpiredAt(): ?string
+    {
+        $expiredAt = self::string($this->so->userExpiredAt());
+        return $expiredAt === 'forever' ? null : $expiredAt;
+    }
+
+    /**
+     * 当前会员邮箱地址（来自请求的token）
+     * @return string
+     */
+    public function userEmail(): string
+    {
+        return self::string($this->so->userEmail());
+    }
+
+    /**
+     * 当前会员Encrypt（来自请求的token）
+     * @return string
+     */
+    public function userEncrypt(): string
+    {
+        return self::string($this->so->userEncrypt());
+    }
+
+    /**
+     * 当前会员token（来自请求的token）
+     * @return string
+     */
+    public function userToken(): string
+    {
+        return self::string($this->so->userToken());
+    }
+
+    /**
+     * 创建帐号
+     * @param $email
+     * @param $password
+     * @return User|null
+     */
+    public function userCreate($email, $password): User|null
+    {
+        $data = Base::json2array(self::string($this->so->userCreate($email, $password)));
+        if (Base::isError($data)) {
+            throw new ApiException($data['msg'] ?: '注册失败');
+        }
+        if (DB::transactionLevel() > 0) {
+            try {
+                DB::commit();
+                DB::beginTransaction();
+            } catch (Throwable) {
+                // do nothing
+            }
+        }
+        $user = User::whereEmail($email)->first();
+        if (empty($user)) {
+            throw new ApiException('注册失败');
+        }
+        return $user;
+    }
+
+    /**
+     * 生成token（编码token）
+     * @param $userid
+     * @param $email
+     * @param $encrypt
+     * @param int $days 有效时间（天）
+     * @return string
+     */
+    public function tokenEncode($userid, $email, $encrypt, int $days = 15): string
+    {
+        return self::string($this->so->tokenEncode($userid, $email, $encrypt, $days));
+    }
+
+    /**
+     * 解码token
+     * @param $token
+     * @return array
+     */
+    public function tokenDecode($token): array
+    {
+        $array = Base::json2array(self::string($this->so->tokenDecode($token)));
+        $array['expired_at'] = $array['expired_at'] === 'forever' ? null : $array['expired_at'];
+        return $array;
+    }
+
+    /**
+     * 翻译
+     * @param $text
+     * @param ?string $lang
+     * @return string
+     */
+    public function translate($text, ?string $lang = ""): string
+    {
+        if (empty($text)) {
+            return "";
+        }
+        if (empty($lang)) {
+            $lang = "";
+        }
+        return self::string($this->so->translate($text, $lang));
+    }
+
+    /**
+     * md5防破解
+     * @param $text
+     * @param string $password
+     * @return string
+     */
+    public function md5s($text, string $password = ""): string
+    {
+        return self::string($this->so->md5s($text, $password));
+    }
+
+    /**
+     * 获取php容器mac地址组
+     * @return array
+     */
+    public function macs(): array
+    {
+        $macs = explode(",", self::string($this->so->macs()));
+        $array = [];
+        foreach ($macs as $mac) {
+            if (Base::isMac($mac)) {
+                $array[] = $mac;
+            }
+        }
+        return $array;
+    }
+
+    /**
+     * 获取当前SN
+     * @return string
+     */
+    public function dooSN(): string
+    {
+        return self::string($this->so->dooSN());
+    }
+
+    /**
+     * 获取当前版本
+     * @return string
+     */
+    public function dooVersion(): string
+    {
+        return self::string($this->so->version());
+    }
+
+    /**
+     * 生成PGP密钥对
+     * @param $name
+     * @param $email
+     * @param string $passphrase
+     * @return array
+     */
+    public function pgpGenerateKeyPair($name, $email, string $passphrase = ""): array
+    {
+        return Base::json2array(self::string($this->so->pgpGenerateKeyPair($name, $email, $passphrase)));
+    }
+
+    /**
+     * PGP加密
+     * @param $plaintext
+     * @param $publicKey
+     * @return string
+     */
+    public function pgpEncrypt($plaintext, $publicKey): string
+    {
+        if (strlen($publicKey) < 50) {
+            $keyCache = Base::json2array(Cache::get("KeyPair::" . $publicKey));
+            $publicKey = $keyCache['public_key'];
+        }
+        return self::string($this->so->pgpEncrypt($plaintext, $publicKey));
+    }
+
+    /**
+     * PGP解密
+     * @param $encryptedText
+     * @param $privateKey
+     * @param null $passphrase
+     * @return string
+     */
+    public function pgpDecrypt($encryptedText, $privateKey, $passphrase = null): string
+    {
+        if (strlen($privateKey) < 50) {
+            $keyCache = Base::json2array(Cache::get("KeyPair::" . $privateKey));
+            $privateKey = $keyCache['private_key'];
+            $passphrase = $keyCache['passphrase'];
+        }
+        return self::string($this->so->pgpDecrypt($encryptedText, $privateKey, $passphrase));
+    }
+
+    /**
+     * PGP加密API
+     * @param $plaintext
+     * @param $publicKey
+     * @return string
+     */
+    public function pgpEncryptApi($plaintext, $publicKey): string
+    {
+        $content = Base::array2json($plaintext);
+        $content = $this->pgpEncrypt($content, $publicKey);
+        return preg_replace("/\s*-----(BEGIN|END) PGP MESSAGE-----\s*/i", "", $content);
+    }
+
+    /**
+     * PGP解密API
+     * @param $encryptedText
+     * @param null $privateKey
+     * @param null $passphrase
+     * @return array
+     */
+    public function pgpDecryptApi($encryptedText, $privateKey, $passphrase = null): array
+    {
+        $content = "-----BEGIN PGP MESSAGE-----\n\n" . $encryptedText . "\n-----END PGP MESSAGE-----";
+        $content = $this->pgpDecrypt($content, $privateKey, $passphrase);
+        return Base::json2array($content);
+    }
+
+    /**
+     * 解析PGP参数
+     * @param $string
+     * @return string[]
+     */
+    public function pgpParseStr($string): array
+    {
+        $array = [
+            'encrypt_type' => '',
+            'encrypt_id' => '',
+            'client_type' => '',
+            'client_key' => '',
+        ];
+        $string = str_replace(";", "&", $string);
+        parse_str($string, $params);
+        foreach ($params as $key => $value) {
+            $key = strtolower(trim($key));
+            if ($key) {
+                $array[$key] = trim($value);
+            }
+        }
+        if ($array['client_type'] === 'pgp' && $array['client_key']) {
+            $array['client_key'] = $this->pgpPublicFormat($array['client_key']);
+        }
+        return $array;
+    }
+
+    /**
+     * 还原公钥格式
+     * @param $key
+     * @return string
+     */
+    public function pgpPublicFormat($key): string
+    {
+        $key = str_replace(["-", "_", "$"], ["+", "/", "\n"], $key);
+        if (!str_contains($key, '-----BEGIN PGP PUBLIC KEY BLOCK-----')) {
+            $key = "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n" . $key . "\n-----END PGP PUBLIC KEY BLOCK-----";
+        }
+        return $key;
+    }
+}

app/Module/Lock.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Module;
+
+use Closure;
+use Exception;
+use Illuminate\Support\Facades\Redis;
+
+class Lock
+{
+    /**
+     * 使用Redis分布式锁执行闭包
+     * @param string $key 锁的key
+     * @param Closure $closure 要执行的闭包函数
+     * @param int $ttl 锁的过期时间（毫秒），默认10000（10秒）
+     * @param int $waitTimeout 等待锁的超时时间（毫秒），0表示不等待，默认10000（10秒）
+     * @return mixed 闭包函数的返回值
+     * @throws Exception 如果获取锁失败或闭包执行异常
+     */
+    public static function withLock(string $key, Closure $closure, int $ttl = 10000, int $waitTimeout = 10000)
+    {
+        $lockKey = "lock:{$key}";
+        $lockValue = uniqid('', true); // 生成唯一值，用于安全释放锁
+
+        // 尝试获取锁，如果waitTimeout为0则直接返回false，否则等待指定时间
+        $acquired = false;
+        if ($waitTimeout > 0) {
+            $end = microtime(true) + ($waitTimeout / 1000);
+            while (microtime(true) < $end) {
+                if (Redis::set($lockKey, $lockValue, 'PX', $ttl, 'NX')) {
+                    $acquired = true;
+                    break;
+                }
+                usleep(100000); // 休眠100ms后重试
+            }
+        } else {
+            $acquired = Redis::set($lockKey, $lockValue, 'PX', $ttl, 'NX');
+        }
+
+        if (!$acquired) {
+            throw new Exception("Failed to acquire lock for key: {$key}");
+        }
+
+        try {
+            // 执行闭包
+            return $closure();
+        } finally {
+            // 安全释放锁（仅当锁值未变时删除）
+            Redis::eval("if redis.call('get', KEYS[1]) == ARGV[1] then return redis.call('del', KEYS[1]) else return 0 end", 1, $lockKey, $lockValue);
+        }
+    }
+}

app/Observers/WebSocketDialogUserObserver.php

@@ -3,6 +3,7 @@
 namespace App\Observers;
 
 use App\Models\Deleted;
+use App\Models\UserBot;
 use App\Models\WebSocketDialogUser;
 use App\Tasks\ZincSearchSyncTask;
 use Carbon\Carbon;
@@ -31,6 +32,11 @@ class WebSocketDialogUserObserver extends AbstractObserver
         }
         Deleted::forget('dialog', $webSocketDialogUser->dialog_id, $webSocketDialogUser->userid);
         self::taskDeliver(new ZincSearchSyncTask('userSync', $webSocketDialogUser->toArray()));
+        //
+        $dialog = $webSocketDialogUser->webSocketDialog;
+        if ($dialog) {
+            $dialog->dispatchMemberWebhook(UserBot::WEBHOOK_EVENT_MEMBER_JOIN, $webSocketDialogUser->userid, intval($webSocketDialogUser->inviter));
+        }
     }
 
     /**
@@ -54,6 +60,12 @@ class WebSocketDialogUserObserver extends AbstractObserver
     {
         Deleted::record('dialog', $webSocketDialogUser->dialog_id, $webSocketDialogUser->userid);
         self::taskDeliver(new ZincSearchSyncTask('deleteUser', $webSocketDialogUser->toArray()));
+        //
+        $dialog = $webSocketDialogUser->webSocketDialog;
+        if ($dialog) {
+            $operatorId = $webSocketDialogUser->operator_id ?? 0;
+            $dialog->dispatchMemberWebhook(UserBot::WEBHOOK_EVENT_MEMBER_LEAVE, $webSocketDialogUser->userid, intval($operatorId));
+        }
     }
 
     /**

app/Services/RequestContext.php

@@ -2,33 +2,101 @@
 
 namespace App\Services;
 
+use App\Module\ClientContext;
 use Illuminate\Http\Request;
+use Swoole\Coroutine;
 
+/**
+ * 请求上下文
+ */
 class RequestContext
 {
-    /** @var array<string, array<string, mixed>> */
-    private static array $context = [];
+    /** @var string 请求ID的上下文键 */
+    private const CONTEXT_KEY = 'request_id';
 
-    private const REQUEST_ID_PREFIX = 'req_';
+    /** @var string 请求ID前缀 */
+    private const REQUEST_ID_PREFIX = 'req';
+
+    /** @var int 上下文的TTL（生存时间） */
+    private const TTL_SECONDS = 3600;  // 上下文 TTL 为 1 小时
+
+    /** @var array<string, ClientContext> 存储每个请求的上下文数据 */
+    private static array $context = [];
 
     /**
      * 生成请求唯一ID
      */
     public static function generateRequestId(): string
     {
-        return self::REQUEST_ID_PREFIX . uniqid() . mt_rand(10000, 99999);
+        $pid = getmypid();
+        $cid = Coroutine::getCid() ?? 0;
+        $microtime = str_replace('.', '', microtime(true));
+        return self::REQUEST_ID_PREFIX . '_' . $pid . '_' . $cid . '_' . $microtime . '_' . mt_rand(1000, 9999);
     }
 
     /**
      * 获取当前请求ID
      */
-    private static function getCurrentRequestId(): ?string
+    public static function getCurrentRequestId($requestId = null): ?string
     {
-        /** @var Request $request */
+        // 如果提供了有效的请求ID，直接返回
+        if ($requestId && str_starts_with($requestId, self::REQUEST_ID_PREFIX)) {
+            return $requestId;
+        }
+
+        // 尝试从当前请求获取
         $request = request();
-        return $request?->requestId;
+        if ($request && method_exists($request, 'attributes') && $request->attributes) {
+            if (!$request->attributes->has(static::CONTEXT_KEY)) {
+                $request->attributes->set(static::CONTEXT_KEY, self::generateRequestId());
+            }
+            return $request->attributes->get(static::CONTEXT_KEY);
+        }
+
+        // 如果没有请求上下文，生成一个新的请求ID
+        return self::generateRequestId();
     }
 
+    /**
+     * 获取当前请求的上下文示例
+     */
+    public static function getCurrentRequestContext($requestId = null): ?ClientContext
+    {
+        $requestId = self::getCurrentRequestId($requestId);
+        if ($requestId === null) {
+            return null;
+        }
+
+        if (!isset(self::$context[$requestId])) {
+            // 如果上下文不存在，则创建一个新的上下文
+            self::$context[$requestId] = new ClientContext();
+        } else {
+            // 如果上下文已存在，更新访问时间
+            self::$context[$requestId]->update();
+        }
+
+        return self::$context[$requestId];
+    }
+
+    /**
+     * 清理过期上下文数据，防止内存泄漏
+     */
+    public static function cleanExpired(): void
+    {
+        $now = microtime(true);
+
+        // 清理过期的上下文
+        foreach (self::$context as $requestId => $context) {
+            if ($now - $context->updatedAt > self::TTL_SECONDS) {
+                unset(self::$context[$requestId]);
+            }
+        }
+    }
+
+    /** ***************************************************************************************** */
+    /** ***************************************************************************************** */
+    /** ***************************************************************************************** */
+
     /**
      * 设置请求上下文
      *
@@ -39,13 +107,34 @@ class RequestContext
      */
     public static function set(string $key, mixed $value, ?string $requestId = null): void
     {
-        $requestId = $requestId ?? self::getCurrentRequestId();
-        if ($requestId === null) {
+        $context = self::getCurrentRequestContext($requestId);
+        if ($context === null) {
             return;
         }
 
-        self::$context[$requestId] ??= [];
-        self::$context[$requestId][$key] = $value;
+        $context->set($key, $value);
+
+        // 概率性清理，避免频繁清理影响性能
+        if (mt_rand(1, 100) === 1) {
+            self::cleanExpired();
+        }
+    }
+
+    /**
+     * 批量设置上下文数据
+     *
+     * @param array<string, mixed> $data
+     * @param string|null $requestId
+     * @return void
+     */
+    public static function setMultiple(array $data, ?string $requestId = null): void
+    {
+        $context = self::getCurrentRequestContext($requestId);
+        if ($context === null) {
+            return;
+        }
+
+        $context->setMultiple($data);
     }
 
     // 与 set 方法的区别是，save 方法会返回传入的 value 值
@@ -65,12 +154,28 @@ class RequestContext
      */
     public static function get(string $key, mixed $default = null, ?string $requestId = null): mixed
     {
-        $requestId = $requestId ?? self::getCurrentRequestId();
-        if ($requestId === null) {
+        $context = self::getCurrentRequestContext($requestId);
+        if ($context === null) {
             return $default;
         }
 
-        return self::$context[$requestId][$key] ?? $default;
+        return $context->get($key, $default);
+    }
+
+    /**
+     * 获取当前请求的所有上下文数据
+     *
+     * @param string|null $requestId
+     * @return array<string, mixed>
+     */
+    public static function getAll(?string $requestId = null): array
+    {
+        $context = self::getCurrentRequestContext($requestId);
+        if ($context === null) {
+            return [];
+        }
+
+        return $context->context ?? [];
     }
 
     /**
@@ -82,12 +187,12 @@ class RequestContext
      */
     public static function has(string $key, ?string $requestId = null): bool
     {
-        $requestId = $requestId ?? self::getCurrentRequestId();
-        if ($requestId === null) {
+        $context = self::getCurrentRequestContext($requestId);
+        if ($context === null) {
             return false;
         }
 
-        return isset(self::$context[$requestId][$key]);
+        return $context->has($key);
     }
 
     /**
@@ -96,9 +201,9 @@ class RequestContext
      * @param string|null $requestId
      * @return void
      */
-    public static function clear(?string $requestId = null): void
+    public static function clean(?string $requestId = null): void
     {
-        $requestId = $requestId ?? self::getCurrentRequestId();
+        $requestId = self::getCurrentRequestId($requestId);
         if ($requestId === null) {
             return;
         }
@@ -106,40 +211,6 @@ class RequestContext
         unset(self::$context[$requestId]);
     }
 
-    /**
-     * 获取当前请求的所有上下文数据
-     *
-     * @param string|null $requestId
-     * @return array<string, mixed>
-     */
-    public static function getAll(?string $requestId = null): array
-    {
-        $requestId = $requestId ?? self::getCurrentRequestId();
-        if ($requestId === null) {
-            return [];
-        }
-
-        return self::$context[$requestId] ?? [];
-    }
-
-    /**
-     * 批量设置上下文数据
-     *
-     * @param array<string, mixed> $data
-     * @param string|null $requestId
-     * @return void
-     */
-    public static function setMultiple(array $data, ?string $requestId = null): void
-    {
-        $requestId = $requestId ?? self::getCurrentRequestId();
-        if ($requestId === null) {
-            return;
-        }
-
-        self::$context[$requestId] ??= [];
-        self::$context[$requestId] = array_merge(self::$context[$requestId], $data);
-    }
-
     /** ***************************************************************************************** */
     /** ***************************************************************************************** */
     /** ***************************************************************************************** */

app/Services/WebSocketService.php

@@ -64,7 +64,7 @@ class WebSocketService implements WebSocketHandlerInterface
                                 'ud' => $userid,
                             ],
                         ]));
-                        $this->userOn($fd, $userid);
+                        $this->userOn($fd, $userid, $get['platform']);
                     } else {
                         // 用户不存在
                         $server->push($fd, Base::array2json([
@@ -105,6 +105,11 @@ class WebSocketService implements WebSocketHandlerInterface
 
             // 握手信息
             case 'handshake':
+                // 更新 PC 端活跃时间
+                $row = WebSocket::whereFd($frame->fd)->first();
+                if ($row && Base::isPc($row->platform)) {
+                    Cache::put("user_pc_active:{$row->userid}", time(), 60);
+                }
                 break;
 
             // 访问状态
@@ -166,17 +171,27 @@ class WebSocketService implements WebSocketHandlerInterface
      * 用户上线
      * @param $fd
      * @param $userid
+     * @param $platform
      * @return void
      */
-    private function userOn($fd, $userid)
+    private function userOn($fd, $userid, $platform = 'web')
     {
+        // 校验平台类型
+        if (!in_array($platform, ['android', 'ios', 'win', 'mac', 'web'])) {
+            $platform = 'web';
+        }
         WebSocket::updateInsert([
             'key' => md5($fd . '@' . $userid)
         ], [
             'fd' => $fd,
             'userid' => $userid,
+            'platform' => $platform,
         ]);
         OnlineData::online($userid);
+        // PC 端上线时更新活跃时间
+        if (Base::isPc($platform)) {
+            Cache::put("user_pc_active:{$userid}", time(), 60);
+        }
     }
 
     /**

app/Tasks/AutoArchivedTask.php

@@ -42,6 +42,7 @@ class AutoArchivedTask extends AbstractTask
             ->whereNotNull('project_tasks.complete_at')
             ->where('project_tasks.complete_at', '<=', Carbon::now()->subDays($archivedDay))
             ->where('project_tasks.archived_userid', 0)
+            ->where('project_tasks.parent_id', 0)
             ->whereNull('project_tasks.archived_at')
             ->where('projects.archive_method', '!=', 'custom')
             ->take(100)
@@ -63,6 +64,7 @@ class AutoArchivedTask extends AbstractTask
             ->join('projects', 'projects.id', '=', 'project_tasks.project_id')
             ->whereNotNull('project_tasks.complete_at')
             ->where('project_tasks.archived_userid', 0)
+            ->where('project_tasks.parent_id', 0)
             ->whereNull('project_tasks.archived_at')
             ->where('projects.archive_method', 'custom')
             ->whereRaw("DATEDIFF(NOW(), {$prefix}project_tasks.complete_at) >= {$prefix}projects.archive_days")

app/Tasks/BotReceiveMsgTask.php

@@ -19,60 +19,88 @@ use App\Module\Ihttp;
 use App\Module\TextExtractor;
 use Carbon\Carbon;
 use Exception;
-use League\HTMLToMarkdown\HtmlConverter;
 use DB;
 
 /**
- * 推送会话消息
- * Class BotReceiveMsgTask
+ * 机器人消息接收处理任务
+ *
  * @package App\Tasks
  */
 class BotReceiveMsgTask extends AbstractTask
 {
     protected $userid;          // 机器人ID
     protected $msgId;           // 消息ID
-    protected $mention;         // 是否提及
+    protected $mention;         // 是否提及（机器人被@，不含@所有人）
     protected $mentionOther;    // 是否提及其他人
     protected $client = [];     // 客户端信息（版本、语言、平台）
 
+    /**
+     * 构造函数
+     * 初始化机器人消息处理任务的相关参数
+     *
+     * @param int $userid 机器人用户ID
+     * @param int $msgId 消息ID
+     * @param array $mentions 提及的用户ID数组
+     * @param array $client 客户端信息（版本、语言、平台等）
+     */
     public function __construct($userid, $msgId, $mentions, $client = [])
     {
         parent::__construct(...func_get_args());
         $this->userid = $userid;
         $this->msgId = $msgId;
-        $this->mention = array_intersect([$userid], $mentions) ? 1 : 0;     // 是否提及（不含@所有人）
-        $this->mentionOther = array_diff($mentions, [0, $userid]) ? 1 : 0;  // 是否提及其他人
+        $this->mention = array_intersect([$userid], $mentions) ? 1 : 0;
+        $this->mentionOther = array_diff($mentions, [0, $userid]) ? 1 : 0;
         $this->client = is_array($client) ? $client : [];
     }
 
+    /**
+     * 任务开始执行
+     * 验证机器人用户和消息的有效性，然后处理机器人接收到的消息
+     */
     public function start()
     {
+        // 判断是否是机器人用户
         $botUser = User::whereUserid($this->userid)->whereBot(1)->first();
         if (empty($botUser)) {
             return;
         }
+
+        // 判断消息是否存在
         $msg = WebSocketDialogMsg::with(['user'])->find($this->msgId);
         if (empty($msg)) {
             return;
         }
+
+        // 标记消息已读
         $msg->readSuccess($botUser->userid);
-        if (!$msg->user?->bot) {
-            $this->botReceiveBusiness($msg, $botUser);
+
+        // 判断消息是否是机器人发送的则不处理，避免循环
+        if (!$msg->user || $msg->user->bot) {
+            return;
         }
+
+        // 处理机器人消息
+        $this->processMessage($msg, $botUser);
     }
 
+    /**
+     * 任务结束回调
+     * 当前为空实现，可在此处添加清理逻辑
+     */
     public function end()
     {
 
     }
 
     /**
-     * 机器人处理消息
-     * @param WebSocketDialogMsg $msg
-     * @param User $botUser
+     * 处理机器人接收到的消息
+     * 根据消息类型和机器人类型执行相应的处理逻辑
+     *
+     * @param WebSocketDialogMsg $msg 接收到的消息对象
+     * @param User $botUser 机器人用户对象
      * @return void
      */
-    private function botReceiveBusiness(WebSocketDialogMsg $msg, User $botUser)
+    private function processMessage(WebSocketDialogMsg $msg, User $botUser)
     {
         // 位置消息（仅支持签到机器人）
         if ($msg->type === 'location') {
@@ -89,16 +117,14 @@ class BotReceiveMsgTask extends AbstractTask
         }
 
         // 提取指令
-        try {
-            $command = $this->extractCommand($msg, $botUser, $this->mention);
-            if (empty($command)) {
-                return;
-            }
-        } catch (Exception $e) {
-            WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'template', [
-                'type' => 'content',
-                'content' => $e->getMessage() ?: "指令解析失败。",
-            ], $botUser->userid, false, false, true);    // todo 未能在任务end事件来发送任务
+        $sendText = $msg->extractMessageContent();
+        $replyText = null;
+        if ($msg->reply_id && $replyMsg = WebSocketDialogMsg::find($msg->reply_id)) {
+            $replyText = $replyMsg->extractMessageContent();
+        }
+
+        // 没有提取到指令，则不处理
+        if (empty($sendText) && empty($replyText)) {
             return;
         }
 
@@ -108,22 +134,17 @@ class BotReceiveMsgTask extends AbstractTask
             return;
         }
 
-        // 如果是群聊，未提及丹提及其他人
-        if ($dialog->type === 'group' && !$this->mention && $this->mentionOther) {
-            return;
-        }
-
         // 推送Webhook
-        $this->botWebhookBusiness($command, $msg, $botUser, $dialog);
+        $this->handleWebhookRequest($sendText, $replyText, $msg, $dialog, $botUser);
 
-        // 仅支持用户会话
+        // 如果不是用户对话，则只处理到这里
         if ($dialog->type !== 'user') {
             return;
         }
 
         // 签到机器人
         if ($botUser->email === 'check-in@bot.system') {
-            $content = UserBot::checkinBotQuickMsg($command, $msg->userid);
+            $content = UserBot::checkinBotQuickMsg($sendText, $msg->userid);
             if ($content) {
                 WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'template', [
                     'type' => 'content',
@@ -134,7 +155,7 @@ class BotReceiveMsgTask extends AbstractTask
 
         // 隐私机器人
         if ($botUser->email === 'anon-msg@bot.system') {
-            $array = UserBot::anonBotQuickMsg($command);
+            $array = UserBot::anonBotQuickMsg($sendText);
             if ($array) {
                 WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'template', [
                     'type' => 'content',
@@ -145,7 +166,7 @@ class BotReceiveMsgTask extends AbstractTask
         }
 
         // 管理机器人
-        if (str_starts_with($command, '/')) {
+        if (str_starts_with($sendText, '/')) {
             // 判断是否是机器人管理员
             if ($botUser->email === 'bot-manager@bot.system') {
                 $isManager = true;
@@ -160,7 +181,7 @@ class BotReceiveMsgTask extends AbstractTask
             }
 
             // 指令处理
-            $array = Base::newTrim(explode(" ", "{$command}    "));
+            $array = Base::newTrim(explode(" ", "{$sendText}    "));
             $type = $array[0];
             $data = [];
             $content = "";
@@ -196,7 +217,7 @@ class BotReceiveMsgTask extends AbstractTask
                 case '/hello':
                 case '/info':
                     $botId = $isManager ? $array[1] : $botUser->userid;
-                    $data = $this->botOne($botId, $msg->userid);
+                    $data = $this->getBotInfo($botId, $msg->userid);
                     if (!$data) {
                         $content = "机器人不存在。";
                     }
@@ -206,7 +227,7 @@ class BotReceiveMsgTask extends AbstractTask
                  * 创建
                  */
                 case '/newbot':
-                    $res = UserBot::newbot($msg->userid, $array[1]);
+                    $res = UserBot::newBot($msg->userid, $array[1]);
                     if (Base::isError($res)) {
                         $content = $res['msg'];
                     } else {
@@ -224,7 +245,7 @@ class BotReceiveMsgTask extends AbstractTask
                         $content = "机器人名称由2-20个字符组成。";
                         break;
                     }
-                    $data = $this->botOne($botId, $msg->userid);
+                    $data = $this->getBotInfo($botId, $msg->userid);
                     if ($data) {
                         $data->nickname = $nameString;
                         $data->az = Base::getFirstCharter($nameString);
@@ -241,7 +262,7 @@ class BotReceiveMsgTask extends AbstractTask
                  */
                 case '/deletebot':
                     $botId = $isManager ? $array[1] : $botUser->userid;
-                    $data = $this->botOne($botId, $msg->userid);
+                    $data = $this->getBotInfo($botId, $msg->userid);
                     if ($data) {
                         $data->deleteUser('delete bot');
                     } else {
@@ -254,7 +275,7 @@ class BotReceiveMsgTask extends AbstractTask
                  */
                 case '/token':
                     $botId = $isManager ? $array[1] : $botUser->userid;
-                    $data = $this->botOne($botId, $msg->userid);
+                    $data = $this->getBotInfo($botId, $msg->userid);
                     if ($data) {
                         User::generateToken($data);
                     } else {
@@ -267,7 +288,7 @@ class BotReceiveMsgTask extends AbstractTask
                  */
                 case '/revoke':
                     $botId = $isManager ? $array[1] : $botUser->userid;
-                    $data = $this->botOne($botId, $msg->userid);
+                    $data = $this->getBotInfo($botId, $msg->userid);
                     if ($data) {
                         $data->encrypt = Base::generatePassword(6);
                         $data->password = Doo::md5s(Base::generatePassword(32), $data->encrypt);
@@ -283,7 +304,7 @@ class BotReceiveMsgTask extends AbstractTask
                 case '/clearday':
                     $botId = $isManager ? $array[1] : $botUser->userid;
                     $clearDay = $isManager ? $array[2] : $array[1];
-                    $data = $this->botOne($botId, $msg->userid);
+                    $data = $this->getBotInfo($botId, $msg->userid);
                     if ($data) {
                         $userBot = UserBot::whereBotId($botId)->whereUserid($msg->userid)->first();
                         if ($userBot) {
@@ -304,7 +325,7 @@ class BotReceiveMsgTask extends AbstractTask
                 case '/webhook':
                     $botId = $isManager ? $array[1] : $botUser->userid;
                     $webhookUrl = $isManager ? $array[2] : $array[1];
-                    $data = $this->botOne($botId, $msg->userid);
+                    $data = $this->getBotInfo($botId, $msg->userid);
                     if (strlen($webhookUrl) > 255) {
                         $content = "webhook地址最长仅支持255个字符。";
                     } elseif ($data) {
@@ -327,7 +348,7 @@ class BotReceiveMsgTask extends AbstractTask
                 case '/dialog':
                     $botId = $isManager ? $array[1] : $botUser->userid;
                     $nameKey = $isManager ? $array[2] : $array[1];
-                    $data = $this->botOne($botId, $msg->userid);
+                    $data = $this->getBotInfo($botId, $msg->userid);
                     if ($data) {
                         $list = DB::table('web_socket_dialog_users as u')
                             ->select(['d.*', 'u.top_at', 'u.last_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
@@ -339,7 +360,7 @@ class BotReceiveMsgTask extends AbstractTask
                             ->orderByDesc('u.last_at')
                             ->take(20)
                             ->get()
-                            ->map(function($item) use ($data) {
+                            ->map(function ($item) use ($data) {
                                 return WebSocketDialog::synthesizeData($item, $data->userid);
                             })
                             ->all();
@@ -382,6 +403,7 @@ class BotReceiveMsgTask extends AbstractTask
                     default => '不支持的指令',
                 };
                 if ($type == '/api') {
+                    $msgData['email'] = $botUser->email;
                     $msgData['version'] = Base::getVersion();
                 } elseif ($type == '/help') {
                     $msgData['manager'] = $isManager;
@@ -392,170 +414,323 @@ class BotReceiveMsgTask extends AbstractTask
     }
 
     /**
-     * 机器人处理 Webhook
-     * @param string $command
-     * @param WebSocketDialogMsg $msg
-     * @param User $botUser
-     * @param WebSocketDialog $dialog
+     * 处理机器人Webhook请求
+     * 根据机器人类型（AI机器人或用户机器人）发送相应的Webhook请求
+     *
+     * @param string $sendText 发送的文本内容
+     * @param string $replyText 回复的文本内容
+     * @param WebSocketDialogMsg $msg 消息对象
+     * @param WebSocketDialog $dialog 对话对象
+     * @param User $botUser 机器人用户对象
      * @return void
      */
-    private function botWebhookBusiness(string $command, WebSocketDialogMsg $msg, User $botUser, WebSocketDialog $dialog)
+    private function handleWebhookRequest($sendText, $replyText, WebSocketDialogMsg $msg, WebSocketDialog $dialog, User $botUser)
     {
-        $serverUrl = 'http://nginx';
+        $webhookUrl = null;
         $userBot = null;
-        $extras = [];
-        $replyText = null;
-        $errorContent = null;
-        if ($botUser->isAiBot($type)) {
-            // AI机器人
-            $setting = Base::setting('aibotSetting');
-            $extras = [
-                'model_type' => match ($type) {
-                    'qianwen' => 'qwen',
-                    default => $type,
-                },
-                'model_name' => $setting[$type . '_model'],
-                'system_message' => $setting[$type . '_system'],
-                'api_key' => $setting[$type . '_key'],
-                'base_url' => $setting[$type . '_base_url'],
-                'agency' => $setting[$type . '_agency'],
-                'server_url' => $serverUrl,
-            ];
-            if ($setting[$type . '_temperature']) {
-                $extras['temperature'] = floatval($setting[$type . '_temperature']);
-            }
-            if ($msg->msg['model_name']) {
-                $extras['model_name'] = $msg->msg['model_name'];
-            }
-            // 提取模型“思考”参数
-            $thinkPatterns = [
-                "/^(.+?)(\s+|\s*[_-]\s*)(think|thinking|reasoning)\s*$/",
-                "/^(.+?)\s*\(\s*(think|thinking|reasoning)\s*\)\s*$/"
-            ];
-            $thinkMatch = [];
-            foreach ($thinkPatterns as $pattern) {
-                if (preg_match($pattern, $extras['model_name'], $thinkMatch)) {
-                    break;
+        $extras = ['timestamp' => time()];
+
+        try {
+            if ($botUser->isAiBot($type)) {
+                // AI机器人，不处理带有留言的转发消息，因为他要处理那条留言消息
+                if (Base::val($msg->msg, 'forward_data.leave')) {
+                    return;
                 }
-            }
-            if ($thinkMatch && !empty($thinkMatch[1])) {
-                $extras['model_name'] = $thinkMatch[1];
-                $extras['max_tokens'] = 20000;
-                $extras['thinking'] = 4096;
-                $extras['temperature'] = 1.0;
-            }
-            // 设定会话ID
-            if ($dialog->session_id) {
-                $extras['context_key'] = 'session_' . $dialog->session_id;
-            }
-            // 设置文心一言的API密钥
-            if ($type === 'wenxin') {
-                $extras['api_key'] .= ':' . $setting['wenxin_secret'];
-            }
-            if ($type === 'ollama') {
-                if (empty($extras['base_url'])) {
-                    $errorContent = '机器人未启用。';
+                // 如果是群聊，没有@自己，则不处理
+                if ($dialog->type === 'group' && !$this->mention) {
+                    return;
+                }
+                // 检查客户端版本
+                if (in_array($this->client['platform'], ['win', 'mac', 'web']) && !Base::judgeClientVersion("0.41.11", $this->client['version'])) {
+                    throw new Exception('当前客户端版本低（所需版本≥v0.41.11）。');
+                }
+                // 判断AI应用是否安装
+                if (!Apps::isInstalled('ai')) {
+                    throw new Exception('应用「AI Assistant」未安装');
+                }
+                // 整理机器人参数
+                $setting = Base::setting('aibotSetting');
+                $extras = [
+                    'model_type' => match ($type) {
+                        'qianwen' => 'qwen',
+                        default => $type,
+                    },
+                    'model_name' => $setting[$type . '_model'],
+                    'system_message' => $setting[$type . '_system'],
+                    'api_key' => $setting[$type . '_key'],
+                    'base_url' => $setting[$type . '_base_url'],
+                    'agency' => $setting[$type . '_agency'],
+                    'server_url' => 'http://nginx',
+                ];
+                if ($setting[$type . '_temperature']) {
+                    $extras['temperature'] = floatval($setting[$type . '_temperature']);
+                }
+                if ($msg->msg['model_name']) {
+                    $extras['model_name'] = $msg->msg['model_name'];
+                }
+                // 提取模型“思考”参数
+                $thinkPatterns = [
+                    "/^(.+?)(\s+|\s*[_-]\s*)(think|thinking|reasoning)\s*$/",
+                    "/^(.+?)\s*\(\s*(think|thinking|reasoning)\s*\)\s*$/"
+                ];
+                $thinkMatch = [];
+                foreach ($thinkPatterns as $pattern) {
+                    if (preg_match($pattern, $extras['model_name'], $thinkMatch)) {
+                        break;
+                    }
+                }
+                if ($thinkMatch && !empty($thinkMatch[1])) {
+                    $extras['model_name'] = $thinkMatch[1];
+                    $extras['max_tokens'] = 20000;
+                    $extras['thinking'] = 4096;
+                    $extras['temperature'] = 1.0;
+                }
+                // 设定会话ID
+                if ($dialog->session_id) {
+                    $extras['context_key'] = 'session_' . $dialog->session_id;
+                }
+                // 设置文心一言的API密钥
+                if ($type === 'wenxin') {
+                    $extras['api_key'] .= ':' . $setting['wenxin_secret'];
+                }
+                // 群聊清理上下文（群聊不使用上下文）
+                if ($dialog->type === 'group') {
+                    $extras['before_clear'] = 1;
+                }
+                if ($type === 'ollama') {
+                    if (empty($extras['base_url'])) {
+                        throw new Exception('机器人未启用。');
+                    }
+                    if (empty($extras['api_key'])) {
+                        $extras['api_key'] = Base::strRandom(6);
+                    }
                 }
                 if (empty($extras['api_key'])) {
-                    $extras['api_key'] = Base::strRandom(6);
+                    throw new Exception('机器人未启用。');
                 }
-            }
-            if (empty($extras['api_key'])) {
-                $errorContent = '机器人未启用。';
-            }
-            if (in_array($this->client['platform'], ['win', 'mac', 'web']) && !Base::judgeClientVersion("0.41.11", $this->client['version'])) {
-                $errorContent = '当前客户端版本低（所需版本≥v0.41.11）。';
-            }
-            if (!Apps::isInstalled('ai')) {
-                $errorContent = '应用「AI Robot」未安装';
-            }
-            if ($msg->reply_id > 0) {
-                $replyCommand = $this->extractReplyCommand($msg->reply_id, $botUser);
-                if (Base::isError($replyCommand)) {
-                    $errorContent = $replyCommand['msg'];
-                } else {
-                    $command = <<<EOF
+                $this->generateSystemPromptForAI($msg->userid, $dialog, $botUser, $extras);
+                // 转换提及格式
+                if ($replyText) {
+                    $sendText = <<<EOF
                         <quoted_content>
-                        {$replyCommand['data']}
+                        {$replyText}
                         </quoted_content>
 
-                        The content within the above quoted_content tags is a citation.
+                        上述 quoted_content 标签中的内容为引用。
 
-                        {$command}
+                        {$sendText}
                         EOF;
                 }
-            }
-            $this->AIGenerateSystemMessage($msg->userid, $dialog, $extras);
-            $webhookUrl = "{$serverUrl}/ai/chat";
-        } else {
-            // 用户机器人
-            if ($botUser->isUserBot() && str_starts_with($command, '/')) {
-                // 用户机器人不处理指令类型命令
-                return;
-            }
-
-            if ($msg->reply_id > 0) {
-                $replyCommand = $this->extractReplyCommand($msg->reply_id, $botUser);
-                if (Base::isSuccess($replyCommand)) {
-                    $replyText = $replyCommand['data'] ?: '';
+                $webhookUrl = "http://nginx/ai/chat";
+            } else {
+                // 用户机器人
+                if ($botUser->isUserBot() && str_starts_with($sendText, '/')) {
+                    // 用户机器人不处理指令类型命令
+                    return;
+                }
+                $userBot = UserBot::whereBotId($botUser->userid)->first();
+                if (!$userBot || !$userBot->shouldDispatchWebhook(UserBot::WEBHOOK_EVENT_MESSAGE)) {
+                    return;
                 }
             }
-            $userBot = UserBot::whereBotId($botUser->userid)->first();
-            $webhookUrl = $userBot?->webhook_url;
-        }
-        if ($errorContent) {
+        } catch (\Exception $e) {
             WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'template', [
                 'type' => 'content',
-                'content' => $errorContent,
+                'content' => $e->getMessage(),
             ], $botUser->userid, false, false, true); // todo 未能在任务end事件来发送任务
             return;
         }
-        if (!preg_match("/^https?:\/\//", $webhookUrl)) {
-            return;
-        }
-        //
-        try {
-            $data = [
-                'text' => $command,
-                'reply_text' => $replyText,
-                'token' => User::generateToken($botUser),
-                'dialog_id' => $dialog->id,
-                'dialog_type' => $dialog->type,
-                'msg_id' => $msg->id,
-                'msg_uid' => $msg->userid,
-                'mention' => $this->mention ? 1 : 0,
-                'bot_uid' => $botUser->userid,
-                'version' => Base::getVersion(),
-                'extras' => Base::array2json($extras)
+
+        // 基本请求数据
+        $data = [
+            'event' => UserBot::WEBHOOK_EVENT_MESSAGE,
+            'text' => $sendText,
+            'reply_text' => $replyText,
+            'token' => User::generateToken($botUser),
+            'session_id' => $dialog->session_id,
+            'dialog_id' => $dialog->id,
+            'dialog_type' => $dialog->type,
+            'msg_id' => $msg->id,
+            'msg_uid' => $msg->userid,
+            'mention' => $this->mention ? 1 : 0,
+            'bot_uid' => $botUser->userid,
+            'extras' => Base::array2json($extras),
+            'version' => Base::getVersion(),
+            'timestamp' => time(),
+        ];
+        // 添加用户信息
+        $userInfo = User::find($msg->userid);
+        if ($userInfo) {
+            $data['msg_user'] = [
+                'userid' => $userInfo->userid,
+                'email' => $userInfo->email,
+                'nickname' => $userInfo->nickname,
+                'profession' => $userInfo->profession,
+                'lang' => $userInfo->lang,
+                'token' => User::generateTokenNoDevice($userInfo, now()->addHour()),
             ];
-            $res = Ihttp::ihttp_post($webhookUrl, $data, 30);
-            if ($userBot) {
-                $userBot->webhook_num++;
-                $userBot->save();
+        }
+
+        $result = null;
+        if ($userBot) {
+            $result = $userBot->dispatchWebhook(UserBot::WEBHOOK_EVENT_MESSAGE, $data);
+        } else {
+            try {
+                $result = Ihttp::ihttp_post($webhookUrl, $data, 30);
+            } catch (\Throwable $th) {
+                info(Base::array2json([
+                    'webhook_url' => $webhookUrl,
+                    'data' => $data,
+                    'error' => $th->getMessage(),
+                ]));
             }
-            if ($res['data'] && $data = Base::json2array($res['data'])) {
-                if ($data['code'] != 200 && $data['message']) {
-                    WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'text', ['text' => $res['data']['message']], $botUser->userid, false, false, true);
-                }
+        }
+
+        if ($result && isset($result['data'])) {
+            $responseData = Base::json2array($result['data']);
+            if (($responseData['code'] ?? 0) === 200 && !empty($responseData['message'])) {
+                WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'text', [
+                    'text' => $responseData['message']
+                ], $botUser->userid, false, false, true);
             }
-        } catch (\Throwable $th) {
-            info(Base::array2json([
-                'bot_userid' => $botUser->userid,
-                'dialog' => $dialog->id,
-                'msg' => $msg->id,
-                'webhook_url' => $webhookUrl,
-                'error' => $th->getMessage(),
-            ]));
         }
     }
 
     /**
-     * 获取机器人信息
-     * @param $botId
-     * @param $userid
-     * @return User
+     * 为AI机器人生成系统提示词
+     * 根据对话类型（用户对话、项目群、任务群、部门群等）生成相应的系统提示词
+     *
+     * @param int|null $userid 用户ID
+     * @param WebSocketDialog $dialog 对话对象
+     * @param User $botUser 机器人用户对象
+     * @param array $extras 额外参数数组，通过引用传递以修改system_message
+     * @return void
      */
-    private function botOne($botId, $userid)
+    private function generateSystemPromptForAI($userid, WebSocketDialog $dialog, User $botUser, array &$extras)
+    {
+        // 用户自定义提示词（私聊场景优先使用）
+        $customPrompt = null;
+        if ($dialog->type === 'user') {
+            $customPrompt = WebSocketDialogConfig::where([
+                'dialog_id' => $dialog->id,
+                'userid' => $userid,
+                'type' => 'ai_prompt',
+            ])->value('value');
+        }
+
+        $prompt = [];
+
+        // 1. 基础角色（自定义提示词优先）
+        if ($customPrompt) {
+            $prompt[] = $customPrompt;
+        } elseif (!empty($extras['system_message'])) {
+            $prompt[] = $extras['system_message'];
+        }
+
+        // 2. 上下文信息
+        $currentTime = Carbon::now()->toDateTimeString();
+        $contextLines = [
+            "您是：{$botUser->nickname}（ID: {$botUser->userid}）",
+            "当前对话ID(dialog_id)：{$dialog->id}",
+            "当前系统时间(now)：{$currentTime}",
+        ];
+
+        if ($dialog->type === 'group') {
+            switch ($dialog->group_type) {
+                case 'project':
+                    $projectInfo = Project::whereDialogId($dialog->id)->first();
+                    if ($projectInfo) {
+                        $contextLines[] = "场景：项目群聊「{$projectInfo->name}」（project_id: {$projectInfo->id}）";
+                    }
+                    break;
+
+                case 'task':
+                    $taskInfo = ProjectTask::with(['content'])->whereDialogId($dialog->id)->first();
+                    if ($taskInfo) {
+                        $contextLines[] = "场景：任务群聊「{$taskInfo->name}」（task_id: {$taskInfo->id}）";
+                    }
+                    break;
+
+                case 'department':
+                    $userDepartment = UserDepartment::whereDialogId($dialog->id)->first();
+                    if ($userDepartment) {
+                        $contextLines[] = "场景：部门群聊「{$userDepartment->name}」";
+                    }
+                    break;
+
+                case 'all':
+                    $contextLines[] = "场景：全体成员群聊";
+                    break;
+            }
+
+            // 3. 聊天历史（仅群聊）
+            $chatHistory = $this->getRecentChatHistory($dialog, 15);
+            if ($chatHistory) {
+                $prompt[] = implode("\n", $contextLines);
+                $prompt[] = "最近的对话记录：\n{$chatHistory}";
+            } else {
+                $prompt[] = implode("\n", $contextLines);
+            }
+        } else {
+            $prompt[] = implode("\n", $contextLines);
+        }
+
+        $extras['system_message'] = implode("\n----\n", array_filter($prompt));
+    }
+
+    /**
+     * 获取最近的聊天记录
+     * @param WebSocketDialog $dialog 对话对象
+     * @param int $limit 获取的聊天记录条数
+     * @return string|null 格式化后的聊天记录字符串，无记录时返回null
+     */
+    private function getRecentChatHistory(WebSocketDialog $dialog, $limit = 10): ?string
+    {
+        // 构建查询条件
+        $conditions = [
+            ['dialog_id', '=', $dialog->id],
+            ['id', '<', $this->msgId],
+        ];
+
+        // 如果有会话ID，添加会话过滤条件
+        if ($dialog->session_id > 0) {
+            $conditions[] = ['session_id', '=', $dialog->session_id];
+        }
+
+        // 查询最近$limit条消息并格式化
+        $chatMessages = WebSocketDialogMsg::with(['user'])
+            ->where($conditions)
+            ->orderByDesc('id')
+            ->take($limit)
+            ->get()
+            ->map(function (WebSocketDialogMsg $message) {
+                $userName = $message->user?->nickname ?? '未知用户';
+                $content = $message->extractMessageContent(500);
+                if (!$content) {
+                    return null;
+                }
+                // 使用XML标签格式，确保AI能清晰识别边界
+                // 对用户名进行HTML转义，防止特殊字符破坏格式
+                $safeUserName = htmlspecialchars($userName, ENT_QUOTES, 'UTF-8');
+                return "<message userid=\"{$message->userid}\" nickname=\"{$safeUserName}\">\n{$content}\n</message>";
+            })
+            ->reverse() // 反转集合，让时间顺序正确（最早的在前）
+            ->filter() // 过滤掉空内容的消息
+            ->values() // 重新索引数组
+            ->toArray();
+
+        return empty($chatMessages) ? null : implode("\n", $chatMessages);
+    }
+
+    /**
+     * 获取机器人信息
+     * 根据机器人ID和用户ID获取机器人的详细信息，包括清理设置和webhook配置
+     *
+     * @param int $botId 机器人ID
+     * @param int $userid 用户ID
+     * @return User|null 机器人用户对象，如果不存在则返回null
+     */
+    private function getBotInfo($botId, $userid)
     {
         $botId = intval($botId);
         $userid = intval($userid);
@@ -575,224 +750,4 @@ class BotReceiveMsgTask extends AbstractTask
         }
         return null;
     }
-
-    /**
-     * 提取消息指令（提取消息内容）
-     * @param WebSocketDialogMsg $msg
-     * @param User $botUser
-     * @param bool $mention
-     * @return string
-     * @throws Exception
-     */
-    private function extractCommand(WebSocketDialogMsg $msg, User $botUser, bool $mention = false)
-    {
-        if ($msg->type !== 'text') {
-            return '';
-        }
-
-        $original = $msg->msg['text'] ?: '';
-        if ($mention) {
-            $original = preg_replace("/<span class=\"mention user\" data-id=\"(\d+)\">(.*?)<\/span>/", "", $original);
-        }
-        if (preg_match("/<span[^>]*?data-quick-key=([\"'])([^\"']+?)\\1[^>]*?>(.*?)<\/span>/is", $original, $match)) {
-            $command = $match[2];
-            if (str_starts_with($command, '%3A.')) {
-                $command = ":" . substr($command, 4);
-            }
-            return $command;
-        }
-
-        if ($botUser->isAiBot()) {
-            // AI 机器人
-            $contents = [];
-            if (preg_match_all("/<span class=\"mention task\" data-id=\"(\d+)\">(.*?)<\/span>/", $original, $match)) {
-                // 任务
-                $taskIds = Base::newIntval($match[1]);
-                foreach ($taskIds as $index => $taskId) {
-                    $taskInfo = ProjectTask::with(['content'])->whereId($taskId)->first();
-                    if (!$taskInfo) {
-                        throw new Exception("任务不存在或已被删除");
-                    }
-                    $taskName = addslashes($taskInfo->name) . " (ID:{$taskId})";
-                    $taskContext = implode("\n", $taskInfo->AIContext());
-                    $contents[] = "<task_content path=\"{$taskName}\">\n{$taskContext}\n</task_content>";
-                    $original = str_replace($match[0][$index], "'{$taskName}' (see below for task_content tag)", $original);
-                }
-            }
-            if (preg_match_all("/<a class=\"mention ([^'\"]*)\" href=\"([^\"']+?)\"[^>]*?>[~%]([^>]*)<\/a>/", $original, $match)) {
-                // 文件、报告
-                $urlPaths = $match[2];
-                foreach ($urlPaths as $index => $urlPath) {
-                    $pathTag = null;
-                    $pathName = null;
-                    $pathContent = null;
-                    // 文件
-                    if (preg_match("/single\/file\/(.*?)$/", $urlPath, $fileMatch)) {
-                        $fileInfo = FileContent::idOrCodeToContent($fileMatch[1]);
-                        if (!$fileInfo || !isset($fileInfo->content['url'])) {
-                            throw new Exception("文件不存在或已被删除");
-                        }
-                        $urlPath = public_path($fileInfo->content['url']);
-                        if (!file_exists($urlPath)) {
-                            throw new Exception("文件不存在或已被删除");
-                        }
-                        $fileResult = TextExtractor::extractFile($urlPath);
-                        if (Base::isError($fileResult)) {
-                            throw new Exception("文件读取失败：" . $fileResult['msg']);
-                        }
-                        $pathTag = "file_content";
-                        $pathName = addslashes($match[3][$index]) . " (ID:{$fileInfo->id})";
-                        $pathContent = $fileResult['data'];
-                    }
-                    // 报告
-                    elseif (preg_match("/single\/report\/detail\/(.*?)$/", $urlPath, $reportMatch)) {
-                        $reportInfo = Report::idOrCodeToContent($reportMatch[1]);
-                        if (!$reportInfo) {
-                            throw new Exception("报告不存在或已被删除");
-                        }
-                        $pathTag = "report_content";
-                        $pathName = addslashes($match[3][$index]) . " (ID:{$reportInfo->id})";
-                        $pathContent = $reportInfo->content;
-                    }
-                    if ($pathTag) {
-                        $contents[] = "<{$pathTag} path=\"{$pathName}\">\n{$pathContent}\n</{$pathTag}>";
-                        $original = str_replace($match[0][$index], "'{$pathName}' (see below for {$pathTag} tag)", $original);
-                    }
-                }
-            }
-            $original = Base::html2markdown($original);
-            if ($contents) {
-                // 添加tag内容
-                $original .= "\n\n" . implode("\n\n", $contents);
-            }
-            return $original;
-        } elseif ($botUser->isUserBot()) {
-            // 用户机器人
-            return Base::html2markdown($original);
-        } else {
-            // 其他机器人（系统）
-            return trim(strip_tags($original));
-        }
-    }
-
-    /**
-     * 提取回复消息指令
-     * @param $id
-     * @param User $botUser
-     * @return array
-     */
-    private function extractReplyCommand($id, User $botUser)
-    {
-        $replyMsg = WebSocketDialogMsg::find($id);
-        $replyCommand = null;
-        if ($replyMsg) {
-            switch ($replyMsg->type) {
-                case 'text':
-                    try {
-                        $replyCommand = $this->extractCommand($replyMsg, $botUser);
-                    } catch (Exception) {
-                        return Base::retError('error', "引用消息解析失败。");
-                    }
-                    break;
-                case 'file':
-                    if ($botUser->isAiBot()) {
-                        $msgData = Base::json2array($replyMsg->getRawOriginal('msg'));
-                        $fileResult = TextExtractor::extractFile(public_path($msgData['path']));
-                        if (Base::isError($fileResult)) {
-                            return Base::retError('error', $fileResult['msg']);
-                        } else {
-                            $replyCommand = $fileResult['data'];
-                        }
-                    }
-                    break;
-            }
-        }
-        return Base::retSuccess('success', $replyCommand);
-    }
-
-    /**
-     * 生成AI系统提示词
-     * @param int|null $userid
-     * @param WebSocketDialog $dialog
-     * @param array $extras
-     * @return void
-     */
-    private function AIGenerateSystemMessage(int|null $userid, WebSocketDialog $dialog, array &$extras)
-    {
-        $system_messages = [];
-        switch ($dialog->type) {
-            case "user":
-                $aiPrompt = WebSocketDialogConfig::where([
-                    'dialog_id' => $dialog->id,
-                    'userid' => $userid,
-                    'type' => 'ai_prompt',
-                ])->value('value');
-                if ($aiPrompt) {
-                    $extras['system_message'] = $aiPrompt;
-                }
-                break;
-            case "group":
-                switch ($dialog->group_type) {
-                    case 'user':
-                        break;
-                    case 'project':
-                        $projectInfo = Project::whereDialogId($dialog->id)->first();
-                        if ($projectInfo) {
-                            $projectDesc = $projectInfo->desc ?: "-";
-                            $projectStatus = $projectInfo->archived_at ? '已归档' : '正在进行中';
-                            $system_messages[] = <<<EOF
-                                当前我在项目【{$projectInfo->name}】中
-                                项目描述：{$projectDesc}
-                                项目状态：{$projectStatus}
-
-                                如果你判断我想要或需要添加任务，请按照以下格式回复：
-
-                                ::: create-task-list
-                                title: 任务标题1
-                                desc: 任务描述1
-
-                                title: 任务标题2
-                                desc: 任务描述2
-                                :::
-                                EOF;
-                        }
-                        break;
-                    case 'task':
-                        $taskInfo = ProjectTask::with(['content'])->whereDialogId($dialog->id)->first();
-                        if ($taskInfo) {
-                            $taskContext = implode("\n", $taskInfo->AIContext());
-                            $system_messages[] = <<<EOF
-                                当前我在任务【{$taskInfo->name}】中
-                                当前时间：{$taskInfo->updated_at}
-                                任务ID：{$taskInfo->id}
-                                {$taskContext}
-
-                                如果你判断我想要或需要添加子任务，请按照以下格式回复：
-
-                                ::: create-subtask-list
-                                title: 子任务标题1
-                                title: 子任务标题2
-                                :::
-                                EOF;
-                        }
-                        break;
-                    case 'department':
-                        $userDepartment = UserDepartment::whereDialogId($dialog->id)->first();
-                        if ($userDepartment) {
-                            $system_messages[] = "当前我在【{$userDepartment->name}】的部门群聊中";
-                        }
-                        break;
-                    case 'all':
-                        $system_messages[] = "当前我在【全体成员】的群聊中";
-                        break;
-                }
-                break;
-        }
-        if ($extras['system_message']) {
-            array_unshift($system_messages, $extras['system_message']);
-        }
-        if ($system_messages) {
-            $extras['system_message'] = implode("\n\n====\n\n", Base::newTrim($system_messages));
-        }
-    }
 }

app/Tasks/DeleteTmpTask.php

@@ -6,6 +6,7 @@ use App\Models\File;
 use App\Models\TaskWorker;
 use App\Models\Tmp;
 use App\Models\UserDevice;
+use App\Models\UmengLog;
 use App\Models\WebSocketTmpMsg;
 use App\Module\Base;
 use Carbon\Carbon;
@@ -103,6 +104,17 @@ class DeleteTmpTask extends AbstractTask
                         }
                     });
                 break;
+
+            case 'umeng_log':
+                UmengLog::where('created_at', '<', Carbon::now()->subHours($this->hours))
+                    ->orderBy('id')
+                    ->chunk(500, function ($logs) {
+                        /** @var UmengLog $log */
+                        foreach ($logs as $log) {
+                            $log->delete();
+                        }
+                    });
+                break;
         }
     }
 

app/Tasks/JokeSoupTask.php

@@ -2,8 +2,8 @@
 
 namespace App\Tasks;
 
+use App\Module\AI;
 use App\Module\Base;
-use App\Module\Extranet;
 use Cache;
 use Carbon\Carbon;
 
@@ -26,25 +26,27 @@ class JokeSoupTask extends AbstractTask
 
     public function start()
     {
-        // 判断每分钟执行一次
-        if (Cache::get(self::keyName("YmdHi")) == date("YmdHi")) {
+        // 判断每小时执行一次
+        if (Cache::get(self::keyName("YmdH")) == date("YmdH")) {
             return;
         }
-        Cache::put(self::keyName("YmdHi"), date("YmdHi"), Carbon::now()->addDay());
-        //
-        $array = Base::json2array(Cache::get(self::keyName("jokes")));
-        $data = Extranet::randJoke();
-        if ($data) {
-            $array[] = $data;
+        Cache::put(self::keyName("YmdH"), date("YmdH"), Carbon::now()->addDay());
+
+        // 开始生成笑话和心灵鸡汤
+        $result = AI::generateJokeAndSoup();
+        if (Base::isError($result)) {
+            Cache::forget(self::keyName("YmdH"));
+            return;
         }
-        Cache::forever(self::keyName("jokes"), Base::array2json(array_slice($array, -200)));
-        //
-        $array = Base::json2array(Cache::get(self::keyName("soups")));
-        $data = Extranet::soups();
-        if ($data) {
-            $array[] = $data;
+
+        // 笑话和心灵鸡汤的缓存
+        foreach (['jokes', 'soups'] as $key) {
+            if ($result['data'][$key] && is_array($result['data'][$key])) {
+                $array = Base::json2array(Cache::get(self::keyName($key)));
+                $array = array_merge($array, $result['data'][$key]);
+                Cache::forever(self::keyName($key), Base::array2json(array_slice($array, -200)));
+            }
         }
-        Cache::forever(self::keyName("soups"), Base::array2json(array_slice($array, -200)));
     }
 
     public function end()

app/Tasks/LoopTask.php

@@ -40,7 +40,7 @@ class LoopTask extends AbstractTask
                         foreach ($projectFlowItem as $flowItem) {
                             if ($flowItem->status == 'start') {
                                 $task->flow_item_id = $flowItem->id;
-                                $task->flow_item_name = $flowItem->status . "|" . $flowItem->name;
+                                $task->flow_item_name = $flowItem->status . "|" . $flowItem->name . "|" . $flowItem->color;
                                 if ($flowItem->userids) {
                                     $userids = array_values(array_unique($flowItem->userids));
                                     foreach ($userids as $uid) {

app/Tasks/PushUmengMsg.php

@@ -2,7 +2,10 @@
 namespace App\Tasks;
 
 use App\Models\UmengAlias;
+use App\Models\WebSocketDialogMsgRead;
 use App\Module\Base;
+use Cache;
+use Hhxsv5\LaravelS\Swoole\Task\Task;
 
 /**
  * 推送友盟消息
@@ -11,6 +14,7 @@ class PushUmengMsg extends AbstractTask
 {
     protected $userid = 0;
     protected $array = [];
+    protected $endPush = [];     // 需要在 end() 方法中处理的延迟推送列表
 
     /**
      * @param array|int $userid
@@ -32,11 +36,68 @@ class PushUmengMsg extends AbstractTask
         if ($setting['push'] !== 'open') {
             return;
         }
-        UmengAlias::pushMsgToUserid($this->userid, $this->array);
+
+        // 消息ID
+        $msgId = isset($this->array['id']) ? intval($this->array['id']) : 0;
+
+        // 处理用户列表
+        $userids = is_array($this->userid) ? $this->userid : [$this->userid];
+        $directPushUsers = [];   // 直接推送的用户
+        $delayedPushUsers = [];  // 需要延迟推送的用户
+
+        foreach ($userids as $uid) {
+            if ($this->getDelay() > 0) {
+                // 已经延迟过，检查消息是否已读
+                if ($msgId > 0) {
+                    $isRead = WebSocketDialogMsgRead::whereMsgId($msgId)
+                        ->whereUserid($uid)
+                        ->whereNotNull('read_at')
+                        ->exists();
+                    if ($isRead) {
+                        // 已读，跳过推送
+                        continue;
+                    }
+                }
+                // 未读或无法判断，执行推送
+                $directPushUsers[] = $uid;
+            } else {
+                // 首次推送，检查 PC 端是否活跃
+                $lastActive = Cache::get("user_pc_active:{$uid}");
+                $isPcActive = $lastActive && (time() - $lastActive) < 60;
+
+                if ($isPcActive) {
+                    // PC 端活跃，需要延迟推送
+                    $delayedPushUsers[] = $uid;
+                } else {
+                    // PC 端不活跃，直接推送
+                    $directPushUsers[] = $uid;
+                }
+            }
+        }
+
+        // 直接推送
+        if ($directPushUsers) {
+            UmengAlias::pushMsgToUserid($directPushUsers, $this->array);
+        }
+
+        // 创建延迟推送任务
+        if ($delayedPushUsers) {
+            $this->endPush[] = [
+                'userid' => $delayedPushUsers,
+                'array' => $this->array,
+            ];
+        }
     }
 
     public function end()
     {
-
+        if (empty($this->endPush)) {
+            return;
+        }
+        foreach ($this->endPush as $item) {
+            $task = new PushUmengMsg($item['userid'], $item['array']);
+            $task->delay(10);
+            Task::deliver($task);
+        }
     }
 }

app/Tasks/UpdateSessionTitleViaAiTask.php

@@ -3,14 +3,17 @@
 namespace App\Tasks;
 
 use App\Models\WebSocketDialogSession;
+use App\Module\AI;
 use App\Module\Base;
-use App\Module\Extranet;
 
 /**
  * 通过AI接口更新对话标题
  */
 class UpdateSessionTitleViaAiTask extends AbstractTask
 {
+    protected $sessionId;
+    protected $msgText;
+
     public function __construct($sessionId, $msgText)
     {
         parent::__construct();
@@ -29,12 +32,12 @@ class UpdateSessionTitleViaAiTask extends AbstractTask
             return;
         }
 
-        $res = Extranet::openAIGenerateTitle($this->msgText);
-        if (Base::isError($res)) {
+        $result = AI::generateTitle($this->msgText);
+        if (Base::isError($result)) {
             return;
         }
 
-        $newTitle = $res['data'];
+        $newTitle = $result['data']['title'];
         if ($newTitle && $newTitle != $session->title) {
             $session->title = Base::cutStr($newTitle, 100);
             $session->save();

app/Tasks/WebSocketDialogMsgTask.php

@@ -140,7 +140,7 @@ class WebSocketDialogMsgTask extends AbstractTask
                 ];
                 // 机器人收到消处理
                 $botUser = User::whereUserid($userid)->whereBot(1)->first();
-                if ($botUser) {
+                if ($botUser) {  // 避免机器人处理自己发送的消息
                     $this->endArray[] = new BotReceiveMsgTask($botUser->userid, $msg->id, $mentions, $this->client);
                 }
             }
@@ -190,8 +190,10 @@ class WebSocketDialogMsgTask extends AbstractTask
             $setting = Base::setting('appPushSetting');
             if ($setting['push'] === 'open') {
                 $umengTitle = User::userid2nickname($msg->userid);
+                $umengBody = WebSocketDialogMsg::previewMsg($msg);
                 if ($dialog->type == 'group') {
-                    $umengTitle = "{$dialog->getGroupName()} ($umengTitle)";
+                    $umengBody = $umengTitle . ': ' . $umengBody;
+                    $umengTitle = $dialog->getGroupName();
                 }
                 $langs = User::select(['userid', 'lang'])
                     ->whereIn('userid', $umengUserid)
@@ -205,10 +207,14 @@ class WebSocketDialogMsgTask extends AbstractTask
                     Doo::setLanguage($lang);
                     $umengMsg = [
                         'title' => $umengTitle,
-                        'body' => WebSocketDialogMsg::previewMsg($msg),
+                        'body' => $umengBody,
                         'description' => "MID:{$msg->id}",
                         'seconds' => 3600,
                         'badge' => 1,
+                        'extra' => [
+                            'dialog_id' => $msg->dialog_id,
+                            'msg_id' => $msg->id,
+                        ]
                     ];
                     $this->endArray[] = new PushUmengMsg($uids->toArray(), $umengMsg);
                 }

cmd

@@ -119,6 +119,14 @@ switch_debug() {
     fi
 }
 
+# 检查是否有sudo
+check_sudo() {
+    if [ "$EUID" -ne 0 ]; then
+        error "请使用 sudo 运行此脚本"
+        exit 1
+    fi
+}
+
 # 检查docker、docker-compose
 check_docker() {
     docker --version &> /dev/null
@@ -175,7 +183,15 @@ web_build() {
     fi
     if [ "$type" = "dev" ]; then
         echo "<script>window.location.href=window.location.href.replace(/:\d+/, ':' + $(env_get APP_PORT))</script>" > ./index.html
-        env_set APP_DEV_PORT $(rand 20001 30000)
+        if [ -z "$(env_get APP_DEV_PORT)" ]; then
+            env_set APP_DEV_PORT $(rand 20001 30000)
+        fi
+        if [ -n "${VSCODE_PROXY_URI:-}" ]; then
+            APP_REAL_URI=$(TARGET_PORT="$(env_get APP_PORT)" node -p "process.env.VSCODE_PROXY_URI.replace(/\{\{port\}\}/g, process.env.TARGET_PORT || '')")
+            VSCODE_PROXY_URI=$(APP_DEV_PORT="$(env_get APP_DEV_PORT)" node -p "process.env.VSCODE_PROXY_URI.replace(/\{\{port\}\}/g, process.env.APP_DEV_PORT || '')")
+            echo "<script>window.location.href='${APP_REAL_URI}'</script>" > ./index.html
+        fi
+        env_set VSCODE_PROXY_URI "${VSCODE_PROXY_URI:-}"
     fi
     switch_debug "$type"
     #
@@ -246,25 +262,33 @@ mysql_snapshot() {
         password=$(env_get DB_PASSWORD)
         # 还原数据库
         mkdir -p ${WORK_DIR}/docker/mysql/backup
-        list=`ls -1 "${WORK_DIR}/docker/mysql/backup" | grep ".sql.gz"`
-        if [ -z "$list" ]; then
+        shopt -s nullglob
+        backup_files=("${WORK_DIR}/docker/mysql/backup/"*.sql.gz)
+        shopt -u nullglob
+        if [ ${#backup_files[@]} -eq 0 ]; then
             error "没有备份文件！"
             exit 1
         fi
-        echo "$list"
-        read -rp "请输入备份文件名称还原：" inputname
-        filename="${WORK_DIR}/docker/mysql/backup/${inputname}"
-        if [ ! -f "$filename" ]; then
-            error "备份文件：${inputname} 不存在！"
-            exit 1
-        fi
+        echo "可用备份列表："
+        for idx in "${!backup_files[@]}"; do
+            printf "%2d) %s\n" "$((idx + 1))" "$(basename "${backup_files[$idx]}")"
+        done
+        while true; do
+            read -rp "请输入备份文件编号还原：" selection
+            if [[ "$selection" =~ ^[0-9]+$ ]] && [ "$selection" -ge 1 ] && [ "$selection" -le ${#backup_files[@]} ]; then
+                break
+            fi
+            warning "编号无效，请重新输入。"
+        done
+        filename="${backup_files[$((selection - 1))]}"
+        inputname="$(basename "$filename")"
         container_name=`docker_name mariadb`
         if [ -z "$container_name" ]; then
             error "没有找到 mariadb 容器!"
             exit 1
         fi
-        docker cp $filename ${container_name}:/
-        container_exec mariadb "gunzip < /${inputname} | mysql -u${username} -p${password} $database"
+        docker cp "$filename" "${container_name}:/"
+        container_exec mariadb "gunzip < '/${inputname}' | mysql -u${username} -p${password} $database"
         container_exec php "php artisan migrate"
         judge "还原数据库"
     fi
@@ -459,6 +483,8 @@ EOF
 
 # 安装函数
 handle_install() {
+    check_sudo
+    
     local relock=$(arg_get relock)
     local port=$(arg_get port)
 
@@ -479,7 +505,8 @@ handle_install() {
     for vol in "${volumes[@]}"; do
         tmp_path="${WORK_DIR}/${vol}"
         mkdir -p "${tmp_path}"
-        chmod -R 775 "${tmp_path}"
+        find "${tmp_path}" -type d -exec chmod 775 {} \;
+
         rm -f "${tmp_path}/dootask.lock"
         cmda="${cmda} -v ${tmp_path}:/usr/share/${vol}"
         cmdb="${cmdb} touch /usr/share/${vol}/dootask.lock &&"
@@ -547,6 +574,8 @@ handle_install() {
 
 # 更新函数
 handle_update() {
+    check_sudo
+
     local target_branch=$(arg_get branch)
     local is_local=$(arg_get local)
     local force_update=$(arg_get force)
@@ -617,7 +646,7 @@ handle_update() {
         fi
 
         # 更新依赖
-        exec_judge "container_exec php 'composer update --optimize-autoloader'" "更新PHP依赖失败"
+        exec_judge "container_exec php 'composer install --optimize-autoloader'" "更新PHP依赖失败"
     else
         # 本地更新模式
         echo "执行数据库备份..."
@@ -644,6 +673,7 @@ handle_update() {
 
 # 卸载函数
 handle_uninstall() {
+    check_sudo
     # 确认卸载
     echo -e "${RedBG}警告：此操作将永久删除以下内容：${Font}"
     echo "- 数据库"
@@ -775,6 +805,7 @@ case "$1" in
         shift 1
         container_exec php "php app/Http/Controllers/Api/apidoc.php"
         docker run -it --rm -v ${WORK_DIR}:/home/node/apidoc kuaifan/apidoc -i app/Http/Controllers/Api -o public/docs
+        container_exec php "php app/Http/Controllers/Api/apidoc.php restore"
         ;;
     "debug")
         shift 1

database/migrations/2025_03_22_120000_create_report_ai_analyses_table.php

@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateReportAiAnalysesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (Schema::hasTable('report_ai_analyses')) {
+            return;
+        }
+
+        Schema::create('report_ai_analyses', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('rid')->comment('报告ID');
+            $table->unsignedBigInteger('userid')->comment('生成分析的会员ID');
+            $table->string('model')->default('')->comment('使用的模型名称');
+            $table->longText('analysis_text')->comment('AI 分析的原始文本（Markdown）');
+            $table->json('meta')->nullable()->comment('额外的上下文信息');
+            $table->timestamps();
+
+            $table->unique(['rid', 'userid'], 'uk_report_ai_analysis_rid_userid');
+            $table->index(['userid', 'updated_at'], 'idx_report_ai_analysis_user_updated');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('report_ai_analyses');
+    }
+}

database/migrations/2025_07_31_231557_add_color_to_project_flow_items_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddColorToProjectFlowItemsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('project_flow_items', function (Blueprint $table) {
+            if (!Schema::hasColumn('project_flow_items', 'color')) {
+                $table->string('color', 20)->nullable()->default('')->after('status')->comment('自定义颜色');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('project_flow_items', function (Blueprint $table) {
+            $table->dropColumn('color');
+        });
+    }
+}

database/migrations/2025_08_10_215202_update_files_name_length_to_200.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class UpdateFilesNameLengthTo200 extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('files', function (Blueprint $table) {
+            $table->string('name', 255)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('files', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/migrations/2025_08_19_180822_add_sort_field_to_project_users_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddSortFieldToProjectUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('project_users', function (Blueprint $table) {
+            // 添加一个排序sort字段
+            if (!Schema::hasColumn('project_users', 'sort')) {
+                $table->integer('sort')->nullable()->default(0)->after('top_at')->comment('排序(ASC)');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('project_users', function (Blueprint $table) {
+            // 删除排序sort字段
+            if (Schema::hasColumn('project_users', 'sort')) {
+                $table->dropColumn('sort');
+            }
+        });
+    }
+}

database/migrations/2025_09_19_175724_add_guest_access_to_files_table.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddGuestAccessToFilesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $isAdd = false;
+        Schema::table('files', function (Blueprint $table) use (&$isAdd) {
+            if (!Schema::hasColumn('files', 'guest_access')) {
+                $table->tinyInteger('guest_access')->nullable()->default(0)->comment('是否允许游客访问')->after('share');
+                $isAdd = true;
+            }
+        });
+        if ($isAdd) {
+            // 更新现有记录的guest_access字段为0（默认不允许游客访问）
+            \DB::table('files')->whereNull('guest_access')->update(['guest_access' => 0]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('files', function (Blueprint $table) {
+            if (Schema::hasColumn('files', 'guest_access')) {
+                $table->dropColumn('guest_access');
+            }
+        });
+    }
+}

database/migrations/2025_09_22_101500_create_user_task_browses_table.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateUserTaskBrowsesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (Schema::hasTable('user_task_browses'))
+            return;
+
+        Schema::create('user_task_browses', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('userid')->index()->nullable()->default(0)->comment('用户ID');
+            $table->bigInteger('task_id')->index()->nullable()->default(0)->comment('任务ID');
+            $table->timestamp('browsed_at')->index()->nullable()->comment('浏览时间');
+            $table->timestamps();
+
+            // 复合索引：用户ID + 浏览时间（用于按时间排序获取用户浏览历史）
+            $table->index(['userid', 'browsed_at']);
+            // 唯一索引：用户ID + 任务ID（防止重复记录，相同任务会更新浏览时间）
+            $table->unique(['userid', 'task_id']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('user_task_browses');
+    }
+}

database/migrations/2025_09_22_101600_create_user_recent_items_table.php

@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateUserRecentItemsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (Schema::hasTable('user_recent_items')) {
+            return;
+        }
+
+        Schema::create('user_recent_items', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('userid')->index()->default(0)->comment('用户ID');
+            $table->string('target_type', 50)->default('')->comment('目标类型(task/file/task_file/message_file 等)');
+            $table->bigInteger('target_id')->default(0)->comment('目标ID');
+            $table->string('source_type', 50)->default('')->comment('来源类型(project/filesystem/project_task/dialog 等)');
+            $table->bigInteger('source_id')->default(0)->comment('来源ID');
+            $table->timestamp('browsed_at')->nullable()->index()->comment('浏览时间');
+            $table->timestamps();
+
+            $table->index(['userid', 'browsed_at']);
+            $table->unique(['userid', 'target_type', 'target_id', 'source_type', 'source_id'], 'recent_unique');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('user_recent_items');
+    }
+}

database/migrations/2025_09_22_102000_create_user_favorites_table.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateUserFavoritesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (Schema::hasTable('user_favorites'))
+            return;
+
+        Schema::create('user_favorites', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('userid')->index()->nullable()->default(0)->comment('用户ID');
+            $table->string('favoritable_type', 50)->index()->nullable()->default('')->comment('收藏类型(比如：task/project/file/message)');
+            $table->bigInteger('favoritable_id')->index()->nullable()->default(0)->comment('收藏对象ID');
+            $table->timestamps();
+
+            // 复合索引：用户ID + 收藏类型（用于按类型获取收藏列表）
+            $table->index(['userid', 'favoritable_type']);
+            // 唯一索引：用户ID + 收藏类型 + 收藏对象ID（防止重复收藏）
+            $table->unique(['userid', 'favoritable_type', 'favoritable_id'], 'user_favorites_unique');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('user_favorites');
+    }
+}

database/migrations/2025_09_22_102100_add_remark_to_user_favorites_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddRemarkToUserFavoritesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('user_favorites', function (Blueprint $table) {
+            if (!Schema::hasColumn('user_favorites', 'remark')) {
+                $table->string('remark', 255)->default('')->after('favoritable_id')->comment('收藏备注');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('user_favorites', function (Blueprint $table) {
+            if (Schema::hasColumn('user_favorites', 'remark')) {
+                $table->dropColumn('remark');
+            }
+        });
+    }
+}

database/migrations/2025_09_24_201032_add_sort_to_project_tags_table.php

@@ -0,0 +1,57 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddSortToProjectTagsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $added = false;
+        Schema::table('project_tags', function (Blueprint $table) use (&$added) {
+            if (!Schema::hasColumn('project_tags', 'sort')) {
+                $table->unsignedInteger('sort')->default(0)->after('color')->comment('排序');
+                $added = true;
+            }
+        });
+
+        if ($added) {
+            \App\Models\ProjectTag::query()
+                ->select('project_id')
+                ->distinct()
+                ->orderBy('project_id')
+                ->chunk(100, function ($projectIds) {
+                    foreach ($projectIds as $project) {
+                        $tags = \App\Models\ProjectTag::query()
+                            ->where('project_id', $project->project_id)
+                            ->orderByDesc('id')
+                            ->get(['id']);
+                        $index = 0;
+                        foreach ($tags as $tag) {
+                            \App\Models\ProjectTag::where('id', $tag->id)->update(['sort' => $index++]);
+                        }
+                    }
+                });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('project_tags', function (Blueprint $table) {
+            if (Schema::hasColumn('project_tags', 'sort')) {
+                $table->dropColumn('sort');
+            }
+        });
+    }
+}

database/migrations/2025_09_24_202833_backfill_sort_project_task_templates.php

@@ -0,0 +1,46 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+class BackfillSortProjectTaskTemplates extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (!Schema::hasTable('project_task_templates') || !Schema::hasColumn('project_task_templates', 'sort')) {
+            return;
+        }
+
+        \App\Models\ProjectTaskTemplate::query()
+            ->select('project_id')
+            ->distinct()
+            ->orderBy('project_id')
+            ->chunk(100, function ($projects) {
+                foreach ($projects as $project) {
+                    $templates = \App\Models\ProjectTaskTemplate::query()
+                        ->where('project_id', $project->project_id)
+                        ->orderByDesc('id')
+                        ->get(['id']);
+                    $index = 0;
+                    foreach ($templates as $template) {
+                        \App\Models\ProjectTaskTemplate::where('id', $template->id)->update(['sort' => $index++]);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // no-op
+    }
+}

database/migrations/2025_09_24_203500_create_project_task_relations_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('project_task_relations', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('task_id')->comment('任务ID');
+            $table->unsignedBigInteger('related_task_id')->comment('关联任务ID');
+            $table->string('direction', 32)->default('mention')->comment('关系方向: mention/mentioned_by');
+            $table->unsignedBigInteger('dialog_id')->nullable()->comment('来源会话ID');
+            $table->unsignedBigInteger('msg_id')->nullable()->comment('来源消息ID');
+            $table->unsignedBigInteger('userid')->nullable()->comment('提及人');
+            $table->timestamps();
+
+            $table->unique(['task_id', 'related_task_id', 'direction'], 'project_task_relations_unique');
+            $table->index(['task_id', 'direction']);
+            $table->index('related_task_id');
+            $table->index('dialog_id');
+            $table->index('msg_id');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('project_task_relations');
+    }
+};

database/migrations/2025_10_01_000001_add_user_bots_webhook_events.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('user_bots', function (Blueprint $table) {
+            if (!Schema::hasColumn('user_bots', 'webhook_events')) {
+                $table->text('webhook_events')->nullable()->after('webhook_num')->comment('Webhook事件配置');
+            }
+        });
+
+        DB::table('user_bots')
+            ->where(function ($query) {
+                $query->whereNull('webhook_events')->orWhere('webhook_events', '');
+            })
+            ->update(['webhook_events' => json_encode(['message'])]);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('user_bots', function (Blueprint $table) {
+            if (Schema::hasColumn('user_bots', 'webhook_events')) {
+                $table->dropColumn('webhook_events');
+            }
+        });
+    }
+};

database/migrations/2025_10_12_090000_add_profile_fields_to_users_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->date('birthday')->nullable()->after('profession');
+            $table->string('address', 255)->nullable()->after('birthday');
+            $table->text('introduction')->nullable()->after('address');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn(['birthday', 'address', 'introduction']);
+        });
+    }
+};

database/migrations/2025_10_13_000000_create_user_tags_table.php

@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateUserTagsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('user_tags', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('user_id')->index()->comment('被标签用户ID');
+            $table->string('name', 50)->comment('标签名称');
+            $table->unsignedBigInteger('created_by')->index()->comment('创建人');
+            $table->unsignedBigInteger('updated_by')->nullable()->comment('最后更新人');
+            $table->timestamps();
+
+            $table->unique(['user_id', 'name'], 'user_tags_unique_name');
+            $table->foreign('user_id')->references('userid')->on('users')->onDelete('cascade');
+            $table->foreign('created_by')->references('userid')->on('users')->onDelete('cascade');
+            $table->foreign('updated_by')->references('userid')->on('users')->onDelete('set null');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('user_tags');
+    }
+}

database/migrations/2025_10_13_000100_create_user_tag_recognitions_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateUserTagRecognitionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('user_tag_recognitions', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('tag_id')->index()->comment('标签ID');
+            $table->unsignedBigInteger('user_id')->index()->comment('认可人ID');
+            $table->timestamps();
+
+            $table->unique(['tag_id', 'user_id'], 'user_tag_recognitions_unique');
+            $table->foreign('tag_id')->references('id')->on('user_tags')->onDelete('cascade');
+            $table->foreign('user_id')->references('userid')->on('users')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('user_tag_recognitions');
+    }
+}

database/migrations/2025_11_01_095600_create_umeng_logs_table.php

@@ -0,0 +1,23 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('umeng_logs', function (Blueprint $table) {
+            $table->id();
+            $table->text('request')->nullable()->comment('请求参数');
+            $table->text('response')->nullable()->comment('推送返回');
+            $table->timestamps();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('umeng_logs');
+    }
+};

database/migrations/2025_11_20_000000_create_user_app_sorts_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateUserAppSortsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (Schema::hasTable('user_app_sorts')) {
+            return;
+        }
+
+        Schema::create('user_app_sorts', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('userid')->unique()->comment('用户ID');
+            $table->json('sorts')->nullable()->comment('排序配置');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('user_app_sorts');
+    }
+}

database/migrations/2025_12_05_100000_add_web_sockets_platform.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddWebSocketsPlatform extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('web_sockets', function (Blueprint $table) {
+            $table->string('platform', 20)->nullable()->default('')->after('path')->comment('平台类型：android, ios, win, mac, web');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('web_sockets', function (Blueprint $table) {
+            $table->dropColumn('platform');
+        });
+    }
+}
+

database/migrations/2025_12_18_000000_update_setting_microapp_menu_type.php

@@ -0,0 +1,79 @@
+<?php
+
+use App\Module\Base;
+use App\Models\Setting;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateSettingMicroappMenuType extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $row = Setting::whereName('microapp_menu')->first();
+        if (!$row) {
+            return;
+        }
+        $data = Base::string2array($row->setting);
+        if (empty($data) || !is_array($data)) {
+            return;
+        }
+
+        $changed = false;
+        foreach ($data as $appIndex => $app) {
+            if (!is_array($app)) {
+                continue;
+            }
+            $menuItems = [];
+            if (isset($app['menu_items']) && is_array($app['menu_items'])) {
+                $menuItems = $app['menu_items'];
+            } elseif (isset($app['menu']) && is_array($app['menu'])) {
+                $menuItems = [$app['menu']];
+            }
+            if (empty($menuItems)) {
+                continue;
+            }
+
+            $newMenuItems = [];
+            foreach ($menuItems as $menu) {
+                if (!is_array($menu)) {
+                    $newMenuItems[] = $menu;
+                    continue;
+                }
+                if (!isset($menu['type']) && isset($menu['url_type'])) {
+                    $menu['type'] = $menu['url_type'];
+                    unset($menu['url_type']);
+                    $changed = true;
+                } elseif (isset($menu['url_type'])) {
+                    unset($menu['url_type']);
+                    $changed = true;
+                }
+                $newMenuItems[] = $menu;
+            }
+
+            if (isset($app['menu_items']) && is_array($app['menu_items'])) {
+                $data[$appIndex]['menu_items'] = $newMenuItems;
+            } elseif (isset($app['menu']) && is_array($app['menu'])) {
+                $data[$appIndex]['menu'] = $newMenuItems[0] ?? $app['menu'];
+            }
+        }
+
+        if ($changed) {
+            $row->updateInstance(['setting' => $data]);
+            $row->save();
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // No-op: do not revert settings payload.
+    }
+}

docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   php:
     container_name: "dootask-php-${APP_ID}"
-    image: "kuaifan/php:swoole-8.0.rc20"
+    image: "kuaifan/php:swoole-8.0.rc21"
     shm_size: 2G
     ulimits:
       core:
@@ -96,10 +96,10 @@ services:
   appstore:
     container_name: "dootask-appstore-${APP_ID}"
     privileged: true
-    image: "dootask/appstore:0.1.1"
+    image: "dootask/appstore:0.3.7"
     volumes:
       - shared_data:/usr/share/dootask
-      - /var/run/docker.sock:/var/run/docker.sock
+      - ${HOST_DOCKER_SOCK:-/var/run/docker.sock}:/var/run/docker.sock
       - ./:/var/www
     environment:
       HOST_PWD: "${PWD}"

docker/crontab/crontab.conf

@@ -1,6 +1,6 @@
 [program:crontab]
 directory=/var/www/docker/crontab
-command=/etc/init.d/cron start
+command=/usr/sbin/cron -f
 numprocs=1
 autostart=true
 autorestart=false

docker/nginx/default.conf

@@ -35,6 +35,13 @@ server {
     add_header Access-Control-Expose-Headers "Date, Last-Modified, Age" always;
 
     location / {
+        if ($uri ~* "^/uploads/.*\.(jpe?g|png|gif|webp)$") {
+            add_header Access-Control-Allow-Origin "http://localhost:22223" always;
+            add_header Access-Control-Allow-Methods "GET, OPTIONS" always;
+            add_header Access-Control-Allow-Headers "DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization" always;
+            add_header Access-Control-Allow-Credentials "true" always;
+        }
+
         try_files $uri @laravels;
     }
 

electron/build.js

@@ -8,7 +8,7 @@ const yauzl = require('yauzl');
 const axios = require('axios');
 const FormData =require('form-data');
 const tar = require('tar');
-const utils = require('./utils');
+const utils = require('./lib/utils');
 const config = require('../package.json')
 const env = require('dotenv').config({ path: './.env' })
 const argv = process.argv;

electron/electron-down.js

@@ -0,0 +1,687 @@
+const {BrowserWindow, screen, shell, ipcMain} = require('electron')
+const fs = require('fs');
+const path = require('path');
+const loger = require("electron-log");
+const {default: electronDl, download, CancelError} = require("@dootask/electron-dl");
+const utils = require("./lib/utils");
+const {DownloadManager, DownloadStore} = require("./lib/download-manager");
+
+const downloadManager = new DownloadManager();
+
+let downloadWindow = null,
+    downloadLanguageCode = 'zh',
+    downloadWaiting = false;
+
+function initialize(onStarted = null) {
+    // 下载配置
+    electronDl({
+        showBadge: false,
+        showProgressBar: false,
+
+        onStarted: (item) => {
+            downloadManager.add(item);
+            downloadWaiting = false;
+            syncDownloadItems();
+            if (typeof onStarted === 'function') {
+                onStarted(item)
+            }
+        },
+        onCancel: (item) => {
+            downloadManager.refresh(item.getSavePath())
+            syncDownloadItems();
+        },
+        onInterrupted: (item) => {
+            downloadManager.refresh(item.getSavePath());
+            syncDownloadItems();
+            // 尝试更新下载项的错误信息
+            downloadManager.updateError(item, {
+                language: downloadLanguageCode,
+            }).then(success => {
+                if (success) {
+                    syncDownloadItems();
+                }
+            });
+        },
+        onProgress: (item) => {
+            downloadManager.refresh(item.path);
+            syncDownloadItems();
+        },
+        onCompleted: (item) => {
+            downloadManager.refresh(item.path);
+            syncDownloadItems();
+        }
+    });
+
+    // IPC
+    ipcMain.handle('downloadManager', async (event, {action, path}) => {
+        switch (action) {
+            case "get": {
+                return {
+                    items: downloadManager.get(),
+                    waiting: downloadWaiting,
+                };
+            }
+
+            case "pause": {
+                downloadManager.pause(path);
+                syncDownloadItems();
+                return true;
+            }
+
+            case "resume": {
+                downloadManager.resume(path);
+                syncDownloadItems();
+                return true;
+            }
+
+            case "cancel": {
+                downloadManager.cancel(path);
+                syncDownloadItems();
+                return true;
+            }
+
+            case "remove": {
+                downloadManager.remove(path);
+                syncDownloadItems();
+                return true;
+            }
+
+            case "removeAll": {
+                downloadManager.removeAll();
+                syncDownloadItems();
+                return true;
+            }
+
+            case "openFile": {
+                if (!fs.existsSync(path)) {
+                    throw new Error('file not found');
+                }
+                return shell.openPath(path);
+            }
+
+            case "showFolder": {
+                if (!fs.existsSync(path)) {
+                    throw new Error('file not found');
+                }
+                shell.showItemInFolder(path);
+                return true;
+            }
+        }
+    });
+}
+
+async function createDownload(window_, url, options = {}) {
+    downloadWaiting = true;
+    syncDownloadItems();
+    try {
+        return await download(window_, url, options);
+    } catch (error) {
+        // electron-dl rejects with CancelError when a download is cancelled; treat it as expected.
+        const isCancelError = (typeof CancelError === 'function' && error instanceof CancelError)
+            || error?.name === 'CancelError';
+        if (!isCancelError) {
+            throw error;
+        }
+        return null;
+    } finally {
+        downloadWaiting = false;
+        syncDownloadItems();
+    }
+}
+
+function syncDownloadItems() {
+    // 同步下载项到渲染进程
+    if (downloadWindow) {
+        downloadWindow.webContents.send('download-items', {
+            items: downloadManager.get(),
+            waiting: downloadWaiting,
+        });
+    }
+}
+
+function getLanguageData(code) {
+    const packs = {
+        zh: {
+            // 语言设置
+            locale: 'zh-CN',
+            title: '下载管理器',
+
+            // 界面文本
+            searchPlaceholder: '搜索文件名或链接...',
+            noItems: '暂无任务',
+            noSearchResult: '未找到匹配的结果',
+
+            // 操作按钮
+            refresh: '刷新',
+            removeAll: "清空历史",
+            copyLink: '复制链接',
+            resume: '继续',
+            pause: '暂停',
+            cancel: '取消',
+            remove: '删除',
+            showInFolder: '显示在文件夹',
+
+            // 状态文本
+            progressing: '下载中',
+            completed: '已完成',
+            cancelled: '已取消',
+            interrupted: '失败',
+            paused: '已暂停',
+
+            // 成功消息
+            copied: "已复制",
+            refreshSuccess: '刷新成功',
+
+            // 确认对话框
+            confirmCancel: '确定要取消此下载任务并删除记录吗？',
+            confirmRemove: '确定要从历史记录中删除此项吗？',
+            confirmRemoveAll: '确定要清空下载历史吗？',
+
+            // 错误消息
+            copyFailed: '复制失败: ',
+            pauseFailed: '暂停失败: ',
+            resumeFailed: '继续失败: ',
+            removeFailed: '删除失败: ',
+            removeAllFailed: '清空失败: ',
+            openFailed: '打开文件失败: ',
+            showFailed: '显示文件失败: ',
+        },
+        'zh-CHT': {
+            locale: 'zh-TW',
+            title: '下載管理器',
+
+            // 界面文本
+            searchPlaceholder: '搜尋檔案名稱或連結...',
+            noItems: '暫無任務',
+            noSearchResult: '未找到匹配的結果',
+
+            // 操作按钮
+            refresh: '重新整理',
+            removeAll: "清空歷史",
+            copyLink: '複製連結',
+            resume: '繼續',
+            pause: '暫停',
+            cancel: '取消',
+            remove: '刪除',
+            showInFolder: '顯示在資料夾',
+
+            // 状态文本
+            progressing: '下載中',
+            completed: '已完成',
+            cancelled: '已取消',
+            interrupted: '失敗',
+            paused: '已暫停',
+
+            // 成功消息
+            copied: "已複製",
+            refreshSuccess: '重新整理成功',
+
+            // 确认对话框
+            confirmCancel: '確定要取消此下載任務並刪除記錄嗎？',
+            confirmRemove: '確定要從歷史記錄中刪除此項嗎？',
+            confirmRemoveAll: '確定要清空下載歷史嗎？',
+
+            // 错误消息
+            copyFailed: '複製失敗: ',
+            pauseFailed: '暫停失敗: ',
+            resumeFailed: '繼續失敗: ',
+            removeFailed: '刪除失敗: ',
+            removeAllFailed: '清空失敗: ',
+            openFailed: '開啟檔案失敗: ',
+            showFailed: '顯示檔案失敗: ',
+        },
+        en: {
+            locale: 'en-US',
+            title: 'Download Manager',
+
+            // 界面文本
+            searchPlaceholder: 'Search filename or link...',
+            noItems: 'No tasks',
+            noSearchResult: 'No matching results found',
+
+            // 操作按钮
+            refresh: 'Refresh',
+            removeAll: "Clear History",
+            copyLink: 'Copy Link',
+            resume: 'Resume',
+            pause: 'Pause',
+            cancel: 'Cancel',
+            remove: 'Remove',
+            showInFolder: 'Show in Folder',
+
+            // 状态文本
+            progressing: 'Downloading',
+            completed: 'Completed',
+            cancelled: 'Cancelled',
+            interrupted: 'Failed',
+            paused: 'Paused',
+
+            // 成功消息
+            copied: "Copied",
+            refreshSuccess: 'Refresh successful',
+
+            // 确认对话框
+            confirmCancel: 'Are you sure you want to cancel this download task and delete the record?',
+            confirmRemove: 'Are you sure you want to remove this item from history?',
+            confirmRemoveAll: 'Are you sure you want to clear download history?',
+
+            // 错误消息
+            copyFailed: 'Copy failed: ',
+            pauseFailed: 'Pause failed: ',
+            resumeFailed: 'Resume failed: ',
+            removeFailed: 'Remove failed: ',
+            removeAllFailed: 'Clear failed: ',
+            openFailed: 'Open file failed: ',
+            showFailed: 'Show file failed: ',
+        },
+        ko: {
+            locale: 'ko-KR',
+            title: '다운로드 관리자',
+
+            // 界面文本
+            searchPlaceholder: '파일명 또는 링크 검색...',
+            noItems: '작업 없음',
+            noSearchResult: '일치하는 결과를 찾을 수 없습니다',
+
+            // 操作按钮
+            refresh: '새로고침',
+            removeAll: "기록 지우기",
+            copyLink: '링크 복사',
+            resume: '계속',
+            pause: '일시정지',
+            cancel: '취소',
+            remove: '삭제',
+            showInFolder: '폴더에서 보기',
+
+            // 状态文本
+            progressing: '다운로드 중',
+            completed: '완료됨',
+            cancelled: '취소됨',
+            interrupted: '실패',
+            paused: '일시정지됨',
+
+            // 成功消息
+            copied: "복사됨",
+            refreshSuccess: '새로고침 성공',
+
+            // 确认对话框
+            confirmCancel: '이 다운로드 작업을 취소하고 기록을 삭제하시겠습니까?',
+            confirmRemove: '기록에서 이 항목을 삭제하시겠습니까?',
+            confirmRemoveAll: '다운로드 기록을 지우시겠습니까?',
+
+            // 错误消息
+            copyFailed: '복사 실패: ',
+            pauseFailed: '일시정지 실패: ',
+            resumeFailed: '계속 실패: ',
+            removeFailed: '삭제 실패: ',
+            removeAllFailed: '지우기 실패: ',
+            openFailed: '파일 열기 실패: ',
+            showFailed: '파일 표시 실패: ',
+        },
+        ja: {
+            locale: 'ja-JP',
+            title: 'ダウンロードマネージャー',
+
+            // 界面文本
+            searchPlaceholder: 'ファイル名またはリンクを検索...',
+            noItems: 'タスクがありません',
+            noSearchResult: '一致する結果が見つかりません',
+
+            // 操作按钮
+            refresh: '更新',
+            removeAll: "履歴をクリア",
+            copyLink: 'リンクをコピー',
+            resume: '再開',
+            pause: '一時停止',
+            cancel: 'キャンセル',
+            remove: '削除',
+            showInFolder: 'フォルダで表示',
+
+            // 状态文本
+            progressing: 'ダウンロード中',
+            completed: '完了',
+            cancelled: 'キャンセル済み',
+            interrupted: '失敗',
+            paused: '一時停止中',
+
+            // 成功消息
+            copied: "コピーしました",
+            refreshSuccess: '更新が完了しました',
+
+            // 确认对话框
+            confirmCancel: 'このダウンロードタスクをキャンセルして記録を削除しますか？',
+            confirmRemove: '履歴からこの項目を削除しますか？',
+            confirmRemoveAll: 'ダウンロード履歴をクリアしますか？',
+
+            // 错误消息
+            copyFailed: 'コピーに失敗しました: ',
+            pauseFailed: '一時停止に失敗しました: ',
+            resumeFailed: '再開に失敗しました: ',
+            removeFailed: '削除に失敗しました: ',
+            removeAllFailed: 'クリアに失敗しました: ',
+            openFailed: 'ファイルを開けませんでした: ',
+            showFailed: 'ファイルの表示に失敗しました: ',
+        },
+        de: {
+            locale: 'de-DE',
+            title: 'Download-Manager',
+
+            // 界面文本
+            searchPlaceholder: 'Dateiname oder Link suchen...',
+            noItems: 'Keine Aufgaben',
+            noSearchResult: 'Keine übereinstimmenden Ergebnisse gefunden',
+
+            // 操作按钮
+            refresh: 'Aktualisieren',
+            removeAll: "Verlauf löschen",
+            copyLink: 'Link kopieren',
+            resume: 'Fortsetzen',
+            pause: 'Pause',
+            cancel: 'Abbrechen',
+            remove: 'Entfernen',
+            showInFolder: 'Im Ordner anzeigen',
+
+            // 状态文本
+            progressing: 'Wird heruntergeladen',
+            completed: 'Abgeschlossen',
+            cancelled: 'Abgebrochen',
+            interrupted: 'Fehlgeschlagen',
+            paused: 'Pausiert',
+
+            // 成功消息
+            copied: "Kopiert",
+            refreshSuccess: 'Erfolgreich aktualisiert',
+
+            // 确认对话框
+            confirmCancel: 'Sind Sie sicher, dass Sie diese Download-Aufgabe abbrechen und den Eintrag löschen möchten?',
+            confirmRemove: 'Sind Sie sicher, dass Sie diesen Eintrag aus dem Verlauf entfernen möchten?',
+            confirmRemoveAll: 'Sind Sie sicher, dass Sie den Download-Verlauf löschen möchten?',
+
+            // 错误消息
+            copyFailed: 'Kopieren fehlgeschlagen: ',
+            pauseFailed: 'Pause fehlgeschlagen: ',
+            resumeFailed: 'Fortsetzen fehlgeschlagen: ',
+            removeFailed: 'Entfernen fehlgeschlagen: ',
+            removeAllFailed: 'Löschen fehlgeschlagen: ',
+            openFailed: 'Datei öffnen fehlgeschlagen: ',
+            showFailed: 'Datei anzeigen fehlgeschlagen: ',
+        },
+        fr: {
+            locale: 'fr-FR',
+            title: 'Gestionnaire de téléchargements',
+
+            // 界面文本
+            searchPlaceholder: 'Rechercher nom de fichier ou lien...',
+            noItems: 'Aucune tâche',
+            noSearchResult: 'Aucun résultat correspondant trouvé',
+
+            // 操作按钮
+            refresh: 'Actualiser',
+            removeAll: "Effacer l'historique",
+            copyLink: 'Copier le lien',
+            resume: 'Reprendre',
+            pause: 'Pause',
+            cancel: 'Annuler',
+            remove: 'Supprimer',
+            showInFolder: 'Afficher dans le dossier',
+
+            // 状态文本
+            progressing: 'Téléchargement en cours',
+            completed: 'Terminé',
+            cancelled: 'Annulé',
+            interrupted: 'Échoué',
+            paused: 'En pause',
+
+            // 成功消息
+            copied: "Copié",
+            refreshSuccess: 'Actualisation réussie',
+
+            // 确认对话框
+            confirmCancel: 'Êtes-vous sûr de vouloir annuler cette tâche de téléchargement et supprimer l\'enregistrement ?',
+            confirmRemove: 'Êtes-vous sûr de vouloir supprimer cet élément de l\'historique ?',
+            confirmRemoveAll: 'Êtes-vous sûr de vouloir effacer l\'historique des téléchargements ?',
+
+            // 错误消息
+            copyFailed: 'Échec de la copie : ',
+            pauseFailed: 'Échec de la pause : ',
+            resumeFailed: 'Échec de la reprise : ',
+            removeFailed: 'Échec de la suppression : ',
+            removeAllFailed: 'Échec de l\'effacement : ',
+            openFailed: 'Échec de l\'ouverture du fichier : ',
+            showFailed: 'Échec de l\'affichage du fichier : ',
+        },
+        id: {
+            locale: 'id-ID',
+            title: 'Manajer Unduhan',
+
+            // 界面文本
+            searchPlaceholder: 'Cari nama file atau tautan...',
+            noItems: 'Tidak ada tugas',
+            noSearchResult: 'Tidak ada hasil yang cocok ditemukan',
+
+            // 操作按钮
+            refresh: 'Segarkan',
+            removeAll: "Hapus Riwayat",
+            copyLink: 'Salin Tautan',
+            resume: 'Lanjutkan',
+            pause: 'Jeda',
+            cancel: 'Batal',
+            remove: 'Hapus',
+            showInFolder: 'Tampilkan di Folder',
+
+            // 状态文本
+            progressing: 'Mengunduh',
+            completed: 'Selesai',
+            cancelled: 'Dibatalkan',
+            interrupted: 'Gagal',
+            paused: 'Dijeda',
+
+            // 成功消息
+            copied: "Disalin",
+            refreshSuccess: 'Berhasil disegarkan',
+
+            // 确认对话框
+            confirmCancel: 'Apakah Anda yakin ingin membatalkan tugas unduhan ini dan menghapus catatan?',
+            confirmRemove: 'Apakah Anda yakin ingin menghapus item ini dari riwayat?',
+            confirmRemoveAll: 'Apakah Anda yakin ingin menghapus riwayat unduhan?',
+
+            // 错误消息
+            copyFailed: 'Gagal menyalin: ',
+            pauseFailed: 'Gagal menjeda: ',
+            resumeFailed: 'Gagal melanjutkan: ',
+            removeFailed: 'Gagal menghapus: ',
+            removeAllFailed: 'Gagal menghapus: ',
+            openFailed: 'Gagal membuka file: ',
+            showFailed: 'Gagal menampilkan file: ',
+        },
+        ru: {
+            locale: 'ru-RU',
+            title: 'Менеджер загрузок',
+
+            // 界面文本
+            searchPlaceholder: 'Поиск имени файла или ссылки...',
+            noItems: 'Нет задач',
+            noSearchResult: 'Совпадающих результатов не найдено',
+
+            // 操作按钮
+            refresh: 'Обновить',
+            removeAll: "Очистить историю",
+            copyLink: 'Копировать ссылку',
+            resume: 'Возобновить',
+            pause: 'Пауза',
+            cancel: 'Отмена',
+            remove: 'Удалить',
+            showInFolder: 'Показать в папке',
+
+            // 状态文本
+            progressing: 'Загружается',
+            completed: 'Завершено',
+            cancelled: 'Отменено',
+            interrupted: 'Ошибка',
+            paused: 'На паузе',
+
+            // 成功消息
+            copied: "Скопировано",
+            refreshSuccess: 'Успешно обновлено',
+
+            // 确认对话框
+            confirmCancel: 'Вы уверены, что хотите отменить эту задачу загрузки и удалить запись?',
+            confirmRemove: 'Вы уверены, что хотите удалить этот элемент из истории?',
+            confirmRemoveAll: 'Вы уверены, что хотите очистить историю загрузок?',
+
+            // 错误消息
+            copyFailed: 'Ошибка копирования: ',
+            pauseFailed: 'Ошибка паузы: ',
+            resumeFailed: 'Ошибка возобновления: ',
+            removeFailed: 'Ошибка удаления: ',
+            removeAllFailed: 'Ошибка очистки: ',
+            openFailed: 'Ошибка открытия файла: ',
+            showFailed: 'Ошибка отображения файла: ',
+        }
+    };
+    downloadLanguageCode = code;
+    return packs[code] || packs.zh;
+}
+
+async function open(language = 'zh', theme = 'light') {
+    // 获取语言包
+    const finalLanguage = getLanguageData(language);
+
+    // 如果窗口已存在，直接显示
+    if (downloadWindow) {
+        // 更新窗口数据
+        await updateWindow(language, theme)
+        // 显示窗口并聚焦
+        downloadWindow.show();
+        downloadWindow.focus();
+        return;
+    }
+
+    // 窗口默认参数
+    const downloadWindowOptions = {
+        width: 700,
+        height: 480,
+        minWidth: 500,
+        minHeight: 350,
+        center: true,
+        show: false,
+        autoHideMenuBar: true,
+        title: finalLanguage.title,
+        backgroundColor: utils.getDefaultBackgroundColor(),
+        webPreferences: {
+            preload: path.join(__dirname, 'electron-preload.js'),
+            webSecurity: true,
+            nodeIntegration: true,
+            contextIsolation: true,
+        }
+    }
+
+    // 恢复窗口位置
+    const downloadWindowBounds = DownloadStore.get('downloadWindowBounds', {});
+    if (
+        downloadWindowBounds.width !== undefined &&
+        downloadWindowBounds.height !== undefined &&
+        downloadWindowBounds.x !== undefined &&
+        downloadWindowBounds.y !== undefined
+    ) {
+        // 获取所有显示器的可用区域
+        const displays = screen.getAllDisplays();
+        // 检查窗口是否在任意一个屏幕内
+        let isInScreen = false;
+        for (const display of displays) {
+            const area = display.workArea;
+            if (
+                downloadWindowBounds.x + downloadWindowBounds.width > area.x &&
+                downloadWindowBounds.x < area.x + area.width &&
+                downloadWindowBounds.y + downloadWindowBounds.height > area.y &&
+                downloadWindowBounds.y < area.y + area.height
+            ) {
+                isInScreen = true;
+                break;
+            }
+        }
+        // 如果超出所有屏幕，则移动到主屏幕可见区域
+        if (!isInScreen) {
+            const primaryArea = screen.getPrimaryDisplay().workArea;
+            downloadWindowBounds.x = primaryArea.x + 50;
+            downloadWindowBounds.y = primaryArea.y + 50;
+            // 防止窗口太大超出屏幕
+            downloadWindowBounds.width = Math.min(downloadWindowBounds.width, primaryArea.width - 100);
+            downloadWindowBounds.height = Math.min(downloadWindowBounds.height, primaryArea.height - 100);
+        }
+        downloadWindowOptions.center = false;
+        downloadWindowOptions.width = downloadWindowBounds.width;
+        downloadWindowOptions.height = downloadWindowBounds.height;
+        downloadWindowOptions.x = downloadWindowBounds.x;
+        downloadWindowOptions.y = downloadWindowBounds.y;
+    }
+
+    // 创建窗口
+    downloadWindow = new BrowserWindow(downloadWindowOptions);
+
+    // 禁止修改窗口标题
+    downloadWindow.on('page-title-updated', (event) => {
+        event.preventDefault()
+    })
+
+    // 监听窗口关闭保存窗口位置
+    downloadWindow.on('close', () => {
+        const bounds = downloadWindow.getBounds();
+        DownloadStore.set('downloadWindowBounds', bounds);
+    });
+
+    // 监听窗口关闭事件
+    downloadWindow.on('closed', () => {
+        downloadWindow = null;
+    });
+
+    // 加载下载管理器页面
+    const htmlPath = path.join(__dirname, 'render', 'download', 'index.html');
+    const themeParam = (theme === 'dark' ? 'dark' : 'light');
+    await downloadWindow.loadFile(htmlPath, {query: {theme: themeParam}});
+
+    // 将语言包发送到渲染进程
+    downloadWindow.webContents.once('dom-ready', () => {
+        updateWindow(language, theme)
+    });
+
+    // 显示窗口
+    downloadWindow.show();
+}
+
+function close() {
+    if (downloadWindow) {
+        downloadWindow.close();
+        downloadWindow = null;
+    }
+}
+
+function destroy() {
+    if (downloadWindow) {
+        downloadWindow.destroy();
+        downloadWindow = null;
+    }
+}
+
+async function updateWindow(language, theme) {
+    if (downloadWindow) {
+        try {
+            const finalLanguage = getLanguageData(language);
+            downloadWindow.setTitle(finalLanguage.title);
+            downloadWindow.webContents.send('download-theme', theme);
+            downloadWindow.webContents.send('download-language', finalLanguage);
+            syncDownloadItems()
+        } catch (error) {
+            loger.error(error);
+        }
+    }
+}
+
+module.exports = {
+    initialize,
+    createDownload,
+    open,
+    close,
+    destroy,
+    updateWindow
+}

electron/electron-menu.js

@@ -9,7 +9,7 @@ const {
 const fs = require('fs')
 const url = require('url')
 const request = require("request");
-const utils = require('./utils')
+const utils = require('./lib/utils')
 
 const MAILTO_PREFIX = "mailto:";
 

electron/electron-preload.js

@@ -32,7 +32,13 @@ contextBridge.exposeInMainWorld(
     'electron', {
         request: (msg, callback, error) => {
             msg.reqId = reqId++;
-            reqInfo[msg.reqId] = {callback: callback, error: error};
+            if (typeof callback !== "function") {
+                callback = function () {};
+            }
+            if (typeof error !== "function") {
+                error = function () {};
+            }
+            reqInfo[msg.reqId] = {callback, error};
             if (msg.action == 'watchFile') {
                 fileChangedListeners[msg.path] = msg.listener;
                 delete msg.listener;

electron/electron.js

@@ -1,7 +1,17 @@
+// Node.js 核心模块
 const fs = require('fs')
 const os = require("os");
 const path = require('path')
+const spawn = require("child_process").spawn;
+const fsProm = require('fs/promises');
+const crc = require('crc');
+const zlib = require('zlib');
+
+// Web 服务相关
 const express = require('express')
+const axios = require('axios');
+
+// Electron 核心模块
 const {
     app,
     ipcMain,
@@ -13,57 +23,87 @@ const {
     nativeTheme,
     Tray,
     Menu,
-    BrowserView,
+    WebContentsView,
     BrowserWindow
 } = require('electron')
+
+// 禁用渲染器后台化
+app.commandLine.appendSwitch('disable-renderer-backgrounding');
+app.commandLine.appendSwitch('disable-backgrounding-occluded-windows');
+
+// Electron 扩展和工具
 const {autoUpdater} = require("electron-updater")
 const Store = require("electron-store");
 const loger = require("electron-log");
 const electronConf = require('electron-config')
-const userConf = new electronConf()
-const fsProm = require('fs/promises');
-const PDFDocument = require('pdf-lib').PDFDocument;
 const Screenshots = require("electron-screenshots-tool").Screenshots;
-const crc = require('crc');
-const zlib = require('zlib');
-const utils = require('./utils');
+
+// PDF 处理
+const PDFDocument = require('pdf-lib').PDFDocument;
+
+// 本地模块和配置
+const utils = require('./lib/utils');
+const navigation = require('./lib/navigation');
 const config = require('./package.json');
+const electronDown = require("./electron-down");
 const electronMenu = require("./electron-menu");
-const spawn = require("child_process").spawn;
+const { startMCPServer, stopMCPServer } = require("./lib/mcp");
+
+// 实例初始化
+const userConf = new electronConf()
 const store = new Store();
 
+// 平台检测常量
 const isMac = process.platform === 'darwin'
 const isWin = process.platform === 'win32'
+
+// URL 和调用验证正则
 const allowedUrls = /^(?:https?|mailto|tel|callto):/i;
 const allowedCalls = /^(?:mailto|tel|callto):/i;
-const cacheDir = path.join(os.tmpdir(), 'dootask-cache')
-let updaterLockFile = path.join(cacheDir, '.dootask_updater.lock');
-let enableStoreBkp = true;
-let dialogOpen = false;
-let enablePlugins = false;
 
-let mainWindow = null,
-    mainTray = null,
+// 路径和缓存配置
+const cacheDir = path.join(os.tmpdir(), 'dootask-cache')
+const updaterLockFile = path.join(cacheDir, '.dootask_updater.lock');
+
+// 应用状态标志
+let enableStoreBkp = true,
+    dialogOpen = false,
+    enablePlugins = false,
     isReady = false,
     willQuitApp = false,
-    devloadPath = path.resolve(__dirname, ".devload"),
-    isDevelopMode = false,
-    serverPort = 22223,
-    serverPublicDir = path.join(__dirname, 'public'),
-    serverUrl = "";
+    isDevelopMode = false;
 
+// 服务器配置
+let serverPort = 22223,
+    mcpPort = 22224,
+    serverPublicDir = path.join(__dirname, 'public'),
+    serverUrl = "",
+    serverTimer = null;
+
+// 截图相关变量
 let screenshotObj = null,
     screenshotKey = null;
 
-let childWindow = [],
+// 窗口实例变量
+let mainWindow = null,
+    mainTray = null,
     preloadWindow = null,
     mediaWindow = null,
-    mediaType = null,
-    webTabWindow = null,
-    webTabView = [],
+    webTabWindow = null;
+
+// 窗口数组和状态
+let childWindow = [],
+    webTabView = [];
+
+// 窗口配置和状态
+let mediaType = null,
     webTabHeight = 40,
     webTabClosedByShortcut = false;
 
+// 开发模式路径
+let devloadPath = path.resolve(__dirname, ".devload");
+
+// 窗口显示状态管理
 let showState = {},
     onShowWindow = (win) => {
         try {
@@ -76,6 +116,7 @@ let showState = {},
         }
     }
 
+// 开发模式加载
 if (fs.existsSync(devloadPath)) {
     let devloadContent = fs.readFileSync(devloadPath, 'utf8')
     if (devloadContent.startsWith('http')) {
@@ -84,25 +125,41 @@ if (fs.existsSync(devloadPath)) {
     }
 }
 
+// 缓存目录检查
 if (!fs.existsSync(cacheDir)) {
     fs.mkdirSync(cacheDir, { recursive: true });
 }
 
+// 初始化下载
+electronDown.initialize(() => {
+    if (mainWindow) {
+        mainWindow.webContents.send("openDownloadWindow", {})
+    }
+})
+
 /**
  * 启动web服务
  */
-async function startWebServer() {
-    if (serverUrl) {
+async function startWebServer(force = false) {
+    if (serverUrl && !force) {
         return Promise.resolve();
     }
 
+    // 每次启动前清理缓存
+    utils.clearServerCache();
+
     return new Promise((resolve, reject) => {
         // 创建Express应用
-        const app = express();
+        const expressApp = express();
+
+        // 健康检查
+        expressApp.head('/health', (req, res) => {
+            res.status(200).send('OK');
+        });
 
         // 使用express.static中间件提供静态文件服务
         // Express内置了全面的MIME类型支持，无需手动配置
-        app.use(express.static(serverPublicDir, {
+        expressApp.use(express.static(serverPublicDir, {
             // 设置默认文件
             index: ['index.html', 'index.htm'],
             // 启用etag缓存
@@ -113,40 +170,131 @@ async function startWebServer() {
             dotfiles: 'ignore',
             // 自定义头部
             setHeaders: (res, path, stat) => {
-                // 对HTML文件禁用缓存，方便开发调试
-                if (path.endsWith('.html')) {
-                    res.set('Cache-Control', 'no-cache');
+                const ext = path.split('.').pop().toLowerCase();
+                // HTML、JS、CSS文件禁用缓存，方便开发调试
+                if (['html', 'js', 'css'].includes(ext)){
+                    res.set('Cache-Control', 'no-cache, no-store, must-revalidate');
+                    res.set('Pragma', 'no-cache');
+                    res.set('Expires', '0');
                 }
             }
         }));
 
         // 404处理中间件
-        app.use((req, res) => {
+        expressApp.use((req, res) => {
             res.status(404).send('File not found');
         });
 
         // 错误处理中间件
-        app.use((err, req, res, next) => {
-            console.error('Server error:', err);
-            res.status(500).send('Internal Server Error');
+        expressApp.use((err, req, res, next) => {
+            // 不是ENOENT错误，记录error级别日志
+            if (err.code !== 'ENOENT') {
+                loger.error('Server error:', err);
+                res.status(500).send('Internal Server Error');
+                return;
+            }
+
+            // 没有path，说明是404错误
+            if (!err.path) {
+                loger.warn('File not found:', req.url);
+                res.status(404).send('File not found');
+                return;
+            }
+
+            // 不是临时文件错误，普通404
+            if (!err.path.includes('.com.dootask.task.')) {
+                loger.warn('File not found:', err.path);
+                res.status(404).send('File not found');
+                return;
+            }
+
+            // 防止死循环 - 如果已经是重定向请求，直接返回404
+            if (req.query._dt_restored) {
+                const redirectTime = parseInt(req.query._dt_restored);
+                const timeDiff = Date.now() - redirectTime;
+                // 10秒内的重定向认为是死循环，直接返回404
+                if (timeDiff < 10000) {
+                    loger.warn('Recent redirect detected, avoiding loop:', timeDiff + 'ms ago');
+                    res.status(404).send('File not found');
+                    return;
+                }
+            }
+
+            loger.warn('Temporary file cleaned up by system:', err.path, req.url);
+
+            // 临时文件被系统清理，尝试从serverPublicDir重新读取并恢复
+            const requestedUrl = new URL(req.url, serverUrl);
+            const requestedFile = path.join(serverPublicDir, requestedUrl.pathname === '/' ? '/index.html' : requestedUrl.pathname);
+            try {
+                // 检查文件是否存在于serverPublicDir
+                fs.accessSync(requestedFile, fs.constants.F_OK);
+
+                // 确保目标目录存在
+                const targetDir = path.dirname(err.path);
+                if (!fs.existsSync(targetDir)) {
+                    fs.mkdirSync(targetDir, {recursive: true});
+                }
+
+                // 从ASAR文件中读取文件并写入到临时位置
+                fs.writeFileSync(err.path, fs.readFileSync(requestedFile));
+
+                // 文件恢复成功后，301重定向到带__redirect参数的URL
+                requestedUrl.searchParams.set('_dt_restored', Date.now());
+                res.redirect(301, requestedUrl.toString());
+            } catch (accessErr) {
+                // 文件不存在于serverPublicDir，返回404
+                loger.warn('Source file not found:', requestedFile, 'Error:', accessErr.message);
+                res.status(404).send('File not found');
+            }
         });
 
         // 启动服务器
-        const server = app.listen(serverPort, 'localhost', () => {
-            console.log(`Express static file server running at http://localhost:${serverPort}/`);
-            console.log(`Serving files from: ${serverPublicDir}`);
+        const server = expressApp.listen(serverPort, 'localhost', () => {
+            loger.info(`Express static file server running at http://localhost:${serverPort}/`);
+            loger.info(`Serving files from: ${serverPublicDir}`);
             serverUrl = `http://localhost:${serverPort}/`;
             resolve(server);
+            // 启动健康检查定时器
+            serverTimeout();
         });
 
         // 错误处理
         server.on('error', (err) => {
-            console.error('Server error:', err);
+            loger.error('Server error:', err);
             reject(err);
         });
     });
 }
 
+/**
+ * 健康检查定时器
+ */
+function serverTimeout() {
+    clearTimeout(serverTimer)
+    serverTimer = setTimeout(async () => {
+        if (!serverUrl) {
+            return;  // 没有服务器URL，直接返回
+        }
+        try {
+            const res = await axios.head(serverUrl + 'health')
+            if (res.status === 200) {
+                serverTimeout()  // 健康检查通过，重新设置定时器
+                return;
+            }
+            loger.error('Server health check failed with status: ' + res.status);
+        } catch (err) {
+            loger.error('Server health check error:', err);
+        }
+        // 如果健康检查失败，尝试重新启动服务器
+        try {
+            await startWebServer(true)
+            loger.info('Server restarted successfully');
+        } catch (error) {
+            loger.error('Failed to restart server:', error);
+        }
+    }, 10000)
+}
+
 /**
  * 创建主窗口
  */
@@ -164,7 +312,7 @@ function createMainWindow() {
             webSecurity: true,
             nodeIntegration: true,
             contextIsolation: true,
-            nativeWindowOpen: true
+            backgroundThrottling: false,
         }
     })
 
@@ -208,10 +356,10 @@ function createMainWindow() {
     // 新窗口处理
     mainWindow.webContents.setWindowOpenHandler(({url}) => {
         if (allowedCalls.test(url)) {
-            openExternal(url)
+            openExternal(url).catch(() => {})
         } else {
             utils.onBeforeOpenWindow(mainWindow.webContents, url).then(() => {
-                openExternal(url)
+                openExternal(url).catch(() => {})
             })
         }
         return {action: 'deny'}
@@ -220,6 +368,9 @@ function createMainWindow() {
     // 设置右键菜单
     electronMenu.webContentsMenu(mainWindow.webContents)
 
+    // 设置导航快捷键（返回/前进）
+    navigation.setup(mainWindow)
+
     // 加载地址
     utils.loadUrl(mainWindow, serverUrl)
 }
@@ -244,7 +395,7 @@ function createUpdaterWindow(updateTitle) {
 
         // 检查updater应用是否存在
         if (!fs.existsSync(updaterPath)) {
-            console.log('Updater not found:', updaterPath);
+            loger.error('Updater not found:', updaterPath);
             return;
         }
 
@@ -256,13 +407,13 @@ function createUpdaterWindow(updateTitle) {
                 try {
                     spawn('icacls', [updaterPath, '/grant', 'everyone:F'], { stdio: 'inherit', shell: true });
                 } catch (e) {
-                    console.log('Failed to set executable permission:', e);
+                    loger.error('Failed to set executable permission:', e);
                 }
             } else if (process.platform === 'darwin') {
                 try {
                     spawn('chmod', ['+x', updaterPath], {stdio: 'inherit'});
                 } catch (e) {
-                    console.log('Failed to set executable permission:', e);
+                    loger.error('Failed to set executable permission:', e);
                 }
             }
         }
@@ -285,11 +436,11 @@ function createUpdaterWindow(updateTitle) {
         child.unref();
 
         child.on('error', (err) => {
-            console.log('Updater process error:', err);
+            loger.error('Updater process error:', err);
         });
 
     } catch (e) {
-        console.log('Failed to create updater process:', e);
+        loger.error('Failed to create updater process:', e);
     }
 }
 
@@ -315,7 +466,6 @@ function preCreateChildWindow() {
             webSecurity: true,
             nodeIntegration: true,
             contextIsolation: true,
-            nativeWindowOpen: true
         }
     });
 
@@ -351,6 +501,14 @@ function createChildWindow(args) {
     const wind = childWindow.find(item => item.name == name);
     let browser = wind ? wind.browser : null;
     let isPreload = false;
+    // 清理已销毁但仍被引用的窗口，避免对失效对象调用方法
+    if (browser && browser.isDestroyed && browser.isDestroyed()) {
+        const index = childWindow.findIndex(item => item.name == name);
+        if (index > -1) {
+            childWindow.splice(index, 1);
+        }
+        browser = null;
+    }
     if (browser) {
         browser.focus();
         if (args.force === false) {
@@ -373,14 +531,21 @@ function createChildWindow(args) {
                 webSecurity: true,
                 nodeIntegration: true,
                 contextIsolation: true,
-                nativeWindowOpen: true
             }, webPreferences),
         }, config)
+
+        options.width = utils.normalizeSize(options.width, 1280)
+        options.height = utils.normalizeSize(options.height, 800)
+        options.minWidth = utils.normalizeSize(options.minWidth, 360)
+        options.minHeight = utils.normalizeSize(options.minHeight, 360)
+        if (!options.webPreferences.contextIsolation) {
+            delete options.webPreferences.preload;
+        }
         if (options.parent) {
             options.parent = mainWindow
         }
 
-        if (preloadWindow && Object.keys(webPreferences).length === 0) {
+        if (preloadWindow && !preloadWindow.isDestroyed?.() && Object.keys(webPreferences).length === 0) {
             // 使用预加载窗口
             browser = preloadWindow;
             preloadWindow = null;
@@ -397,7 +562,7 @@ function createChildWindow(args) {
         } else {
             // 创建新窗口
             browser = new BrowserWindow(options)
-            console.log("create new window")
+            loger.info("create new window")
         }
 
         browser.on('page-title-updated', (event, title) => {
@@ -426,7 +591,7 @@ function createChildWindow(args) {
         })
 
         browser.on('closed', () => {
-            const index = childWindow.findIndex(item => item.name == name);
+            const index = childWindow.findIndex(item => item.browser === browser);
             if (index > -1) {
                 childWindow.splice(index, 1)
             }
@@ -450,10 +615,10 @@ function createChildWindow(args) {
     // 新窗口处理
     browser.webContents.setWindowOpenHandler(({url}) => {
         if (allowedCalls.test(url)) {
-            openExternal(url)
+            openExternal(url).catch(() => {})
         } else {
             utils.onBeforeOpenWindow(browser.webContents, url).then(() => {
-                openExternal(url)
+                openExternal(url).catch(() => {})
             })
         }
         return {action: 'deny'}
@@ -462,6 +627,9 @@ function createChildWindow(args) {
     // 设置右键菜单
     electronMenu.webContentsMenu(browser.webContents)
 
+    // 设置导航快捷键（返回/前进）
+    navigation.setup(browser)
+
     // 加载地址
     const hash = `${args.hash || args.path}`;
     if (/^https?:/i.test(hash)) {
@@ -622,9 +790,8 @@ function createWebTabWindow(args) {
                 webSecurity: true,
                 nodeIntegration: true,
                 contextIsolation: true,
-                nativeWindowOpen: true
             },
-        }, userConf.get('webTabWindow', {})))
+        }, userConf.get('webTabWindow') || {}))
 
         const originalClose = webTabWindow.close;
         webTabWindow.close = function() {
@@ -688,9 +855,20 @@ function createWebTabWindow(args) {
                 webTabClosedByShortcut = true
             } else if (utils.isMetaOrControl(input) && input.shift && input.key.toLowerCase() === 'i') {
                 devToolsWebTab(0)
+            } else {
+                const item = currentWebTab()
+                if (item) {
+                    navigation.handleInput(event, input, item.view.webContents)
+                }
             }
         })
 
+        // 设置鼠标侧键和触控板手势导航
+        navigation.setupWindowEvents(webTabWindow, () => {
+            const item = currentWebTab()
+            return item ? item.view.webContents : null
+        })
+
         webTabWindow.loadFile('./render/tabs/index.html', {}).then(_ => { }).catch(_ => { })
     }
     if (webTabWindow.isMinimized()) {
@@ -700,17 +878,16 @@ function createWebTabWindow(args) {
     webTabWindow.show();
 
     // 创建 tab 子窗口
-    const viewOptions = Object.assign({
-        useHTMLTitleAndIcon: true,
-        useLoadingView: true,
-        useErrorView: true,
-    }, args.config || {})
+    const viewOptions = args.config || {}
     viewOptions.webPreferences = Object.assign({
         preload: path.join(__dirname, 'electron-preload.js'),
         nodeIntegration: true,
         contextIsolation: true
     }, args.webPreferences || {})
-    const browserView = new BrowserView(viewOptions)
+    if (!viewOptions.webPreferences.contextIsolation) {
+        delete viewOptions.webPreferences.preload;
+    }
+    const browserView = new WebContentsView(viewOptions)
     if (args.backgroundColor) {
         browserView.setBackgroundColor(args.backgroundColor)
     } else if (nativeTheme.shouldUseDarkColors) {
@@ -729,7 +906,7 @@ function createWebTabWindow(args) {
     })
     browserView.webContents.setWindowOpenHandler(({url}) => {
         if (allowedCalls.test(url)) {
-            openExternal(url)
+            openExternal(url).catch(() => {})
         } else {
             createWebTabWindow({url})
         }
@@ -747,6 +924,20 @@ function createWebTabWindow(args) {
         if (!errorDescription) {
             return
         }
+        // 主框架加载失败时，展示内置的错误页面
+        if (isMainFrame) {
+            const originalUrl = validatedURL || args.url || ''
+            const filePath = path.join(__dirname, 'render', 'tabs', 'error.html')
+            browserView.webContents.loadFile(filePath, {
+                query: {
+                    id: String(browserView.webContents.id),
+                    url: originalUrl,
+                    code: String(errorCode),
+                    desc: errorDescription,
+                }
+            }).then(_ => { }).catch(_ => { })
+            return
+        }
         utils.onDispatchEvent(webTabWindow.webContents, {
             event: 'title',
             id: browserView.webContents.id,
@@ -762,6 +953,9 @@ function createWebTabWindow(args) {
         }).then(_ => { })
     })
     browserView.webContents.on('did-start-loading', _ => {
+        webTabView.forEach(({id: vid, view}) => {
+            view.setVisible(vid === browserView.webContents.id)
+        })
         utils.onDispatchEvent(webTabWindow.webContents, {
             event: 'start-loading',
             id: browserView.webContents.id,
@@ -772,6 +966,7 @@ function createWebTabWindow(args) {
             event: 'stop-loading',
             id: browserView.webContents.id,
         }).then(_ => { })
+        
         // 加载完成暗黑模式下把窗口背景色改成白色，避免透明网站背景色穿透
         if (nativeTheme.shouldUseDarkColors) {
             browserView.setBackgroundColor('#FFFFFF')
@@ -785,6 +980,8 @@ function createWebTabWindow(args) {
             webTabClosedByShortcut = true
         } else if (utils.isMetaOrControl(input) && input.shift && input.key.toLowerCase() === 'i') {
             browserView.webContents.toggleDevTools()
+        } else {
+            navigation.handleInput(event, input, browserView.webContents)
         }
     })
 
@@ -794,8 +991,9 @@ function createWebTabWindow(args) {
     electronMenu.webContentsMenu(browserView.webContents, true)
 
     browserView.webContents.loadURL(args.url).then(_ => { }).catch(_ => { })
+    browserView.setVisible(true)
 
-    webTabWindow.addBrowserView(browserView)
+    webTabWindow.contentView.addChildView(browserView)
     webTabView.push({
         id: browserView.webContents.id,
         view: browserView
@@ -811,15 +1009,36 @@ function createWebTabWindow(args) {
 
 /**
  * 获取当前内置浏览器标签
- * @returns {Electron.BrowserView|undefined}
+ * @returns {Electron.WebContentsView|undefined}
  */
 function currentWebTab() {
-    const views = webTabWindow.getBrowserViews()
-    const view = views.length ? views[views.length - 1] : undefined
-    if (!view) {
-        return undefined
+    // 第一：使用当前可见的标签
+    try {
+        const item = webTabView.find(({view}) => view?.getVisible && view.getVisible())
+        if (item) {
+            return item
+        }
+    } catch (e) {}
+    // 第二：使用当前聚焦的 webContents
+    try {
+        const focused = webContents.getFocusedWebContents?.()
+        if (focused) {
+            const item = webTabView.find(it => it.id === focused.id)
+            if (item) {
+                return item
+            }
+        }
+    } catch (e) {}
+    // 兜底：根据 children 顺序选择最上层的可用视图
+    const children = webTabWindow.contentView.children || []
+    for (let i = children.length - 1; i >= 0; i--) {
+        const id = children[i]?.webContents?.id
+        const item = webTabView.find(it => it.id === id)
+        if (item) {
+            return item
+        }
     }
-    return webTabView.find(item => item.id == view.webContents.id)
+    return undefined
 }
 
 /**
@@ -872,8 +1091,10 @@ function activateWebTab(id) {
     if (!item) {
         return
     }
+    webTabView.forEach(({id: vid, view}) => {
+        view.setVisible(vid === item.id)
+    })
     resizeWebTab(item.id)
-    webTabWindow.setTopBrowserView(item.view)
     item.view.webContents.focus()
     utils.onDispatchEvent(webTabWindow.webContents,  {
         event: 'switch',
@@ -893,7 +1114,7 @@ function closeWebTab(id) {
     if (webTabView.length === 1) {
         webTabWindow.hide()
     }
-    webTabWindow.removeBrowserView(item.view)
+    webTabWindow.contentView.removeChildView(item.view)
     try {
         item.view.webContents.close()
     } catch (e) {
@@ -955,11 +1176,11 @@ if (!getTheLock) {
     app.on('ready', async () => {
         isReady = true
         isWin && app.setAppUserModelId(config.appId)
-        // 启动web服务
+        // 启动 Web 服务器
         try {
             await startWebServer()
         } catch (error) {
-            dialog.showErrorBox('启动失败', `服务器启动失败：${error.message}`);
+            dialog.showErrorBox('启动失败', `Web 服务器启动失败：${error.message}`);
             app.quit();
             return;
         }
@@ -1031,7 +1252,7 @@ app.on('before-quit', () => {
     willQuitApp = true
 })
 
-app.on("will-quit",function(){
+app.on("will-quit", () => {
     globalShortcut.unregisterAll();
 })
 
@@ -1156,7 +1377,7 @@ ipcMain.on('webTabExternal', (event) => {
     if (!item) {
         return
     }
-    openExternal(item.view.webContents.getURL())
+    openExternal(item.view.webContents.getURL()).catch(() => {})
     event.returnValue = "ok"
 })
 
@@ -1182,6 +1403,99 @@ ipcMain.on('webTabDestroyAll', (event) => {
     event.returnValue = "ok"
 })
 
+/**
+ * 内置浏览器 - 后退
+ */
+ipcMain.on('webTabGoBack', (event) => {
+    const item = currentWebTab()
+    if (!item) {
+        return
+    }
+    if (item.view.webContents.canGoBack()) {
+        item.view.webContents.goBack()
+        // 导航后更新状态
+        setTimeout(() => {
+            utils.onDispatchEvent(webTabWindow.webContents, {
+                event: 'navigation-state',
+                id: item.id,
+                canGoBack: item.view.webContents.canGoBack(),
+                canGoForward: item.view.webContents.canGoForward()
+            }).then(_ => { })
+        }, 100)
+    }
+    event.returnValue = "ok"
+})
+
+/**
+ * 内置浏览器 - 前进
+ */
+ipcMain.on('webTabGoForward', (event) => {
+    const item = currentWebTab()
+    if (!item) {
+        return
+    }
+    if (item.view.webContents.canGoForward()) {
+        item.view.webContents.goForward()
+        // 导航后更新状态
+        setTimeout(() => {
+            utils.onDispatchEvent(webTabWindow.webContents, {
+                event: 'navigation-state',
+                id: item.id,
+                canGoBack: item.view.webContents.canGoBack(),
+                canGoForward: item.view.webContents.canGoForward()
+            }).then(_ => { })
+        }, 100)
+    }
+    event.returnValue = "ok"
+})
+
+/**
+ * 内置浏览器 - 刷新
+ */
+ipcMain.on('webTabReload', (event) => {
+    const item = currentWebTab()
+    if (!item) {
+        return
+    }
+    item.view.webContents.reload()
+    // 刷新完成后会触发 did-stop-loading 事件，在那里会更新导航状态
+    event.returnValue = "ok"
+})
+
+/**
+ * 内置浏览器 - 停止加载
+ */
+ipcMain.on('webTabStop', (event) => {
+    const item = currentWebTab()
+    if (!item) {
+        return
+    }
+    item.view.webContents.stop()
+    event.returnValue = "ok"
+})
+
+/**
+ * 内置浏览器 - 获取导航状态
+ */
+ipcMain.on('webTabGetNavigationState', (event) => {
+    const item = currentWebTab()
+    if (!item) {
+        return
+    }
+    
+    const canGoBack = item.view.webContents.canGoBack()
+    const canGoForward = item.view.webContents.canGoForward()
+    
+    utils.onDispatchEvent(webTabWindow.webContents, {
+        event: 'navigation-state',
+        id: item.id,
+        canGoBack,
+        canGoForward
+    }).then(_ => { })
+    
+    event.returnValue = "ok"
+})
+
 /**
  * 隐藏窗口（mac、win隐藏，其他关闭）
  */
@@ -1221,6 +1535,7 @@ ipcMain.on('childWindowCloseAll', (event) => {
     })
     preloadWindow?.close()
     mediaWindow?.close()
+    electronDown.close()
     event.returnValue = "ok"
 })
 
@@ -1233,6 +1548,7 @@ ipcMain.on('childWindowDestroyAll', (event) => {
     })
     preloadWindow?.destroy()
     mediaWindow?.destroy()
+    electronDown.destroy()
     event.returnValue = "ok"
 })
 
@@ -1379,6 +1695,19 @@ ipcMain.on('setDockBadge', (event, args) => {
     event.returnValue = "ok"
 })
 
+/**
+ * MCP 服务器状态切换
+ * @param args
+ */
+ipcMain.on('mcpServerToggle', (event, args) => {
+    const { running } = args;
+    if (running === 'running') {
+        startMCPServer(mainWindow, mcpPort)
+    } else {
+        stopMCPServer()
+    }
+})
+
 /**
  * 复制Base64图片
  * @param args
@@ -1400,7 +1729,7 @@ ipcMain.on('copyImageAt', (event, args) => {
     try {
         event.sender.copyImageAt(args.x, args.y);
     } catch (e) {
-        // loger.error(e)
+        loger.error('copyImageAt error:', e)
     }
     event.returnValue = "ok"
 })
@@ -1483,6 +1812,14 @@ ipcMain.handle('getStore', (event, args) => {
     return store.get(args)
 });
 
+/**
+ * 清理服务器缓存
+ */
+ipcMain.on('clearServerCache', (event) => {
+    utils.clearServerCache();
+    event.returnValue = "ok";
+});
+
 //================================================================
 // Update
 //================================================================
@@ -1569,6 +1906,7 @@ ipcMain.on('updateQuitAndInstall', (event, args) => {
     })
     preloadWindow?.destroy()
     mediaWindow?.destroy()
+    electronDown.destroy()
 
     // 启动更新子窗口
     createUpdaterWindow(args.updateTitle)
@@ -1717,7 +2055,6 @@ function exportVsdx(event, args, directFinalize) {
             webSecurity: true,
             nodeIntegration: true,
             contextIsolation: true,
-            nativeWindowOpen: true
         },
     })
 
@@ -2330,7 +2667,7 @@ async function saveFile(fileObject, data, origStat, overwrite, defEnc) {
 
     async function doSaveFile(isNew) {
         if (enableStoreBkp && !isNew) {
-            //Copy file to backup file (after conflict and stat is checked)
+            //Copy file to back up file (after conflict and stat is checked)
             let bkpFh;
 
             try {
@@ -2466,7 +2803,7 @@ function getPluginFile(plugin) {
     return null;
 }
 
-function uninstallPlugin(plugin) {
+async function uninstallPlugin(plugin) {
     const pluginFile = getPluginFile(plugin);
 
     if (pluginFile != null) {
@@ -2527,7 +2864,7 @@ async function deleteFile(file) {
     }
 }
 
-function windowAction(method) {
+async function windowAction(method) {
     let win = BrowserWindow.getFocusedWindow();
 
     if (win) {
@@ -2547,16 +2884,14 @@ function windowAction(method) {
     }
 }
 
-function openExternal(url) {
+async function openExternal(url) {
     //Only open http(s), mailto, tel, and callto links
     if (allowedUrls.test(url)) {
-        shell.openExternal(url).catch(_ => {});
-        return true;
+        await shell.openExternal(url)
     }
-    return false;
 }
 
-function watchFile(path) {
+async function watchFile(path) {
     let win = BrowserWindow.getFocusedWindow();
 
     if (win) {
@@ -2568,12 +2903,13 @@ function watchFile(path) {
                     prev: prev
                 });
             } catch (e) {
-            } // Ignore
+                // Ignore
+            }
         });
     }
 }
 
-function unwatchFile(path) {
+async function unwatchFile(path) {
     fs.unwatchFile(path);
 }
 
@@ -2602,7 +2938,7 @@ ipcMain.on("rendererReq", async (event, args) => {
                 ret = await getDocumentsFolder();
                 break;
             case 'checkFileExists':
-                ret = await checkFileExists(args.pathParts);
+                ret = checkFileExists(args.pathParts);
                 break;
             case 'showOpenDialog':
                 dialogOpen = true;
@@ -2623,7 +2959,7 @@ ipcMain.on("rendererReq", async (event, args) => {
                 ret = await uninstallPlugin(args.plugin);
                 break;
             case 'getPluginFile':
-                ret = await getPluginFile(args.plugin);
+                ret = getPluginFile(args.plugin);
                 break;
             case 'isPluginsEnabled':
                 ret = enablePlugins;
@@ -2635,7 +2971,7 @@ ipcMain.on("rendererReq", async (event, args) => {
                 ret = await readFile(args.filename, args.encoding);
                 break;
             case 'clipboardAction':
-                ret = await clipboardAction(args.method, args.data);
+                ret = clipboardAction(args.method, args.data);
                 break;
             case 'deleteFile':
                 ret = await deleteFile(args.file);
@@ -2652,6 +2988,15 @@ ipcMain.on("rendererReq", async (event, args) => {
             case 'openExternal':
                 ret = await openExternal(args.url);
                 break;
+            case 'openDownloadWindow':
+                ret = await electronDown.open(args.language || 'zh', args.theme || 'light');
+                break;
+            case 'updateDownloadWindow':
+                ret = await electronDown.updateWindow(args.language, args.theme);
+                break;
+            case 'createDownload':
+                ret = await electronDown.createDownload(mainWindow, args.url, args.options || {});
+                break;
             case 'watchFile':
                 ret = await watchFile(args.path);
                 break;
@@ -2659,12 +3004,13 @@ ipcMain.on("rendererReq", async (event, args) => {
                 ret = await unwatchFile(args.path);
                 break;
             case 'getCurDir':
-                ret = await getCurDir();
+                ret = getCurDir();
                 break;
         }
 
         event.reply('mainResp', {success: true, data: ret, reqId: args.reqId});
     } catch (e) {
         event.reply('mainResp', {error: true, msg: e.message, e: e, reqId: args.reqId});
+        loger.error('Renderer request error', e.message, e.stack);
     }
 });