feat: 优化个人资料卡片

- 子任务不自动归档

.env.docker

@@ -17,7 +17,7 @@ LOG_CHANNEL=stack
 LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
-DB_HOST="${APP_IPPR}.5"
+DB_HOST=mariadb
 DB_PORT=3306
 DB_DATABASE=dootask
 DB_USERNAME=dootask
@@ -34,7 +34,7 @@ SESSION_LIFETIME=120
 
 MEMCACHED_HOST=127.0.0.1
 
-REDIS_HOST="${APP_IPPR}.4"
+REDIS_HOST=redis
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 

.github/workflows/publish.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - "pro"
-      - "dev"
 
 jobs:
   check-version:
@@ -115,9 +114,50 @@ jobs:
             })
             return data.id
 
-  build-client:
+  pack-vendor:
     needs: [ check-version, create-release ]
     if: needs.check-version.outputs.should_release == 'true'
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          extensions: mbstring, intl, gd, xml, zip, swoole
+          tools: composer:v2
+
+      - name: Install Dependencies
+        run: composer install
+
+      - name: Create Vendor Archive
+        run: tar -czf vendor.tar.gz vendor/
+
+      - name: Upload Vendor Archive
+        uses: actions/github-script@v7
+        env:
+          RELEASE_ID: ${{ needs.create-release.outputs.release_id }}
+        with:
+          script: |
+            const fs = require('fs');
+
+            const data = await fs.promises.readFile('vendor.tar.gz');
+
+            await github.rest.repos.uploadReleaseAsset({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              release_id: process.env.RELEASE_ID,
+              name: 'vendor.tar.gz',
+              data: data
+            });
+
+  build-client:
+    needs: [ check-version, create-release, pack-vendor ]
+    if: needs.check-version.outputs.should_release == 'true'
     permissions:
       contents: write
     strategy:
@@ -231,7 +271,7 @@ jobs:
           ./cmd electron win
 
   publish-release:
-    needs: [ check-version, create-release, build-client ]
+    needs: [ check-version, create-release, pack-vendor, build-client ]
     if: needs.check-version.outputs.should_release == 'true' && github.ref == 'refs/heads/pro'
     permissions:
       contents: write
@@ -258,7 +298,7 @@ jobs:
         env:
           PUBLISH_KEY: ${{ secrets.PUBLISH_KEY }}
         run: |
-          pushd electron
+          pushd electron || exit
           npm install
-          popd
+          popd || exit
           node ./electron/build.js published

.gitignore

@@ -1,31 +1,58 @@
+# 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
 .idea
 .vscode
-.vagrant
 .windsurfrules
-.phpunit.result.cache
+
+# Development tools
+.vagrant
 Homestead.json
 Homestead.yaml
+
+# 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
+AGENTS.md
 README_LOCAL.md

.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

CHANGELOG.md

@@ -2,6 +2,601 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.3.15]
+
+### Bug Fixes
+
+- 编辑器快捷键保存重复
+- 优化用户交接人选择逻辑
+- 优化文件访问权限检查逻辑
+- 更新消息预览文本获取方法
+
+### Features
+
+- 优化共同群聊计数缓存
+- 优化自动归档逻辑
+- 添加任务关联功能
+- 添加emoji表情删除按钮
+- 优化对话搜索时的选择状态管理
+- 优化部门选择逻辑
+- 优化Ai提示词
+- 添加文件缩略图显示
+- 添加文件拖拽选择功能
+- 添加文件预览功能和优化文件打开逻辑
+- 优化透明模式样式
+- 添加任务复制功能
+- 添加任务模板排序功能
+- 添加标签排序功能
+- 添加会话重命名功能
+- 添加收藏备注功能
+- 添加最近访问记录功能
+- 增强用户部门成员管理功能
+
+## [1.2.75]
+
+### Bug Fixes
+
+- 重置成功登录流程后的认证异常标志
+- 添加异常处理以确保提及格式转换的稳定性
+- 更新应用商店镜像版本至0.2.9
+- 修复在列表中未找到当前图像时的处理逻辑
+
+### Features
+
+- 添加数据导出功能及相关样式
+- 优化 AI 生成交互体验
+- 添加 AI 助手生成消息功能
+- 添加 AI 助手生成项目功能
+- 添加 AI 助手生成任务功能
+- 扩展收藏功能，支持消息类型的收藏
+- 重构收藏功能，优化状态检查与切换逻辑
+- 增强文件和项目的收藏功能
+- 添加用户收藏功能
+- 添加任务浏览历史功能
+- 优化消息传递处理逻辑
+- 添加部门成员同步功能
+- 添加下载功能的等待状态支持
+- 添加文件游客访问权限功能
+
+### Performance
+
+- 优化群聊消息AI处理逻辑
+
+## [1.2.49]
+
+### Bug Fixes
+
+- 无法修改群组名称的问题
+- 修复甘特图时间轴计算错误
+
+### Features
+
+- 添加内置浏览器导航功能
+- 添加查看共同的群
+
+### Performance
+
+- 支持项目调整排序
+- 优化错误页
+- 优化输入框工具栏
+- 优化任务模板、任务标签
+
+## [1.2.21]
+
+### Bug Fixes
+
+- 修复 supervisor crontab 运行状态错误
+- 修复应用加载中无法点击胶囊
+
+### Performance
+
+- 优化下载工具
+
+## [1.2.5]
+
+### Bug Fixes
+
+- 无法打包文件加载的情况
+- 修复@弹窗无法滚动
+
+### Features
+
+- 添加 setCapsuleConfig 方法以更新胶囊配置
+- 添加应用移动端胶囊布局
+
+### Performance
+
+- 优化粘贴提及消息
+- 优化消息类型的判断
+- 签到记录窗口添加打开签到机器人
+- 文件名长度限制最长为100字
+- 允许打包下载一个文件夹
+- 优化桌面端出现打开久之后访问错误的情况
+- 优化抽屉样式
+- 更新应用胶囊配置和优化微应用加载
+- 优化 css 语法
+- 优化抽屉窗口
+- 优化微应用
+- 优化微应用关闭窗口逻辑
+- 优化消息重复
+
+## [1.1.66]
+
+### Bug Fixes
+
+- 表格消息文字颜色冲突
+- 修复无法导出的问题
+
+### Features
+
+- 添加待办完成状态的支持
+- 工作流支持自定义颜色
+- 重构基础模块
+- 更新请求上下文处理
+
+## [1.1.56]
+
+### Bug Fixes
+
+- 修复无法删除webhook的问题
+- 用户头像加载失败的情况
+
+### Features
+
+- 优化请求上下文处理
+
+### Performance
+
+- 优化错误提示
+- 优化应用菜单
+- 优化机器人消息接收处理任务
+- 签到新增高德和腾讯地图
+- 优化国际化
+- 优化 AI 设置
+- 优化应用弹窗
+- 优化会员选择器
+- 优化会员搜索接口
+- 优化提及窗口
+- 优化机器人消息
+- 机器人支持新会话
+- 优化应用方法
+- 机器人 webhook 添加用户信息
+- 优化应用
+
+## [1.1.15]
+
+### Bug Fixes
+
+- 修复客户度右键复制图片失败的情况
+- 修复部分emoji表情无法提交的情况
+
+### Performance
+
+- 优化预览消息
+- 优化应用参数
+
+## [1.1.8]
+
+### Bug Fixes
+
+- 修复机器人发送消息接口
+- 修复应用无法在窗口独立显示
+
+## [1.1.3]
+
+### Bug Fixes
+
+- 转发消息同时留言时ai会回复两条的情况
+- 修复应用 {system_theme} 参数无效的问题
+- 修复应用 selectUsers 方法的问题
+- 修复应用地址转换不正确的问题
+
+### Performance
+
+- 优化应用
+- 优化创建新会话数据
+- 新增使用系统机器人发送消息
+- 优化应用中心
+- 获取我的部门列表接口
+
+## [1.0.88]
+
+### Bug Fixes
+
+- 修复修改删除标签未同步任务标签的问题
+- 修复部分屏幕无法完全显示项目管理员菜单
+- 修复项目成员无法认领任务的情况
+
+### Performance
+
+- 优化应用商城
+- 优化一些样式
+- 优化桌面端服务
+- 优化标签选择
+- 优化标签操作日志
+- 支持管理自己创建的标签
+- 调整项目最多支持添加50个模板、100个标签
+- 优化翻译
+- 优化邀请加入项目
+- 优化项目邀请链接
+- 优化聊天发送会员、任务、文件支持搜索ID
+- 优化发送消息结果
+- 优化通知内容
+- 优化群消息推送内容
+
+## [1.0.65]
+
+### Performance
+
+- 优化应用商城
+
+## [1.0.61]
+
+### Bug Fixes
+
+- 修复客户端无法打开部分应用的问题
+
+### Performance
+
+- 优化客户端缓存
+- 优化已知问题
+- 优化iPadOS兼容性
+- 优化设备登录
+
+## [1.0.51]
+
+### Bug Fixes
+
+- 修复应用商店参数失效问题
+
+### Features
+
+- 微应用支持iframe模式
+
+### Performance
+
+- 优化导出签到功能
+- 优化导出审批功能
+- 优化导出任务功能
+
+## [1.0.45]
+
+### Bug Fixes
+
+- 修复已经在消息中打开项目对话时无法在其他地方打开项目沟通
+- 修复搜索标签后搜索框消失的情况
+- 修复部分标签背景色不显示的情况
+
+### Performance
+
+- 优化本地资源加载方式
+- 优化微应用参数变量的支持
+
+## [1.0.37]
+
+### Bug Fixes
+
+- 修复客户端无法打开工作报告
+- 修复部分机子无法打开OKR的情况
+
+## [1.0.31]
+
+### Bug Fixes
+
+- 修复移动端审批列表无法滚动到底部的情况
+- 修复重复周期 子任务没有复制过去
+
+### Features
+
+- 桌面端使用web服务启动
+
+## [1.0.0]
+
+### Bug Fixes
+
+- 修复录音文件转文字后无法切换翻译的问题
+
+### Features
+
+- 新增应用商店
+- 检查应用是否已安装
+
+### Performance
+
+- 更新AI默认模型列表
+
+## [0.47.7]
+
+### Bug Fixes
+
+- 修复任务详情查看历史空白的情况
+- 修复我的机器人不回复的情况
+- 修复设待办后数据不立即显示的问题
+
+### Features
+
+- 添加删除附件日志记录
+
+### Performance
+
+- 优化从任务页面发送消息
+- 优化已归档/已删除任务列表支持按状态检索
+- 优化长按消息菜单位置
+- 优化登录设备名称
+
+## [0.46.74]
+
+### Features
+
+- 新增系统分享搜索功能
+
+### Performance
+
+- 优化通用菜单
+- 优化视频压缩
+- 优化全文搜索
+- 优化长按菜单
+
+## [0.46.16]
+
+### Bug Fixes
+
+- 修复调整任务排序后出现空白的情况
+- 修复移动任务时负责人和协助人可以同时选择的情况
+- 修复无法从任务页面打开聊天的情况
+- 修复移动端焦点抖动的问题
+
+### Features
+
+- 新增任务发送功能
+- 新增会员详情窗口
+- 添加从团队管理打开会话窗口
+
+### Performance
+
+- 优化移动任务
+- 优化自己的对话不限修改撤回时间
+- 优化访问链接
+- 优化日历
+- 优化长按事件
+- 优化移动端任务窗口布局
+- 优化长按操作
+- 优化转发确认选项保持上一次选择
+- 优化移动端布局
+- 优化禁止选择会员效果
+- 优化长按菜单位置
+- 优化移动端打开会话等待效果
+- 优化会议弹窗
+- 任务详情点任务聊天时不要发送消息
+- 优化国际化
+
+## [0.45.64]
+
+### Bug Fixes
+
+- 修复部分页面出现空白的情况
+- 修复输入框无法点击添加链接的情况
+- 修复AI机器人不存在的情况
+
+### Features
+
+- 新增转发至AI开启新会话
+
+### Performance
+
+- 优化数据结构
+- 优化图片存储名
+- 优化消息窗口显示
+- 优化目录结构
+- 优化日历
+- 优化任务时间范围选择
+
+## [0.45.33]
+
+### Bug Fixes
+
+- 修复未读数错误暴增的情况
+- 修复地址可能存在localhost的情况
+- 修复消息编辑和发布时序号对不上
+- 修复草稿出现上一次内容的情况
+- 修复本地群消息通知没有会员昵称的问题
+- 修复了拉人进群无法踢出去的问题
+- 提及出现白色字的情况
+
+### Features
+
+- 添加移动端提示可能要发送的图片
+
+### Performance
+
+- 优化消息窗口
+- 优化消息长按菜单
+- 优化内置浏览器
+- 优化App隐私政策提示
+- 优化对话独立窗口显示
+- 优化移动端选择交互
+- 优化移动端选中消息文本
+- 优化撤回消息逻辑
+- 优化提及搜索
+- 优化机器人Webhook消息
+
+## [0.44.91]
+
+### Features
+
+- 添加我的机器人管理
+
+### Performance
+
+- 优化初始化逻辑
+- 优化docker配置
+
+## [0.44.82]
+
+### Bug Fixes
+
+- 修复搜索结果显示即将到期
+
+### Features
+
+- 新增独立窗口打开会话
+
+### Performance
+
+- 优化AI支持文件类型
+
+## [0.44.74]
+
+### Performance
+
+- 优化AI解析文件
+- 优化 WebSocket 消息
+- 优化数据
+
+## [0.44.67]
+
+### Bug Fixes
+
+- 修复查看待办图片不符的情况
+
+### Performance
+
+- 优化数据
+- 优化未读消息数
+- 优化搜索组件
+- 已归档/已删除任务列表支持按状态检索
+- 优化消息流效果
+- 优化AI上下文
+- 优化工作流获取
+- 优化转发功能
+
+## [0.44.53]
+
+### Bug Fixes
+
+- 工作流存在已离职人员
+
+### Features
+
+- 可点击标注图标查看标注人员
+- 支持分享工作报告到消息
+- 支持AI分析工作报告
+- 支持使用%发送工作报告
+- 新增自定义撤回及修改消息时限
+
+### Performance
+
+- 优化转发消息
+- 优化工作报告列表
+- 优化引用消息
+- 优化全局提示
+- 优化草稿消息
+
+## [0.44.19]
+
+### Bug Fixes
+
+- 看不到未读消息定位提醒
+
+### Performance
+
+- 优化消息定位
+- 优化消息性能
+
+## [0.44.15]
+
+### Bug Fixes
+
+- 会话内消息搜索布局错位
+- 流程设置翻译不统一
+
+### Performance
+
+- 优化消息定位
+- 优化MD消息
+
+## [0.44.3]
+
+### Bug Fixes
+
+- 定位签到失败的问题
+
+### Performance
+
+- 优化发送语音效果
+- 录音转文字支持自定义语言
+- 优化ES模块
+- 优化emoji表情
+- 按住Ctrl/Command键可连续选择表情
+- Md消息支持html代码
+- 优化脚本
+- 优化安装命令
+- 优化ES索引名称
+
+## [0.43.73]
+
+### Bug Fixes
+
+- 全屏预览图片关闭窗口
+- 点击排序导致任务不显示的情况
+
+### Performance
+
+- 新增录音转文字
+- 优化数据排序
+
+## [0.43.49]
+
+### Performance
+
+- 添加全局搜索功能
+- 优化消息搜索
+- 团队管理支持调整部门区域尺寸
+- 任务详情支持调整聊天区域尺寸
+- 优化团队部门支持3级部门
+- 可见群组ID
+- 支持在团队管理打开群聊
+- 优化回复消息自动@逻辑
+- 转发预览隐藏表情回应部分
+- 优化任务日志
+- 已删除任务支持按标签搜索
+- 归档任务支持按标签搜索
+- 项目面板添加按标签筛选
+- 优化 AI 提示词
+- 优化 AI 设置
+
+## [0.43.18]
+
+### Bug Fixes
+
+- 首次跟ai聊天没有记录的问题
+
+### Performance
+
+- 工作报告支持查看仅未读
+- AI 支持引用文件
+- 优化图文消息
+- 优化文本信息复制
+- 优化样式
+- 无法再AI机器人页面看到模型的问题
+
+## [0.43.7]
+
+### Features
+
+- 添加 Grok AI、Ollama AI
+
+### Performance
+
+- 优化MD消息过长处理
+- 优化AI支持分析指定文件
+- 支持在AI对话中直接引用任务提问
+- 优化 AI 参数
+- 优化 Ollama AI
+- 优化设置
+- 优化AI设置
+- 优化AI消息
+
 ## [0.42.85]
 
 ### Bug Fixes
@@ -10,6 +605,7 @@ All notable changes to this project will be documented in this file.
 
 ### Performance
 
+- 表情回复时更新对话列表
 - Onlyoffice 支持打开超过100m的文件
 - 优化点击上传列表效果
 - AI支持自定义模型列表

README.md

@@ -1,148 +1,147 @@
-# Install (Docker)
+# DooTask - Open Source Task Management System
 
 English | **[中文文档](./README_CN.md)**
 
-- [Screenshot preview](./README_PREVIEW.md)
-- [Demo site](http://www.dootask.com/)
+- [Screenshot Preview](./README_PREVIEW.md)
+- [Demo Site](http://www.dootask.com/)
 
 **QQ Group**
 
-Group No.: `546574618`
+- Group Number: `546574618`
 
-## Setup
+## 📍 Migration from 0.x to 1.x
 
-- `Docker v20.10+` & `Docker Compose v2.0+` must be installed
-- System: `Centos/Debian/Ubuntu/macOS/Windows`
-- Hardware suggestion: 2 cores and above 4G memory
-- Special note: Windows users please use `git bash` or `cmder` to run the command
+- Please ensure to back up your data before upgrading!
+- If the upgrade fails, try running `./cmd update` multiple times.
+- If you encounter "Container xxx not found" during upgrade, run `./cmd reup` and then execute `./cmd update`.
+- If you see a 502 error after upgrading, run `./cmd reup` to restart the services.
+- If you encounter "Application 'xxx' not installed" after upgrading, log in with the admin account and install the relevant applications from the App Store.
 
-### Deployment (Pro Edition)
+## Installation Requirements
+
+- Required: `Docker v20.10+` and `Docker Compose v2.0+`
+- Supported Systems: `CentOS/Debian/Ubuntu/macOS` and other Linux/Unix systems
+- Hardware Recommendation: 2+ cores, 4GB+ memory
+- Special Note: Windows users can install Linux environment using WSL2 before installing DooTask.
+
+### Deploy Project
 
 ```bash
-# 1、Clone the repository
+# 1、Clone the project to your local machine or server
 
-# Clone projects on github
-git clone -b pro --depth=1 https://github.com/kuaifan/dootask.git
-# Or you can use gitee
-git clone -b pro --depth=1 https://gitee.com/aipaw/dootask.git
+# Clone project from GitHub
+git clone --depth=1 https://github.com/kuaifan/dootask.git
+# Or you can use Gitee
+git clone --depth=1 https://gitee.com/aipaw/dootask.git
 
 # 2、Enter directory
 cd dootask
 
-# 3、Installation（Custom port installation, as: ./cmd install --port 80）
+# 3、One-click installation (Custom port installation: ./cmd install --port 80)
 ./cmd install
 ```
 
-### Reset password
+### Reset Password
 
 ```bash
-# Reset default account password
+# Reset default administrator password
 ./cmd repassword
 ```
 
-### Change port
+### Change Port
 
 ```bash
-# This method only replaces the HTTP port. To replace the HTTPS port, please read the SSL configuration below
+# This method only changes HTTP port. For HTTPS port, please read SSL configuration below
 ./cmd port 80
 ```
 
-### Stop server
+### Stop Service
 
 ```bash
-./cmd stop
-
-# P.S: Once application is set up, whenever you want to start the server (if it is stopped) run below command
-./cmd start
+./cmd down
 ```
 
-### Development compilation
-
-- `NodeJs 20+` must be installed
+### Start Service
 
 ```bash
-# Development
+./cmd up
+```
+
+### Development & Build
+
+Please ensure you have installed `NodeJs 20+`
+
+```bash
+# Development mode
 ./cmd dev
    
-# Production (This is web client. For App/PC/Mac clients, Please read README-CLIENT.md)
+# Build project (This is for web client. For desktop apps, refer to ".github/workflows/publish.yml")
 ./cmd prod  
 ```
 
-### Shortcuts for running command
+### SSL Configuration
 
-```bash
-# You can do this using the following command
-./cmd artisan "your command"          # To run a artisan command
-./cmd php "your command"              # To run a php command
-./cmd nginx "your command"            # To run a nginx command
-./cmd redis "your command"            # To run a redis command
-./cmd composer "your command"         # To run a composer command
-./cmd supervisorctl "your command"    # To run a supervisorctl command
-./cmd mysql "your command"            # To run a mysql command (backup: Backup database, recovery: Restore database, open: Open database external port access, close: Close database external port access)
-```
-
-### SSL configuration
-
-#### Method 1: Automatic configuration
+#### Method 1: Automatic Configuration
 
 ```bash 
-# Running commands in a project
+# Run command and follow the prompts
 ./cmd https
 ```
 
-#### Or Method 2: Nginx Agent Configuration
+#### Method 2: Nginx Proxy Configuration
 
 ```bash 
-# 1、Nginx config add
+# 1、Add Nginx proxy configuration
 proxy_set_header X-Forwarded-Host $http_host;
 proxy_set_header X-Forwarded-Proto $scheme;
 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-# 2、Running commands in a project (If you unconfigure the NGINX agent, run: ./cmd https close)
+# 2、Run command (To cancel Nginx proxy configuration: ./cmd https close)
 ./cmd https agent
 ```
 
-## Upgrade
+## Upgrade & Update
 
-**Note: Please back up your data before upgrading!**
+**Note: Please backup your data before upgrading!**
 
 ```bash
-# Method 1: Running commands in a project
 ./cmd update
-
-# Or method 2: use this method if method 1 fails
-git pull
-./cmd mysql backup
-./cmd uninstall
-./cmd install
-./cmd mysql recovery
 ```
 
-* Please try again if the upgrade fails across a large version.
-* If 502 after the upgrade please run `./cmd restart` restart the service.
+* Please retry if upgrade fails across major versions.
+* If you encounter 502 errors after upgrade, run `./cmd reup` to restart services.
 
-## Transfer
+## Project Migration
 
-Follow these steps to complete the project migration after the new project is installed:
+After installing the new project, follow these steps to complete migration:
 
-1. Backup original database
+1、Backup original database
 
 ```bash
-# Run command under old project
+# Run command in the old project
 ./cmd mysql backup
 ```
 
-2. Copy `database backup file` and `public/uploads` directory to the new project.
+2、Copy the following files and directories from old project to the same paths in new project
 
-3. Restore database to new project
+ - `Database backup file`
+ - `docker/appstore`
+ - `public/uploads`
+
+3、Restore database to new project
 ```bash
-# Run command under new project
+# Run command in the new project
 ./cmd mysql recovery
 ```
 
-## Uninstall
+## Uninstall Project
 
 ```bash
-# Running commands in a project
 ./cmd uninstall
 ```
+
+### More Commands
+
+```bash
+./cmd help
+```

README_CN.md

@@ -1,4 +1,4 @@
-# Install (Docker)
+# DooTask - 开源任务管理系统
 
 **[English](./README.md)** | 中文文档
 
@@ -9,22 +9,30 @@
 
 - QQ群号: `546574618`
 
+## 📍 0.x 迁移到 1.x
+
+- 升级时请务必备份好数据！
+- 如果升级失败请尝试执行 `./cmd update` 重试几次。
+- 如果升级中出现 `没有找到 xxx 容器` 的提示，请运行 `./cmd reup` 后再执行 `./cmd update`。
+- 如果升级后出现502错误请运行 `./cmd reup` 重启服务即可。
+- 如果升级后出现 `应用「xxx」未安装` 的提示，请使用管理员账号进入应用商店安装相关应用。
+
 ## 安装程序
 
 - 必须安装：`Docker v20.10+` 和 `Docker Compose v2.0+`
-- 支持环境：`Centos/Debian/Ubuntu/macOS/Windows`
+- 支持环境：`Centos/Debian/Ubuntu/macOS` 等 linux/unix 系统
 - 硬件建议：2核4G以上
-- 特别说明：Windows 用户请使用 `git bash` 或者 `cmder` 运行命令
+- 特别说明：Windows 可以使用 WSL2 安装 Linux 环境后再安装 DooTask。
 
-### 部署项目（Pro版）
+### 部署项目
 
 ```bash
 # 1、克隆项目到您的本地或服务器
 
 # 通过github克隆项目
-git clone -b pro --depth=1 https://github.com/kuaifan/dootask.git
+git clone --depth=1 https://github.com/kuaifan/dootask.git
 # 或者你也可以使用gitee
-git clone -b pro --depth=1 https://gitee.com/aipaw/dootask.git
+git clone --depth=1 https://gitee.com/aipaw/dootask.git
 
 # 2、进入目录
 cd dootask
@@ -50,48 +58,37 @@ cd dootask
 ### 停止服务
 
 ```bash
-./cmd stop
+./cmd down
+```
 
-# 一旦应用程序被设置，无论何时你想要启动服务器(如果它被停止)运行以下命令
-./cmd start
+### 启动服务
+
+```bash
+./cmd up
 ```
 
 ### 开发编译
 
-- 请确保你已经安装了 `NodeJs 20+`
+请确保你已经安装了 `NodeJs 20+`
 
 ```bash
 # 开发模式
 ./cmd dev
    
-# 编译项目（这是网页端的，App/Pc/Mac客户端请查看 README_CLIENT.md）
+# 编译项目（这是网页端的，客户端请参考“.github/workflows/publish.yml”文件）
 ./cmd prod  
 ```
 
-
-### 运行命令的快捷方式
-
-```bash
-# 你可以使用以下命令来执行
-./cmd artisan "your command"          # 运行 artisan 命令
-./cmd php "your command"              # 运行 php 命令
-./cmd nginx "your command"            # 运行 nginx 命令
-./cmd redis "your command"            # 运行 redis 命令
-./cmd composer "your command"         # 运行 composer 命令
-./cmd supervisorctl "your command"    # 运行 supervisorctl 命令
-./cmd mysql "your command"            # 运行 mysql 命令 (backup: 备份数据库，recovery: 还原数据库，open: 开启数据库外部端口访问，close: 关闭数据库外部端口访问)
-```
-
 ### SSL 配置
 
 #### 方法1：自动配置
 
 ```bash 
-# 在项目下运行命令，根据提示执行即可
+# 执行指令，根据提示执行即可
 ./cmd https
 ```
 
-#### （或者）方法2：Nginx 代理配置
+#### 方法2：Nginx 代理配置
 
 ```bash 
 # 1、Nginx 代理配置添加
@@ -99,7 +96,7 @@ proxy_set_header X-Forwarded-Host $http_host;
 proxy_set_header X-Forwarded-Proto $scheme;
 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-# 2、在项目下运行命令（如果取消 Nginx 代理配置请运行：./cmd https close）
+# 2、执行指令（如果取消 Nginx 代理配置请运行：./cmd https close）
 ./cmd https agent
 ```
 
@@ -108,19 +105,11 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 **注意：在升级之前请备份好你的数据！**
 
 ```bash
-# 方法1：在项目下运行命令
 ./cmd update
-
-# （或者）方法2：如果方法1失败请使用此方法
-git pull
-./cmd mysql backup
-./cmd uninstall
-./cmd install
-./cmd mysql recovery
 ```
 
 * 跨越大版本升级失败时请重试执行一次。
-* 如果升级后出现502请运行 `./cmd restart` 重启服务即可。
+* 如果升级后出现502请运行 `./cmd reup` 重启服务即可。
 
 ## 迁移项目
 
@@ -129,21 +118,30 @@ git pull
 1、备份原数据库
 
 ```bash
-# 在旧的项目下运行命令
+# 在旧的项目下执行指令
 ./cmd mysql backup
 ```
 
-2、将`数据库备份文件`及`public/uploads`目录拷贝至新项目
+2、将旧项目以下文件和目录拷贝至新项目同路径位置
+
+ - `数据库备份文件`
+ - `docker/appstore`
+ - `public/uploads`
 
 3、还原数据库至新项目
 ```bash
-# 在新的项目下运行命令
+# 在新的项目下执行指令
 ./cmd mysql recovery
 ```
 
 ## 卸载项目
 
 ```bash
-# 在项目下运行命令
 ./cmd uninstall
 ```
+
+### 更多指令
+
+```bash
+./cmd help
+```

app/Console/Commands/SyncUserMsgToZincSearch.php

@@ -0,0 +1,175 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\WebSocketDialogMsg;
+use App\Module\Apps;
+use App\Module\ZincSearch\ZincSearchKeyValue;
+use App\Module\ZincSearch\ZincSearchDialogMsg;
+use Cache;
+use Illuminate\Console\Command;
+
+class SyncUserMsgToZincSearch extends Command
+{
+    /**
+     * 更新数据
+     * --f: 全量更新 (默认)
+     * --i: 增量更新（从上次更新的最后一个ID接上）
+     *
+     * 清理数据
+     * --c: 清除索引
+     */
+
+    protected $signature = 'zinc:sync-user-msg {--f} {--i} {--c} {--batch=1000}';
+    protected $description = '同步聊天会话用户和消息到 ZincSearch';
+
+    /**
+     * @return int
+     */
+    public function handle(): int
+    {
+        if (!Apps::isInstalled("search")) {
+            $this->error("应用「ZincSearch」未安装");
+            return 1;
+        }
+
+        // 注册信号处理器（仅在支持pcntl扩展的环境下）
+        if (extension_loaded('pcntl')) {
+            pcntl_async_signals(true); // 启用异步信号处理
+            pcntl_signal(SIGINT, [$this, 'handleSignal']);  // Ctrl+C
+            pcntl_signal(SIGTERM, [$this, 'handleSignal']); // kill
+        }
+
+        // 检查锁，如果已被占用则退出
+        $lockInfo = $this->getLock();
+        if ($lockInfo) {
+            $this->error("命令已在运行中，开始时间: {$lockInfo['started_at']}");
+            return 1;
+        }
+
+        // 设置锁
+        $this->setLock();
+
+        // 清除索引
+        if ($this->option('c')) {
+            $this->info('清除索引...');
+            ZincSearchKeyValue::clear();
+            ZincSearchDialogMsg::clear();
+            $this->info("索引删除成功");
+            $this->releaseLock();
+            return 0;
+        }
+
+        $this->info('开始同步聊天数据...');
+
+        // 同步消息数据
+        $this->syncDialogMsgs();
+
+        // 完成
+        $this->info("\n同步完成");
+        $this->releaseLock();
+        return 0;
+    }
+
+    /**
+     * 获取锁信息
+     *
+     * @return array|null 如果锁存在返回锁信息，否则返回null
+     */
+    private function getLock(): ?array
+    {
+        $lockKey = md5($this->signature);
+        return Cache::has($lockKey) ? Cache::get($lockKey) : null;
+    }
+
+    /**
+     * 设置锁
+     */
+    private function setLock(): void
+    {
+        $lockKey = md5($this->signature);
+        $lockInfo = [
+            'started_at' => date('Y-m-d H:i:s')
+        ];
+        Cache::put($lockKey, $lockInfo, 300); // 5分钟
+    }
+
+    /**
+     * 释放锁
+     */
+    private function releaseLock(): void
+    {
+        $lockKey = md5($this->signature);
+        Cache::forget($lockKey);
+    }
+
+    /**
+     * 处理终端信号
+     *
+     * @param int $signal
+     * @return void
+     */
+    public function handleSignal(int $signal): void
+    {
+        // 释放锁
+        $this->releaseLock();
+        exit(0);
+    }
+
+    /**
+     * 同步消息数据
+     *
+     * @return void
+     */
+    private function syncDialogMsgs(): void
+    {
+        // 获取上次同步的最后ID
+        $lastKey = "sync:dialogUserMsgLastId";
+        $lastId = $this->option('i') ? intval(ZincSearchKeyValue::get($lastKey, 0)) : 0;
+
+        if ($lastId > 0) {
+            $this->info("\n同步消息数据（{$lastId}）...");
+        } else {
+            $this->info("\n同步消息数据...");
+        }
+
+        $num = 0;
+        $count = WebSocketDialogMsg::where('id', '>', $lastId)->count();
+        $batchSize = $this->option('batch');
+
+        $total = 0;
+        $lastNum = 0;
+
+        do {
+            // 获取一批
+            $dialogMsgs = WebSocketDialogMsg::where('id', '>', $lastId)
+                ->orderBy('id')
+                ->limit($batchSize)
+                ->get();
+
+            if ($dialogMsgs->isEmpty()) {
+                break;
+            }
+
+            $num += count($dialogMsgs);
+            $progress = round($num / $count * 100, 2);
+            if ($progress < 100) {
+                $progress = number_format($progress, 2);
+            }
+            $this->info("{$num}/{$count} ({$progress}%) 正在同步消息ID {$dialogMsgs->first()->id} ~ {$dialogMsgs->last()->id} ({$total}|{$lastNum})");
+
+            // 刷新锁
+            $this->setLock();
+
+            // 同步数据
+            $lastNum = ZincSearchDialogMsg::batchSync($dialogMsgs);
+            $total += $lastNum;
+
+            // 更新最后ID
+            $lastId = $dialogMsgs->last()->id;
+            ZincSearchKeyValue::set($lastKey, $lastId);
+        } while (count($dialogMsgs) == $batchSize);
+
+        $this->info("同步消息结束 - 最后ID {$lastId}");
+    }
+}

app/Events/WorkerStartEvent.php

@@ -3,6 +3,7 @@
 namespace App\Events;
 
 use App\Models\WebSocket;
+use App\Services\RequestContext;
 use Hhxsv5\LaravelS\Swoole\Events\WorkerStartInterface;
 use Swoole\Http\Server;
 
@@ -25,5 +26,6 @@ class WorkerStartEvent implements WorkerStartInterface
     private function handleFirstWorkerTasks()
     {
         WebSocket::query()->delete();
+        RequestContext::clearBaseUrlCache();
     }
 }

app/Exceptions/ApiException.php

@@ -10,13 +10,18 @@ class ApiException extends RuntimeException
      */
     protected $data;
 
+    /**
+     * @var bool
+     */
+    protected $writeLog = true;
+
     /**
      * ApiException constructor.
-     * @param string $msg
+     * @param string|array $msg
      * @param array $data
      * @param int $code
      */
-    public function __construct($msg = '', $data = [], $code = 0)
+    public function __construct($msg = '', $data = [], $code = 0, $writeLog = true)
     {
         if (is_array($msg) && isset($msg['code'])) {
             $code = $msg['code'];
@@ -24,6 +29,7 @@ class ApiException extends RuntimeException
             $msg = $msg['msg'];
         }
         $this->data = $data;
+        $this->writeLog = $writeLog && $code !== -1;
         parent::__construct($msg, $code);
     }
 
@@ -34,4 +40,12 @@ class ApiException extends RuntimeException
     {
         return $this->data;
     }
+
+    /**
+     * @return bool
+     */
+    public function isWriteLog(): bool
+    {
+        return $this->writeLog;
+    }
 }

app/Exceptions/Handler.php

@@ -74,7 +74,7 @@ class Handler extends ExceptionHandler
     public function report(Throwable $e)
     {
         if ($e instanceof ApiException) {
-            if ($e->getCode() !== -1) {
+            if ($e->isWriteLog()) {
                 Log::error($e->getMessage(), [
                     'code' => $e->getCode(),
                     'data' => $e->getData(),

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;
@@ -20,8 +20,10 @@ use App\Models\ApproveProcInstHistory;
 use App\Exceptions\ApiException;
 use App\Models\UserDepartment;
 use App\Models\WebSocketDialogMsg;
+use App\Module\Apps;
 use App\Module\BillMultipleExport;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
+use Swoole\Coroutine;
 
 /**
  * @apiDefine approve
@@ -34,6 +36,7 @@ class ApproveController extends AbstractController
 
     public function __construct()
     {
+        Apps::isInstalledThrow('approve');
         $this->flow_url = env('FLOW_URL') ?: 'http://approve';
     }
 
@@ -766,131 +769,192 @@ class ApproveController extends AbstractController
         if (Carbon::parse($date[1])->timestamp - Carbon::parse($date[0])->timestamp > 35 * 86400) {
             return Base::retError('日期范围限制最大35天');
         }
-        //
-        $ret = Ihttp::ihttp_post($this->flow_url . '/api/v1/workflow/process/findAllProcIns', json_encode($data));
-        $process = json_decode($ret['ret'] == 1 ? $ret['data'] : '{}', true);
-        if (!$process || $process['status'] != 200) {
-            return Base::retError($process['message'] ?? '查询失败');
+        $botUser = User::botGetOrCreate('system-msg');
+        if (empty($botUser)) {
+            return Base::retError('系统机器人不存在');
         }
+        $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid);
         //
-        $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('请假单位');
-        //
-        $datas = [];
-        foreach ($res as $val) {
+        $doo = Doo::load();
+        go(function () use ($doo, $data, $user, $botUser, $dialog) {
+            Coroutine::sleep(1);
             //
-            $nickname = Base::filterEmoji($val['start_user_name']);
-            $participant = $this->getUserProcessParticipantById($val['id']); // 获取参与人
-            $participant = $this->handleParticipant($val, $participant['data']); // 处理参与人返回数据
-            //
-            $job_number = ''; // 发起人工号
-            $department_leader = User::userid2nickname(UserDepartment::find(1, ['owner_userid'])['owner_userid']); // 部门负责人
-            $historical_approver = $participant['historical_approver'] ?? ''; // 历史审批人
-            $historical_agent = ''; // 历史办理人
-            $approval_record = $participant['approval_record'] ?? ''; // 审批记录
-            $current_handler = !$val['is_finished'] ? implode(',', User::whereIn('userid', explode(';', $val['candidate']))->pluck('nickname')->toArray()) : ''; // 当前处理人
-            $approved_node = $participant['approved_node'] ?? 0; // 审批节点
-            $approved_num = $participant['approved_num'] ?? 0; // 审批人数
-            // 计算审批耗时
-            $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)); // 审批耗时
-            // 计算时长
-            $varStartTime = Carbon::parse($val['var']['start_time']);
-            $varEndTime = Carbon::parse($val['var']['end_time']);
-            $duration = $varEndTime->floatDiffInHours($varStartTime);
-            $duration_unit = Doo::translate('小时'); // 时长单位
-            $datas[] = [
-                $val['id'], // 申请编号
-                $val['proc_def_name'], // 标题
-                $this->getStateDescription($val['state']), // 申请状态
-                $val['start_time'], // 发起时间
-                $val['end_time'], // 完成时间
-                $job_number, // 发起人工号
-                $val['start_user_id'], // 发起人User ID
-                $nickname, // 发起人姓名
-                $val['department'], // 发起人部门
-                $val['department_id'], // 发起人部门ID
-                $department_leader, // 部门负责人
-                $historical_approver, // 历史审批人
-                $historical_agent, // 历史办理人
-                $approval_record, // 审批记录
-                $current_handler, // 当前处理人
-                $approved_node, // 审批节点
-                $approved_num, // 审批人数
-                $approval_time, // 审批耗时
-                $val['var']['type'], // 假期类型
-                $val['var']['start_time'], // 开始时间
-                $val['var']['end_time'], // 结束时间
-                $duration, // 时长
-                $val['var']['description'], // 请假事由
-                $duration_unit, // 请假单位
+            $content = [];
+            $content[] = [
+                'content' => '导出审批数据已完成',
+                'style' => 'font-weight: bold;padding-bottom: 4px;',
             ];
-        }
-        if (empty($datas)) {
-            return Base::retError('没有任何数据');
-        }
+            //
+            $ret = Ihttp::ihttp_post($this->flow_url . '/api/v1/workflow/process/findAllProcIns', json_encode($data));
+            $process = json_decode($ret['ret'] == 1 ? $ret['data'] : '{}', true);
+            if (!$process || $process['status'] != 200) {
+                $content[] = [
+                    'content' => $process['message'] ?? '查询失败',
+                    'style' => 'color: #ff0000;',
+                ];
+                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                    'type' => 'content',
+                    'title' => $content[0]['content'],
+                    'content' => $content,
+                ], $botUser->userid, true, false, true);
+                return;
+            }
+            //
+            $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('请假单位');
+            //
+            $datas = [];
+            foreach ($res as $val) {
+                //
+                $nickname = Base::filterEmoji($val['start_user_name']);
+                $participant = $this->getUserProcessParticipantById($val['id']); // 获取参与人
+                $participant = $this->handleParticipant($val, $participant['data']); // 处理参与人返回数据
+                //
+                $job_number = ''; // 发起人工号
+                $department_leader = User::userid2nickname(UserDepartment::find(1, ['owner_userid'])['owner_userid']); // 部门负责人
+                $historical_approver = $participant['historical_approver'] ?? ''; // 历史审批人
+                $historical_agent = ''; // 历史办理人
+                $approval_record = $participant['approval_record'] ?? ''; // 审批记录
+                $current_handler = !$val['is_finished'] ? implode(',', User::whereIn('userid', explode(';', $val['candidate']))->pluck('nickname')->toArray()) : ''; // 当前处理人
+                $approved_node = $participant['approved_node'] ?? 0; // 审批节点
+                $approved_num = $participant['approved_num'] ?? 0; // 审批人数
+                // 计算审批耗时
+                $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)); // 审批耗时
+                // 计算时长
+                $varStartTime = Carbon::parse($val['var']['start_time']);
+                $varEndTime = Carbon::parse($val['var']['end_time']);
+                $duration = $varEndTime->floatDiffInHours($varStartTime);
+                $duration_unit = $doo->translate('小时'); // 时长单位
+                $datas[] = [
+                    $val['id'], // 申请编号
+                    $val['proc_def_name'], // 标题
+                    $this->getStateDescription($val['state']), // 申请状态
+                    $val['start_time'], // 发起时间
+                    $val['end_time'], // 完成时间
+                    $job_number, // 发起人工号
+                    $val['start_user_id'], // 发起人User ID
+                    $nickname, // 发起人姓名
+                    $val['department'], // 发起人部门
+                    $val['department_id'], // 发起人部门ID
+                    $department_leader, // 部门负责人
+                    $historical_approver, // 历史审批人
+                    $historical_agent, // 历史办理人
+                    $approval_record, // 审批记录
+                    $current_handler, // 当前处理人
+                    $approved_node, // 审批节点
+                    $approved_num, // 审批人数
+                    $approval_time, // 审批耗时
+                    $val['var']['type'], // 假期类型
+                    $val['var']['start_time'], // 开始时间
+                    $val['var']['end_time'], // 结束时间
+                    $duration, // 时长
+                    $val['var']['description'], // 请假事由
+                    $duration_unit, // 请假单位
+                ];
+            }
+            if (empty($datas)) {
+                $content[] = [
+                    'content' => '没有任何数据',
+                    'style' => 'color: #ff0000;',
+                ];
+                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                    'type' => 'content',
+                    'title' => $content[0]['content'],
+                    'content' => $content,
+                ], $botUser->userid, true, false, true);
+                return;
+            }
+            //
+            $title = $doo->translate("审批记录");
+            $sheets = [
+                BillExport::create()->setTitle($title)->setHeadings($headings)->setData($datas)->setStyles(["A1:Y1" => ["font" => ["bold" => true]]])
+            ];
+            //
+            $fileName = $title . '_' . Timer::time() . '.xlsx';
+            $filePath = "temp/approve/export/" . date("Ym", Timer::time());
+            $export = new BillMultipleExport($sheets);
+            $res = $export->store($filePath . "/" . $fileName);
+            if ($res != 1) {
+                $content[] = [
+                    'content' => "导出失败，{$fileName}！",
+                    'style' => 'color: #ff0000;',
+                ];
+                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                    'type' => 'content',
+                    'title' => $content[0]['content'],
+                    'content' => $content,
+                ], $botUser->userid, true, false, true);
+                return;
+            }
+            $xlsPath = storage_path("app/" . $filePath . "/" . $fileName);
+            $zipFile = "app/" . $filePath . "/" . Base::rightDelete($fileName, '.xlsx') . ".zip";
+            $zipPath = storage_path($zipFile);
+            if (file_exists($zipPath)) {
+                Base::deleteDirAndFile($zipPath, true);
+            }
+            try {
+                Madzipper::make($zipPath)->add($xlsPath)->close();
+            } catch (\Throwable) {
+            }
+            //
+            if (file_exists($zipPath)) {
+                $key = Down::cache_encode([
+                    'file' => $zipFile,
+                ]);
+                $fileUrl = Base::fillUrl('api/approve/down?key=' . $key);
+                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                    'type' => 'file_download',
+                    'title' => '导出审批数据已完成',
+                    'name' => $fileName,
+                    'size' => filesize($zipPath),
+                    'url' => $fileUrl,
+                ], $botUser->userid, true, false, true);
+            } else {
+                $content[] = [
+                    'content' => "打包失败，请稍后再试...",
+                    'style' => 'color: #ff0000;',
+                ];
+                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                    'type' => 'content',
+                    'title' => $content[0]['content'],
+                    'content' => $content,
+                ], $botUser->userid, true, false, true);
+            }
+        });
         //
-        $title = Doo::translate("审批记录");
-        $sheets = [
-            BillExport::create()->setTitle($title)->setHeadings($headings)->setData($datas)->setStyles(["A1:Y1" => ["font" => ["bold" => true]]])
-        ];
+        WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+            'type' => 'content',
+            'content' => '正在导出审批数据，请稍等...',
+        ], $botUser->userid, true, false, true);
         //
-        $fileName = $title . '_' . Timer::time() . '.xlsx';
-        $filePath = "temp/approve/export/" . date("Ym", Timer::time());
-        $export = new BillMultipleExport($sheets);
-        $res = $export->store($filePath . "/" . $fileName);
-        if ($res != 1) {
-            return Base::retError('导出失败，' . $fileName . '！');
-        }
-        $xlsPath = storage_path("app/" . $filePath . "/" . $fileName);
-        $zipFile = "app/" . $filePath . "/" . Base::rightDelete($fileName, '.xlsx') . ".zip";
-        $zipPath = storage_path($zipFile);
-        if (file_exists($zipPath)) {
-            Base::deleteDirAndFile($zipPath, true);
-        }
-        try {
-            Madzipper::make($zipPath)->add($xlsPath)->close();
-        } catch (\Throwable) {
-        }
-        //
-        if (file_exists($zipPath)) {
-            $base64 = base64_encode(Base::array2string([
-                'file' => $zipFile,
-            ]));
-            Session::put('approve::export:userid', $user->userid);
-            return Base::retSuccess('success', [
-                'size' => Base::twoFloat(filesize($zipPath) / 1024, true),
-                'url' => Base::fillUrl('api/approve/down?key=' . urlencode($base64)),
-            ]);
-        } else {
-            return Base::retError('打包失败，请稍后再试...');
-        }
+        return Base::retSuccess('success');
     }
 
     function getStateDescription($state)
@@ -918,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));
     }

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;
@@ -87,6 +88,13 @@ class FileController extends AbstractController
                 }
                 return Base::retError($msg, $data);
             }
+            
+            // 如果文件不允许游客访问，则需要登录
+            if (!$file->guest_access) {
+                User::auth();
+            }
+            
+            $fileLink->increment("num");
         } else {
             return Base::retError('参数错误');
         }
@@ -106,6 +114,7 @@ class FileController extends AbstractController
      *
      * @apiParam {String} [link]        通过分享地址搜索（如：https://t.hitosea.com/single/file/ODcwOCwzOSxpa0JBS2lmVQ==）
      * @apiParam {String} [key]         关键词
+     * @apiParam {Number} [take]        获取数量（默认：50，最大：100）
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -118,7 +127,7 @@ class FileController extends AbstractController
         $link = trim(Request::input('link'));
         $key = trim(Request::input('key'));
         $id = 0;
-        $take = 50;
+        $take = Base::getPaginate(100, 50, 'take');
         if (preg_match("/\/single\/file\/(.*?)$/i", $link, $match)) {
             $id = intval(FileLink::whereCode($match[1])->value('file_id'));
             $take = 1;
@@ -132,7 +141,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();
         // 搜索共享的
@@ -195,8 +208,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) {
@@ -501,6 +514,10 @@ class FileController extends AbstractController
             return Base::retError('参数错误');
         }
         //
+        if ($down == 'no') {
+            File::isNeedInstallApp($file->type);
+        }
+        //
         if ($only_update_at == 'yes') {
             return Base::retSuccess('success', [
                 'id' => $file->id,
@@ -513,6 +530,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));
         }
@@ -575,10 +602,12 @@ class FileController extends AbstractController
                 $contentArray = Base::json2array($content);
                 $contentString = $contentArray['xml'];
                 $file->ext = 'drawio';
+                File::isNeedInstallApp($file->type);
                 break;
             case 'mind':
                 $contentString = $content;
                 $file->ext = 'mind';
+                File::isNeedInstallApp($file->type);
                 break;
             case 'txt':
             case 'code':
@@ -615,7 +644,7 @@ class FileController extends AbstractController
     /**
      * @api {get} api/file/office/token          10. 获取token
      *
-     * @apiDescription 需要token身份
+     * @apiDescription 用于生成office在线编辑的token
      * @apiVersion 1.0.0
      * @apiGroup file
      * @apiName office__token
@@ -628,7 +657,7 @@ class FileController extends AbstractController
      */
     public function office__token()
     {
-        User::auth();
+        File::isNeedInstallApp('office');
         //
         $config = Request::input('config');
         $token = \Firebase\JWT\JWT::encode($config, env('APP_KEY') ,'HS256');
@@ -655,6 +684,8 @@ class FileController extends AbstractController
     {
         $user = User::auth();
         //
+        File::isNeedInstallApp('office');
+        //
         $id = intval(Request::input('id'));
         $status = intval(Request::input('status'));
         $key = Request::input('key');
@@ -664,7 +695,7 @@ class FileController extends AbstractController
         //
         if ($status === 2) {
             $parse = parse_url($url);
-            $from = 'http://' . env('APP_IPPR') . '.3' . $parse['path'] . '?' . $parse['query'];
+            $from = 'http://nginx' . $parse['path'] . '?' . $parse['query'];
             $path = 'uploads/file/' . $file->type . '/' . date("Ym") . '/' . $file->id . '/' . $key;
             $save = public_path($path);
             Base::makeDir(dirname($save));
@@ -775,6 +806,8 @@ class FileController extends AbstractController
         //
         $file = File::permissionFind($id, $user);
         //
+        File::isNeedInstallApp($file->type);
+        //
         $history = FileContent::whereFid($file->id)->whereId($history_id)->first();
         if (empty($history)) {
             return Base::retError('历史数据不存在或已被删除');
@@ -963,6 +996,9 @@ class FileController extends AbstractController
      * @apiParam {String} refresh           刷新链接
      * - no: 只获取（默认）
      * - yes: 刷新链接，之前的将失效
+     * @apiParam {String} guest_access      是否允许游客访问
+     * - no: 不允许（默认）
+     * - yes: 允许游客访问
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -974,9 +1010,16 @@ 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);
     }
@@ -998,17 +1041,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));
         }
@@ -1073,11 +1110,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));
@@ -1086,17 +1122,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) {
@@ -1105,11 +1142,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,8 +6,10 @@ use App\Exceptions\ApiException;
 use App\Models\AbstractModel;
 use App\Models\ProjectTask;
 use App\Models\Report;
+use App\Models\ReportLink;
 use App\Models\ReportReceive;
 use App\Models\User;
+use App\Models\WebSocketDialogMsg;
 use App\Module\Base;
 use App\Module\Doo;
 use App\Tasks\PushTask;
@@ -28,11 +30,13 @@ class ReportController extends AbstractController
     /**
      * @api {get} api/report/my          01. 我发送的汇报
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName my
      *
      * @apiParam {Object} [keys]             搜索条件
+     * - keys.key: 关键词
      * - keys.type: 汇报类型，weekly:周报，daily:日报
      * - keys.created_at: 汇报时间
      * @apiParam {Number} [page]        当前页，默认:1
@@ -49,6 +53,15 @@ class ReportController extends AbstractController
         $builder = Report::with(['receivesUser'])->whereUserid($user->userid);
         $keys = Request::input('keys');
         if (is_array($keys)) {
+            if ($keys['key']) {
+                if (str_contains($keys['key'], '@')) {
+                    $builder->whereHas('sendUser', function ($q2) use ($keys) {
+                        $q2->where("users.email", "LIKE", "%{$keys['key']}%");
+                    });
+                } else {
+                    $builder->where("title", "LIKE", "%{$keys['key']}%");
+                }
+            }
             if (in_array($keys['type'], [Report::WEEKLY, Report::DAILY])) {
                 $builder->whereType($keys['type']);
             }
@@ -64,13 +77,16 @@ class ReportController extends AbstractController
     /**
      * @api {get} api/report/receive          02. 我接收的汇报
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName receive
      *
      * @apiParam {Object} [keys]             搜索条件
      * - keys.key: 关键词
+     * - keys.department_id: 部门ID
      * - keys.type: 汇报类型，weekly:周报，daily:日报
+     * - keys.status: 状态，unread:未读，read:已读
      * - keys.created_at: 汇报时间
      * @apiParam {Number} [page]        当前页，默认:1
      * @apiParam {Number} [pagesize]    每页显示数量，默认:20，最大:50
@@ -89,15 +105,29 @@ class ReportController extends AbstractController
         $keys = Request::input('keys');
         if (is_array($keys)) {
             if ($keys['key']) {
-                $builder->where(function($query) use ($keys) {
-                    $query->whereHas('sendUser', function ($q2) use ($keys) {
+                if (str_contains($keys['key'], '@')) {
+                    $builder->whereHas('sendUser', function ($q2) use ($keys) {
                         $q2->where("users.email", "LIKE", "%{$keys['key']}%");
-                    })->orWhere("title", "LIKE", "%{$keys['key']}%");
+                    });
+                } elseif (Base::isNumber($keys['key'])) {
+                    $builder->where("userid", intval($keys['key']));
+                } else {
+                    $builder->where("title", "LIKE", "%{$keys['key']}%");
+                }
+            }
+            if ($keys['department_id']) {
+                $builder->whereHas('sendUser', function ($query) use ($keys) {
+                    $query->where("users.department", "LIKE", "%,{$keys['department_id']},%");
                 });
             }
             if (in_array($keys['type'], [Report::WEEKLY, Report::DAILY])) {
                 $builder->whereType($keys['type']);
             }
+            if (in_array($keys['status'], ['unread', 'read'])) {
+                $builder->whereHas("receivesUser", function ($query) use ($user, $keys) {
+                    $query->where("report_receives.userid", $user->userid)->where("report_receives.read", $keys['status'] === 'unread' ? 0 : 1);
+                });
+            }
             if (is_array($keys['created_at'])) {
                 if ($keys['created_at'][0] > 0) $builder->where('created_at', '>=', Base::newCarbon($keys['created_at'][0])->startOfDay());
                 if ($keys['created_at'][1] > 0) $builder->where('created_at', '<=', Base::newCarbon($keys['created_at'][1])->endOfDay());
@@ -115,6 +145,7 @@ class ReportController extends AbstractController
     /**
      * @api {get} api/report/store          03. 保存并发送工作汇报
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName store
@@ -190,7 +221,6 @@ class ReportController extends AbstractController
                 $report->updateInstance([
                     "title" => $input["title"],
                     "type" => $input["type"],
-                    "content" => htmlspecialchars($input["content"]),
                 ]);
             } else {
                 // 生成唯一标识
@@ -204,11 +234,25 @@ class ReportController extends AbstractController
                     "title" => $input["title"],
                     "type" => $input["type"],
                     "userid" => $user->userid,
-                    "content" => htmlspecialchars($input["content"]),
                 ]);
             }
             $report->save();
 
+            // 保存内容
+            $content = $input["content"];
+            preg_match_all("/<img\s+src=\"data:image\/(png|jpg|jpeg|webp);base64,(.*?)\"/s", $content, $matchs);
+            foreach ($matchs[2] as $key => $text) {
+                $tmpPath = "uploads/report/" . Carbon::parse($report->created_at)->format("Ym") . "/" . $report->id . "/attached/";
+                Base::makeDir(public_path($tmpPath));
+                $tmpPath .= md5($text) . "." . $matchs[1][$key];
+                if (Base::saveContentImage(public_path($tmpPath), base64_decode($text))) {
+                    $paramet = getimagesize(public_path($tmpPath));
+                    $content = str_replace($matchs[0][$key], '<img src="' . Base::fillUrl($tmpPath) . '" original-width="' . $paramet[0] . '" original-height="' . $paramet[1] . '"', $content);
+                }
+            }
+            $report->content = htmlspecialchars($content);
+            $report->save();
+
             // 删除关联
             $report->Receives()->delete();
             if ($input["receive_content"]) {
@@ -240,6 +284,7 @@ class ReportController extends AbstractController
     /**
      * @api {get} api/report/template          04. 生成汇报模板
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName template
@@ -411,11 +456,13 @@ class ReportController extends AbstractController
     /**
      * @api {get} api/report/detail          05. 报告详情
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName detail
      *
-     * @apiParam {Number} [id]           报告id
+     * @apiParam {Number} [id]           报告ID
+     * @apiParam {String} [code]         报告分享代码，与ID二选一，优先ID
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -424,30 +471,43 @@ class ReportController extends AbstractController
     public function detail(): array
     {
         $user = User::auth();
+        //
         $id = intval(trim(Request::input("id")));
-        if (empty($id))
+        $code = trim(Request::input("code"));
+        //
+        if (empty($id) && empty($code)) {
             return Base::retError("缺少ID参数");
-
-        $one = Report::getOne($id);
-        $one->type_val = $one->getRawOriginal("type");
-
-        // 标记为已读
-        if (!empty($one->receivesUser)) {
-            foreach ($one->receivesUser as $item) {
-                if ($item->userid === $user->userid && $item->pivot->read === 0) {
-                    $one->receivesUser()->updateExistingPivot($user->userid, [
-                        "read" => 1,
-                    ]);
+        }
+        //
+        if (!empty($id)) {
+            $one = Report::getOne($id);
+            $one->type_val = $one->getRawOriginal("type");
+            // 标记为已读
+            if (!empty($one->receivesUser)) {
+                foreach ($one->receivesUser as $item) {
+                    if ($item->userid === $user->userid && $item->pivot->read === 0) {
+                        $one->receivesUser()->updateExistingPivot($user->userid, [
+                            "read" => 1,
+                        ]);
+                    }
                 }
             }
+        } else {
+            $link = ReportLink::whereCode($code)->first();
+            if (empty($link)) {
+                return Base::retError("报告不存在或已被删除");
+            }
+            $one = Report::getOne($link->rid);
+            $one->report_link = $link;
+            $link->increment("num");
         }
-
         return Base::retSuccess("success", $one);
     }
 
     /**
      * @api {get} api/report/mark          06. 标记已读/未读
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName mark
@@ -488,8 +548,71 @@ class ReportController extends AbstractController
     }
 
     /**
-     * @api {get} api/report/last_submitter          07. 获取最后一次提交的接收人
+     * @api {get} api/report/share          07. 分享报告到消息
      *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName share
+     *
+     * @apiParam {Number} id                报告id（组）
+     * @apiParam {Array} dialogids          转发给的对话ID
+     * @apiParam {Array} userids            转发给的成员ID
+     * @apiParam {String} leave_message     转发留言
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function share()
+    {
+        $user = User::auth();
+        //
+        $id = Request::input('id');
+        $dialogids = Request::input('dialogids');
+        $userids = Request::input('userids');
+        $leave_message = Request::input('leave_message');
+        //
+        if (is_array($id)) {
+            if (count(Base::arrayRetainInt($id)) > 20) {
+                return Base::retError("最多只能操作20条数据");
+            }
+            $builder = Report::whereIn("id", Base::arrayRetainInt($id));
+        } else {
+            $builder = Report::whereId(intval($id));
+        }
+        $reportMsgs = [];
+        $builder ->chunkById(100, function ($list) use (&$reportMsgs, $user) {
+            /** @var Report $item */
+            foreach ($list as $item) {
+                $reportLink = ReportLink::generateLink($item->id, $user->userid);
+                $reportMsgs[] = "<a class=\"mention report\" href=\"{{RemoteURL}}single/report/detail/{$reportLink['code']}\" target=\"_blank\">%{$item->title}</a>";
+            }
+        });
+        if (empty($reportMsgs)) {
+            return Base::retError("报告不存在或已被删除");
+        }
+        $reportTag = count($reportMsgs) > 1 ? 'li' : 'p';
+        $reportAttr = $reportTag === 'li' ? ' data-list="ordered"' : '';
+        $reportMsgs = array_map(function ($item) use ($reportAttr, $reportTag) {
+            return "<{$reportTag}{$reportAttr}>{$item}</{$reportTag}>";
+        }, $reportMsgs);
+        if ($reportTag === 'li') {
+            array_unshift($reportMsgs, "<ol>");
+            $reportMsgs[] = "</ol>";
+        }
+        if ($leave_message) {
+            $reportMsgs[] = "<p>{$leave_message}</p>";
+        }
+        $msgText = implode("", $reportMsgs);
+        //
+        return WebSocketDialogMsg::sendMsgBatch($user, $userids, $dialogids, $msgText);
+    }
+
+    /**
+     * @api {get} api/report/last_submitter          08. 获取最后一次提交的接收人
+     *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName last_submitter
@@ -505,8 +628,9 @@ class ReportController extends AbstractController
     }
 
     /**
-     * @api {get} api/report/unread          08. 获取未读
+     * @api {get} api/report/unread          09. 获取未读
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName unread
@@ -529,8 +653,9 @@ class ReportController extends AbstractController
     }
 
     /**
-     * @api {get} api/report/read          09. 标记汇报已读，可批量
+     * @api {get} api/report/read          10. 标记汇报已读，可批量
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName read

app/Http/Controllers/Api/SystemController.php

@@ -2,10 +2,12 @@
 
 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;
@@ -14,14 +16,15 @@ 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;
 use App\Models\UserCheckinRecord;
+use App\Module\Apps;
 use App\Module\BillMultipleExport;
 use LdapRecord\LdapRecordException;
 use Guanguans\Notify\Messages\EmailMessage;
+use Swoole\Coroutine;
 
 /**
  * @apiDefine system
@@ -41,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', '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', 'start_home']）
+     * - 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']）
 
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -70,7 +73,11 @@ class SystemController extends AbstractController
                     'anon_message',
                     'voice2text',
                     'translation',
+                    'convert_video',
+                    'compress_video',
                     'e2e_message',
+                    'msg_rev_limit',
+                    'msg_edit_limit',
                     'auto_archived',
                     'archived_day',
                     'task_visible',
@@ -84,7 +91,6 @@ class SystemController extends AbstractController
                     'image_compress',
                     'image_quality',
                     'image_save_local',
-                    'start_home',
                     'file_upload_limit',
                     'unclaimed_task_reminder',
                     'unclaimed_task_reminder_time',
@@ -101,10 +107,10 @@ class SystemController extends AbstractController
                 }
             }
             if ($all['voice2text'] == 'open' && !Setting::AIOpen()) {
-                return Base::retError('开启语音转文字功能需要在应用中开启 ChatGPT AI 机器人。');
+                return Base::retError('开启语音转文字功能需要先设置 AI 助理。');
             }
             if ($all['translation'] == 'open' && !Setting::AIOpen()) {
-                return Base::retError('开启翻译功能需要在应用中开启 ChatGPT AI 机器人。');
+                return Base::retError('开启翻译功能需要先设置 AI 助理。');
             }
             if ($all['system_alias'] == env('APP_NAME')) {
                 $all['system_alias'] = '';
@@ -134,7 +140,11 @@ class SystemController extends AbstractController
         $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';
+        $setting['msg_rev_limit'] = $setting['msg_rev_limit'] ?: '';
+        $setting['msg_edit_limit'] = $setting['msg_edit_limit'] ?: '';
         $setting['auto_archived'] = $setting['auto_archived'] ?: 'close';
         $setting['archived_day'] = floatval($setting['archived_day']) ?: 7;
         $setting['task_visible'] = $setting['task_visible'] ?: 'close';
@@ -142,11 +152,9 @@ class SystemController extends AbstractController
         $setting['all_group_autoin'] = $setting['all_group_autoin'] ?: 'yes';
         $setting['user_private_chat_mute'] = $setting['user_private_chat_mute'] ?: 'open';
         $setting['user_group_chat_mute'] = $setting['user_group_chat_mute'] ?: 'open';
-        $setting['start_home'] = $setting['start_home'] ?: 'close';
         $setting['file_upload_limit'] = $setting['file_upload_limit'] ?: '';
         $setting['unclaimed_task_reminder'] = $setting['unclaimed_task_reminder'] ?: 'close';
         $setting['unclaimed_task_reminder_time'] = $setting['unclaimed_task_reminder_time'] ?: '';
-        $setting['server_closeai'] = env("SERVER_CLOSEAI") ?: 'open';
         $setting['server_timezone'] = config('app.timezone');
         $setting['server_version'] = Base::getVersion();
         //
@@ -278,7 +286,49 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/setting/aibot          04. 获取会议设置、保存AI机器人设置（限管理员）
+     * @api {get} api/system/setting/ai          04. AI助手设置（限管理员）
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName setting__ai
+     *
+     * @apiParam {String} type
+     * - get: 获取（默认）
+     * - save: 保存设置（参数：['ai_provider', 'ai_api_key', 'ai_api_url', 'ai_proxy']）
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function setting__ai()
+    {
+        User::auth('admin');
+        //
+        $type = trim(Request::input('type'));
+        if ($type == 'save') {
+            if (env("SYSTEM_SETTING") == 'disabled') {
+                return Base::retError('当前环境禁止修改');
+            }
+            $all = Base::newTrim(Request::input());
+            foreach ($all as $key => $value) {
+                if (!in_array($key, [
+                    'ai_provider',
+                    'ai_api_key',
+                    'ai_api_url',
+                    'ai_proxy',
+                ])) {
+                    unset($all[$key]);
+                }
+            }
+            $setting = Base::setting('aiSetting', Base::newTrim($all));
+        } else {
+            $setting = Base::setting('aiSetting');
+        }
+        //
+        return Base::retSuccess('success', $setting ?: json_decode('{}'));
+    }
+
+    /**
+     * @api {get} api/system/setting/aibot          05. 获取会议设置、保存AI机器人设置（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -287,6 +337,8 @@ class SystemController extends AbstractController
      * @apiParam {String} type
      * - get: 获取（默认）
      * - save: 保存设置（参数：[...]）
+     * @apiParam {String} filter    过滤字段（可选）
+     *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
      * @apiSuccess {Object} data    返回数据
@@ -295,7 +347,10 @@ class SystemController extends AbstractController
     {
         User::auth('admin');
         //
+        Apps::isInstalledThrow('ai');
+        //
         $type = trim(Request::input('type'));
+        $filter = trim(Request::input('filter'));
         $setting = Base::setting('aibotSetting');
         if ($type == 'save') {
             if (env("SYSTEM_SETTING") == 'disabled') {
@@ -310,10 +365,18 @@ class SystemController extends AbstractController
             }
             $setting = Base::setting('aibotSetting', Base::newTrim($setting));
         }
+        if ($filter) {
+            $setting = array_filter($setting, function($value, $key) use ($filter) {
+                return str_starts_with($key, $filter);
+            }, ARRAY_FILTER_USE_BOTH);
+        }
         //
         if (env("SYSTEM_SETTING") == 'disabled') {
             foreach ($setting as $key => $item) {
-                if (str_contains($key, '_key')) {
+                if (empty($item)) {
+                    continue;
+                }
+                if (str_ends_with($key, '_key') || str_ends_with($key, '_secret')) {
                     $setting[$key] = substr($item, 0, 4) . str_repeat('*', strlen($item) - 8) . substr($item, -4);
                 }
             }
@@ -323,7 +386,66 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/setting/checkin          05. 获取签到设置、保存签到设置（限管理员）
+     * @api {get} api/system/setting/aibot_models          06. 获取AI模型
+     *
+     * @apiDescription 获取所有AI机器人模型设置
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName aibot_models
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    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('{}'));
+    }
+
+    /**
+     * @api {get} api/system/setting/aibot_defmodels          07. 获取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    返回数据
+     */
+    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 AI::ollamaModels($baseUrl, $key, $agency);
+        }
+        $models = Setting::AIBotDefaultModels($type);
+        if (empty($models)) {
+            return Base::retError('未找到默认模型');
+        }
+        return Base::retSuccess('success', [
+            'models' => $models
+        ]);
+    }
+
+    /**
+     * @api {get} api/system/setting/checkin          08. 获取签到设置、保存签到设置（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -359,8 +481,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',
@@ -376,16 +503,33 @@ class SystemController extends AbstractController
                 if (!$botUser) {
                     return Base::retError('创建签到机器人失败');
                 }
-                if (in_array('locat', $all['modes'])) {
-                    if (empty($all['locat_bd_lbs_key'])) {
-                        return Base::retError('请填写百度地图AK');
+                if (is_array($all['modes'])) {
+                    if (in_array('locat', $all['modes'])) {
+                        $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('请选择地图类型');
+                        }
+                        $conf = $mapTypes[$type];
+                        if (empty($all[$conf['key']])) {
+                            return Base::retError($conf['msg']);
+                        }
+                        if (!is_array($all[$conf['point']])) {
+                            return Base::retError('请选择允许签到位置');
+                        }
+                        $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('请选择有效的签到位置');
+                        }
                     }
-                    if (!is_array($all['locat_bd_lbs_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'])) {
-                        return Base::retError('请选择有效的签到位置');
+                    // 人脸识别
+                    if (in_array('face', $all['modes'])) {
+                        Apps::isInstalledThrow('face');
                     }
                 }
             }
@@ -411,7 +555,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;
@@ -429,7 +576,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/setting/apppush          06. 获取APP推送设置、保存APP推送设置（限管理员）
+     * @api {get} api/system/setting/apppush          09. 获取APP推送设置、保存APP推送设置（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -474,7 +621,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/setting/thirdaccess          07. 第三方帐号（限管理员）
+     * @api {get} api/system/setting/thirdaccess          10. 第三方帐号（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -544,7 +691,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/setting/file          08. 文件设置（限管理员）
+     * @api {get} api/system/setting/file          11. 文件设置（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -584,7 +731,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/demo          09. 获取演示帐号
+     * @api {get} api/system/demo          12. 获取演示帐号
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -608,7 +755,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/priority          10. 任务优先级
+     * @api {post} api/system/priority          13. 任务优先级
      *
      * @apiDescription 获取任务优先级、保存任务优先级
      * @apiVersion 1.0.0
@@ -657,7 +804,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/column/template          11. 创建项目模板
+     * @api {post} api/system/column/template          14. 创建项目模板
      *
      * @apiDescription 获取创建项目模板、保存创建项目模板
      * @apiVersion 1.0.0
@@ -704,7 +851,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/license          12. License
+     * @api {post} api/system/license          15. License
      *
      * @apiDescription 获取License信息、保存License（限管理员）
      * @apiVersion 1.0.0
@@ -735,6 +882,7 @@ class SystemController extends AbstractController
             'info' => Doo::license(),
             'macs' => Doo::macs(),
             'doo_sn' => Doo::dooSN(),
+            'doo_version' => Doo::dooVersion(),
             'user_count' => User::whereBot(0)->whereNull('disable_at')->count(),
             'error' => []
         ];
@@ -743,7 +891,7 @@ class SystemController extends AbstractController
             if ($data['info']['sn'] != $data['doo_sn']) {
                 $data['error'][] = '终端SN与License不匹配';
             }
-            if ($data['info']['mac']) {
+            if ($data['info']['mac'] && $data['macs']) {
                 $approved = false;
                 foreach ($data['info']['mac'] as $mac) {
                     if (in_array($mac, $data['macs'])) {
@@ -773,7 +921,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/info          13. 获取终端详细信息
+     * @api {get} api/system/get/info          16. 获取终端详细信息
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -792,8 +940,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(),
@@ -802,7 +948,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ip          14. 获取IP地址
+     * @api {get} api/system/get/ip          17. 获取IP地址
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -817,7 +963,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/cnip          15. 是否中国IP地址
+     * @api {get} api/system/get/cnip          18. 是否中国IP地址
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -834,41 +980,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ipgcj02          16. 获取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          17. 获取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          18. 上传图片
+     * @api {post} api/system/imgupload          19. 上传图片
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -877,7 +989,7 @@ class SystemController extends AbstractController
      *
      * @apiParam {File} image               post-图片对象
      * @apiParam {String} [image64]         post-图片base64（与'image'二选一）
-     * @apiParam {String} filename          post-文件名
+     * @apiParam {String} [filename]        post-文件名
      * @apiParam {Number} [width]           压缩图片宽（默认0）
      * @apiParam {Number} [height]          压缩图片高（默认0）
      * @apiParam {String} [whcut]           压缩方式（等比缩放）
@@ -934,7 +1046,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/imgview          19. 浏览图片空间
+     * @api {get} api/system/get/imgview          20. 浏览图片空间
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1031,16 +1143,16 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/fileupload          20. 上传文件
+     * @api {post} api/system/fileupload          21. 上传文件
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup system
      * @apiName fileupload
      *
-     * @apiParam {String} [image64]         图片base64
-     * @apiParam {String} filename          文件名
-     * @apiParam {String} [files]           文件名
+     * @apiParam {File} files               文件名
+     * @apiParam {String} [image64]         图片base64（与'files'二选一）
+     * @apiParam {String} [filename]        文件名
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -1075,7 +1187,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/updatelog          21. 获取更新日志
+     * @api {get} api/system/get/updatelog          22. 获取更新日志
      *
      * @apiDescription 获取更新日志
      * @apiVersion 1.0.0
@@ -1108,7 +1220,7 @@ class SystemController extends AbstractController
         if ($logResults) {
             $logVersion = $logResults[0]['title'];
             $logContent = implode("\n", array_map(function($item) {
-                return "## [{$item['title']}]" . $item['content'];
+                return "## {$item['title']}" . $item['content'];
             }, $logResults));
         }
         return Base::retSuccess('success', [
@@ -1118,7 +1230,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/email/check          22. 邮件发送测试（限管理员）
+     * @api {get} api/system/email/check          23. 邮件发送测试（限管理员）
      *
      * @apiDescription 测试配置邮箱是否能发送邮件
      * @apiVersion 1.0.0
@@ -1164,7 +1276,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/checkin/export          23. 导出签到数据（限管理员）
+     * @api {get} api/system/checkin/export          24. 导出签到数据（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -1180,7 +1292,7 @@ class SystemController extends AbstractController
      */
     public function checkin__export()
     {
-        User::auth('admin');
+        $user = User::auth('admin');
         //
         $setting = Base::setting('checkinSetting');
         if ($setting['open'] !== 'open') {
@@ -1210,130 +1322,183 @@ class SystemController extends AbstractController
         $secondStart = strtotime("2000-01-01 {$time[0]}") - strtotime("2000-01-01 00:00:00");
         $secondEnd = strtotime("2000-01-01 {$time[1]}") - strtotime("2000-01-01 00:00:00");
         //
-        $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('参数数据');
+        $botUser = User::botGetOrCreate('system-msg');
+        if (empty($botUser)) {
+            return Base::retError('系统机器人不存在');
+        }
+        $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid);
         //
-        $sheets = [];
-        $startD = Carbon::parse($date[0])->startOfDay();
-        $endD = Carbon::parse($date[1])->endOfDay();
-        $users = User::whereIn('userid', $userid)->take(100)->get();
-        /** @var User $user */
-        foreach ($users as $user) {
-            $recordTimes = UserCheckinRecord::getTimes($user->userid, [$startD, $endD]);
+        $doo = Doo::load();
+        go(function () use ($doo, $secondStart, $secondEnd, $time, $userid, $date, $user, $botUser, $dialog) {
+            Coroutine::sleep(1);
             //
-            $nickname = Base::filterEmoji($user->nickname);
-            $styles = ["A1:H1" => ["font" => ["bold" => true]]];
-            $datas = [];
-            $startT = $startD->timestamp;
-            $endT = $endD->timestamp;
-            $index = 1;
-            while ($startT < $endT) {
-                $index++;
-                $sameDate = date("Y-m-d", $startT);
-                $sameTimes = $recordTimes[$sameDate] ?? [];
-                $sameCollect = UserCheckinRecord::atCollect($sameDate, $sameTimes);
-                $firstBetween = [Carbon::createFromTimestamp($startT), Carbon::createFromTimestamp($startT + $secondEnd - 1)];
-                $lastBetween = [Carbon::createFromTimestamp($startT + $secondStart + 1), Carbon::createFromTimestamp($startT + 86400)];
-                $firstRecord = $sameCollect?->whereBetween("datetime", $firstBetween)->first();
-                $lastRecord = $sameCollect?->whereBetween("datetime", $lastBetween)->last();
-                $firstTimestamp = $firstRecord['timestamp'] ?: 0;
-                $lastTimestamp = $lastRecord['timestamp'] ?: 0;
-                if (Timer::time() < $startT + $secondStart) {
-                    $firstResult = "-";
-                } else {
-                    $firstResult = Doo::translate("正常");
-                    if (empty($firstTimestamp)) {
-                        $firstResult = Doo::translate("缺卡");
-                        $styles["E{$index}"] = ["font" => ["color" => ["rgb" => "ff0000"]]];
-                    } elseif ($firstTimestamp > $startT + $secondStart) {
-                        $firstResult = Doo::translate("迟到");
-                        $styles["E{$index}"] = ["font" => ["color" => ["rgb" => "436FF6"]]];
+            $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('参数数据');
+            //
+            $content = [];
+            $content[] = [
+                'content' => '导出签到数据已完成',
+                'style' => 'font-weight: bold;padding-bottom: 4px;',
+            ];
+            //
+            $sheets = [];
+            $startD = Carbon::parse($date[0])->startOfDay();
+            $endD = Carbon::parse($date[1])->endOfDay();
+            $users = User::whereIn('userid', $userid)->take(100)->get();
+            /** @var User $user */
+            foreach ($users as $user) {
+                $recordTimes = UserCheckinRecord::getTimes($user->userid, [$startD, $endD]);
+                //
+                $nickname = Base::filterEmoji($user->nickname);
+                $styles = ["A1:H1" => ["font" => ["bold" => true]]];
+                $datas = [];
+                $startT = $startD->timestamp;
+                $endT = $endD->timestamp;
+                $index = 1;
+                while ($startT < $endT) {
+                    $index++;
+                    $sameDate = date("Y-m-d", $startT);
+                    $sameTimes = $recordTimes[$sameDate] ?? [];
+                    $sameCollect = UserCheckinRecord::atCollect($sameDate, $sameTimes);
+                    $firstBetween = [Carbon::createFromTimestamp($startT), Carbon::createFromTimestamp($startT + $secondEnd - 1)];
+                    $lastBetween = [Carbon::createFromTimestamp($startT + $secondStart + 1), Carbon::createFromTimestamp($startT + 86400)];
+                    $firstRecord = $sameCollect?->whereBetween("datetime", $firstBetween)->first();
+                    $lastRecord = $sameCollect?->whereBetween("datetime", $lastBetween)->last();
+                    $firstTimestamp = $firstRecord['timestamp'] ?: 0;
+                    $lastTimestamp = $lastRecord['timestamp'] ?: 0;
+                    if (Timer::time() < $startT + $secondStart) {
+                        $firstResult = "-";
+                    } else {
+                        $firstResult = $doo->translate("正常");
+                        if (empty($firstTimestamp)) {
+                            $firstResult = $doo->translate("缺卡");
+                            $styles["E{$index}"] = ["font" => ["color" => ["rgb" => "ff0000"]]];
+                        } elseif ($firstTimestamp > $startT + $secondStart) {
+                            $firstResult = $doo->translate("迟到");
+                            $styles["E{$index}"] = ["font" => ["color" => ["rgb" => "436FF6"]]];
+                        }
                     }
-                }
-                if (Timer::time() < $startT + $secondEnd) {
-                    $lastResult = "-";
-                    $lastTimestamp = 0;
-                } else {
-                    $lastResult = Doo::translate("正常");
-                    if (empty($lastTimestamp) || $lastTimestamp === $firstTimestamp) {
-                        $lastResult = Doo::translate("缺卡");
-                        $styles["G{$index}"] = ["font" => ["color" => ["rgb" => "ff0000"]]];
-                    } elseif ($lastTimestamp < $startT + $secondEnd) {
-                        $lastResult = Doo::translate("早退");
-                        $styles["G{$index}"] = ["font" => ["color" => ["rgb" => "436FF6"]]];
+                    if (Timer::time() < $startT + $secondEnd) {
+                        $lastResult = "-";
+                        $lastTimestamp = 0;
+                    } else {
+                        $lastResult = $doo->translate("正常");
+                        if (empty($lastTimestamp) || $lastTimestamp === $firstTimestamp) {
+                            $lastResult = $doo->translate("缺卡");
+                            $styles["G{$index}"] = ["font" => ["color" => ["rgb" => "ff0000"]]];
+                        } elseif ($lastTimestamp < $startT + $secondEnd) {
+                            $lastResult = $doo->translate("早退");
+                            $styles["G{$index}"] = ["font" => ["color" => ["rgb" => "436FF6"]]];
+                        }
                     }
+                    $firstTimestamp = $firstTimestamp ? date("H:i", $firstTimestamp) : "-";
+                    $lastTimestamp = $lastTimestamp ? date("H:i", $lastTimestamp) : "-";
+                    $section = array_map(function($item) {
+                        return $item[0] . "-" . ($item[1] ?: "None");
+                    }, UserCheckinRecord::atSection($sameTimes));
+                    $datas[] = [
+                        "{$nickname} (ID: {$user->userid})",
+                        $sameDate,
+                        implode("-", $time),
+                        $firstTimestamp,
+                        $firstResult,
+                        $lastTimestamp,
+                        $lastResult,
+                        implode(", ", $section),
+                    ];
+                    $startT += 86400;
                 }
-                $firstTimestamp = $firstTimestamp ? date("H:i", $firstTimestamp) : "-";
-                $lastTimestamp = $lastTimestamp ? date("H:i", $lastTimestamp) : "-";
-                $section = array_map(function($item) {
-                    return $item[0] . "-" . ($item[1] ?: "None");
-                }, UserCheckinRecord::atSection($sameTimes));
-                $datas[] = [
-                    "{$nickname} (ID: {$user->userid})",
-                    $sameDate,
-                    implode("-", $time),
-                    $firstTimestamp,
-                    $firstResult,
-                    $lastTimestamp,
-                    $lastResult,
-                    implode(", ", $section),
-                ];
-                $startT += 86400;
+                $title = (count($sheets) + 1) . "." . ($nickname ?: $user->userid);
+                $sheets[] = BillExport::create()->setTitle($title)->setHeadings($headings)->setData($datas)->setStyles($styles);
             }
-            $title = (count($sheets) + 1) . "." . ($nickname ?: $user->userid);
-            $sheets[] = BillExport::create()->setTitle($title)->setHeadings($headings)->setData($datas)->setStyles($styles);
-        }
-        if (empty($sheets)) {
-            return Base::retError('没有任何数据');
-        }
+            if (empty($sheets)) {
+                $content[] = [
+                    'content' => '没有任何数据',
+                    'style' => 'color: #ff0000;',
+                ];
+                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                    'type' => 'content',
+                    'title' => $content[0]['content'],
+                    'content' => $content,
+                ], $botUser->userid, true, false, true);
+                return;
+            }
+            //
+            $fileName = $users[0]->nickname;
+            if (count($users) > 1) {
+                $fileName .= "等" . count($userid) . "位成员的签到记录";
+            } else {
+                $fileName .= '的签到记录';
+            }
+            $fileName = $doo->translate($fileName) . '_' . Timer::time() . '.xlsx';
+            $filePath = "temp/checkin/export/" . date("Ym", Timer::time());
+            $export = new BillMultipleExport($sheets);
+            $res = $export->store($filePath . "/" . $fileName);
+            if ($res != 1) {
+                $content[] = [
+                    'content' => "导出失败，{$fileName}！",
+                    'style' => 'color: #ff0000;',
+                ];
+                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                    'type' => 'content',
+                    'title' => $content[0]['content'],
+                    'content' => $content,
+                ], $botUser->userid, true, false, true);
+                return;
+            }
+            $xlsPath = storage_path("app/" . $filePath . "/" . $fileName);
+            $zipFile = "app/" . $filePath . "/" . Base::rightDelete($fileName, '.xlsx') . ".zip";
+            $zipPath = storage_path($zipFile);
+            if (file_exists($zipPath)) {
+                Base::deleteDirAndFile($zipPath, true);
+            }
+            try {
+                Madzipper::make($zipPath)->add($xlsPath)->close();
+            } catch (\Throwable) {
+            }
+            //
+            if (file_exists($zipPath)) {
+                $key = Down::cache_encode([
+                    'file' => $zipFile,
+                ]);
+                $fileUrl = Base::fillUrl('api/system/checkin/down?key=' . $key);
+                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                    'type' => 'file_download',
+                    'title' => '导出签到数据已完成',
+                    'name' => $fileName,
+                    'size' => filesize($zipPath),
+                    'url' => $fileUrl,
+                ], $botUser->userid, true, false, true);
+            } else {
+                $content[] = [
+                    'content' => "打包失败，请稍后再试...",
+                    'style' => 'color: #ff0000;',
+                ];
+                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                    'type' => 'content',
+                    'title' => $content[0]['content'],
+                    'content' => $content,
+                ], $botUser->userid, true, false, true);
+            }
+        });
         //
-        $fileName = $users[0]->nickname;
-        if (count($users) > 1) {
-            $fileName .= "等" . count($userid) . "位成员的签到记录";
-        } else {
-            $fileName .= '的签到记录';
-        }
-        $fileName = Doo::translate($fileName) . '_' . Timer::time() . '.xlsx';
-        $filePath = "temp/checkin/export/" . date("Ym", Timer::time());
-        $export = new BillMultipleExport($sheets);
-        $res = $export->store($filePath . "/" . $fileName);
-        if ($res != 1) {
-            return Base::retError('导出失败，' . $fileName . '！');
-        }
-        $xlsPath = storage_path("app/" . $filePath . "/" . $fileName);
-        $zipFile = "app/" . $filePath . "/" . Base::rightDelete($fileName, '.xlsx') . ".zip";
-        $zipPath = storage_path($zipFile);
-        if (file_exists($zipPath)) {
-            Base::deleteDirAndFile($zipPath, true);
-        }
-        try {
-            Madzipper::make($zipPath)->add($xlsPath)->close();
-        } catch (\Throwable) {
-        }
+        WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+            'type' => 'content',
+            'content' => '正在导出签到数据，请稍等...',
+        ], $botUser->userid, true, false, true);
         //
-        if (file_exists($zipPath)) {
-            $base64 = base64_encode(Base::array2string([
-                'file' => $zipFile,
-            ]));
-            Session::put('checkin::export:userid', $user->userid);
-            return Base::retSuccess('success', [
-                'size' => Base::twoFloat(filesize($zipPath) / 1024, true),
-                'url' => Base::fillUrl('api/system/checkin/down?key=' . urlencode($base64)),
-            ]);
-        } else {
-            return Base::retError('打包失败，请稍后再试...');
-        }
+        return Base::retSuccess('success');
     }
 
     /**
-     * @api {get} api/system/checkin/down          24. 下载导出的签到数据
+     * @api {get} api/system/checkin/down          25. 下载导出的签到数据
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -1345,21 +1510,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          25. 获取版本号
+     * @api {get} api/system/version          26. 获取版本号
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -1367,23 +1527,29 @@ class SystemController extends AbstractController
      *
      * @apiSuccessExample {json} Success-Response:
     {
-        "version": "0.0.1",
+        "device_count": 3,  // 设备数量
+        "version": "0.0.1", // 服务端版本号
         "publish": {
             "provider": "generic",
             "url": ""
         }
     }
+    // 如果header请求中存在version字段，则返回数据包裹在 {ret:1,data:{},msg:"success"} 中
      */
     public function version()
     {
-        $url = url('');
         $package = Base::getPackage();
         $array = [
+            'device_count' => 0,
             'version' => Base::getVersion(),
             'publish' => [],
         ];
+        if (Doo::userId()) {
+            $array['device_count'] = UserDevice::whereUserid(Doo::userId())->count();
+        }
         if (is_array($package['app'])) {
             $i = 0;
+            $url = url('');
             foreach ($package['app'] as $item) {
                 $urls = $item['urls'] && is_array($item['urls']) ? $item['urls'] : $item['url'];
                 if (is_array($item['publish']) && ($i === 0 || Base::hostContrast($url, $urls))) {
@@ -1392,11 +1558,14 @@ class SystemController extends AbstractController
                 $i++;
             }
         }
+        if (Request::hasHeader('version')) {
+            return Base::retSuccess('success', $array);
+        }
         return $array;
     }
 
     /**
-     * @api {get} api/system/prefetch          26. 预加载的资源
+     * @api {get} api/system/prefetch          27. 预加载的资源
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -1436,11 +1605,13 @@ class SystemController extends AbstractController
             }
             // 添加office资源
             $officePath = '';
-            $officeApi = 'http://' . env('APP_IPPR') . '.6/web-apps/apps/api/documents/api.js';
-            $content = @file_get_contents($officeApi);
-            if ($content) {
-                if (preg_match("/const\s+ver\s*=\s*'\/*([^']+)'/", $content, $matches)) {
-                    $officePath = $matches[1];
+            if (Apps::isInstalled('office')) {
+                $officeApi = 'http://office/web-apps/apps/api/documents/api.js';
+                $content = @file_get_contents($officeApi);
+                if ($content) {
+                    if (preg_match("/const\s+ver\s*=\s*'\/*([^']+)'/", $content, $matches)) {
+                        $officePath = $matches[1];
+                    }
                 }
             }
             if ($officePath) {
@@ -1455,6 +1626,18 @@ class SystemController extends AbstractController
                     return !str_starts_with($item, 'office/{path}/');
                 });
             }
+            // 添加OKR资源
+            if (Apps::isInstalled('okr')) {
+                $okrContent = @file_get_contents("http://nginx/apps/okr/");
+                preg_match_all('/<script[^>]*src=["\']([^"\']+)["\'][^>]*>/i', $okrContent, $scriptMatches);
+                foreach ($scriptMatches[1] as $src) {
+                    $array[] = $src;
+                }
+                preg_match_all('/<link[^>]*rel=["\']stylesheet["\'][^>]*href=["\']([^"\']+)["\'][^>]*>/i', $okrContent, $linkMatches);
+                foreach ($linkMatches[1] as $href) {
+                    $array[] = $href;
+                }
+            }
         }
 
         return array_map(function($item) use ($version) {

app/Http/Controllers/IndexController.php

@@ -8,8 +8,6 @@ use Request;
 use Redirect;
 use Response;
 use App\Models\File;
-use App\Models\User;
-use App\Models\UserTransfer;
 use App\Module\Doo;
 use App\Module\Base;
 use App\Module\Extranet;
@@ -23,10 +21,10 @@ use App\Tasks\AutoArchivedTask;
 use App\Tasks\DeleteBotMsgTask;
 use App\Tasks\CheckinRemindTask;
 use App\Tasks\CloseMeetingRoomTask;
+use App\Tasks\ZincSearchSyncTask;
 use App\Tasks\UnclaimedTaskRemindTask;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
 use Laravolt\Avatar\Avatar;
-use Swoole\Coroutine;
 
 
 /**
@@ -63,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]);
@@ -85,6 +87,15 @@ class IndexController extends InvokeController
         return Redirect::to(Base::fillUrl('api/system/version'), 301);
     }
 
+    /**
+     * 健康检查
+     * @return string
+     */
+    public function health()
+    {
+        return "ok";
+    }
+
     /**
      * 头像
      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response|\Symfony\Component\HttpFoundation\BinaryFileResponse
@@ -241,11 +252,12 @@ class IndexController extends InvokeController
         // App推送
         Task::deliver(new AppPushTask());
         // 删除过期的临时表数据
-        Task::deliver(new DeleteTmpTask('wg_tmp_msgs', 1));
-        Task::deliver(new DeleteTmpTask('task_worker', 12));
+        Task::deliver(new DeleteTmpTask('tmp_msgs', 1));
         Task::deliver(new DeleteTmpTask('tmp'));
+        Task::deliver(new DeleteTmpTask('task_worker', 12));
         Task::deliver(new DeleteTmpTask('file'));
         Task::deliver(new DeleteTmpTask('tmp_file', 24));
+        Task::deliver(new DeleteTmpTask('user_device', 24));
         // 删除机器人消息
         Task::deliver(new DeleteBotMsgTask());
         // 周期任务
@@ -258,6 +270,8 @@ class IndexController extends InvokeController
         Task::deliver(new UnclaimedTaskRemindTask());
         // 关闭会议室
         Task::deliver(new CloseMeetingRoomTask());
+        // ZincSearch 同步
+        Task::deliver(new ZincSearchSyncTask());
 
         return "success";
     }
@@ -321,7 +335,7 @@ class IndexController extends InvokeController
                 "file" => Request::file('file'),
                 "type" => 'publish',
                 "path" => $draftPath,
-                "fileName" => true,
+                "saveName" => true,
             ]);
         }
 
@@ -342,9 +356,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) {
@@ -422,13 +434,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');
@@ -468,7 +476,7 @@ class IndexController extends InvokeController
                                 action: "eeuiAppSendMessage",
                                 data: [
                                     {
-                                        action: 'setPageData',
+                                        action: 'setPageData',  // 设置页面数据
                                         data: {
                                             showProgress: true,
                                             titleFixed: true,
@@ -476,7 +484,7 @@ class IndexController extends InvokeController
                                         }
                                     },
                                     {
-                                        action: 'createTarget',
+                                        action: 'createTarget', // 创建目标（访问新地址）
                                         url: "{$redirectUrl}",
                                     }
                                 ]
@@ -490,7 +498,7 @@ class IndexController extends InvokeController
         if (in_array($ext, File::localExt)) {
             $url = Base::fillUrl($path);
         } else {
-            $url = 'http://' . env('APP_IPPR') . '.3/' . $path;
+            $url = 'http://nginx/' . $path;
         }
         $url = Base::urlAddparameter($url, [
             'fullfilename' => Base::rightDelete($name, '.' . $ext) . '_' . filemtime($file) . '.' . $ext
@@ -498,43 +506,4 @@ class IndexController extends InvokeController
         $redirectUrl = Base::fillUrl("fileview/onlinePreview?url=" . urlencode(base64_encode($url)));
         return Redirect::to($redirectUrl, 301);
     }
-
-    /**
-     * 修复操作离职后续操作(todo 临时，后期删除)
-     * @return array
-     */
-    public function migration__userdialog()
-    {
-        if (Request::header('app-key') !== env('APP_KEY')) {
-            return Base::retError("key error");
-        }
-        go(function() {
-            Coroutine::sleep(3);
-            $handled = [];
-            UserTransfer::orderBy('id')->chunkById(10, function ($transfers) use ($handled) {
-                /** @var UserTransfer $transfer */
-                foreach ($transfers as $transfer) {
-                    if (in_array($transfer->original_userid, $handled)) {
-                        continue;
-                    }
-                    $handled[] = $transfer->original_userid;
-                    //
-                    $user = User::find($transfer->original_userid);
-                    if ($user?->isDisable()) {
-                        $transfer->exitDialog();
-                    }
-                }
-            });
-        });
-        return Base::retSuccess('success');
-    }
-
-    /**
-     * 保存配置 (todo 已废弃)
-     * @return string
-     */
-    public function storage__synch()
-    {
-        return '<!-- Deprecated -->';
-    }
 }

app/Http/Middleware/WebApi.php

@@ -19,11 +19,13 @@ 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'));
 
+        // 更新请求的基本URL
+        RequestContext::updateBaseUrl($request);
+
         // 加载Doo类
         Doo::load();
 
@@ -73,6 +75,6 @@ class WebApi
     public function terminate()
     {
         // 请求结束后清理上下文
-        RequestContext::clear();
+        RequestContext::clean();
     }
 }

app/Models/AbstractModel.php

@@ -151,6 +151,25 @@ class AbstractModel extends Model
         return $date->format($this->dateFormat ?: 'Y-m-d H:i:s');
     }
 
+    /**
+     * 通过模型创建实例
+     * @param array $param
+     * @param bool $force
+     * @return static
+     */
+    public static function fillInstance(array $param = [], bool $force = true)
+    {
+        $instance = new static;
+        if ($param) {
+            if ($force) {
+                $instance->forceFill($param);
+            } else {
+                $instance->fill($param);
+            }
+        }
+        return $instance;
+    }
+
     /**
      * 创建/更新数据
      * @param array $param
@@ -209,24 +228,35 @@ class AbstractModel extends Model
 
     /**
      * 数据库更新或插入
-     * @param $where
-     * @param array|\Closure $update 存在时更新的内容
-     * @param array|\Closure $insert 不存在时插入的内容，如果没有则插入更新内容
-     * @param bool $isInsert 是否是插入数据
+     * @param array $where              查询条件
+     * @param array|\Closure $update    存在时更新的内容
+     * @param array|\Closure $insert    不存在时插入的内容，如果没有则插入更新内容
+     * @param bool $isInsert            是否是插入数据
+     * @param bool|null $lockForUpdate  是否加锁（true:加锁，false:不加锁，null:在事务中会自动加锁）
      * @return AbstractModel|\Illuminate\Database\Eloquent\Builder|Model|object|static|null
      */
-    public static function updateInsert($where, $update = [], $insert = [], &$isInsert = true)
+    public static function updateInsert($where, $update = [], $insert = [], &$isInsert = true, $lockForUpdate = null)
     {
-        $row = static::where($where)->first();
+        $query = static::where($where);
+        if ($lockForUpdate === null) {
+            $lockForUpdate = \DB::transactionLevel() > 0;
+        }
+        if ($lockForUpdate) {
+            $query->lockForUpdate();
+        }
+        $row = $query->first();
         if (empty($row)) {
             $row = new static;
-            if ($update instanceof \Closure) {
-                $update = $update();
-            }
             if ($insert instanceof \Closure) {
                 $insert = $insert();
             }
-            $array = array_merge($where, $insert ?: $update);
+            if (empty($insert)) {
+                if ($update instanceof \Closure) {
+                    $update = $update();
+                }
+                $insert = $update;
+            }
+            $array = array_merge($where, $insert);
             if (isset($array[$row->primaryKey])) {
                 unset($array[$row->primaryKey]);
             }

app/Models/ApproveProcInstHistory.php

@@ -6,6 +6,60 @@ use Cache;
 use Carbon\Carbon;
 use DB;
 
+/**
+ * App\Models\ApproveProcInstHistory
+ *
+ * @property int $id
+ * @property int $proc_def_id 流程定义ID
+ * @property string|null $proc_def_name 流程定义名
+ * @property string|null $title 标题
+ * @property int|null $department_id 用户部门ID
+ * @property string|null $department 用户部门
+ * @property string|null $company 用户公司
+ * @property string|null $node_id 当前节点
+ * @property string|null $candidate 审批人
+ * @property int|null $task_id 当前任务
+ * @property string|null $start_time 开始时间
+ * @property string|null $end_time 结束时间
+ * @property int|null $duration 持续时间
+ * @property string|null $start_user_id 开始用户ID
+ * @property string|null $start_user_name 开始用户名
+ * @property int|null $is_finished 是否完成
+ * @property string|null $var
+ * @property int $state 当前状态: 0待审批，1审批中，2通过，3拒绝，4撤回
+ * @property string|null $latest_comment
+ * @property string|null $global_comment
+ * @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|ApproveProcInstHistory newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereCandidate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereCompany($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereDepartment($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereDepartmentId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereDuration($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereEndTime($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereGlobalComment($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereIsFinished($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereLatestComment($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereNodeId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereProcDefId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereProcDefName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereStartTime($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereStartUserId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereStartUserName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereState($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereTaskId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereTitle($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereVar($value)
+ * @mixin \Eloquent
+ */
 class ApproveProcInstHistory extends AbstractModel
 {
     protected $table = 'approve_proc_inst_history';

app/Models/File.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Request;
+use App\Module\Apps;
 use App\Module\Base;
 use App\Tasks\PushTask;
 use App\Exceptions\ApiException;
@@ -23,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
@@ -43,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)
@@ -117,7 +120,7 @@ class File extends AbstractModel
         'jpg', 'jpeg', 'webp', 'png', 'gif', 'bmp', 'ico', 'raw',
         'tif', 'tiff',
         'mp3', 'wav', 'mp4', 'flv',
-        'avi', 'mov', 'wmv', 'mkv', '3gp', 'rm',
+        // 'avi', 'mov', 'wmv', 'mkv', '3gp', 'rm',    // 这一排是要转换的，无法使用本地播放
     ];
 
     /**
@@ -641,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,26 +982,39 @@ class File extends AbstractModel
     }
 
     /**
-     * 文件推送消息
-     * @param $action
-     * @param array|null $data   发送内容
-     * @param array $userid      会员ID
+     * 根据文件类型判断是否需要安装应用
+     * @param $type
+     * @return void
      */
-    public static function filePushMsg($action, $data = null, $userid = null)
+    public static function isNeedInstallApp($type): void
     {
-        $userid = User::userid();
-        if (empty($userid)) {
-            return;
+        // 文件类型与应用的映射配置
+        $fileTypeAppMapping = [
+            // Office 应用映射
+            [
+                'types' => ['word', 'excel', 'ppt', 'docx', 'xlsx', 'pptx'],
+                'app_id' => 'office',
+                'app_name' => 'OnlyOffice'
+            ],
+            // Drawio 应用映射
+            [
+                'types' => ['drawio'],
+                'app_id' => 'drawio',
+                'app_name' => 'Drawio'
+            ],
+            // Minder 应用映射
+            [
+                'types' => ['mind'],
+                'app_id' => 'minder',
+                'app_name' => 'Minder'
+            ]
+        ];
+
+        // 遍历配置检查是否需要安装应用
+        foreach ($fileTypeAppMapping as $config) {
+            if (in_array($type, $config['types'])) {
+                Apps::isInstalledThrow($config['app_id']);
+            }
         }
-        $msg = [
-            'type' => 'file',
-            'action' => $action,
-            'data' => $data,
-        ];
-        $params = [
-            'userid' => $userid,
-            'msg' => $msg
-        ];
-        Task::deliver(new PushTask($params));
     }
 }

app/Models/FileContent.php

@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-
 use App\Module\Base;
 use App\Module\Timer;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -130,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) {
@@ -148,13 +145,34 @@ 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 ]);
     }
+
+    /**
+     * 获取文件内容
+     * @param $id
+     * @return self|null
+     */
+    public static function idOrCodeToContent($id)
+    {
+        $builder = null;
+        if (Base::isNumber($id)) {
+            $builder = FileContent::whereFid($id);
+        } elseif ($id) {
+            $fileLink = FileLink::whereCode($id)->first();
+            if ($fileLink) {
+                $builder = FileContent::whereFid($fileLink->file_id);
+            }
+        }
+        /** @var self $fileContent */
+        $fileContent = $builder?->orderByDesc('id')->first();
+        if ($fileContent) {
+            $fileContent->content = Base::json2array($fileContent->content ?: []);
+        }
+        return $fileContent;
+    }
 }

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);
@@ -221,6 +223,7 @@ class Project extends AbstractModel
                     'important' => 1
                 ], function () use ($userid) {
                     return [
+                        'important' => 1,
                         'bot' => User::isBot($userid) ? 1 : 0,
                     ];
                 });
@@ -419,29 +422,38 @@ class Project extends AbstractModel
             $hasStart = false;
             $hasEnd = false;
             $upTaskList = [];
+            $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("状态[{$name}]设置错误，状态负责人[{$nickname}]不在项目成员内");
+                    }
                 }
                 $flow = ProjectFlowItem::updateInsert([
                     'id' => $id,
                     '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,
@@ -461,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;
                     }
                 }
             }
@@ -582,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

@@ -485,7 +485,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;
                 }
@@ -617,7 +617,12 @@ class ProjectTask extends AbstractModel
                         $data['complete_at'] = false;
                     }
                 }
-                if ($newFlowItem->userids) {
+                $flowUserids = $newFlowItem->userids;
+                if ($flowUserids) {
+                    // 确认负责人在任务中
+                    $flowUserids = ProjectUser::whereProjectId($this->project_id)->whereIn('userid', $flowUserids)->pluck('userid')->toArray();
+                }
+                if ($flowUserids) {
                     // 判断自动添加负责人
                     $flowData['owner'] = $data['owner'] = $this->taskUser->where('owner', 1)->pluck('userid')->toArray();
                     if (in_array($newFlowItem->usertype, ["replace", "merge"])) {
@@ -626,14 +631,14 @@ class ProjectTask extends AbstractModel
                             $flowData['assist'] = $data['assist'] = $this->taskUser->where('owner', 0)->pluck('userid')->toArray();
                             $data['assist'] = array_merge($data['assist'], $data['owner']);
                         }
-                        $data['owner'] = $newFlowItem->userids;
+                        $data['owner'] = $flowUserids;
                         // 判断剔除模式：保留操作状态的人员
                         if ($newFlowItem->usertype == "merge") {
                             $data['owner'][] = User::userid();
                         }
                     } else {
                         // 添加模式
-                        $data['owner'] = array_merge($data['owner'], $newFlowItem->userids);
+                        $data['owner'] = array_merge($data['owner'], $flowUserids);
                     }
                     $data['owner'] = array_values(array_unique($data['owner']));
                     if (isset($data['assist'])) {
@@ -644,7 +649,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]
@@ -729,7 +734,9 @@ class ProjectTask extends AbstractModel
                     if (count($older) == 0 && count($array) == 1 && $array[0] == User::userid()) {
                         $this->addLog("认领{任务}");
                     } else {
-                        $this->addLog("修改{任务}负责人", ['userid' => $array]);
+                        if (array_merge(array_diff($array, $older), array_diff($older, $array))) {
+                            $this->addLog("修改{任务}负责人", ['userid' => $array]);
+                        }
                     }
                     $this->taskPush(array_values(array_diff($array, $older)), 0);
                 }
@@ -770,6 +777,7 @@ class ProjectTask extends AbstractModel
             if (Arr::exists($data, 'times')) {
                 $oldAt = [Carbon::parse($this->start_at), Carbon::parse($this->end_at)];
                 $oldStringAt = $this->start_at ? ($oldAt[0]->toDateTimeString() . '~' . $oldAt[1]->toDateTimeString()) : '';
+                $isOverdue = $this->overdue;
                 $clearSubTaskTime = false;
                 $this->start_at = null;
                 $this->end_at = null;
@@ -835,7 +843,20 @@ class ProjectTask extends AbstractModel
                         }
                     });
                 }
-                $newStringAt = $this->start_at && !$clearSubTaskTime ? ($this->start_at->toDateTimeString() . '~' . $this->end_at->toDateTimeString()) : '';
+                $existAt = $this->start_at && !$clearSubTaskTime;
+                $newStringAt = $existAt ? ($this->start_at->toDateTimeString() . '~' . $this->end_at->toDateTimeString()) : '';
+                if ($isOverdue) {
+                    $effectiveEndTime = $existAt ? Carbon::parse($this->end_at)->min(Carbon::now()) : Carbon::now();
+                    $this->addLog("{任务}超期未完成", [
+                        'cache' => [
+                            'task_at' => $oldStringAt,
+                            'change_at' => $newStringAt,
+                            'over_sec' => $effectiveEndTime->diffInSeconds($oldAt[1]),
+                            'owners' => $this->taskUser->where('owner', 1)->pluck('userid')->toArray(),
+                            'assists' => $this->taskUser->where('owner', 0)->pluck('userid')->toArray(),
+                        ]
+                    ]);
+                }
                 $newDesc = $desc ? "（备注：{$desc}）" : "";
                 $this->addLog("修改{任务}时间" . $newDesc, [
                     'change' => [$oldStringAt, $newStringAt]
@@ -870,6 +891,7 @@ class ProjectTask extends AbstractModel
                 }
                 // 协助人员
                 if (Arr::exists($data, 'assist')) {
+                    $older = $this->taskUser->where('owner', 0)->pluck('userid')->toArray();
                     $array = [];
                     $assist = is_array($data['assist']) ? $data['assist'] : [$data['assist']];
                     if (count($assist) > 10) {
@@ -890,7 +912,9 @@ class ProjectTask extends AbstractModel
                         $array[] = $uid;
                     }
                     if ($array) {
-                        $this->addLog("修改{任务}协助人员", ['userid' => $array]);
+                        if (array_merge(array_diff($array, $older), array_diff($older, $array))) {
+                            $this->addLog("修改{任务}协助人员", ['userid' => $array]);
+                        }
                     }
                     $rows = ProjectTaskUser::whereTaskId($this->id)->whereOwner(0)->whereNotIn('userid', $array)->get();
                     if ($rows->isNotEmpty()) {
@@ -1119,12 +1143,14 @@ class ProjectTask extends AbstractModel
      */
     public function copyTask()
     {
-        if ($this->parent_id > 0) {
-            throw new ApiException('子任务禁止复制');
+        $source = $this->fresh(['content', 'taskFile', 'taskUser']);
+        if (!$source) {
+            throw new ApiException('任务不存在');
         }
-        return AbstractModel::transaction(function() {
-            // 复制任务
-            $task = $this->replicate();
+
+        return AbstractModel::transaction(function () use ($source) {
+            // 复制任务（使用最新数据，避免复制临时字段）
+            $task = $source->replicate();
             $task->dialog_id = 0;
             $task->archived_at = null;
             $task->archived_userid = 0;
@@ -1133,21 +1159,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;
@@ -1182,6 +1208,7 @@ class ProjectTask extends AbstractModel
                     'important' => 1
                 ], function () use ($userid) {
                     return [
+                        'important' => 1,
                         'bot' => User::isBot($userid) ? 1 : 0,
                     ];
                 });
@@ -1328,6 +1355,9 @@ class ProjectTask extends AbstractModel
             $addMsg = $this->parent_id == 0 && $this->dialog_id > 0;
             if ($complete_at === null) {
                 // 标记未完成
+                if (!$this->complete_at) {
+                    return; // 本来就未完成
+                }
                 $this->complete_at = null;
                 $this->addLog("标记{任务}未完成");
                 if ($addMsg) {
@@ -1337,6 +1367,9 @@ class ProjectTask extends AbstractModel
                 }
             } else {
                 // 标记已完成
+                if ($this->complete_at) {
+                    return; // 本来就已完成
+                }
                 if ($this->parent_id == 0) {
                     if (self::whereParentId($this->id)->whereCompleteAt(null)->exists()) {
                         throw new ApiException('子任务未完成', [
@@ -1347,6 +1380,16 @@ class ProjectTask extends AbstractModel
                 if (!$this->hasOwner()) {
                     throw new ApiException('请先领取任务');
                 }
+                if ($this->overdue) {
+                    $this->addLog("{任务}超期未完成", [
+                        'cache' => [
+                            'task_at' => $this->start_at . '~' . $this->end_at,
+                            'over_sec' => Carbon::now()->diffInSeconds($this->end_at),
+                            'owners' => $this->taskUser->where('owner', 1)->pluck('userid')->toArray(),
+                            'assists' => $this->taskUser->where('owner', 0)->pluck('userid')->toArray(),
+                        ]
+                    ]);
+                }
                 if (empty($complete_name)) {
                     $complete_name = '已完成';
                 }
@@ -1393,11 +1436,12 @@ class ProjectTask extends AbstractModel
                 $this->archived_at = null;
                 $this->archived_userid = User::userid();
                 $this->archived_follow = 0;
-                $this->addLog("任务取消归档");
+                $logText = "任务取消归档";
+                $userid = 0;
             } else {
                 // 归档任务
                 if ($isAuto === true) {
-                    $logText = "自动任务归档";
+                    $logText = "任务自动归档";
                     $userid = 0;
                 } else {
                     $logText = "任务归档";
@@ -1406,13 +1450,20 @@ class ProjectTask extends AbstractModel
                 $this->archived_at = $archived_at;
                 $this->archived_userid = $userid;
                 $this->archived_follow = 0;
-                $this->addLog($logText, [], $userid);
             }
+            // 添加日志
+            $this->addLog($logText, [], $userid);
+            // 推送状态
             $this->pushMsg($archived_at === null ? 'recovery' : 'archived', [
                 'id' => $this->id,
                 'archived_at' => $this->archived_at,
                 'archived_userid' => $this->archived_userid,
             ]);
+            // 更新对话时间
+            if ($this->dialog_id > 0) {
+                WebSocketDialogUser::whereDialogId($this->dialog_id)->update(['updated_at' => Carbon::now()]);  // 因为是若提醒，可以直接使用 update 更新
+            }
+            // 更新保存
             self::whereParentId($this->id)->change([
                 'archived_at' => $this->archived_at,
                 'archived_userid' => $this->archived_userid,
@@ -1509,8 +1560,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;
@@ -1522,6 +1574,7 @@ 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();
@@ -1532,67 +1585,75 @@ class ProjectTask extends AbstractModel
         } 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;
         }
-        //
+
+        if (!Arr::exists($data, 'visibility')) {
+            $data['visibility'] = $this->visibility;
+        }
+
+        $visibility = intval($data['visibility']);
+        $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' => 1,
+                ])
+            ];
+        }
+
+        if ($assistUsers) {
+            $array[] = [
+                'userid' => $assistUsers,
+                'data' => array_merge($data, [
+                    'owner' => 0,
+                    'assist' => 1,
+                ])
+            ];
+        }
+
+        $otherUsers = [];
+        switch ($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;
+            default:
+                $otherUsers = array_diff($userids, $ownerUsers, $assistUsers);
+                break;
+        }
+
+        if ($otherUsers) {
+            $array[] = [
+                'userid' => array_values($otherUsers),
+                'data' => $data
+            ];
+        }
+
+        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',
@@ -1801,16 +1862,30 @@ class ProjectTask extends AbstractModel
      * @param int $flowItemId
      * @param array $owner
      * @param array $assist
-     * @param string $completeAt
+     * @param string|null $completed
      * @return bool
      */
-    public function moveTask(int $projectId, int $columnId,int $flowItemId = 0,array $owner = [], array $assist = [], string $completeAt='')
+    public function moveTask(int $projectId, int $columnId, int $flowItemId = 0, array $owner = [], array $assist = [], ?string $completed = null)
     {
-        AbstractModel::transaction(function () use ($projectId, $columnId, $flowItemId, $owner, $assist, $completeAt) {
+        AbstractModel::transaction(function () use ($projectId, $columnId, $flowItemId, $owner, $assist, $completed) {
             $newTaskUser =  array_merge($owner, $assist);
             //
+            $oldProject = Project::find($this->project_id);
+            $newProject = $this->project_id != $projectId ? Project::find($projectId) : $oldProject;
+            if (!$oldProject || !$newProject) {
+                throw new ApiException('项目不存在');
+            }
+            //
             $this->project_id = $projectId;
             $this->column_id = $columnId;
+            // 日志
+            $log = $this->addLog("移动{任务}", [
+                'change' => [$oldProject->name, $newProject->name]
+            ]);
+            if ($this->dialog_id) {
+                $notice = $oldProject->id != $newProject->id ? "「{$oldProject->name}」移动至「{$newProject->name}」" : $log->detail;
+                WebSocketDialogMsg::sendMsg(null, $this->dialog_id, 'notice', ['notice' => $notice], User::userid(), true, true);
+            }
             // 任务内容
             if ($this->content) {
                 $this->content->project_id = $projectId;
@@ -1844,31 +1919,90 @@ class ProjectTask extends AbstractModel
             ]);
             //
             if ($flowItemId) {
+                // 更新任务流程
                 $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 {
                     $this->completeTask(null);
                 }
             } else {
+                // 没有流程只更新状态
                 $this->flow_item_id = 0;
                 $this->flow_item_name = '';
-            }
-            //
-            if ($completeAt) {
-                $this->complete_at = $completeAt;
+                if ($completed !== null) {
+                    $this->completeTask($completed ? Carbon::now(): null);
+                }
             }
             //
             $this->save();
-            //
-            $this->addLog("移动{任务}");
         });
         $this->pushMsg('update');
         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) {
+                $descContent = Base::cutStr(Base::html2markdown($taskDesc['content'], ['strip_tags' => true]), 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

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/ProjectTaskTemplate.php

@@ -16,7 +16,7 @@ namespace App\Models;
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\Project $project
- * @property-read \App\Models\User|null $user
+ * @property-read \App\Models\User $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)

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

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Exceptions\ApiException;
+use App\Module\Base;
 use Carbon\Carbon;
 use Carbon\Traits\Creator;
 use Illuminate\Database\Eloquent\Builder;
@@ -95,6 +96,24 @@ class Report extends AbstractModel
         return $this->appendattrs['receives'];
     }
 
+    /**
+     * 获取汇报内容
+     * @param $id
+     * @return self|null
+     */
+    public static function idOrCodeToContent($id)
+    {
+        if (Base::isNumber($id)) {
+            return self::find($id);
+        } elseif ($id) {
+            $reportLink = ReportLink::whereCode($id)->first();
+            if ($reportLink) {
+                return self::find($reportLink->rid);
+            }
+        }
+        return null;
+    }
+
     /**
      * 获取单条记录
      * @param $id

app/Models/ReportLink.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Models;
+
+use App\Exceptions\ApiException;
+use App\Module\Base;
+
+/**
+ * App\Models\ReportLink
+ *
+ * @property int $id
+ * @property int|null $rid 报告ID
+ * @property int|null $num 累计访问
+ * @property string|null $code 链接码
+ * @property int|null $userid 会员ID
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\Report|null $report
+ * @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|ReportLink newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportLink newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportLink query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportLink whereCode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportLink whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportLink whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportLink whereNum($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportLink whereRid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportLink whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportLink whereUserid($value)
+ * @mixin \Eloquent
+ */
+class ReportLink extends AbstractModel
+{
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function report(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(Report::class, 'id', 'report_id');
+    }
+
+    /**
+     * 生成链接
+     * @param $rid
+     * @param $userid
+     * @param $refresh
+     * @return array
+     */
+    public static function generateLink($rid, $userid, $refresh = false)
+    {
+        $report = Report::find($rid);
+        if (empty($report)) {
+            throw new ApiException('报告不存在或已被删除');
+        }
+        if ($report->userid != $userid) {
+            if (!ReportReceive::whereRid($rid)->whereUserid($userid)->exists()) {
+                throw new ApiException('您没有权限查看该报告');
+            }
+        }
+        $reportLink = ReportLink::whereRid($rid)->whereUserid($userid)->first();
+        if (empty($reportLink)) {
+            $reportLink = ReportLink::createInstance([
+                'rid' => $rid,
+                'userid' => $userid,
+                'code' => base64_encode("{$rid},{$userid}," . Base::generatePassword()),
+            ]);
+            $reportLink->save();
+        } else {
+            if ($refresh == 'yes') {
+                $reportLink->code = base64_encode("{$rid},{$userid}," . Base::generatePassword());
+                $reportLink->save();
+            }
+        }
+        return [
+            'id' => $rid,
+            'url' => Base::fillUrl('single/report/detail/' . $reportLink->code),
+            'code' => $reportLink->code,
+            'num' => $reportLink->num
+        ];
+    }
+}

app/Models/Setting.php

@@ -2,8 +2,11 @@
 
 namespace App\Models;
 
+use App\Exceptions\ApiException;
 use App\Module\Base;
+use App\Module\Doo;
 use App\Module\Timer;
+use Carbon\Carbon;
 
 /**
  * App\Models\Setting
@@ -45,6 +48,7 @@ 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';
@@ -55,18 +59,28 @@ class Setting extends AbstractModel
                 }
                 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 'aiSetting':
+                $value['ai_provider'] = $value['ai_provider'] ?: 'openai';
+                $value['ai_api_key'] = $value['ai_api_key'] ?: '';
+                $value['ai_api_url'] = $value['ai_api_url'] ?: '';
+                $value['ai_proxy'] = $value['ai_proxy'] ?: '';
+                break;
+
+            // AI 机器人设置
             case 'aibotSetting':
                 if ($value['claude_token'] && empty($value['claude_key'])) {
                     $value['claude_key'] = $value['claude_token'];
                 }
                 $array = [];
-                $aiList = ['openai', 'claude', 'deepseek', 'gemini', 'zhipu', 'qianwen', 'wenxin'];
-                $fieldList = ['key', 'models', 'model', 'base_url', 'agency', 'temperature', 'system', 'secret'];
+                $aiList = ['openai', 'claude', 'deepseek', 'gemini', 'grok', 'ollama', 'zhipu', 'qianwen', 'wenxin'];
+                $fieldList = ['key', 'secret', 'models', 'model', 'base_url', 'agency', 'temperature', 'system'];
                 foreach ($aiList as $aiName) {
                     foreach ($fieldList as $fieldName) {
                         $key = $aiName . '_' . $fieldName;
@@ -78,12 +92,12 @@ class Setting extends AbstractModel
                                     $content = array_filter($content);
                                 }
                                 if (empty($content)) {
-                                    $content = self::AIDefaultModels($aiName);
+                                    $content = self::AIBotDefaultModels($aiName);
                                 }
                                 $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':
@@ -102,112 +116,119 @@ 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'];
+        return !!Base::settingFind('aiSetting', 'ai_api_key');
     }
 
     /**
-     * AI默认模型
+     * AI 机器人默认模型
      * @param string $ai
      * @return array
      */
-    public static function AIDefaultModels($ai = 'openai')
+    public static function AIBotDefaultModels($ai = 'openai')
     {
         return match ($ai) {
             'openai' => [
-                'gpt-4: GPT-4',
-                'gpt-4-turbo: GPT-4 Turbo',
-                'gpt-4o: GPT-4o',
-                'gpt-4o-mini: GPT-4o Mini',
-                'o1: GPT-o1',
-                'o1-mini: GPT-o1 Mini',
-                'o3-mini: GPT-o3 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'
+                '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-3-5-sonnet-latest: Claude 3.5 Sonnet',
-                'claude-3-5-sonnet-20241022: Claude 3.5 Sonnet 20241022',
-                'claude-3-5-haiku-latest: Claude 3.5 Haiku',
-                'claude-3-5-haiku-20241022: Claude 3.5 Haiku 20241022',
-                'claude-3-opus-latest: Claude 3 Opus',
-                'claude-3-opus-20240229: Claude 3 Opus 20240229',
-                'claude-3-haiku-20240307: Claude 3 Haiku 20240307',
-                'claude-2.1: Claude 2.1',
-                'claude-2.0: Claude 2.0'
+                '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'
-            ],
-            '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'
-            ],
-            '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'
+                'deepseek-chat | DeepSeek V3',
+                'deepseek-reasoner | DeepSeek R1'
             ],
             'gemini' => [
-                'gemini-2.0-flash: Gemini 2.0 Flash',
-                'gemini-2.0-flash-lite-preview-02-05: Gemini 2.0 Flash-Lite Preview',
-                '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'
+                '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'
+                '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 => [],
         };
     }
 
     /**
-     * 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 = [];
         foreach ($list as $item) {
-            list($value, $label) = explode(':', $item . ':');
-            if ($value) {
+            $arr = Base::newTrim(explode('|', $item . '|'));
+            if ($arr[0]) {
                 $array[] = [
-                    'value' => trim($value),
-                    'label' => trim($label ?: $value)
+                    'value' => $arr[0],
+                    'label' => $arr[1] ?: $arr[0]
                 ];
             }
         }
@@ -253,4 +274,36 @@ class Setting extends AbstractModel
         }
         return $array;
     }
+
+    /**
+     * 验证消息限制
+     * @param $type
+     * @param $msg
+     * @return void
+     */
+    public static function validateMsgLimit($type, $msg)
+    {
+        $keyName = 'msg_edit_limit';
+        $error = '此消息不可修改';
+        if ($type == 'rev') {
+            $keyName = 'msg_rev_limit';
+            $error = '此消息不可撤回';
+        }
+        $limitNum = intval(Base::settingFind('system', $keyName, 0));
+        if ($limitNum <= 0) {
+            return;
+        }
+        if ($msg instanceof WebSocketDialogMsg) {
+            $dialogMsg = $msg;
+        } else {
+            $dialogMsg = WebSocketDialogMsg::find($msg);
+        }
+        if (!$dialogMsg) {
+            return;
+        }
+        $limitTime = Carbon::parse($dialogMsg->created_at)->addMinutes($limitNum);
+        if ($limitTime->lt(Carbon::now())) {
+            throw new ApiException('已超过' . Doo::translate(Base::forumMinuteDay($limitNum)) . '，' . $error);
+        }
+    }
 }

app/Models/UmengAlias.php

@@ -15,6 +15,7 @@ use Hedeqiang\UMeng\IOS;
  * @property string|null $alias 别名
  * @property string|null $platform 平台类型
  * @property string|null $device 设备类型
+ * @property string|null $device_hash 设备哈希值，用于关联UserDevice表
  * @property string|null $version 应用版本号
  * @property string|null $ua userAgent
  * @property int|null $is_notified 通知权限
@@ -32,19 +33,68 @@ use Hedeqiang\UMeng\IOS;
  * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereAlias($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereDevice($value)
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereVersion($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereDeviceHash($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereIsNotified($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias wherePlatform($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUa($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUserid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereVersion($value)
  * @mixin \Eloquent
  */
 class UmengAlias extends AbstractModel
 {
     protected $table = 'umeng_alias';
 
+    private static $waitSend = [];
+
+
+    /**
+     * 推送消息
+     * @param $push
+     * @return void
+     */
+    private static function sendTask($push = null)
+    {
+        if ($push) {
+            self::$waitSend[] = $push;
+        }
+
+        if (!self::$waitSend) {
+            return;
+        }
+
+        $first = array_shift(self::$waitSend);
+        if (empty($first)) {
+            return;
+        }
+
+        try {
+            switch ($first['platform']) {
+                case 'ios':
+                    $instance = new IOS($first['config']);
+                    break;
+                case 'android':
+                    $instance = new Android($first['config']);
+                    break;
+                default:
+                    return;
+            }
+            $instance->send($first['data']);
+        } catch (\Exception $e) {
+            $first['retry'] = intval($first['retry'] ?? 0) + 1;
+            if ($first['retry'] > 3) {
+                info("[PushMsg] fail: " . $e->getMessage());
+            } else {
+                info("[PushMsg] retry ({$first['retry']}): " . $e->getMessage());
+                self::$waitSend[] = $first;
+            }
+        } finally {
+            self::sendTask();
+        }
+    }
+
     /**
      * 推送内容处理
      * @param $string
@@ -88,13 +138,13 @@ class UmengAlias extends AbstractModel
      * @param string $alias
      * @param string $platform
      * @param array $array [title, subtitle, body, description, extra, seconds, badge]
-     * @return array|false
+     * @return void
      */
-    public static function pushMsgToAlias($alias, $platform, $array)
+    private static function pushMsgToAlias($alias, $platform, $array)
     {
         $config = self::getPushConfig();
         if ($config === false) {
-            return false;
+            return;
         }
         //
         $title = self::specialCharacters($array['title'] ?: '');        // 标题
@@ -108,65 +158,71 @@ class UmengAlias extends AbstractModel
         switch ($platform) {
             case 'ios':
                 if (!isset($config['iOS'])) {
-                    return false;
+                    return;
                 }
-                $ios = new IOS($config);
-                return $ios->send([
-                    'description' => $description,
-                    'payload' => array_merge([
-                        'aps' => [
-                            'alert' => [
-                                'title' => $title,
-                                'subtitle' => $subtitle,
-                                'body' => $body,
+                self::sendTask([
+                    'platform' => $platform,
+                    'config' => $config,
+                    'data' => [
+                        'description' => $description,
+                        'payload' => array_merge([
+                            'aps' => [
+                                'alert' => [
+                                    'title' => $title,
+                                    'subtitle' => $subtitle,
+                                    'body' => $body,
+                                ],
+                                'sound' => 'default',
+                                'badge' => $badge,
                             ],
-                            'sound' => 'default',
-                            'badge' => $badge,
+                        ], $extra),
+                        'type' => 'customizedcast',
+                        'alias_type' => 'userid',
+                        'alias' => $alias,
+                        'policy' => [
+                            'expire_time' => Carbon::now()->addSeconds($seconds)->toDateTimeString(),
                         ],
-                    ], $extra),
-                    'type' => 'customizedcast',
-                    'alias_type' => 'userid',
-                    'alias' => $alias,
-                    'policy' => [
-                        'expire_time' => Carbon::now()->addSeconds($seconds)->toDateTimeString(),
-                    ],
+                    ]
                 ]);
+                break;
 
             case 'android':
                 if (!isset($config['Android'])) {
-                    return false;
+                    return;
                 }
-                $android = new Android($config);
-                return $android->send([
-                    'description' => $description,
-                    'payload' => array_merge([
-                        'display_type' => 'notification',
-                        'body' => [
-                            'ticker' => $title,
-                            'text' => $body,
-                            'title' => $title,
-                            'after_open' => 'go_app',
-                            'play_sound' => true,
+                self::sendTask([
+                    'platform' => $platform,
+                    'config' => $config,
+                    'data' => [
+                        'description' => $description,
+                        'payload' => array_merge([
+                            'display_type' => 'notification',
+                            'body' => [
+                                'ticker' => $title,
+                                'text' => $body,
+                                'title' => $title,
+                                'after_open' => 'go_app',
+                                'play_sound' => true,
+                            ],
+                        ], $extra),
+                        'type' => 'customizedcast',
+                        'alias_type' => 'userid',
+                        'alias' => $alias,
+                        'mipush' => true,
+                        'mi_activity' => 'app.eeui.umeng.activity.MfrMessageActivity',
+                        'policy' => [
+                            'expire_time' => Carbon::now()->addSeconds($seconds)->toDateTimeString(),
                         ],
-                    ], $extra),
-                    'type' => 'customizedcast',
-                    'alias_type' => 'userid',
-                    'alias' => $alias,
-                    'mipush' => true,
-                    'mi_activity' => 'app.eeui.umeng.activity.MfrMessageActivity',
-                    'policy' => [
-                        'expire_time' => Carbon::now()->addSeconds($seconds)->toDateTimeString(),
-                    ],
-                    'channel_properties' => [
-                        'vivo_category' => 'IM',
-                        'huawei_channel_importance' => 'NORMAL',
-                        'huawei_channel_category' => 'IM',
-                        'channel_fcm' => 0,
-                    ],
+                        'channel_properties' => [
+                            'oppo_channel_id' => 'dootask',
+                            'vivo_category' => 'IM',
+                            'huawei_channel_importance' => 'NORMAL',
+                            'huawei_channel_category' => 'IM',
+                            'channel_fcm' => 0,
+                        ],
+                    ]
                 ]);
-
-            default:
-                return false;
+                break;
         }
     }
 

app/Models/User.php

@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-
 use App\Exceptions\ApiException;
 use App\Module\Base;
 use App\Module\Doo;
@@ -15,15 +14,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 +36,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 语言首选项
@@ -90,7 +92,7 @@ class User extends AbstractModel
     public static $defaultAvatarMode = 'auto';
 
     // 基本信息的字段
-    public static $basicField = ['userid', 'email', 'nickname', 'profession', 'department', 'userimg', 'bot', 'az', 'pinyin', 'line_at', 'disable_at'];
+    public static $basicField = ['userid', 'email', 'nickname', 'profession', 'birthday', 'address', 'introduction', 'department', 'userimg', 'bot', 'az', 'pinyin', 'line_at', 'disable_at'];
 
     /**
      * 昵称
@@ -173,10 +175,9 @@ class User extends AbstractModel
         return UserDepartment::where('owner_userid', $this->userid)->exists();
     }
 
-
     /**
      * 获取机器人所有者
-     * @return int|mixed
+     * @return int
      */
     public function getBotOwner()
     {
@@ -184,9 +185,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;
-        });
+        }));
     }
 
     /**
@@ -242,6 +243,31 @@ class User extends AbstractModel
         return in_array('admin', $this->identity);
     }
 
+    /**
+     * 返回是否AI机器人
+     * @return bool
+     */
+    public function isAiBot(&$aiName = '')
+    {
+        if (preg_match('/^ai-(.*?)@bot\.system$/', $this->email, $matches)) {
+            $aiName = $matches[1];
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 返回是否用户机器人
+     * @return bool
+     */
+    public function isUserBot()
+    {
+        if (preg_match('/^user-(.*?)@bot\.system$/', $this->email)) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * 判断是否管理员
      */
@@ -419,7 +445,9 @@ class User extends AbstractModel
     {
         $user = self::authInfo();
         if (!$user) {
-            if (Base::token()) {
+            $token = Base::token();
+            if ($token) {
+                UserDevice::forget($token);
                 throw new ApiException('身份已失效,请重新登录', [], -1);
             } else {
                 throw new ApiException('请登录后继续...', [], -1);
@@ -441,31 +469,46 @@ class User extends AbstractModel
     private static function authInfo()
     {
         if (RequestContext::has('auth')) {
+            // 缓存
             return RequestContext::get('auth');
         }
-        if (Doo::userId() > 0
-            && !Doo::userExpired()
-            && $user = self::whereUserid(Doo::userId())->whereEmail(Doo::userEmail())->whereEncrypt(Doo::userEncrypt())->first()) {
-            $upArray = [];
-            if (Base::getIp() && $user->line_ip != Base::getIp()) {
-                $upArray['line_ip'] = Base::getIp();
-            }
-            if (Carbon::parse($user->line_at)->addSeconds(30)->lt(Carbon::now())) {
-                $upArray['line_at'] = Carbon::now();
-            }
-            $headerLanguage = RequestContext::get('header_language');
-            if (empty($user->lang) || $headerLanguage) {
-                if (Doo::checkLanguage($headerLanguage) && $user->lang != $headerLanguage) {
-                    $upArray['lang'] = $headerLanguage;
-                }
-            }
-            if ($upArray) {
-                $user->updateInstance($upArray);
-                $user->save();
-            }
-            return RequestContext::save('auth', $user);
+        if (Doo::userId() <= 0) {
+            // 没有登录
+            return RequestContext::save('auth', false);
         }
-        return RequestContext::save('auth', false);
+        if (Doo::userExpired()) {
+            // 登录过期
+            return RequestContext::save('auth', false);
+        }
+        if (!UserDevice::check()) {
+            // token 不存在
+            return RequestContext::save('auth', false);
+        }
+        $user = self::whereUserid(Doo::userId())->whereEmail(Doo::userEmail())->whereEncrypt(Doo::userEncrypt())->first();
+        if (!$user) {
+            // 登录信息不匹配
+            return RequestContext::save('auth', false);
+        }
+
+        // 更新登录信息
+        $upArray = [];
+        if (Base::getIp() && $user->line_ip != Base::getIp()) {
+            $upArray['line_ip'] = Base::getIp();
+        }
+        if (Carbon::parse($user->line_at)->addSeconds(30)->lt(Carbon::now())) {
+            $upArray['line_at'] = Carbon::now();
+        }
+        $headerLanguage = RequestContext::get('header_language');
+        if (empty($user->lang) || $headerLanguage) {
+            if (Doo::checkLanguage($headerLanguage) && $user->lang != $headerLanguage) {
+                $upArray['lang'] = $headerLanguage;
+            }
+        }
+        if ($upArray) {
+            $user->updateInstance($upArray);
+            $user->save();
+        }
+        return RequestContext::save('auth', $user);
     }
 
     /**
@@ -489,11 +532,28 @@ class User extends AbstractModel
         } else {
             $token = Doo::userToken();
         }
+        UserDevice::record($token);
         unset($userinfo->encrypt);
         unset($userinfo->password);
         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
@@ -597,6 +657,10 @@ class User extends AbstractModel
                 return url("images/avatar/default_deepseek.png");
             case 'ai-gemini@bot.system':
                 return url("images/avatar/default_gemini.png");
+            case 'ai-grok@bot.system':
+                return url("images/avatar/default_grok.png");
+            case 'ai-ollama@bot.system':
+                return url("images/avatar/default_ollama.png");
             case 'ai-zhipu@bot.system':
                 return url("images/avatar/default_zhipu.png");
             case 'bot-manager@bot.system':
@@ -676,11 +740,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;
@@ -689,17 +753,38 @@ 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;
+        });
+    }
+
+    /**
+     * 搜索用户
+     * @param $key
+     * @param $take
+     * @return User[]|\Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection|\Illuminate\Database\Query\Builder[]|\Illuminate\Support\Collection
+     */
+    public static function searchUser($key, $take = 20)
+    {
+        return User::select(User::$basicField)
+            ->where(function ($query) use ($key) {
+                if (str_contains($key, "@")) {
+                    $query->where("email", "like", "%{$key}%");
+                } else {
+                    $query->where("nickname", "like", "%{$key}%")
+                        ->orWhere("pinyin", "like", "%{$key}%")
+                        ->orWhere("profession", "like", "%{$key}%");
+                }
+            })->orderBy('userid')
+            ->take($take)
+            ->get();
     }
 }

app/Models/UserBot.php

@@ -5,10 +5,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 +22,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 +47,131 @@ 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 事件
+     *
+     * @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
+     * @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] : []);
+    }
+
+    /**
+     * 获取 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 $payload
+     * @param int $timeout
+     * @param array $context
+     * @return array|null
+     */
+    public function dispatchWebhook(string $event, array $payload, int $timeout = 30, array $context = []): ?array
+    {
+        if (!$this->shouldDispatchWebhook($event)) {
+            return null;
+        }
+
+        $payload = array_merge([
+            'event' => $event,
+            'timestamp' => time(),
+            'bot_uid' => $this->bot_id,
+            'owner_uid' => $this->userid,
+        ], $payload);
+
+        try {
+            $result = Ihttp::ihttp_post($this->webhook_url, $payload, $timeout);
+            $this->increment('webhook_num');
+            return $result;
+        } catch (Throwable $th) {
+            info(Base::array2json(array_merge($context, [
+                'bot_userid' => $this->bot_id,
+                'event' => $event,
+                'webhook_url' => $this->webhook_url,
+                'error' => $th->getMessage(),
+            ])));
+            return null;
+        }
+    }
 
     /**
      * 判断是否系统机器人
@@ -55,16 +183,6 @@ class UserBot extends AbstractModel
         return str_ends_with($email, '@bot.system') && self::systemBotName($email);
     }
 
-    /**
-     * 判断是否系统AI机器人
-     * @param $email
-     * @return bool
-     */
-    public static function isAiBot($email)
-    {
-        return str_starts_with($email, 'ai-') && self::isSystemBot($email);
-    }
-
     /**
      * 系统机器人名称
      * @param $name string 邮箱 或 邮箱前缀
@@ -84,10 +202,12 @@ class UserBot extends AbstractModel
             'ai-openai' => 'ChatGPT',
             'ai-claude' => 'Claude',
             'ai-deepseek' => 'DeepSeek',
-            'ai-wenxin' => '文心一言',
-            'ai-qianwen' => '通义千问',
             'ai-gemini' => 'Gemini',
+            'ai-grok' => 'Grok',
+            'ai-ollama' => 'Ollama',
             'ai-zhipu' => '智谱清言',
+            'ai-qianwen' => '通义千问',
+            'ai-wenxin' => '文心一言',
             'bot-manager' => '机器人管理',
             'meeting-alert' => '会议通知',
             'okr-alert' => 'OKR提醒',
@@ -105,39 +225,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[] = [
@@ -188,28 +302,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('开启新会话'),
@@ -219,6 +313,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 [];
         }
@@ -247,7 +362,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') {
@@ -259,16 +373,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;
     }
 
     /**
@@ -450,4 +562,49 @@ class UserBot extends AbstractModel
             default => [],
         };
     }
+
+    /**
+     * 创建我的机器人
+     * @param int $userid               创建人userid
+     * @param string $botName           机器人名称
+     * @param bool $sessionSupported    是否支持会话
+     * @return array
+     */
+    public static function newBot($userid, $botName, $sessionSupported = false)
+    {
+        if (User::select(['users.*'])
+                ->join('user_bots', 'users.userid', '=', 'user_bots.bot_id')
+                ->where('users.bot', 1)
+                ->where('user_bots.userid', $userid)
+                ->count() >= 50) {
+            return Base::retError("超过最大创建数量。");
+        }
+        if (strlen($botName) < 2 || strlen($botName) > 20) {
+            return Base::retError("机器人名称由2-20个字符组成。");
+        }
+        $botType = ($sessionSupported ? "user-session-" : "user-normal-") . Base::generatePassword();
+        $data = User::botGetOrCreate($botType, [
+            'nickname' => $botName
+        ], $userid);
+        if (empty($data)) {
+            return Base::retError("创建失败。");
+        }
+        $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' => '创建成功。',
+                'data' => $data,
+            ], $data->userid);
+        }
+        return Base::retSuccess("创建成功。", $data);
+    }
 }

app/Models/UserCheckinFace.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Exceptions\ApiException;
+use App\Module\Apps;
 use App\Module\Base;
 use App\Module\Ihttp;
 
@@ -37,8 +38,9 @@ use App\Module\Ihttp;
 class UserCheckinFace extends AbstractModel
 {
 
-    public static function saveFace($userid, $nickname, $faceimg, $remark='')
+    public static function saveFace($userid, $nickname, $faceimg, $remark = '')
     {
+        Apps::isInstalledThrow('face');
         // 取上传图片的URL
         $faceimg = Base::unFillUrl($faceimg);
         $record = "";
@@ -47,7 +49,7 @@ class UserCheckinFace extends AbstractModel
             $record = base64_encode(file_get_contents($faceFile));
         }
 
-        $url = 'http://' . env('APP_IPPR') . '.14' . ":7788/user";
+        $url = "http://face:7788/user";
         $data = [
             'name' => $nickname,
             'enrollid' => $userid,
@@ -59,14 +61,14 @@ class UserCheckinFace extends AbstractModel
         }
 
         $res = Ihttp::ihttp_post($url, json_encode($data), 15);
-        if($res['data'] && $data = json_decode($res['data'])){
-            if($data->ret != 1 && $data->msg){
+        if ($res['data'] && $data = json_decode($res['data'])) {
+            if ($data->ret != 1 && $data->msg) {
                 throw new ApiException($data->msg);
             }
         }
 
 
-        return AbstractModel::transaction(function() use ($userid, $faceimg, $remark) {
+        return AbstractModel::transaction(function () use ($userid, $faceimg, $remark) {
             $checkinFace = self::query()->whereUserid($userid)->first();
             if ($checkinFace) {
                 self::updateData(['id' => $checkinFace->id], [
@@ -82,27 +84,24 @@ class UserCheckinFace extends AbstractModel
                 $checkinFace->save();
             }
             if ($faceimg == '') {
-                $res = UserCheckinFace::deleteDeviceUser($userid);
-                if ($res) {
-                    return $res;
-                }
+                UserCheckinFace::deleteDeviceUser($userid);
             }
             return Base::retSuccess('设置成功');
         });
     }
 
-    public static function deleteDeviceUser($userid) {
-        $url = 'http://' . env('APP_IPPR') . '.14' . ":7788/user/delete";
+    private static function deleteDeviceUser($userid)
+    {
+        $url = "http://face:7788/user/delete";
         $data = [
             'enrollid' => $userid,
             'backupnum' => 50, // 13 删除整个用户  50 删除图片
         ];
 
         $res = Ihttp::ihttp_post($url, json_encode($data));
-        if($res['data'] && $data = json_decode($res['data'])){
-            if($data->ret != 1 && $data->msg){
+        if ($res['data'] && $data = json_decode($res['data'])) {
+            if ($data->ret != 1 && $data->msg) {
                 throw new ApiException($data->msg);
-                // return Base::retError($data->msg);
             }
         }
     }

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()
@@ -37,11 +37,6 @@ use App\Module\Base;
  */
 class UserDelete extends AbstractModel
 {
-    /**
-     * 昵称
-     * @param $value
-     * @return string
-     */
     public function getCacheAttribute($value)
     {
         if (!is_array($value)) {
@@ -65,13 +60,25 @@ class UserDelete extends AbstractModel
      */
     public static function userid2basic($userid)
     {
-        $row = self::whereUserid($userid)->first();
-        if (empty($row) || empty($row->cache)) {
-            return null;
-        }
-        $cache = $row->cache;
-        $cache = array_intersect_key($cache, array_flip(array_merge(User::$basicField, ['department_name'])));
-        $cache['delete_at'] = $row->created_at->toDateTimeString();
-        return $cache;
+        return \Cache::remember("UserDelete:{$userid}", now()->addDays(3), function () use ($userid) {
+            $row = self::whereUserid($userid)->first();
+            if (empty($row) || empty($row->cache)) {
+                return null;
+            }
+            $cache = $row->cache;
+            $cache = array_intersect_key($cache, array_flip(array_merge(User::$basicField, ['department_name'])));
+            $cache['delete_at'] = $row->created_at->toDateTimeString();
+            return $cache;
+        });
+    }
+
+    /**
+     * userid 获取 昵称
+     * @param $userid
+     * @return string
+     */
+    public static function userid2nickname($userid)
+    {
+        return self::userid2basic($userid)['nickname'] ?? '';
     }
 }

app/Models/UserDepartment.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Exceptions\ApiException;
+use Cache;
 
 /**
  * App\Models\UserDepartment
@@ -34,6 +35,21 @@ use App\Exceptions\ApiException;
  */
 class UserDepartment extends AbstractModel
 {
+    /**
+     * 获取所有父级部门
+     * @return array
+     */
+    public function parents()
+    {
+        $parents = [];
+        $parent = $this;
+        while ($parent) {
+            $parents[] = $parent;
+            $parent = $parent->parent_id ? self::find($parent->parent_id) : null;
+        }
+        return $parents;
+    }
+
     /**
      * 保存部门
      * @param $data
@@ -131,9 +147,7 @@ class UserDepartment extends AbstractModel
         });
         // 解散群组
         $dialog = WebSocketDialog::find($this->dialog_id);
-        if ($dialog) {
-            $dialog->deleteDialog();
-        }
+        $dialog?->deleteDialog();
         //
         $this->delete();
     }
@@ -155,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

@@ -0,0 +1,312 @@
+<?php
+
+namespace App\Models;
+
+use App\Module\Base;
+use App\Module\Doo;
+use App\Module\Lock;
+use Cache;
+use Carbon\Carbon;
+use DeviceDetector\DeviceDetector;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Request;
+
+/**
+ * App\Models\UserDevice
+ *
+ * @property int $id
+ * @property int|null $userid 会员ID
+ * @property string|null $hash TOKEN MD5
+ * @property string|null $detail 详细信息
+ * @property string|null $expired_at 过期时间
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read int $is_current
+ * @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|UserDevice newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDevice newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDevice onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDevice query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDevice whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDevice whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDevice whereDetail($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDevice whereExpiredAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDevice whereHash($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDevice whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDevice whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDevice whereUserid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDevice withTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDevice withoutTrashed()
+ * @mixin \Eloquent
+ */
+class UserDevice extends AbstractModel
+{
+    use SoftDeletes;
+
+    protected $table = 'user_devices';
+
+    public static int $deviceLimit = 200; // 每个用户设备限制数量
+
+    protected $appends = [
+        'is_current',
+    ];
+
+    public function getDetailAttribute($value)
+    {
+        if (is_array($value)) {
+            return $value;
+        }
+        return Base::json2array($value);
+    }
+
+    public function getIsCurrentAttribute(): int
+    {
+        return $this->hash === md5(Doo::userToken()) ? 1 : 0;
+    }
+
+    /** ****************************************************************************** */
+    /** ****************************************************************************** */
+    /** ****************************************************************************** */
+
+    /**
+     * 缓存key
+     * @param string $hash
+     * @return string
+     */
+    public static function ck(string $hash): string
+    {
+        return "user_devices:{$hash}";
+    }
+
+    /**
+     * 解析 UA 获取设备信息
+     * @param string $ua
+     * @return array
+     */
+    private static function getDeviceInfo(string $ua): array
+    {
+        $result = [
+            'ip' => Base::getIp(),
+            'type' => '电脑',
+            'os' => 'Unknown',
+            'browser' => 'Unknown',
+            'version' => '',
+
+            'app_name' => '',       // 客户端名称
+            'app_type' => '',       // 客户端类型
+            'app_version' => '',    // 客户端版本
+        ];
+
+        if (empty($ua)) {
+            return $result;
+        }
+
+        // 使用 Device-Detector 解析 UA
+        $dd = new DeviceDetector($ua);
+
+        // 解析 UA 字符串
+        $dd->parse();
+
+        // 获取客户端信息（浏览器）
+        $clientInfo = $dd->getClient();
+        if (!empty($clientInfo)) {
+            $result['browser'] = $clientInfo['name'] ?? 'Unknown';
+            $result['version'] = $clientInfo['version'] ?? '';
+        }
+
+        // 获取操作系统信息
+        $osInfo = $dd->getOs();
+        if (!empty($osInfo)) {
+            $result['os'] = trim(($osInfo['name'] ?? '') . ' ' . ($osInfo['version'] ?? ''));
+            if (empty($result['os'])) {
+                $result['os'] = 'Unknown';
+            }
+        }
+
+        if (preg_match("/android_kuaifan_eeui/i", $ua)) {
+            // Android 客户端
+            $result['app_type'] = 'Android';
+            if ($dd->getBrandName() && $dd->getModel()) {
+                // 厂商+型号
+                $result['app_name'] = $dd->getBrandName() . ' ' . $dd->getModel();
+            } elseif ($dd->getBrandName()) {
+                // 仅厂商
+                $result['app_name'] = $dd->getBrandName();
+            } elseif ($dd->isTablet()) {
+                // 平板
+                $result['app_name'] = 'Tablet';
+            } elseif ($dd->isPhablet()) {
+                // 平板
+                $result['app_name'] = 'Phablet';
+            }
+            $result['app_version'] = self::getAfterVersion($ua, 'kuaifan_eeui/');
+        } elseif (preg_match("/ios_kuaifan_eeui/i", $ua)) {
+            // iOS 客户端
+            $result['app_type'] = 'iOS';
+            if (preg_match("/(macintosh|ipad)/i", $ua)) {
+                // iPad
+                $result['app_name'] = 'iPad';
+            } elseif (preg_match("/iphone/i", $ua)) {
+                // iPhone
+                $result['app_name'] = 'iPhone';
+            }
+            $result['app_version'] = self::getAfterVersion($ua, 'kuaifan_eeui/');
+        } elseif (preg_match("/dootask/i", $ua)) {
+            // DooTask 客户端
+            $result['app_type'] = $osInfo['name'];
+            $result['app_version'] = self::getAfterVersion($ua, 'dootask/');
+        } else {
+            // 其他客户端
+            $result['app_type'] = 'Web';
+            $result['app_version'] = Base::getClientVersion();
+        }
+
+        return $result;
+    }
+
+    /**
+     * 从 ua 的 find 之后的内容获取版本号
+     * @param string $ua
+     * @param string $find
+     * @return string
+     */
+    private static function getAfterVersion(string $ua, string $find): string
+    {
+        $findPattern = preg_quote($find, '/');
+        if (preg_match("/{$findPattern}(.*?)(?:\s|$)/i", $ua, $matches)) {
+            $appInfo = $matches[1];
+
+            // 从内容中提取版本号（寻找符合x.x.x格式的部分）
+            if (preg_match("/(\d+\.\d+(?:\.\d+)*)/", $appInfo, $versionMatches)) {
+                return $versionMatches[1];
+            }
+        }
+        return '';
+    }
+
+    /** ****************************************************************************** */
+    /** ****************************************************************************** */
+    /** ****************************************************************************** */
+
+    /**
+     * 检查用户是否存在
+     * @return string|null
+     */
+    public static function check(): ?string
+    {
+        $token = Doo::userToken();
+        $userid = Doo::userId();
+
+        $hash = md5($token);
+        if (Cache::has(self::ck($hash))) {
+            return $hash;
+        }
+
+        $row = self::whereHash($hash)->first();
+        if ($row) {
+            // 判断是否过期
+            if ($row->expired_at && Carbon::parse($row->expired_at)->isPast()) {
+                self::forget($row);
+                return null;
+            }
+            // 更新缓存
+            self::record();
+            return $hash;
+        }
+        // 没有记录
+        return null;
+    }
+
+    /**
+     * 记录设备（添加、更新）
+     * @param string|null $token
+     * @return self|null
+     */
+    public static function record(string $token = null): ?self
+    {
+        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();
+
+                Cache::put(self::ck($hash), $row->userid, now()->addHour());
+                return $row;
+            });
+        });
+    }
+
+    /**
+     * 忘记设备（删除）
+     * @param UserDevice|string|int|null $token
+     * - UserDevice 表示指定的设备对象
+     * - string 表示指定的 token
+     * - int 表示指定的数据ID
+     * - null 表示当前登录的设备
+     * @return void
+     */
+    public static function forget(UserDevice|string|int $token = null): void
+    {
+        if ($token instanceof UserDevice) {
+            $hash = $token->hash;
+            $token->delete();
+        } elseif (Base::isNumber($token)) {
+            $row = self::find(intval($token));
+            if ($row) {
+                $hash = $row->hash;
+                $row->delete();
+            }
+        } else {
+            if ($token === null) {
+                $token = Doo::userToken();
+            }
+            if ($token) {
+                $hash = md5($token);
+                self::whereHash($hash)->delete();
+            }
+        }
+        if (isset($hash)) {
+            Cache::forget(self::ck($hash));
+            UmengAlias::whereDeviceHash($hash)->delete();
+        }
+    }
+}

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/WebSocketDialog.php

@@ -97,6 +97,32 @@ class WebSocketDialog extends AbstractModel
             ->whereNull('users.disable_at');
     }
 
+    /**
+     * 搜索对话
+     * @param $userid
+     * @param $key
+     * @param $take
+     * @return array
+     */
+    public static function searchDialog($userid, $key, $take = 20)
+    {
+        return 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'])
+            ->join('web_socket_dialogs as d', 'u.dialog_id', '=', 'd.id')
+            ->where('u.userid', $userid)
+            ->where(function ($query) use ($key) {
+                $query->where('d.name', 'like', '%' . $key . '%');
+            })
+            ->whereNull('d.deleted_at')
+            ->orderByDesc('u.top_at')
+            ->orderByDesc('u.last_at')
+            ->take($take)
+            ->get()
+            ->map(function($item) use ($userid) {
+                return WebSocketDialog::synthesizeData($item, $userid);
+            })
+            ->all();
+    }
 
     /**
      * 获取对话列表
@@ -298,7 +324,8 @@ class WebSocketDialog extends AbstractModel
                     $data['is_disable'] = $basic->isDisable(true);
                     $data['quick_msgs'] = UserBot::quickMsgs($basic->email);
                 } else {
-                    $data['name'] = 'non-existent';
+                    $data['name'] = UserDelete::userid2nickname($dialog_user->userid) ?: '[Delete]';
+                    $data['is_disable'] = 1;
                     $data['dialog_delete'] = 1;
                 }
                 $data['dialog_user'] = $dialog_user;
@@ -434,7 +461,8 @@ class WebSocketDialog extends AbstractModel
      */
     public function joinGroup($userid, $inviter, $important = null)
     {
-        AbstractModel::transaction(function () use ($important, $inviter, $userid) {
+        $addedUserIds = [];
+        AbstractModel::transaction(function () use ($important, $inviter, $userid, &$addedUserIds) {
             foreach (is_array($userid) ? $userid : [$userid] as $value) {
                 if ($value > 0) {
                     $updateData = [
@@ -447,12 +475,13 @@ class WebSocketDialog extends AbstractModel
                     WebSocketDialogUser::updateInsert([
                         'dialog_id' => $this->id,
                         'userid' => $value,
-                    ], $updateData, function() use ($value) {
-                        return [
-                            'bot' => User::isBot($value) ? 1 : 0,
-                        ];
+                    ], $updateData, function() use ($value, $updateData) {
+                        return array_merge($updateData, [
+                            'bot' => User::isBot($value) ? 1 : 0
+                        ]);
                     }, $isInsert);
                     if ($isInsert) {
+                        $addedUserIds[] = $value;
                         WebSocketDialogMsg::sendMsg(null, $this->id, 'notice', [
                             'notice' => User::userid2nickname($value) . " 已加入群组"
                         ], $inviter, true, true);
@@ -463,6 +492,16 @@ class WebSocketDialog extends AbstractModel
         $data = WebSocketDialog::generatePeople($this->id);
         $data['id'] = $this->id;
         $this->pushMsg("groupUpdate", $data);
+        if ($addedUserIds) {
+            $meta = ['action' => 'join'];
+            if ($inviter > 0) {
+                $actor = $this->getUserSnapshots([$inviter]);
+                if (!empty($actor)) {
+                    $meta['actor'] = $actor[0];
+                }
+            }
+            $this->dispatchMemberWebhook(UserBot::WEBHOOK_EVENT_MEMBER_JOIN, $addedUserIds, $meta);
+        }
         return true;
     }
 
@@ -476,14 +515,15 @@ class WebSocketDialog extends AbstractModel
     public function exitGroup($userid, $type = 'exit', $checkDelete = true, $pushMsg = true)
     {
         $typeDesc = $type === 'remove' ? '移出' : '退出';
-        AbstractModel::transaction(function () use ($pushMsg, $checkDelete, $typeDesc, $type, $userid) {
+        $removedUserIds = [];
+        AbstractModel::transaction(function () use ($pushMsg, $checkDelete, $typeDesc, $type, $userid, &$removedUserIds) {
             $builder = WebSocketDialogUser::whereDialogId($this->id);
             if (is_array($userid)) {
                 $builder->whereIn('userid', $userid);
             } else {
                 $builder->whereUserid($userid);
             }
-            $builder->chunkById(100, function($list) use ($pushMsg, $checkDelete, $typeDesc, $type) {
+            $builder->chunkById(100, function($list) use ($pushMsg, $checkDelete, $typeDesc, $type, &$removedUserIds) {
                 /** @var WebSocketDialogUser $item */
                 foreach ($list as $item) {
                     if ($checkDelete) {
@@ -504,6 +544,7 @@ class WebSocketDialog extends AbstractModel
                     }
                     //
                     $item->delete();
+                    $removedUserIds[] = $item->userid;
                     //
                     if ($pushMsg) {
                         if ($type === 'remove') {
@@ -522,6 +563,87 @@ class WebSocketDialog extends AbstractModel
         $data = WebSocketDialog::generatePeople($this->id);
         $data['id'] = $this->id;
         $this->pushMsg("groupUpdate", $data);
+        if ($removedUserIds) {
+            $meta = ['action' => $type];
+            $operatorId = User::userid();
+            if ($operatorId > 0) {
+                $actor = $this->getUserSnapshots([$operatorId]);
+                if (!empty($actor)) {
+                    $meta['actor'] = $actor[0];
+                }
+            }
+            $this->dispatchMemberWebhook(UserBot::WEBHOOK_EVENT_MEMBER_LEAVE, $removedUserIds, $meta);
+        }
+    }
+
+    /**
+     * 获取用户快照
+     * @param array $userIds
+     * @return array
+     */
+    protected function getUserSnapshots(array $userIds): array
+    {
+        $userIds = array_values(array_unique(array_filter($userIds)));
+        if (empty($userIds)) {
+            return [];
+        }
+        return User::whereIn('userid', $userIds)
+            ->get(['userid', 'nickname', 'email', 'bot'])
+            ->map(function (User $user) {
+                return [
+                    'userid' => $user->userid,
+                    'nickname' => $user->nickname,
+                    'email' => $user->email,
+                    'is_bot' => (bool)$user->bot,
+                ];
+            })
+            ->values()
+            ->all();
+    }
+
+    /**
+     * 推送成员事件到机器人 webhook
+     * @param string $event
+     * @param array $memberIds
+     * @param array $meta
+     * @return void
+     */
+    protected function dispatchMemberWebhook(string $event, array $memberIds, array $meta = []): void
+    {
+        $memberIds = array_values(array_unique(array_filter($memberIds)));
+        if (empty($memberIds)) {
+            return;
+        }
+
+        $botIds = $this->dialogUser()->where('bot', 1)->pluck('userid')->toArray();
+        if (empty($botIds)) {
+            return;
+        }
+
+        $userBots = UserBot::whereIn('bot_id', $botIds)->get();
+        if ($userBots->isEmpty()) {
+            return;
+        }
+
+        $members = $this->getUserSnapshots($memberIds);
+        if (empty($members)) {
+            return;
+        }
+
+        $payload = array_merge([
+            'dialog_id' => $this->id,
+            'dialog_type' => $this->type,
+            'group_type' => $this->group_type,
+            'dialog_name' => $this->getGroupName(),
+            'members' => $members,
+        ], array_filter($meta, fn ($value) => $value !== null));
+
+        foreach ($userBots as $userBot) {
+            $userBot->dispatchWebhook($event, $payload, 10, [
+                'dialog' => $this->id,
+                'event_members' => $memberIds,
+            ]);
+        }
     }
 
     /**
@@ -666,6 +788,60 @@ class WebSocketDialog extends AbstractModel
         Task::deliver($task);
     }
 
+    /**
+     * 检查是否是单人对话
+     * @return bool
+     */
+    public function isSelfDialog()
+    {
+        if ($this->type !== 'user') {
+            return false;
+        }
+        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
@@ -674,6 +850,9 @@ class WebSocketDialog extends AbstractModel
      */
     public static function checkDialog($dialog_id, $checkOwner = false)
     {
+        if ($dialog_id <= 0) {
+            throw new ApiException('参数错误');
+        }
         $dialog = WebSocketDialog::find($dialog_id);
         if (empty($dialog)) {
             throw new ApiException('对话不存在或已被删除', ['dialog_id' => $dialog_id], -4003);
@@ -687,18 +866,25 @@ class WebSocketDialog extends AbstractModel
             throw new ApiException('仅限群主操作');
         }
         //
-        if ($dialog->group_type === 'task') {
-            // 任务群对话校验是否在项目内
-            $project_id = intval(ProjectTask::whereDialogId($dialog->id)->value('project_id'));
-            if ($project_id > 0) {
-                if (ProjectUser::whereProjectId($project_id)->whereUserid($userid)->exists()) {
+        switch ($dialog->group_type) {
+            case 'project':
+            case 'task':
+                // 项目群、任务群对话校验是否在项目内
+                if ($dialog->group_type === 'project') {
+                    $projectId = intval(Project::whereDialogId($dialog->id)->value('id'));
+                } else {
+                    $projectId = intval(ProjectTask::whereDialogId($dialog->id)->value('project_id'));
+                }
+                if ($projectId > 0 && ProjectUser::whereProjectId($projectId)->whereUserid($userid)->exists()) {
                     return $dialog;
                 }
-            }
-        }
-        if ($dialog->group_type == 'okr') {
-            return $dialog;
+                break;
+
+            case 'okr':
+                // OKR群对话不用校验
+                return $dialog;
         }
+        //
         if (!WebSocketDialogUser::whereDialogId($dialog->id)->whereUserid($userid)->exists()) {
             WebSocketDialogMsgRead::forceRead($dialog_id, $userid);
             throw new ApiException('不在成员列表内', ['dialog_id' => $dialog_id], -4003);
@@ -729,6 +915,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();
@@ -765,11 +952,22 @@ 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,
+                ]);
+                $session->save();
+                $dialog->session_id = $session->id;
+                $dialog->save();
+            }
             return $dialog;
         });
     }
@@ -831,7 +1029,7 @@ class WebSocketDialog extends AbstractModel
         $data = [];
         foreach ($dialogIds as $dialog_id) {
             $dialog = WebSocketDialog::checkDialog($dialog_id);
-            //
+
             $action = $replyId > 0 ? "reply-$replyId" : "";
             $path = "uploads/chat/" . date("Ym") . "/" . $dialog_id . "/";
             if ($image64) {
@@ -845,49 +1043,52 @@ class WebSocketDialog extends AbstractModel
                 Base::makeDir(public_path($path));
                 copy($filePath, public_path($path) . basename($filePath));
             } else {
+                $setting = Base::setting("system");
                 $data = Base::upload([
                     "file" => $files,
                     "type" => 'more',
                     "path" => $path,
                     "fileName" => $fileName,
                     "quality" => true,
-                    "convertVideo" => true
+                    "convertVideo" => $setting['convert_video'] === 'open',
+                    "compressVideo" => $setting['compress_video'] === 'open',
                 ]);
             }
-            //
             if (Base::isError($data)) {
                 throw new ApiException($data['msg']);
-            } else {
-                $fileData = $data['data'];
-                $filePath = $fileData['file'];
-                $fileName = $fileData['name'];
-                $fileData['thumb'] = Base::unFillUrl($fileData['thumb']);
-                $fileData['size'] *= 1024;
-                //
-                if ($dialog->type === 'group' && $dialog->group_type === 'task') {                // 任务群组保存文件
-                    if ($imageAttachment || !in_array($fileData['ext'], File::imageExt)) {         // 如果是图片不保存
-                        $task = ProjectTask::whereDialogId($dialog->id)->first();
-                        if ($task) {
-                            $file = ProjectTaskFile::createInstance([
-                                'project_id' => $task->project_id,
-                                'task_id' => $task->id,
-                                'name' => $fileData['name'],
-                                'size' => $fileData['size'],
-                                'ext' => $fileData['ext'],
-                                'path' => $fileData['path'],
-                                'thumb' => $fileData['thumb'],
-                                'userid' => $user->userid,
-                            ]);
-                            $file->save();
-                        }
+            }
+            $fileData = $data['data'];
+            $filePath = $fileData['file'];
+            $fileName = $fileData['name'];
+            $fileData['thumb'] = Base::unFillUrl($fileData['thumb']);
+            $fileData['size'] *= 1024;
+
+            // 任务群组保存文件
+            if ($dialog->group_type === 'task') {
+                // 如果是图片不保存
+                if ($imageAttachment || !in_array($fileData['ext'], File::imageExt)) {
+                    $task = ProjectTask::whereDialogId($dialog->id)->first();
+                    if ($task) {
+                        $file = ProjectTaskFile::createInstance([
+                            'project_id' => $task->project_id,
+                            'task_id' => $task->id,
+                            'name' => $fileData['name'],
+                            'size' => $fileData['size'],
+                            'ext' => $fileData['ext'],
+                            'path' => $fileData['path'],
+                            'thumb' => $fileData['thumb'],
+                            'userid' => $user->userid,
+                        ]);
+                        $file->save();
                     }
                 }
-                //
-                $result = WebSocketDialogMsg::sendMsg($action, $dialog_id, 'file', $fileData, $user->userid);
-                if (Base::isSuccess($result)) {
-                    if (isset($task)) {
-                        $result['data']['task_id'] = $task->id;
-                    }
+            }
+
+            // 发送消息
+            $result = WebSocketDialogMsg::sendMsg($action, $dialog_id, 'file', $fileData, $user->userid);
+            if (Base::isSuccess($result)) {
+                if (isset($task)) {
+                    $result['data']['task_id'] = $task->id;
                 }
             }
         }

app/Models/WebSocketDialogConfig.php

@@ -13,7 +13,7 @@ namespace App\Models;
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\WebSocketDialog|null $dialog
- * @property-read \App\Models\User|null $user
+ * @property-read \App\Models\User $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)

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;
@@ -18,6 +20,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property int $id
  * @property int|null $dialog_id 对话ID
  * @property string|null $dialog_type 对话类型
+ * @property int|null $session_id 会话ID
  * @property int|null $userid 发送会员ID
  * @property string|null $type 消息类型
  * @property string|null $mtype 消息类型（用于搜索）
@@ -27,7 +30,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property int|null $read 已阅数量
  * @property int|null $send 发送数量
  * @property int|null $tag 标注会员ID
- * @property int|null $session_id 会话ID
  * @property int|null $todo 设为待办会员ID
  * @property int|null $link 是否存在链接
  * @property int|null $modify 是否编辑
@@ -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,24 +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);
-        $dialog->pushMsg('update', $upData);
         //
-        $retData = [
-            'add' => [],
-            'update' => $upData
-        ];
+        $addData = [];
         if ($cancel) {
             $res = self::sendMsg(null, $this->dialog_id, 'todo', [
                 'action' => 'remove',
@@ -396,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();
             }
         }
@@ -411,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)) {
@@ -426,7 +437,18 @@ class WebSocketDialogMsg extends AbstractModel
             }
         }
         //
-        return Base::retSuccess($this->todo ? '设置成功' : '取消成功', $retData);
+        $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 ? '设置成功' : '取消成功', [
+            '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'];
                     }
                 }
             }
@@ -539,10 +562,6 @@ class WebSocketDialogMsg extends AbstractModel
      */
     public function withdrawMsg()
     {
-        $send_dt = Carbon::parse($this->created_at)->addDay();
-        if ($send_dt->lt(Carbon::now())) {
-            throw new ApiException('已超过24小时，此消息不能撤回');
-        }
         AbstractModel::transaction(function() {
             $deleteRead = WebSocketDialogMsgRead::whereMsgId($this->id)->whereNull('read_at')->delete();    // 未阅读记录不需要软删除，直接删除即可
             $this->delete();
@@ -659,14 +678,25 @@ 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 '';
         if ($msgData['type'] === 'md') {
             $text = preg_replace("/:::\s*reasoning[\s\S]*?:::/", "", $text);
-            $text = Base::markdown2html($text);
-            $text = self::previewConvertTaskList($text);
+            if (preg_match('/:::\s*reasoning\s+/', $text)) {
+                return Doo::translate('思考中...');
+            }
+            $title = '';
+            if (preg_match('/^#{1,2}\s+(.+)/m', $text, $matches)) {
+                $title = trim($matches[1]);
+            }
+            if ($title) {
+                $text = $title;
+            } else {
+                $text = Base::markdown2html($text);
+                $text = self::previewConvertTaskList($text);
+            }
         }
         $text = preg_replace("/<img\s+class=\"emoticon\"[^>]*?alt=\"(\S+)\"[^>]*?>/", "[$1]", $text);
         $text = preg_replace("/<img\s+class=\"emoticon\"[^>]*?>/", "[" . Doo::translate('动画表情') . "]", $text);
@@ -764,9 +794,15 @@ class WebSocketDialogMsg extends AbstractModel
             $key = '';
             switch ($this->type) {
                 case 'text':
-                    if (!preg_match("/<span[^>]*?data-quick-key=([\"'])([^\"']+?)\\1[^>]*?>/is", $this->msg['text'])) {
-                        $key = strip_tags($this->msg['text']);
+                    if (preg_match("/<span[^>]*?data-quick-key=([\"'])([^\"']+?)\\1[^>]*?>/i", $this->msg['text'])) {
+                        break;
                     }
+                    $key = $this->msg['text'];
+                    if ($this->msg['type'] === 'md') {
+                        $key = preg_replace("/:::\s*reasoning[\s\S]*?:::/", "", $key);
+                        $key = Base::markdown2html($key);
+                    }
+                    $key = strip_tags($key);
                     break;
 
                 case 'vote':
@@ -816,6 +852,111 @@ 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":
+                // 提取文件消息
+                $msgData = Base::json2array($this->getRawOriginal('msg'));
+                $result = $this->convertMentionFormat("path", $msgData['path'], $msgData['name'], $reserves);
+                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 () {
+                        return "";
+                    },
+
+                    // 任务
+                    "/<span class=\"mention task\" data-id=\"(\d+)\">#?(.*?)<\/span>/" => function ($match) use (&$reserves) {
+                        return $this->convertMentionFormat("task", $match[1], $match[2], $reserves);
+                    },
+
+                    // 文件
+                    "/<a class=\"mention file\" href=\"([^\"']+?)\"[^>]*?>~?(.*?)<\/a>/" => function ($match) use (&$reserves) {
+                        if (preg_match("/single\/file\/(.*?)$/", $match[1], $subMatch)) {
+                            return $this->convertMentionFormat("file", $subMatch[1], $match[2], $reserves);
+                        }
+                        return "";
+                    },
+
+                    // 报告
+                    "/<a class=\"mention report\" href=\"([^\"']+?)\"[^>]*?>%?(.*?)<\/a>/" => function ($match) use (&$reserves) {
+                        if (preg_match("/single\/report\/detail\/(.*?)$/", $match[1], $subMatch)) {
+                            return $this->convertMentionFormat("report", $subMatch[1], $match[2], $reserves);
+                        }
+                        return "";
+                    },
+                ], $result);
+
+                // 转成 markdown
+                if ($this->msg['type'] !== 'md') {
+                    $result = Base::html2markdown($result);
+                }
+                break;
+
+            default:
+                // 其他类型消息不处理
+                return '';
+        }
+
+        // 处理 reserves
+        foreach ($reserves as $rand => $mention) {
+            $result = str_replace($rand, $mention, $result);
+        }
+
+        // 截取最大长度
+        if ($maxLength > 0 && mb_strlen($result) > $maxLength) {
+            $result = mb_substr($result, 0, $maxLength);
+        }
+
+        return $result;
+    }
+
+    /**
+     * 转换提及消息格式
+     * 将提及的任务、文件、报告等转换为统一的格式 [type#key#name]
+     *
+     * @param string $type 提及类型（task、file、report、path）
+     * @param string $key 提及对象的唯一标识
+     * @param string $name 提及对象的显示名称
+     * @return string 格式化后的提及字符串
+     */
+    private function convertMentionFormat($type, $key, $name, &$reserves)
+    {
+        $key = str_replace(['#', '-->'], '', $key);
+        $name = str_replace(['#', '-->'], '', $name);
+        $rand = Base::generatePassword(12);
+        $reserves[$rand] = "<!--{$type}#{$key}#{$name}-->";
+        return $rand;
+    }
+
     /**
      * 处理文本消息内容，用于发送前
      * @param $text
@@ -890,8 +1031,16 @@ class WebSocketDialogMsg extends AbstractModel
         $imageSaveLocal = Base::settingFind("system", "image_save_local");
         preg_match_all("/<img[^>]*?src=([\"'])(.*?(png|jpg|jpeg|webp|gif).*?)\\1[^>]*?>/is", $text, $matchs);
         foreach ($matchs[2] as $key => $str) {
+            $parsed = parse_url($str);
+            if (str_starts_with($parsed['path'], "/uploads/")) {
+                $relativePath = ltrim($parsed['path'], "/");
+                $relativePath = Base::thumbRestore($relativePath);
+                if (file_exists(public_path($relativePath))) {
+                    $str = "{{RemoteURL}}{$relativePath}";
+                }
+            }
             if ($imageSaveLocal === 'close') {
-                $imageSize = getimagesize($str);
+                $imageSize = @getimagesize($str);
                 if ($imageSize === false) {
                     $imageSize = ["auto", "auto"];
                 }
@@ -926,7 +1075,7 @@ class WebSocketDialogMsg extends AbstractModel
                 }
             }
         }
-        // @成员、#任务、~文件
+        // @成员、#任务、~文件、%报告
         preg_match_all("/<span\s+class=\"mention\"(.*?)>.*?<\/span>.*?<\/span>.*?<\/span>/s", $text, $matchs);
         foreach ($matchs[1] as $key => $str) {
             preg_match("/data-denotation-char=\"(.*?)\"/", $str, $matchChar);
@@ -934,6 +1083,7 @@ class WebSocketDialogMsg extends AbstractModel
             preg_match("/data-value=\"(.*?)\"/s", $str, $matchValye);
             $keyId = $matchId[1];
             if ($matchChar[1] === "~") {
+                // 文件特殊处理
                 if (Base::isNumber($keyId)) {
                     $file = File::permissionFind($keyId, User::auth());
                     if ($file->type == 'folder') {
@@ -949,6 +1099,19 @@ class WebSocketDialogMsg extends AbstractModel
                         throw new ApiException('文件分享错误');
                     }
                 }
+            } elseif ($matchChar[1] === "%") {
+                // 报告特殊处理
+                if (Base::isNumber($keyId)) {
+                    $reportLink = ReportLink::generateLink($keyId, User::userid());
+                    $keyId = $reportLink['code'];
+                } else {
+                    preg_match("/\/single\/report\/detail\/(.*?)$/i", $keyId, $match);
+                    if ($match && strlen($match[1]) >= 8) {
+                        $keyId = $match[1];
+                    } else {
+                        throw new ApiException('报告分享错误');
+                    }
+                }
             }
             $text = str_replace($matchs[0][$key], "[:{$matchChar[1]}:{$keyId}:{$matchValye[1]}:]", $text);
         }
@@ -977,31 +1140,18 @@ class WebSocketDialogMsg extends AbstractModel
         foreach ($matchs[0] as $key => $str) {
             $herf = $matchs[2][$key];
             $title = $matchs[3][$key] ?: $herf;
-            preg_match("/\/single\/file\/(.*?)$/i", strip_tags($title), $match);
-            if ($match && strlen($match[1]) >= 8) {
-                $file = File::select(['files.id', 'files.name', 'files.ext'])->join('file_links as L', 'files.id', '=', 'L.file_id')->where('L.code', $match[1])->first();
-                if ($file && $file->name) {
-                    $name = $file->ext ? "{$file->name}.{$file->ext}" : $file->name;
-                    $text = str_replace($str, "[:~:{$match[1]}:{$name}:]", $text);
-                    continue;
-                }
+            if (self::formatLink($str, strip_tags($title), $text)) {
+                continue;
             }
             $herf = base64_encode($herf);
             $title = base64_encode($title);
             $text = str_replace($str, "[:LINK:{$herf}:{$title}:]", $text);
         }
-        // 文件分享链接
+        // 分享链接
         preg_match_all("/(https?:\/\/)((\w|=|\?|\.|\/|&|-|:|\+|%|;|#|@|,|!)+)/i", $text, $matchs);
         if ($matchs) {
             foreach ($matchs[0] as $str) {
-                preg_match("/\/single\/file\/(.*?)$/i", $str, $match);
-                if ($match && strlen($match[1]) >= 8) {
-                    $file = File::select(['files.id', 'files.name', 'files.ext'])->join('file_links as L', 'files.id', '=', 'L.file_id')->where('L.code', $match[1])->first();
-                    if ($file && $file->name) {
-                        $name = $file->ext ? "{$file->name}.{$file->ext}" : $file->name;
-                        $text = str_replace($str, "[:~:{$match[1]}:{$name}:]", $text);
-                    }
-                }
+                self::formatLink($str, $str, $text);
             }
         }
         // 过滤标签
@@ -1031,10 +1181,41 @@ class WebSocketDialogMsg extends AbstractModel
         $text = preg_replace("/\[:@:(.*?):(.*?):\]/i", "<span class=\"mention user\" data-id=\"$1\">@$2</span>", $text);
         $text = preg_replace("/\[:#:(.*?):(.*?):\]/is", "<span class=\"mention task\" data-id=\"$1\">#$2</span>", $text);
         $text = preg_replace("/\[:~:(.*?):(.*?):\]/i", "<a class=\"mention file\" href=\"{{RemoteURL}}single/file/$1\" target=\"_blank\">~$2</a>", $text);
+        $text = preg_replace("/\[:%:(.*?):(.*?):\]/i", "<a class=\"mention report\" href=\"{{RemoteURL}}single/report/detail/$1\" target=\"_blank\">%$2</a>", $text);
         $text = preg_replace("/\[:QUICK:(.*?):(.*?):\]/i", "<span data-quick-key=\"$1\">$2</span>", $text);
         return preg_replace("/^(<p><\/p>)+|(<p><\/p>)+$/i", "", $text);
     }
 
+    /**
+     * 链接转换处理
+     * @param $search
+     * @param $subject
+     * @param $content
+     * @return bool
+     */
+    public static function formatLink($search, $subject, &$content)
+    {
+        $ret = false;
+        preg_match("/\/single\/file\/(.*?)$/i", $subject, $match);
+        if ($match && strlen($match[1]) >= 8) {
+            $file = File::select(['files.id', 'files.name', 'files.ext'])->join('file_links as L', 'files.id', '=', 'L.file_id')->where('L.code', $match[1])->first();
+            if ($file && $file->name) {
+                $name = $file->ext ? "{$file->name}.{$file->ext}" : $file->name;
+                $content = str_replace($search, "[:~:{$match[1]}:{$name}:]", $content);
+                $ret = true;
+            }
+        }
+        preg_match("/\/single\/report\/detail\/(.*?)$/i", $subject, $match);
+        if ($match && strlen($match[1]) >= 8) {
+            $report = Report::select(['reports.id', 'reports.title'])->join('report_links as L', 'reports.id', '=', 'L.rid')->where('L.code', $match[1])->first();
+            if ($report && $report->title) {
+                $content = str_replace($search, "[:%:{$match[1]}:{$report->title}:]", $content);
+                $ret = true;
+            }
+        }
+        return $ret;
+    }
+
     /**
      * 发送消息、修改消息
      * @param string $action            动作
@@ -1144,6 +1325,7 @@ class WebSocketDialogMsg extends AbstractModel
             }
             //
             $updateData = [
+                'type' => $type,
                 'mtype' => $mtype,
                 'link' => $link,
                 'msg' => array_merge($oldMsg, $msg),
@@ -1151,6 +1333,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,    // 修改消息时，显示会话（仅自己）
@@ -1217,6 +1400,7 @@ class WebSocketDialogMsg extends AbstractModel
                     'updated_at' => Carbon::now()->toDateTimeString('millisecond'),
                 ]);
             });
+            ProjectTaskRelation::recordMentionsFromMessage($dialogMsg);
             //
             $task = new WebSocketDialogMsgTask($dialogMsg->id);
             if ($push_self) {
@@ -1234,6 +1418,54 @@ class WebSocketDialogMsg extends AbstractModel
         }
     }
 
+    /**
+     * 批量发送消息
+     * @param User $user        发送的会员
+     * @param array $userids    接收的会员ID
+     * @param array $dialogids  接收的会话ID
+     * @param string $msgText   发送的消息
+     * @return array
+     */
+    public static function sendMsgBatch($user, $userids, $dialogids, $msgText)
+    {
+        return AbstractModel::transaction(function() use ($user, $userids, $dialogids, $msgText) {
+            $msgs = [];
+            $already = [];
+            if ($dialogids) {
+                if (!is_array($dialogids)) {
+                    $dialogids = [$dialogids];
+                }
+                foreach ($dialogids as $dialogid) {
+                    $res = WebSocketDialogMsg::sendMsg(null, $dialogid, 'text', ['text' => $msgText], $user->userid);
+                    if (Base::isSuccess($res)) {
+                        $msgs[] = $res['data'];
+                        $already[] = $dialogid;
+                    }
+                }
+            }
+            if ($userids) {
+                if (!is_array($userids)) {
+                    $userids = [$userids];
+                }
+                foreach ($userids as $userid) {
+                    if (!User::whereUserid($userid)->exists()) {
+                        continue;
+                    }
+                    $dialog = WebSocketDialog::checkUserDialog($user, $userid);
+                    if ($dialog && !in_array($dialog->id, $already)) {
+                        $res = WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => $msgText], $user->userid);
+                        if (Base::isSuccess($res)) {
+                            $msgs[] = $res['data'];
+                        }
+                    }
+                }
+            }
+            return Base::retSuccess('发送成功', [
+                'msgs' => $msgs
+            ]);
+        });
+    }
+
     /**
      * 将被@的人加入群
      * @param WebSocketDialog $dialog 对话

app/Models/WebSocketDialogSession.php

@@ -3,8 +3,8 @@
 namespace App\Models;
 
 use App\Module\Base;
-use App\Module\Extranet;
-use Swoole\Coroutine;
+use App\Tasks\UpdateSessionTitleViaAiTask;
+use Hhxsv5\LaravelS\Swoole\Task\Task;
 use Cache;
 
 /**
@@ -16,7 +16,6 @@ use Cache;
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\WebSocketDialog|null $dialog
- * @property-read \App\Models\User $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)
@@ -67,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;
@@ -83,18 +81,6 @@ class WebSocketDialogSession extends AbstractModel
         $session->title = $title;
         $session->save();
         Cache::forever($cacheKey, true);
-        // 通过AI接口更新对话标题
-        go(function () use ($session, $title, $originalTitle) {
-            Coroutine::sleep(0.1);
-            $res = Extranet::openAIGenerateTitle($originalTitle);
-            if (Base::isError($res)) {
-                return;
-            }
-            $newTitle = $res['data'];
-            if ($newTitle && $newTitle != $title) {
-                $session->title = Base::cutStr($newTitle, 100);
-                $session->save();
-            }
-        });
+        Task::deliver(new UpdateSessionTitleViaAiTask($session->id, $dialogMsg->msg['text']));
     }
 }

app/Models/WebSocketDialogUser.php

@@ -8,6 +8,7 @@ namespace App\Models;
  * @property int $id
  * @property int|null $dialog_id 对话ID
  * @property int|null $userid 会员ID
+ * @property int|null $bot 是否机器人
  * @property \Illuminate\Support\Carbon|null $top_at 置顶时间
  * @property \Illuminate\Support\Carbon|null $last_at 最后消息时间
  * @property int|null $mark_unread 是否标记为未读：0否，1是
@@ -28,6 +29,7 @@ namespace App\Models;
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser query()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereBot($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereColor($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereDialogId($value)

app/Module/AI.php

@@ -0,0 +1,933 @@
+<?php
+
+namespace App\Module;
+
+use App\Models\Setting;
+use Cache;
+use Carbon\Carbon;
+
+/**
+ * AI 助手模块
+ */
+class AI
+{
+    protected $post = [];
+    protected $headers = [];
+    protected $urlPath = '';
+    protected $timeout = 30;
+
+    /**
+     * 构造函数
+     * @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;
+    }
+
+    /**
+     * 请求 AI 接口
+     * @param bool $resRaw 是否返回原始数据
+     * @return array
+     */
+    public function request($resRaw = false)
+    {
+        $aiSetting = Base::setting('aiSetting');
+        if (!Setting::AIOpen()) {
+            return Base::retError("AI 助手未开启");
+        }
+
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Authorization' => 'Bearer ' . $aiSetting['ai_api_key'],
+        ];
+        if ($aiSetting['ai_proxy']) {
+            $headers['CURLOPT_PROXY'] = $aiSetting['ai_proxy'];
+            $headers['CURLOPT_PROXYTYPE'] = str_contains($aiSetting['ai_proxy'], 'socks') ? CURLPROXY_SOCKS5 : CURLPROXY_HTTP;
+        }
+        $headers = array_merge($headers, $this->headers);
+
+        $url = $aiSetting['ai_api_url'] ?: 'https://api.openai.com/v1';
+        $url = $url . ($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);
+    }
+
+    /** ******************************************************************************************** */
+    /** ******************************************************************************************** */
+    /** ******************************************************************************************** */
+
+    /**
+     * 通过 openAI 语音转文字
+     * @param string $filePath 语音文件路径
+     * @param array $extParams 扩展参数
+     * @param bool $noCache 是否禁用缓存
+     * @return array
+     */
+    public static function transcriptions($filePath, $extParams = [], $noCache = false)
+    {
+        if (!file_exists($filePath)) {
+            return Base::retError("语音文件不存在");
+        }
+        $systemSetting = Base::setting('system');
+        if ($systemSetting['voice2text'] !== 'open') {
+            return Base::retError("语音转文字功能未开启");
+        }
+
+        $cacheKey = "openAItranscriptions::" . md5($filePath . '_' . Base::array2json($extParams));
+        if ($noCache) {
+            Cache::forget($cacheKey);
+        }
+
+        $result = Cache::remember($cacheKey, Carbon::now()->addDays(), function () use ($extParams, $filePath) {
+            $post = array_merge($extParams, [
+                'file' => new \CURLFile($filePath),
+                'model' => 'whisper-1',
+            ]);
+            $header = [
+                'Content-Type' => 'multipart/form-data',
+            ];
+
+            $ai = new self($post, $header);
+            $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)
+    {
+        $systemSetting = Base::setting('system');
+        if ($systemSetting['translation'] !== 'open') {
+            return Base::retError("翻译功能未开启");
+        }
+
+        $cacheKey = "openAItranslations::" . md5($text . '_' . $targetLanguage);
+        if ($noCache) {
+            Cache::forget($cacheKey);
+        }
+
+        $result = Cache::remember($cacheKey, Carbon::now()->addDays(7), function () use ($text, $targetLanguage) {
+            $post = json_encode([
+                "model" => "gpt-5-nano",
+                "reasoning_effort" => "minimal",
+                "messages" => [
+                    [
+                        "role" => "system",
+                        "content" => <<<EOF
+                            你是一名资深的专业翻译专家，专门从事项目任务管理系统的多语言本地化工作。
+
+                            翻译任务：将提供的文本内容翻译为 {$targetLanguage}
+
+                            专业要求：
+                            1. 术语一致性：确保项目管理、任务管理、团队协作等专业术语的准确翻译
+                            2. 上下文理解：根据项目管理场景选择最合适的表达方式
+                            3. 格式保持：严格保持原文的格式、结构、标点符号和排版
+                            4. 语言规范：使用目标语言的标准表达，符合该语言的语法和习惯
+                            5. 专业性：体现项目管理领域的专业水准和准确性
+                            6. 简洁性：避免冗余表达，保持语言简洁明了
+
+                            注意事项：
+                            - 保留所有HTML标签、特殊符号、数字、日期格式
+                            - 对于专有名词（如软件名称、品牌名）保持原文
+                            - 确保翻译后的文本自然流畅，符合目标语言的表达习惯
+                            - 如遇到歧义表达，优先选择项目管理场景下的含义
+
+                            请直接返回翻译结果，不要包含任何解释或标记。
+                            EOF
+                    ],
+                    [
+                        "role" => "user",
+                        "content" => "请将以下内容翻译为 {$targetLanguage}：\n\n{$text}"
+                    ]
+                ],
+            ]);
+
+            $ai = new self($post);
+            $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)
+    {
+        $cacheKey = "openAIGenerateTitle::" . md5($text);
+        if ($noCache) {
+            Cache::forget($cacheKey);
+        }
+
+        $result = Cache::remember($cacheKey, Carbon::now()->addHours(24), function () use ($text) {
+            $post = json_encode([
+                "model" => "gpt-5-nano",
+                "reasoning_effort" => "minimal",
+                "messages" => [
+                    [
+                        "role" => "system",
+                        "content" => <<<EOF
+                            你是一个专业的标题生成器，专门为项目任务管理系统的对话内容生成精准、简洁的标题。
+
+                            要求：
+                            1. 标题要准确概括文本的核心内容和主要意图
+                            2. 标题长度控制在5-20个字符之间
+                            3. 语言简洁明了，避免冗余词汇
+                            4. 适合在项目管理场景中使用
+                            5. 不要包含引号或特殊符号
+                            6. 如果是技术讨论，突出技术要点
+                            7. 如果是项目管理内容，突出关键动作或目标
+                            8. 如果是需求讨论，突出需求的核心点
+
+                            请直接返回标题，不要包含任何解释或其他内容。
+                            EOF
+                    ],
+                    [
+                        "role" => "user",
+                        "content" => "请为以下内容生成一个合适的标题：\n\n" . $text
+                    ]
+                ],
+            ]);
+
+            $ai = new self($post);
+            $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 string $text 用户提供的提示词
+     * @param array $context 上下文信息
+     * @return array
+     */
+    public static function generateTask($text, $context = [])
+    {
+        // 构建上下文提示信息
+        $contextPrompt = self::buildTaskContextPrompt($context);
+
+        $post = json_encode([
+            "model" => "gpt-5-nano",
+            "reasoning_effort" => "minimal",
+            "messages" => [
+                [
+                    "role" => "system",
+                    "content" => <<<EOF
+                        你是一个专业的任务管理专家，擅长将想法和需求转化为清晰、可执行的项目任务。
+
+                        任务生成要求：
+                        1. 根据输入内容分析并生成合适的任务标题和详细描述
+                        2. 标题要简洁明了，准确概括任务核心目标，长度控制在8-30个字符
+                        3. 描述需覆盖任务背景、具体要求、交付标准、风险提示等关键信息
+                        4. 描述内容使用Markdown格式，合理组织标题、列表、加粗等结构
+                        5. 内容需适配项目管理系统，表述专业、逻辑清晰，并与用户输入语言保持一致
+                        6. 优先遵循用户在输入中给出的风格、长度或复杂度要求；默认情况下将详细描述控制在120-200字内，如用户要求简单或简短，则控制在80-120字内
+                        7. 当任务具有多个执行步骤、阶段或协作角色时，请拆解出 2-6 个关键子任务；如无必要，可返回空数组
+                        8. 子任务应聚焦单一可执行动作，名称控制在8-30个字符内，避免重复和含糊表述
+
+                        返回格式要求：
+                        必须严格按照以下 JSON 结构返回，禁止输出额外文字或 Markdown 代码块标记；即使某项为空，也保留对应字段：
+                        {
+                            "title": "任务标题",
+                            "content": "任务的详细描述内容，使用Markdown格式，根据实际情况组织结构",
+                            "subtasks": [
+                                "子任务名称1",
+                                "子任务名称2"
+                            ]
+                        }
+
+                        内容格式建议（非强制）：
+                        - 可以使用标题、列表、加粗等Markdown格式
+                        - 可以包含任务背景、具体要求、验收标准等部分
+                        - 根据任务性质灵活组织内容结构
+                        - 仅在确有必要时生成子任务，并确保每个子任务都是独立、可执行、便于追踪的动作
+                        - 若用户明确要求简洁或简单，保持描述紧凑，避免添加冗余段落或重复信息
+
+                        上下文信息处理指南：
+                        - 如果已有标题和内容，优先考虑优化改进而非完全重写
+                        - 如果使用了任务模板，严格按照模板的结构和格式要求生成
+                        - 如果已设置负责人或时间计划，在任务描述中体现相关要求
+                        - 根据优先级等级调整任务的紧急程度和详细程度
+
+                        注意事项：
+                        - 标题要体现任务的核心动作和目标
+                        - 描述要包含足够的细节让执行者理解任务
+                        - 如果涉及技术开发，要明确技术要求和实现方案
+                        - 如果涉及设计，要说明设计要求和期望效果
+                        - 如果涉及测试，要明确测试范围和验收标准
+                        EOF
+                ],
+                [
+                    "role" => "user",
+                    "content" => $contextPrompt . "\n\n请根据以上上下文并结合以下提示词生成一个完整的项目任务（包含标题和详细描述）：\n\n" . $text
+                ]
+            ],
+        ]);
+
+        $ai = new self($post);
+        $ai->setTimeout(60);
+
+        $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['title']) || !isset($parsedData['content'])) {
+            return Base::retError("任务生成格式错误", $content);
+        }
+
+        $title = trim($parsedData['title']);
+        $markdownContent = trim($parsedData['content']);
+        $rawSubtasks = $parsedData['subtasks'] ?? [];
+
+        if (empty($title) || empty($markdownContent)) {
+            return Base::retError("生成的任务标题或内容为空", $parsedData);
+        }
+
+        $subtasks = [];
+        if (is_array($rawSubtasks)) {
+            foreach ($rawSubtasks as $raw) {
+                if (is_array($raw)) {
+                    $name = trim($raw['title'] ?? $raw['name'] ?? '');
+                } else {
+                    $name = trim($raw);
+                }
+
+                if (!empty($name)) {
+                    $subtasks[] = $name;
+                }
+
+                if (count($subtasks) >= 8) {
+                    break;
+                }
+            }
+        }
+
+        return Base::retSuccess("success", [
+            'title' => $title,
+            'content' => Base::markdown2html($markdownContent),  // 将 Markdown 转换为 HTML
+            'subtasks' => $subtasks
+        ]);
+    }
+
+    /**
+     * 通过 openAI 生成项目名称与任务列表
+     * @param string $text 用户提供的提示词
+     * @param array $context 上下文信息
+     * @return array
+     */
+    public static function generateProject($text, $context = [])
+    {
+        $text = trim((string)$text);
+        if ($text === '') {
+            return Base::retError("项目提示词不能为空");
+        }
+
+        $context['current_name'] = trim($context['current_name'] ?? '');
+        $context['current_columns'] = self::normalizeProjectColumns($context['current_columns'] ?? []);
+
+        if (!empty($context['template_examples']) && is_array($context['template_examples'])) {
+            $examples = [];
+            foreach ($context['template_examples'] as $item) {
+                $name = trim($item['name'] ?? '');
+                $columns = self::normalizeProjectColumns($item['columns'] ?? []);
+                if (empty($columns)) {
+                    continue;
+                }
+                $examples[] = [
+                    'name' => $name,
+                    'columns' => $columns,
+                ];
+                if (count($examples) >= 6) {
+                    break;
+                }
+            }
+            $context['template_examples'] = $examples;
+        } else {
+            $context['template_examples'] = [];
+        }
+
+        $contextPrompt = self::buildProjectContextPrompt($context);
+
+        $post = json_encode([
+            "model" => "gpt-5-nano",
+            "reasoning_effort" => "minimal",
+            "messages" => [
+                [
+                    "role" => "system",
+                    "content" => <<<EOF
+                        你是一名资深的项目规划顾问，帮助团队快速搭建符合需求的项目。
+
+                        生成要求：
+                        1. 产出一个简洁、有辨识度的项目名称（不超过18个汉字或36个字符）
+                        2. 给出 3 - 8 个项目任务列表，用于看板列或阶段分组
+                        3. 任务列表名称保持 4 - 12 个字符，聚焦阶段或责任划分，避免冗长描述
+                        4. 结合用户描述的业务特征，必要时可包含里程碑或交付节点
+                        5. 尽量参考上下文提供的现有内容或模板，不要与之完全重复
+
+                        输出格式：
+                        必须严格返回 JSON，禁止携带额外说明或 Markdown 代码块，结构如下：
+                        {
+                            "name": "项目名称",
+                            "columns": ["列表1", "列表2", "列表3"]
+                        }
+
+                        校验标准：
+                        - 列表名称应当互不重复且语义明确
+                        - 若上下文包含已有名称或列表，请在此基础上迭代优化
+                        EOF
+                ],
+                [
+                    "role" => "user",
+                    "content" => ($contextPrompt ? $contextPrompt . "\n\n" : "") . "请根据以上信息，并结合以下提示词生成适合的项目名称和任务列表：\n\n" . $text
+                ],
+            ],
+        ]);
+
+        $ai = new self($post);
+        $ai->setTimeout(45);
+
+        $res = $ai->request();
+        if (Base::isError($res)) {
+            return Base::retError("项目生成失败", $res);
+        }
+
+        $content = $res['data'];
+        $content = preg_replace('/^\s*```json\s*/', '', $content);
+        $content = preg_replace('/\s*```\s*$/', '', $content);
+
+        if (empty($content)) {
+            return Base::retError("项目生成结果为空");
+        }
+
+        $parsedData = Base::json2array($content);
+        if (!$parsedData || !isset($parsedData['name'])) {
+            return Base::retError("项目生成格式错误", $content);
+        }
+
+        $name = trim($parsedData['name']);
+        $columns = self::normalizeProjectColumns($parsedData['columns'] ?? []);
+
+        if ($name === '') {
+            return Base::retError("生成的项目名称为空", $parsedData);
+        }
+
+        if (empty($columns)) {
+            $columns = $context['current_columns'];
+        }
+
+        return Base::retSuccess("success", [
+            'name' => $name,
+            'columns' => $columns,
+        ]);
+    }
+
+    /**
+     * 通过 openAI 生成聊天消息
+     * @param string $text 用户提供的提示词
+     * @param array $context 上下文信息
+     * @return array
+     */
+    public static function generateMessage($text, $context = [])
+    {
+        $text = trim((string)$text);
+        if ($text === '') {
+            return Base::retError("消息提示词不能为空");
+        }
+
+        $contextPrompt = self::buildMessageContextPrompt($context);
+
+        $post = json_encode([
+            "model" => "gpt-5-nano",
+            "reasoning_effort" => "minimal",
+            "messages" => [
+                [
+                    "role" => "system",
+                    "content" => <<<EOF
+                        你是一名专业的沟通助手，协助用户编写得体、清晰且具行动指向的即时消息。
+
+                        写作要求：
+                        1. 根据用户提供的需求与上下文生成完整消息，语气需符合业务沟通场景，保持真诚、礼貌且高效
+                        2. 默认使用简洁的短段落，可使用 Markdown 基础格式（加粗、列表、引用）增强结构，但不要输出代码块或 JSON
+                        3. 如果上下文包含引用信息或草稿，请在消息中自然呼应相关要点
+                        4. 如无特别说明，将消息长度控制在 60-180 字；若需更短或更长，遵循用户描述
+                        5. 如需提出行动或问题，请明确表达，避免含糊
+
+                        输出规范：
+                        - 仅返回可直接发送的消息内容
+                        - 禁止在内容前后添加额外说明、标签或引导语
+                        EOF
+                ],
+                [
+                    "role" => "user",
+                    "content" => ($contextPrompt ? $contextPrompt . "\n\n" : "") . "请根据以上信息，并结合以下提示词生成一条待发送的消息：\n\n" . $text
+                ],
+            ],
+        ]);
+
+        $ai = new self($post);
+        $ai->setTimeout(45);
+
+        $res = $ai->request();
+        if (Base::isError($res)) {
+            return Base::retError("消息生成失败", $res);
+        }
+
+        $content = trim($res['data']);
+        $content = preg_replace('/^\s*```(?:markdown|md|text)?\s*/i', '', $content);
+        $content = preg_replace('/\s*```\s*$/', '', $content);
+        $content = trim($content);
+
+        if ($content === '') {
+            return Base::retError("消息生成结果为空");
+        }
+
+        return Base::retSuccess("success", [
+            'text' => $content,
+            'html' => Base::markdown2html($content),
+        ]);
+    }
+
+    /**
+     * 构建任务生成的上下文提示信息
+     * @param array $context 上下文信息
+     * @return string
+     */
+    private static function buildTaskContextPrompt($context)
+    {
+        $prompts = [];
+
+        // 当前任务信息
+        if (!empty($context['current_title']) || !empty($context['current_content'])) {
+            $prompts[] = "## 当前任务信息";
+            if (!empty($context['current_title'])) {
+                $prompts[] = "当前标题：" . $context['current_title'];
+            }
+            if (!empty($context['current_content'])) {
+                $prompts[] = "当前内容：" . $context['current_content'];
+            }
+            $prompts[] = "请在此基础上优化改进，而不是完全重写。";
+        }
+
+        // 任务模板信息
+        if (!empty($context['template_name']) || !empty($context['template_content'])) {
+            $prompts[] = "## 任务模板要求";
+            if (!empty($context['template_name'])) {
+                $prompts[] = "模板名称：" . $context['template_name'];
+            }
+            if (!empty($context['template_content'])) {
+                $prompts[] = "模板内容结构：" . $context['template_content'];
+            }
+            $prompts[] = "请严格按照此模板的结构和格式要求生成内容。";
+        }
+
+        // 项目状态信息
+        $statusInfo = [];
+        if (!empty($context['has_owner'])) {
+            $statusInfo[] = "已设置负责人";
+        }
+        if (!empty($context['has_time_plan'])) {
+            $statusInfo[] = "已设置计划时间";
+        }
+        if (!empty($context['priority_level'])) {
+            $statusInfo[] = "优先级：" . $context['priority_level'];
+        }
+
+        if (!empty($statusInfo)) {
+            $prompts[] = "## 任务状态";
+            $prompts[] = implode("，", $statusInfo);
+            $prompts[] = "请在任务描述中体现相应的要求和约束。";
+        }
+
+        return empty($prompts) ? "" : implode("\n", $prompts);
+    }
+
+    private static function buildProjectContextPrompt($context)
+    {
+        $prompts = [];
+
+        if (!empty($context['current_name']) || !empty($context['current_columns'])) {
+            $prompts[] = "## 当前项目草稿";
+            if (!empty($context['current_name'])) {
+                $prompts[] = "已有名称：" . $context['current_name'];
+            }
+            if (!empty($context['current_columns'])) {
+                $prompts[] = "现有任务列表：" . implode("、", $context['current_columns']);
+            }
+            $prompts[] = "请在此基础上进行优化和补充。";
+        }
+
+        if (!empty($context['template_examples'])) {
+            $prompts[] = "## 常用模板示例";
+            foreach ($context['template_examples'] as $example) {
+                $line = '';
+                if (!empty($example['name'])) {
+                    $line .= $example['name'] . "：";
+                }
+                $line .= implode("、", $example['columns']);
+                $prompts[] = "- " . $line;
+            }
+            $prompts[] = "可以借鉴以上结构，但要结合用户需求生成更贴合的方案。";
+        }
+
+        return empty($prompts) ? "" : implode("\n", $prompts);
+    }
+
+    private static function buildMessageContextPrompt($context)
+    {
+        $prompts = [];
+
+        if (!empty($context['dialog_name']) || !empty($context['dialog_type']) || !empty($context['group_type'])) {
+            $prompts[] = "## 会话信息";
+            if (!empty($context['dialog_name'])) {
+                $prompts[] = "名称：" . Base::cutStr($context['dialog_name'], 60);
+            }
+            if (!empty($context['dialog_type'])) {
+                $typeMap = ['group' => '群聊', 'user' => '单聊'];
+                $prompts[] = "类型：" . ($typeMap[$context['dialog_type']] ?? $context['dialog_type']);
+            }
+            if (!empty($context['group_type'])) {
+                $prompts[] = "分类：" . Base::cutStr($context['group_type'], 60);
+            }
+        }
+
+        if (!empty($context['members']) && is_array($context['members'])) {
+            $members = array_slice(array_filter($context['members']), 0, 10);
+            if (!empty($members)) {
+                $prompts[] = "## 会话成员";
+                $prompts[] = implode("，", array_map(fn($name) => Base::cutStr($name, 30), $members));
+            }
+        }
+
+        if (!empty($context['recent_messages']) && is_array($context['recent_messages'])) {
+            $prompts[] = "## 最近消息";
+            foreach ($context['recent_messages'] as $item) {
+                $sender = Base::cutStr(trim($item['sender'] ?? ''), 40) ?: '成员';
+                $summary = Base::cutStr(trim($item['summary'] ?? ''), 120);
+                if ($summary !== '') {
+                    $prompts[] = "- {$sender}：{$summary}";
+                }
+            }
+        }
+
+        if (!empty($context['quote_summary'])) {
+            $prompts[] = "## 引用消息";
+            $quoteUser = Base::cutStr(trim($context['quote_user'] ?? ''), 40);
+            $quoteText = Base::cutStr(trim($context['quote_summary']), 200);
+            if ($quoteUser !== '') {
+                $prompts[] = "{$quoteUser}：{$quoteText}";
+            } else {
+                $prompts[] = $quoteText;
+            }
+        }
+
+        if (!empty($context['current_draft'])) {
+            $prompts[] = "## 当前草稿";
+            $prompts[] = Base::cutStr(trim($context['current_draft']), 200);
+        }
+
+        return empty($prompts) ? "" : implode("\n", $prompts);
+    }
+
+    private static function normalizeProjectColumns($columns)
+    {
+        if (is_string($columns)) {
+            $columns = preg_split('/[\n\r,，;；|]/u', $columns);
+        }
+
+        $normalized = [];
+        if (is_array($columns)) {
+            foreach ($columns as $item) {
+                if (is_array($item)) {
+                    $item = $item['name'] ?? $item['title'] ?? reset($item);
+                }
+                $item = trim((string)$item);
+                if ($item === '') {
+                    continue;
+                }
+                $item = mb_substr($item, 0, 30);
+                if (!in_array($item, $normalized)) {
+                    $normalized[] = $item;
+                }
+                if (count($normalized) >= 8) {
+                    break;
+                }
+            }
+        }
+
+        return $normalized;
+    }
+
+    /**
+     * 通过 openAI 生成职场笑话、心灵鸡汤
+     * @param bool $noCache 是否禁用缓存
+     * @return array 返回20个笑话和20个心灵鸡汤
+     */
+    public static function generateJokeAndSoup($noCache = false)
+    {
+        $cacheKey = "openAIJokeAndSoup::" . md5(date('Y-m-d'));
+        if ($noCache) {
+            Cache::forget($cacheKey);
+        }
+
+        $result = Cache::remember($cacheKey, Carbon::now()->addHours(6), function () {
+            $post = json_encode([
+                "model" => "gpt-5-nano",
+                "reasoning_effort" => "minimal",
+                "messages" => [
+                    [
+                        "role" => "system",
+                        "content" => <<<EOF
+                            你是一个专业的内容生成器。
+
+                            要求：
+                            1. 笑话要幽默风趣，适合职场环境，内容积极正面
+                            2. 心灵鸡汤要励志温暖，适合职场人士阅读
+                            3. 每个笑话和鸡汤都要简洁明了，尽量不超过100字
+                            4. 必须严格按照以下JSON格式返回，不要markdown格式，不要包含任何其他内容：
+
+                            {
+                                "jokes": [
+                                    "笑话内容1",
+                                    "笑话内容2",
+                                    ...
+                                ],
+                                "soups": [
+                                    "心灵鸡汤内容1",
+                                    "心灵鸡汤内容2",
+                                    ...
+                                ]
+                            }
+                            EOF
+                    ],
+                    [
+                        "role" => "user",
+                        "content" => "请生成20个职场笑话和20个心灵鸡汤"
+                    ]
+                ],
+            ]);
+
+            $ai = new self($post);
+            $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;
+    }
+
+    /**
+     * 获取 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']
+        ]);
+    }
+}

app/Module/Apps.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Module;
+
+use App\Exceptions\ApiException;
+use App\Services\RequestContext;
+use Symfony\Component\Yaml\Yaml;
+
+class Apps
+{
+    /**
+     * 判断应用是否已安装
+     *
+     * @param string $appId 应用ID（名称）
+     * @return bool 如果应用已安装返回 true，否则返回 false
+     */
+    public static function isInstalled(string $appId): bool
+    {
+        if ($appId === 'appstore') {
+            return true;
+        }
+
+        $key = 'app_installed_' . $appId;
+        if (RequestContext::has($key)) {
+            return RequestContext::get($key);
+        }
+
+        $configFile = base_path('docker/appstore/config/' . $appId . '/config.yml');
+        $installed = false;
+        if (file_exists($configFile)) {
+            $configData = Yaml::parseFile($configFile);
+            $installed = $configData['status'] === 'installed';
+        }
+
+        return RequestContext::save($key, $installed);
+    }
+
+    /**
+     * 判断应用是否已安装，如果未安装则抛出异常
+     * @param string $appId
+     * @return void
+     */
+    public static function isInstalledThrow(string $appId): void
+    {
+        if (!self::isInstalled($appId)) {
+            $name = match ($appId) {
+                'ai' => 'AI Robot',
+                'face' => 'Face check-in',
+                'appstore' => 'AppStore',
+                'approve' => 'Approval',
+                'office' => 'OnlyOffice',
+                'drawio' => 'Drawio',
+                'minder' => 'Minder',
+                'search' => 'ZincSearch',
+                default => $appId,
+            };
+            throw new ApiException("应用「{$name}」未安装", [], 0, false);
+        }
+    }
+}

app/Module/Base.php

@@ -9,7 +9,7 @@ use App\Services\RequestContext;
 use Cache;
 use Carbon\Carbon;
 use League\CommonMark\CommonMarkConverter;
-use League\CommonMark\Exception\CommonMarkException;
+use League\HTMLToMarkdown\HtmlConverter;
 use Overtrue\Pinyin\Pinyin;
 use Redirect;
 use Request;
@@ -351,7 +351,7 @@ class Base
     /**
      * 删除文件夹及文件夹下所有的文件
      * @param $dirName
-     * @param bool $undeleteDir 不删除文件夹（只删除文件）
+     * @param bool $undeleteDir 不删除文件夹本身（只删除文件夹里面的内容）
      */
     public static function deleteDirAndFile($dirName, $undeleteDir = false)
     {
@@ -802,16 +802,16 @@ class Base
             str_starts_with(str_replace(' ', '', $str), "data:image/")
         ) {
             return $str;
-        } else {
-            if (RequestContext::has('fill_url_remote_url')) {
-                return "{{RemoteURL}}" . $str;
-            }
-            try {
-                return url($str);
-            } catch (\Throwable) {
-                return self::getSchemeAndHost() . "/" . $str;
-            }
         }
+        if (RequestContext::has('fill_url_remote_url')) {
+            return "{{RemoteURL}}" . $str;
+        }
+        try {
+            $fillUrl = url($str);
+        } catch (\Throwable) {
+            $fillUrl = self::getSchemeAndHost() . "/" . $str;
+        }
+        return RequestContext::replaceBaseUrl($fillUrl);
     }
 
     /**
@@ -827,12 +827,19 @@ class Base
             }
             return $str;
         }
-        try {
-            $find = url('');
-        } catch (\Throwable) {
-            $find = self::getSchemeAndHost();
+        if (empty($str)) {
+            return $str;
         }
-        return Base::leftDelete($str, $find . '/');
+        $parsedUrl = parse_url($str);
+        if (isset($parsedUrl['scheme']) && isset($parsedUrl['host'])) {
+            $relativePath = $parsedUrl['path'] ?? '';
+            $relativePath = ltrim($relativePath, '/');
+            $absolutePath = public_path($relativePath);
+            if (file_exists($absolutePath) || file_exists(Base::thumbRestore($absolutePath))) {
+                return $relativePath;
+            }
+        }
+        return $str;
     }
 
     /**
@@ -1295,7 +1302,7 @@ class Base
      * 获取或设置
      * @param $setname          // 配置名称
      * @param bool $array       // 保存内容
-     * @param false $isUpdate   // 保存内容为更新模式，默认否
+     * @param bool $isUpdate    // 保存内容为更新模式，默认否
      * @return array
      */
     public static function setting($setname, $array = false, $isUpdate = false)
@@ -1397,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);
     }
 
     /**
@@ -1476,14 +1485,36 @@ class Base
     public static function forumHourDay($hour)
     {
         $hour = intval($hour);
-        if ($hour > 24) {
+        if ($hour >= 24) {
             $day = floor($hour / 24);
             $hour -= $day * 24;
-            return $day . '天' . $hour . '小时';
+            if ($hour > 0) {
+                return $day . '天' . $hour . '小时';
+            }
+            return $day . '天';
         }
         return $hour . '小时';
     }
 
+    /**
+     * 分钟转天/小时/分钟
+     * @param $minute
+     * @return string
+     */
+    public static function forumMinuteDay($minute)
+    {
+        $minute = intval($minute);
+        if ($minute >= 60) {
+            $hour = floor($minute / 60);
+            $minute -= $hour * 60;
+            if ($minute > 0) {
+                return Base::forumHourDay($hour) . $minute . '分钟';
+            }
+            return Base::forumHourDay($hour);
+        }
+        return $minute . '分钟';
+    }
+
     /**
      * 创建Carbon对象
      * @param $var
@@ -1829,12 +1860,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);
     }
 
     /**
@@ -1850,18 +1891,18 @@ class Base
             if (!in_array($extension, ['mp3', 'wav'])) {
                 return Base::retError('语音格式错误');
             }
-            $fileName = 'record_' . md5($base64) . '.' . $extension;
+            $saveName = 'record_' . md5($base64) . '.' . $extension;
             $fileDir = $param['path'];
             $filePath = public_path($fileDir);
             Base::makeDir($filePath);
-            if (file_put_contents($filePath . $fileName, base64_decode(str_replace($res[1], '', $base64)))) {
-                $fileSize = filesize($filePath . $fileName);
+            if (file_put_contents($filePath . $saveName, base64_decode(str_replace($res[1], '', $base64)))) {
+                $fileSize = filesize($filePath . $saveName);
                 $array = [
-                    "name" => $fileName,                                                //原文件名
+                    "name" => $saveName,                                                //原文件名
                     "size" => Base::twoFloat($fileSize / 1024, true),         //大小KB
-                    "file" => $filePath . $fileName,                                    //文件的完整路径                "D:\www....KzZ.jpg"
-                    "path" => $fileDir . $fileName,                                     //相对路径                     "uploads/pic....KzZ.jpg"
-                    "url" => Base::fillUrl($fileDir . $fileName),                   //完整的URL                    "https://.....hhsKzZ.jpg"
+                    "file" => $filePath . $saveName,                                    //文件的完整路径                "D:\www....KzZ.jpg"
+                    "path" => $fileDir . $saveName,                                     //相对路径                     "uploads/pic....KzZ.jpg"
+                    "url" => Base::fillUrl($fileDir . $saveName),                   //完整的URL                    "https://.....hhsKzZ.jpg"
                     "ext" => $extension,                                                //文件后缀名
                 ];
                 return Base::retSuccess('success', $array);
@@ -1872,8 +1913,23 @@ class Base
 
     /**
      * image64图片保存
-     * @param array $param [ image64=带前缀的base64, path=>文件路径, fileName=>文件名称, scale=>[压缩原图宽,高, 压缩方式], autoThumb=>false不要自动生成缩略图, 'quality'=>压缩图片质量(默认：0不压缩) ]
-     * @return array [name=>文件名, size=>文件大小(单位KB),file=>绝对地址, path=>相对地址, url=>全路径地址, ext=>文件后缀名]
+     * @param array $param [
+        image64=带前缀的base64,
+        path=>文件路径,
+        fileName=>文件名称,
+        saveName=>保存文件名称,
+        scale=>[压缩原图宽,高, 压缩方式],
+        autoThumb=>false不要自动生成缩略图,
+        quality=>压缩图片质量(默认：0不压缩)
+     ]
+     * @return array [
+        name=>文件名,
+        size=>文件大小(单位KB),
+        file=>绝对地址,
+        path=>相对地址,
+        url=>全路径地址,
+        ext=>文件后缀名
+     ]
      */
     public static function image64save($param)
     {
@@ -1884,8 +1940,8 @@ class Base
                 return Base::retError('图片格式错误');
             }
             $scaleName = "";
-            if ($param['fileName']) {
-                $fileName = basename($param['fileName']);
+            if ($param['saveName']) {
+                $saveName = basename($param['saveName']);
             } else {
                 if ($param['scale'] && is_array($param['scale'])) {
                     list($width, $height) = $param['scale'];
@@ -1896,21 +1952,21 @@ class Base
                         }
                     }
                 }
-                $fileName = 'paste_' . md5($imgBase64) . '.' . $extension;
+                $saveName = 'paste_' . md5($imgBase64) . '.' . $extension;
                 $scaleName = md5_file($imgBase64) . $scaleName . '.' . $extension;
             }
             $fileDir = $param['path'];
             $filePath = public_path($fileDir);
-            $fileFullPath = $filePath . $fileName;
+            $fileFullPath = $filePath . $saveName;
             Base::makeDir($filePath);
             if (file_put_contents($fileFullPath, base64_decode(str_replace($res[1], '', $imgBase64)))) {
                 $fileSize = filesize($fileFullPath);
                 $array = [
-                    "name" => $fileName,                                                //原文件名
+                    "name" => $param['fileName'] ?: $saveName,                      //原文件名
                     "size" => Base::twoFloat($fileSize / 1024, true),         //大小KB
                     "file" => $fileFullPath,                                            //文件的完整路径                "D:\www....KzZ.jpg"
-                    "path" => $fileDir . $fileName,                                     //相对路径                     "uploads/pic....KzZ.jpg"
-                    "url" => Base::fillUrl($fileDir . $fileName),                   //完整的URL                    "https://.....hhsKzZ.jpg"
+                    "path" => $fileDir . $saveName,                                     //相对路径                     "uploads/pic....KzZ.jpg"
+                    "url" => Base::fillUrl($fileDir . $saveName),                   //完整的URL                    "https://.....hhsKzZ.jpg"
                     "thumb" => '',                                                      //缩略图（预览图）               "https://.....hhsKzZ.jpg_thumb.jpg"
                     "width" => -1,                                                      //图片宽度
                     "height" => -1,                                                     //图片高度
@@ -1941,10 +1997,10 @@ class Base
                         // 重命名
                         if ($scaleName) {
                             $scaleName = str_replace(['{WIDTH}', '{HEIGHT}'], [$array['width'], $array['height']], $scaleName);
-                            if (rename($array['file'], Base::rightDelete($array['file'], $fileName) . $scaleName)) {
-                                $array['file'] = Base::rightDelete($array['file'], $fileName) . $scaleName;
-                                $array['path'] = Base::rightDelete($array['path'], $fileName) . $scaleName;
-                                $array['url'] = Base::rightDelete($array['url'], $fileName) . $scaleName;
+                            if (rename($array['file'], Base::rightDelete($array['file'], $saveName) . $scaleName)) {
+                                $array['file'] = Base::rightDelete($array['file'], $saveName) . $scaleName;
+                                $array['path'] = Base::rightDelete($array['path'], $saveName) . $scaleName;
+                                $array['url'] = Base::rightDelete($array['url'], $saveName) . $scaleName;
                             }
                         }
                     }
@@ -1978,12 +2034,14 @@ class Base
         file=>Request::file,
         path=>文件路径,
         fileName=>文件名称,
+        saveName=>保存文件名称,
         scale=>[压缩原图宽,高, 压缩方式],
         size=>限制大小KB,
         autoThumb=>false不要自动生成缩略图,
         chmod=>权限(默认0644),
         quality=>压缩图片质量(默认：0不压缩),
         convertVideo=>转换视频格式(默认false) ,
+        compressVideo=>压缩视频(默认false，如果转换就不压缩) ,
      ]
      * @return array [
         name=>原文件名,
@@ -2069,10 +2127,10 @@ class Base
                 }
             }
             $scaleName = "";
-            if ($param['fileName'] === true) {
-                $fileName = $file->getClientOriginalName();
-            } elseif ($param['fileName']) {
-                $fileName = basename($param['fileName']);
+            if ($param['saveName'] === true) {
+                $saveName = $file->getClientOriginalName();
+            } elseif ($param['saveName']) {
+                $saveName = basename($param['saveName']);
             } else {
                 if ($param['scale'] && is_array($param['scale'])) {
                     list($width, $height) = $param['scale'];
@@ -2083,19 +2141,19 @@ class Base
                         }
                     }
                 }
-                $fileName = md5_file($file);
+                $saveName = md5_file($file);
                 $scaleName = md5_file($file) . $scaleName;
                 if ($extension) {
-                    $fileName = $fileName . '.' . $extension;
+                    $saveName = $saveName . '.' . $extension;
                     $scaleName = $scaleName . '.' . $extension;
                 }
             }
             //
-            $file->move(public_path($param['path']), $fileName);
+            $file->move(public_path($param['path']), $saveName);
             //
-            $path = $param['path'] . $fileName;
+            $path = $param['path'] . $saveName;
             $array = [
-                "name" => $file->getClientOriginalName(),                       //原文件名
+                "name" => $param['fileName'] ?: $file->getClientOriginalName(), //原文件名
                 "size" => Base::twoFloat($fileSize / 1024, true),     //大小KB
                 "file" => public_path($path),                                   //文件的完整路径                "D:\www....KzZ.jpg"
                 "path" => $path,                                                //相对路径                     "uploads/pic....KzZ.jpg"
@@ -2141,6 +2199,7 @@ class Base
                 }
                 @shell_exec($command);
                 if (file_exists($output) && filesize($output) > 0) {
+                    // 压缩后的文件正常
                     @unlink($array['file']);
                     $array = array_merge($array, [
                         "name" => Base::rightReplace($array['name'], ".{$array['ext']}", '.mp4'),
@@ -2151,6 +2210,27 @@ class Base
                         "ext" => 'mp4',
                     ]);
                 }
+                $param['compressVideo'] = false; // 如果转换就不压缩
+            }
+            if ($param['compressVideo'] && $array['ext'] == 'mp4') {
+                // 压缩视频
+                $output = $array['file'] . '_compress';
+                $command = sprintf("ffmpeg -y -i %s -c:v libx264 -crf 28 -preset medium -c:a aac -b:a 96k %s 2>&1", escapeshellarg($array['file']), escapeshellarg($output));
+                @shell_exec($command);
+                if (file_exists($output) && filesize($output) > 0) {
+                    // 压缩后的文件正常
+                    if (filesize($output) < filesize($array['file'])) {
+                        // 小于原文件
+                        @unlink($array['file']);
+                        $array = array_merge($array, [
+                            "size" => Base::twoFloat(filesize($output) / 1024, true),
+                            "file" => $output,
+                        ]);
+                    } else {
+                        // 大于原文件
+                        @unlink($output);
+                    }
+                }
             }
             if (in_array($array['ext'], ['mov', 'webm', 'mp4'])) {
                 // 视频尺寸
@@ -2185,10 +2265,10 @@ class Base
                         // 重命名
                         if ($scaleName) {
                             $scaleName = str_replace(['{WIDTH}', '{HEIGHT}'], [$array['width'], $array['height']], $scaleName);
-                            if (rename($array['file'], Base::rightDelete($array['file'], $fileName) . $scaleName)) {
-                                $array['file'] = Base::rightDelete($array['file'], $fileName) . $scaleName;
-                                $array['path'] = Base::rightDelete($array['path'], $fileName) . $scaleName;
-                                $array['url'] = Base::rightDelete($array['url'], $fileName) . $scaleName;
+                            if (rename($array['file'], Base::rightDelete($array['file'], $saveName) . $scaleName)) {
+                                $array['file'] = Base::rightDelete($array['file'], $saveName) . $scaleName;
+                                $array['path'] = Base::rightDelete($array['path'], $saveName) . $scaleName;
+                                $array['url'] = Base::rightDelete($array['url'], $saveName) . $scaleName;
                             }
                         }
                     }
@@ -2513,22 +2593,37 @@ class Base
     /**
      * 中文转拼音
      * @param $str
+     * @param $delim
      * @return string
      */
-    public static function cn2pinyin($str)
+    public static function cn2pinyin($str, $delim = '')
     {
         if (empty($str)) {
             return '';
         }
         if (!preg_match("/^[a-zA-Z0-9_.]+$/", $str)) {
-            $str = Cache::rememberForever("cn2pinyin:" . md5($str), function() use ($str) {
+            $str = Cache::rememberForever("cn2pinyin:" . md5($str . '_' . $delim), function () use ($delim, $str) {
                 $pinyin = new Pinyin();
-                return $pinyin->permalink($str, '');
+                return $pinyin->permalink($str, $delim);
             });
         }
         return $str;
     }
 
+    /**
+     * 驼峰转下划线
+     * @param $str
+     * @return string
+     */
+    public static function camel2snake($str)
+    {
+        if (empty($str)) {
+            return '';
+        }
+        $str = preg_replace('/([a-z])([A-Z])/', '$1_$2', $str);
+        return strtolower($str);
+    }
+
     /**
      * 缓存数据
      * @param $name
@@ -2955,11 +3050,84 @@ class Base
      */
     public static function markdown2html($markdown)
     {
-        $converter = new CommonMarkConverter();
         try {
-            return $converter->convert($markdown);
-        } catch (CommonMarkException $e) {
+            $converter = new CommonMarkConverter();
+            return $converter->convert($markdown)->getContent();
+        } catch (\League\CommonMark\Exception\CommonMarkException $e) {
             return $markdown;
         }
     }
+
+    /**
+     * html 转 MD(markdown)
+     * @param $html
+     * @param array $options
+     * @return mixed|string
+     */
+    public static function html2markdown($html, $options = [])
+    {
+        try {
+            $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,72 +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* 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;
     }
 
     /**
@@ -76,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();
     }
 
     /**
@@ -138,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);
     }
 
     /**
@@ -166,7 +87,7 @@ class Doo
      */
     public static function userId(): int
     {
-        return intval(self::doo()->userId());
+        return self::load()->userId();
     }
 
     /**
@@ -175,18 +96,16 @@ class Doo
      */
     public static function userExpired(): bool
     {
-        $expiredAt = self::userExpiredAt();
-        return $expiredAt && Carbon::parse($expiredAt)->isBefore(Carbon::now());
+        return self::load()->userExpired();
     }
 
     /**
      * token过期时间（来自请求的token）
-     * @return string
+     * @return string|null
      */
-    public static function userExpiredAt(): string
+    public static function userExpiredAt(): ?string
     {
-        $expiredAt = self::string(self::doo()->userExpiredAt());
-        return $expiredAt === 'forever' ? '' : $expiredAt;
+        return self::load()->userExpiredAt();
     }
 
     /**
@@ -195,7 +114,7 @@ class Doo
      */
     public static function userEmail(): string
     {
-        return self::string(self::doo()->userEmail());
+        return self::load()->userEmail();
     }
 
     /**
@@ -204,7 +123,7 @@ class Doo
      */
     public static function userEncrypt(): string
     {
-        return self::string(self::doo()->userEncrypt());
+        return self::load()->userEncrypt();
     }
 
     /**
@@ -213,7 +132,7 @@ class Doo
      */
     public static function userToken(): string
     {
-        return self::string(self::doo()->userToken());
+        return self::load()->userToken();
     }
 
     /**
@@ -224,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);
     }
 
     /**
@@ -253,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);
     }
 
     /**
@@ -263,38 +166,42 @@ class Doo
      */
     public static function tokenDecode($token): array
     {
-        return Base::json2array(self::string(self::doo()->tokenDecode($token)));
+        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" => "简体中文",
@@ -331,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);
     }
 
     /**
@@ -340,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();
     }
 
     /**
@@ -356,7 +256,16 @@ class Doo
      */
     public static function dooSN(): string
     {
-        return self::string(self::doo()->dooSN());
+        return self::load()->dooSN();
+    }
+
+    /**
+     * 获取当前版本
+     * @return string
+     */
+    public static function dooVersion(): string
+    {
+        return self::load()->dooVersion();
     }
 
     /**
@@ -368,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);
     }
 
     /**
@@ -379,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);
     }
 
     /**
@@ -395,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);
     }
 
     /**
@@ -411,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);
     }
 
     /**
@@ -425,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);
     }
 
     /**
@@ -437,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);
     }
 
     /**
@@ -464,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,266 +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
-     * @return array
-     */
-    public static function openAItranscriptions($filePath)
-    {
-        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'];
-            if (str_contains($aibotSetting['openai_agency'], 'socks')) {
-                $extra['CURLOPT_PROXYTYPE'] = CURLPROXY_SOCKS5;
-            } else {
-                $extra['CURLOPT_PROXYTYPE'] = CURLPROXY_HTTP;
-            }
-        }
-        $res = Ihttp::ihttp_request('https://api.openai.com/v1/audio/transcriptions', [
-            'file' => new \CURLFile($filePath),
-            'model' => 'whisper-1'
-        ], $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']);
-    }
-
-    /**
-     * 通过 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'];
-            if (str_contains($aibotSetting['openai_agency'], 'socks')) {
-                $extra['CURLOPT_PROXYTYPE'] = CURLPROXY_SOCKS5;
-            } else {
-                $extra['CURLOPT_PROXYTYPE'] = CURLPROXY_HTTP;
-            }
-        }
-        $res = Ihttp::ihttp_request('https://api.openai.com/v1/chat/completions', json_encode([
-            "model" => "gpt-3.5-turbo",
-            "messages" => [
-                [
-                    "role" => "system",
-                    "content" => "你是一个专业的翻译器，翻译的结果尽量符合“项目任务管理系统”的使用，并且翻译的结果不用额外添加换行尽量保持原格式，将提供的文本翻译成“{$targetLanguage}”语言。"
-                ],
-                [
-                    "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);
-    }
-
-    /**
-     * 通过 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'];
-            if (str_contains($aibotSetting['openai_agency'], 'socks')) {
-                $extra['CURLOPT_PROXYTYPE'] = CURLPROXY_SOCKS5;
-            } else {
-                $extra['CURLOPT_PROXYTYPE'] = CURLPROXY_HTTP;
-            }
-        }
-        $res = Ihttp::ihttp_request('https://api.openai.com/v1/chat/completions', json_encode([
-            "model" => "gpt-3.5-turbo",
-            "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);
-    }
-
-    /**
-     * 获取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）
@@ -319,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/Module/MsgTool.php

@@ -25,11 +25,23 @@ class MsgTool
         }
 
         $isMd = strtolower($type) === 'md';
+        $placeholders = [];
 
-        // 如果是Markdown，转换为HTML
+        // 如果是Markdown，先处理特殊标记及转换为HTML
         if ($isMd) {
-            $converter = new CommonMarkConverter();
+            // 处理特殊标记
+            $pattern = '/:::\s*reasoning\s+(.*?)\s*:::/s';
+            $counter = 0;
+            $text = preg_replace_callback($pattern, function($matches) use ($type, $length, &$placeholders, &$counter) {
+                // 使用更简短的占位符，避免被markdown解析
+                $placeholder = "@PH::{$counter}::PH@";
+                $placeholders[$placeholder] = "::: reasoning\n" . self::truncateText($matches[1], $length, $type) . "\n:::";
+                $counter++;
+                return $placeholder;
+            }, $text);
+            // 转换为HTML
             try {
+                $converter = new CommonMarkConverter();
                 $text = $converter->convert($text);
             } catch (CommonMarkException) {
                 return "";
@@ -50,10 +62,26 @@ class MsgTool
         // 递归函数来遍历节点并截取内容
         self::traverseNodes($body, $currentLength, $length, $truncatedHtml);
 
-        // 如果是Markdown，转换回Markdown
+        // 如果是Markdown，转换回Markdown及还原特殊标记
         if ($isMd) {
-            $converter = new HtmlConverter();
-            $truncatedHtml = $converter->convert($truncatedHtml);
+            // 转换回Markdown
+            try {
+                $converter = new HtmlConverter();
+                $truncatedHtml = $converter->convert($truncatedHtml);
+            } catch (\Exception) {
+                return "";
+            }
+            // 还原特殊标记
+            if (!empty($placeholders)) {
+                $truncatedHtml = preg_replace('/@P?H?:*\s*$/', '', $truncatedHtml);
+                $preCount = substr_count($truncatedHtml, '@PH::');
+                $sufCount = substr_count($truncatedHtml, '::PH@');
+                $diffCount = $preCount - $sufCount;
+                if ($diffCount > 0) {
+                    $truncatedHtml .= str_repeat('::PH@', $diffCount);
+                }
+                $truncatedHtml = strtr($truncatedHtml, $placeholders);
+            }
         }
 
         return $truncatedHtml;

app/Module/TextExtractor.php

@@ -0,0 +1,259 @@
+<?php
+
+namespace App\Module;
+
+use Exception;
+use PhpOffice\PhpWord\IOFactory as WordIOFactory;
+use PhpOffice\PhpSpreadsheet\IOFactory as SpreadsheetIOFactory;
+use PhpOffice\PhpPresentation\IOFactory as PresentationIOFactory;
+use Illuminate\Support\Facades\File as FileFacade;
+
+
+class TextExtractor
+{
+    private string $filePath;
+    private string $fileMimeType;
+    private string $fileExtension;
+
+    /**
+     * @param string $filePath
+     * @throws Exception
+     */
+    public function __construct(string $filePath)
+    {
+        if (!file_exists($filePath)) {
+            throw new Exception("File does not exist: {$filePath}");
+        }
+        $this->filePath = $filePath;
+        $this->fileMimeType = FileFacade::mimeType($filePath);
+        $this->fileExtension = $this->detectFileType();
+    }
+
+    /**
+     * 从文件中提取文本
+     * @return string
+     * @throws Exception
+     */
+    public function extractContent(): string
+    {
+        return match ($this->fileExtension) {
+            // Word文档
+            'docx' => $this->parseWordDocument(),
+
+            // Excel文档
+            'xlsx', 'xls', 'csv' => $this->parseSpreadsheet(),
+
+            // PowerPoint文档
+            'ppt', 'pptx' => $this->parsePresentation(),
+
+            // PDF文档
+            'pdf' => $this->parsePdf(),
+
+            // RTF文档
+            'rtf' => $this->parseRtf(),
+
+            // 其他文本文件
+            default => $this->parseOther(),
+        };
+    }
+
+    /**
+     * 获取文件类型
+     * @return string
+     */
+    private function detectFileType(): string
+    {
+        return match ($this->fileMimeType) {
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'docx',
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'xlsx',
+            'application/vnd.ms-excel' => 'xls',
+            'text/csv', 'application/csv' => 'csv',
+            'application/vnd.ms-powerpoint' => 'ppt',
+            'application/vnd.openxmlformats-officedocument.presentationml.presentation' => 'pptx',
+            'application/pdf' => 'pdf',
+            'application/rtf', 'text/rtf' => 'rtf',
+            default => strtolower(pathinfo($this->filePath, PATHINFO_EXTENSION)),
+        };
+    }
+
+    /**
+     * Parse Word documents (.doc, .docx)
+     * @return string
+     */
+    private function parseWordDocument(): string
+    {
+        $phpWord = WordIOFactory::load($this->filePath);
+        $text = '';
+
+        // Extract text from each section
+        foreach ($phpWord->getSections() as $section) {
+            foreach ($section->getElements() as $element) {
+                if (method_exists($element, 'getText')) {
+                    $text .= $element->getText() . "\n";
+                } elseif (method_exists($element, 'getElements')) {
+                    foreach ($element->getElements() as $childElement) {
+                        if (method_exists($childElement, 'getText')) {
+                            $text .= $childElement->getText() . "\n";
+                        }
+                    }
+                }
+            }
+        }
+
+        return $text;
+    }
+
+    /**
+     * Parse spreadsheet files (.xlsx, .xls, .csv)
+     * @return string
+     */
+    private function parseSpreadsheet(): string
+    {
+        $spreadsheet = SpreadsheetIOFactory::load($this->filePath);
+        $text = '';
+
+        // Extract text from all worksheets
+        foreach ($spreadsheet->getWorksheetIterator() as $worksheet) {
+            $text .= 'Worksheet: ' . $worksheet->getTitle() . "\n";
+
+            foreach ($worksheet->getRowIterator() as $row) {
+                $cellIterator = $row->getCellIterator();
+                $cellIterator->setIterateOnlyExistingCells(false);
+                $rowText = '';
+
+                foreach ($cellIterator as $cell) {
+                    $value = $cell->getValue();
+                    if (!empty($value)) {
+                        $rowText .= $value . "\t";
+                    }
+                }
+
+                if (!empty(trim($rowText))) {
+                    $text .= trim($rowText) . "\n";
+                }
+            }
+
+            $text .= "\n";
+        }
+
+        return $text;
+    }
+
+    /**
+     * Parse presentation files (.ppt, .pptx)
+     * @return string
+     * @throws Exception
+     */
+    private function parsePresentation(): string
+    {
+        $presentation = PresentationIOFactory::load($this->filePath);
+        $text = '';
+
+        // Extract text from all slides
+        foreach ($presentation->getAllSlides() as $slide) {
+            foreach ($slide->getShapeCollection() as $shape) {
+                if ($shape instanceof \PhpOffice\PhpPresentation\Shape\RichText) {
+                    foreach ($shape->getParagraphs() as $paragraph) {
+                        foreach ($paragraph->getRichTextElements() as $element) {
+                            $text .= $element->getText();
+                        }
+                        $text .= "\n";
+                    }
+                }
+            }
+            $text .= "\n";
+        }
+
+        return $text;
+    }
+
+    /**
+     * Parse PDF files (requires additional library like Smalot\PdfParser)
+     * @return string
+     * @throws Exception
+     */
+    private function parsePdf(): string
+    {
+        // You'll need to install the Smalot PDF Parser: composer require smalot/pdfparser
+        if (!class_exists('\Smalot\PdfParser\Parser')) {
+            throw new \Exception("PDF Parser not available. Install with: composer require smalot/pdfparser");
+        }
+
+        $parser = new \Smalot\PdfParser\Parser();
+        $pdf = $parser->parseFile($this->filePath);
+        return $pdf->getText();
+    }
+
+    /**
+     * Parse RTF files
+     * @return string
+     */
+    private function parseRtf(): string
+    {
+        // Simple RTF to text conversion
+        $content = file_get_contents($this->filePath);
+
+        // Remove RTF control words and groups
+        $content = preg_replace('/\\\\([a-z]{1,32})(-?[0-9]{1,10})?[ ]?/i', '', $content);
+        $content = preg_replace('/\\\\([^a-z]|[a-z]{33,})/i', '', $content);
+        $content = preg_replace('/\{\*?\\\\[^{}]*\}/', '', $content);
+        $content = preg_replace('/\{[\r\n]*\}/', '', $content);
+
+        // Convert special characters
+        $content = preg_replace('/\\\\\'([0-9a-f]{2})/i', '', $content);
+
+        // Remove remaining curly braces
+        $content = str_replace(['{', '}'], '', $content);
+
+        return $content ?: '';
+    }
+
+    /**
+     * Parse Other(text) files
+     * @return string
+     * @throws Exception
+     */
+    private function parseOther(): string
+    {
+        $isBinary = !str_contains($this->fileMimeType, 'text/')
+            && !str_contains($this->fileMimeType, 'application/json')
+            && !str_contains($this->fileMimeType, 'application/xml');
+
+        if ($isBinary) {
+            throw new Exception("Unable to read the text content of this type of file");
+        }
+
+        return file_get_contents($this->filePath);
+    }
+
+    /** ********************************************************************* */
+    /** ********************************************************************* */
+    /** ********************************************************************* */
+
+    /**
+     * 获取文件内容
+     * @param $filePath
+     * @param int $fileMaxSize      最大文件大小，单位字节，默认1024KB
+     * @param int $contentMaxSize   最大内容大小，单位字节，默认300KB
+     * @return array
+     */
+    public static function extractFile($filePath, int $fileMaxSize = 1024, int $contentMaxSize = 300): array
+    {
+        if (!file_exists($filePath) || !is_file($filePath)) {
+            return Base::retError("Failed to read contents of {$filePath}");
+        }
+        if (filesize($filePath) > $fileMaxSize * 1024) {
+            return Base::retError("File size exceeds " . Base::readableBytes($fileMaxSize * 1024) . ", unable to display content");
+        }
+        try {
+            $extractor = new self($filePath);
+            $content = $extractor->extractContent();
+            if (strlen($content) > $contentMaxSize * 1024) {
+                return Base::retError("Content size exceeds " . Base::readableBytes($contentMaxSize * 1024) . ", unable to display content");
+            }
+            return Base::retSuccess("success", $content);
+        } catch (Exception $e) {
+            return Base::retError($e->getMessage());
+        }
+    }
+}

app/Module/ZincSearch/ZincSearchBase.php

@@ -0,0 +1,267 @@
+<?php
+
+namespace App\Module\ZincSearch;
+
+use App\Module\Apps;
+use App\Module\Doo;
+
+/**
+ * ZincSearch 公共类
+ */
+class ZincSearchBase
+{
+    private mixed $host;
+    private mixed $port;
+    private mixed $user;
+    private mixed $pass;
+
+    /**
+     * 构造函数
+     */
+    public function __construct()
+    {
+        $this->host = env('ZINCSEARCH_HOST', 'search');
+        $this->port = env('ZINCSEARCH_PORT', '4080');
+        $this->user = env('DB_USERNAME', '');
+        $this->pass = env('DB_PASSWORD', '');
+    }
+
+    /**
+     * 通用请求方法
+     */
+    private function request($path, $body = null, $method = 'POST')
+    {
+        if (!Apps::isInstalled("search")) {
+            return [
+                'success' => false,
+                'error' => Doo::translate("应用「ZincSearch」未安装")
+            ];
+        }
+
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, "http://{$this->host}:{$this->port}{$path}");
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_USERPWD, $this->user . ':' . $this->pass);
+        curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+
+        $headers = ['Content-Type: application/json'];
+        if ($method === 'BULK') {
+            $headers = ['Content-Type: text/plain'];
+        }
+
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+        if ($body !== null) {
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
+        }
+        $result = curl_exec($ch);
+        $error = curl_error($ch);
+        $status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        curl_close($ch);
+        if ($error) {
+            return ['success' => false, 'error' => $error];
+        }
+        $data = json_decode($result, true);
+        return [
+            'success' => $status >= 200 && $status < 300,
+            'status' => $status,
+            'data' => $data
+        ];
+    }
+
+    // ==============================
+    // 索引管理相关方法
+    // ==============================
+
+    /**
+     * 创建索引
+     */
+    public static function createIndex($index, $mappings = []): array
+    {
+        $body = json_encode([
+            'name' => $index,
+            'mappings' => $mappings
+        ]);
+        return (new self())->request("/api/index", $body);
+    }
+
+    /**
+     * 获取索引信息
+     */
+    public static function getIndex($index): array
+    {
+        return (new self())->request("/api/index/{$index}", null, 'GET');
+    }
+
+    /**
+     * 判断索引是否存在
+     */
+    public static function indexExists($index): bool
+    {
+        $result = self::getIndex($index);
+        return $result['success'] && isset($result['data']['name']);
+    }
+
+    /**
+     * 获取所有索引
+     */
+    public static function listIndices(): array
+    {
+        return (new self())->request("/api/index", null, 'GET');
+    }
+
+    /**
+     * 删除索引
+     */
+    public static function deleteIndex($index): array
+    {
+        return (new self())->request("/api/index/{$index}", null, 'DELETE');
+    }
+
+    /**
+     * 删除所有索引
+     */
+    public static function deleteAllIndices(): array
+    {
+        $instance = new self();
+        $result = $instance->request("/api/index", null, 'GET');
+
+        if (!$result['success']) {
+            return $result;
+        }
+
+        $indices = $result['data'] ?? [];
+        $deleteResults = [];
+        $success = true;
+
+        foreach ($indices as $index) {
+            $indexName = $index['name'] ?? '';
+            if (!empty($indexName)) {
+                $deleteResult = $instance->request("/api/index/{$indexName}", null, 'DELETE');
+                $deleteResults[$indexName] = $deleteResult;
+
+                if (!$deleteResult['success']) {
+                    $success = false;
+                }
+            }
+        }
+
+        return [
+            'success' => $success,
+            'message' => $success ? '所有索引删除成功' : '部分索引删除失败',
+            'details' => $deleteResults
+        ];
+    }
+
+    /**
+     * 分析文本
+     */
+    public static function analyze($analyzer, $text): array
+    {
+        $body = json_encode([
+            'analyzer' => $analyzer,
+            'text' => $text
+        ]);
+        return (new self())->request("/api/_analyze", $body);
+    }
+
+    // ==============================
+    // 文档管理相关方法
+    // ==============================
+
+    /**
+     * 写入单条文档
+     */
+    public static function addDoc($index, $doc): array
+    {
+        $body = json_encode($doc);
+        return (new self())->request("/api/{$index}/_doc", $body);
+    }
+
+    /**
+     * 更新文档
+     */
+    public static function updateDoc($index, $id, $doc): array
+    {
+        $body = json_encode($doc);
+        return (new self())->request("/api/{$index}/_update/{$id}", $body);
+    }
+
+    /**
+     * 删除文档
+     */
+    public static function deleteDoc($index, $id): array
+    {
+        return (new self())->request("/api/{$index}/_doc/{$id}", null, 'DELETE');
+    }
+
+    /**
+     * 批量写入文档
+     */
+    public static function addDocs($index, $docs): array
+    {
+        $body = json_encode([
+            'index' => $index,
+            'records' => $docs
+        ]);
+        return (new self())->request("/api/_bulkv2", $body);
+    }
+
+    /**
+     * 使用原始BULK API批量写入文档
+     * 请求格式为Elasticsearch兼容格式
+     */
+    public static function bulkDocs($data): array
+    {
+        return (new self())->request("/api/_bulk", $data, 'BULK');
+    }
+
+    // ==============================
+    // 搜索相关方法
+    // ==============================
+
+    /**
+     * 查询文档
+     */
+    public static function search($index, $query, $from = 0, $size = 10): array
+    {
+        $searchParams = [
+            'search_type' => 'match',
+            'query' => [
+                'term' => $query
+            ],
+            'from' => $from,
+            'max_results' => $size
+        ];
+
+        $body = json_encode($searchParams);
+        return (new self())->request("/api/{$index}/_search", $body);
+    }
+
+    /**
+     * 高级查询文档
+     */
+    public static function advancedSearch($index, $searchParams): array
+    {
+        $body = json_encode($searchParams);
+        return (new self())->request("/api/{$index}/_search", $body);
+    }
+
+    /**
+     * 兼容ES查询文档
+     */
+    public static function elasticSearch($index, $searchParams): array
+    {
+        $body = json_encode($searchParams);
+        return (new self())->request("/es/{$index}/_search", $body);
+    }
+
+    /**
+     * 多索引查询
+     */
+    public static function multiSearch($queries): array
+    {
+        $body = json_encode($queries);
+        return (new self())->request("/api/_msearch", $body);
+    }
+}

app/Module/ZincSearch/ZincSearchDialogMsg.php

@@ -0,0 +1,612 @@
+<?php
+
+namespace App\Module\ZincSearch;
+
+use App\Models\WebSocketDialogMsg;
+use App\Models\WebSocketDialogUser;
+use App\Module\Apps;
+use Carbon\Carbon;
+use DB;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * ZincSearch 会话消息类
+ *
+ * 使用方法:
+ *
+ * 1. 基础方法
+ *     - 清空所有数据: clear();
+ *
+ * 2. 搜索方法
+ *    - 关键词搜索: search('用户ID', '关键词');
+ *
+ * 3. 基本方法
+ *    - 单个同步: sync(WebSocketDialogMsg $dialogMsg);
+ *    - 批量同步: batchSync(WebSocketDialogMsg[] $dialogMsgs);
+ *    - 用户同步: userSync(WebSocketDialogUser $dialogUser);
+ *    - 删除消息: delete(WebSocketDialogMsg|WebSocketDialogUser|int $data);
+ */
+class ZincSearchDialogMsg
+{
+    /**
+     * 索引名称
+     */
+    protected static string $indexNameMsg = 'dialogMsg';
+    protected static string $indexNameUser = 'dialogUser';
+
+    // ==============================
+    // 基础方法
+    // ==============================
+
+    /**
+     * 确保索引存在
+     */
+    private static function ensureIndex(): bool
+    {
+        if (!ZincSearchBase::indexExists(self::$indexNameMsg)) {
+            $mappings = [
+                'properties' => [
+                    // 拓展数据
+                    'dialog_userid' => ['type' => 'keyword', 'index' => true],  // 对话ID+用户ID
+                    'to_userid' => ['type' => 'numeric', 'index' => true],      // 此消息发给的用户ID
+
+                    // 消息数据
+                    'id' => ['type' => 'numeric', 'index' => true],
+                    'dialog_id' => ['type' => 'numeric', 'index' => true],
+                    'dialog_type' => ['type' => 'keyword', 'index' => true],
+                    'session_id' => ['type' => 'numeric', 'index' => true],
+                    'userid' => ['type' => 'numeric', 'index' => true],
+                    'type' => ['type' => 'keyword', 'index' => true],
+                    'key' => ['type' => 'text', 'index' => true],
+                    'created_at' => ['type' => 'date', 'index' => true],
+                    'updated_at' => ['type' => 'date', 'index' => true],
+                ]
+            ];
+            $result = ZincSearchBase::createIndex(self::$indexNameMsg, $mappings);
+            return $result['success'] ?? false;
+        }
+        if (!ZincSearchBase::indexExists(self::$indexNameUser)) {
+            $mappings = [
+                'properties' => [
+                    // 拓展数据
+                    'dialog_userid' => ['type' => 'keyword', 'index' => true],  // 对话ID+用户ID
+
+                    // 用户数据
+                    'id' => ['type' => 'numeric', 'index' => true],
+                    'dialog_id' => ['type' => 'numeric', 'index' => true],
+                    'userid' => ['type' => 'numeric', 'index' => true],
+                    'top_at' => ['type' => 'date', 'index' => true],
+                    'last_at' => ['type' => 'date', 'index' => true],
+                    'mark_unread' => ['type' => 'numeric', 'index' => true],
+                    'silence' => ['type' => 'numeric', 'index' => true],
+                    'hide' => ['type' => 'numeric', 'index' => true],
+                    'color' => ['type' => 'keyword', 'index' => true],
+                    'created_at' => ['type' => 'date', 'index' => true],
+                    'updated_at' => ['type' => 'date', 'index' => true],
+                ]
+            ];
+            $result = ZincSearchBase::createIndex(self::$indexNameUser, $mappings);
+            return $result['success'] ?? false;
+        }
+        return true;
+    }
+
+    /**
+     * 清空所有键值
+     *
+     * @return bool 是否成功
+     */
+    public static function clear(): bool
+    {
+        // 检查索引是否存在然后删除
+        if (ZincSearchBase::indexExists(self::$indexNameMsg)) {
+            $deleteResult = ZincSearchBase::deleteIndex(self::$indexNameMsg);
+            if (!($deleteResult['success'] ?? false)) {
+                return false;
+            }
+        }
+        if (ZincSearchBase::indexExists(self::$indexNameUser)) {
+            $deleteResult = ZincSearchBase::deleteIndex(self::$indexNameUser);
+            if (!($deleteResult['success'] ?? false)) {
+                return false;
+            }
+        }
+
+        return self::ensureIndex();
+    }
+
+    // ==============================
+    // 搜索方法
+    // ==============================
+
+    /**
+     * 根据用户ID和消息关键词搜索会话
+     *
+     * @param string $userid 用户ID
+     * @param string $keyword 消息关键词
+     * @param int $from 起始位置
+     * @param int $size 返回结果数量
+     * @return array
+     */
+    public static function search(string $userid, string $keyword, int $from = 0, int $size = 20): array
+    {
+        if (!Apps::isInstalled("search")) {
+            // 如果搜索功能未安装，使用数据库查询
+            return self::searchByMysql($userid, $keyword, $from, $size);
+        }
+
+        $searchParams = [
+            'query' => [
+                'bool' => [
+                    'must' => [
+                        ['term' => ['to_userid' => $userid]],
+                        ['match_phrase' => ['key' => $keyword]]
+                    ]
+                ]
+            ],
+            'from' => $from,
+            'size' => $size,
+            'sort' => [
+                ['updated_at' => 'desc']
+            ]
+        ];
+        try {
+            $result = ZincSearchBase::elasticSearch(self::$indexNameMsg, $searchParams);
+            $hits = $result['data']['hits']['hits'] ?? [];
+
+            // 收集所有的用户信息
+            $dialogUserids = [];
+            foreach ($hits as $hit) {
+                $source = $hit['_source'];
+                $dialogUserids[] = $source['dialog_userid'];
+            }
+            $userInfos = self::searchUser(array_unique($dialogUserids));
+
+            // 组合返回结果，将用户信息合并到消息中
+            $msgs = [];
+            foreach ($hits as $hit) {
+                $msgInfo = $hit['_source'];
+                $userInfo = $userInfos[$msgInfo['dialog_userid']] ?? [];
+                if ($userInfo) {
+                    $msgs[] = [
+                        'id' => $msgInfo['dialog_id'],
+                        'search_msg_id' => $msgInfo['id'],
+                        'user_at' =>  Carbon::parse($msgInfo['updated_at'])->format('Y-m-d H:i:s'),
+
+                        'mark_unread' => $userInfo['mark_unread'],
+                        'silence' => $userInfo['silence'],
+                        'hide' => $userInfo['hide'],
+                        'color' => $userInfo['color'],
+                        'top_at' => Carbon::parse($userInfo['top_at'])->format('Y-m-d H:i:s'),
+                        'last_at' =>  Carbon::parse($userInfo['last_at'])->format('Y-m-d H:i:s'),
+                    ];
+                }
+            }
+            return $msgs;
+        } catch (\Exception $e) {
+            Log::error('search: ' . $e->getMessage());
+            return [];
+        }
+    }
+
+    /**
+     * 根据用户ID和消息关键词搜索会话（MySQL 版本，主要用于未安装ZincSearch的情况）
+     *
+     * @param string $userid 用户ID
+     * @param string $keyword 消息关键词
+     * @param int $from 起始位置
+     * @param int $size 返回结果数量
+     * @return array
+     */
+    private static function searchByMysql(string $userid, string $keyword, int $from = 0, int $size = 20): array
+    {
+        $items = 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', 'm.id as search_msg_id'])
+            ->join('web_socket_dialogs as d', 'u.dialog_id', '=', 'd.id')
+            ->join('web_socket_dialog_msgs as m', 'm.dialog_id', '=', 'd.id')
+            ->where('u.userid', $userid)
+            ->where('m.bot', 0)
+            ->whereNull('d.deleted_at')
+            ->where('m.key', 'like', "%{$keyword}%")
+            ->orderByDesc('m.id')
+            ->offset($from)
+            ->limit($size)
+            ->get()
+            ->all();
+        $msgs = [];
+        foreach ($items as $item) {
+            $msgs[] = [
+                'id' => $item->id,
+                'search_msg_id' => $item->search_msg_id,
+                'user_at' =>  Carbon::parse($item->user_at)->format('Y-m-d H:i:s'),
+
+                'mark_unread' => $item->mark_unread,
+                'silence' => $item->silence,
+                'hide' => $item->hide,
+                'color' => $item->color,
+                'top_at' => Carbon::parse($item->top_at)->format('Y-m-d H:i:s'),
+                'last_at' =>  Carbon::parse($item->last_at)->format('Y-m-d H:i:s'),
+            ];
+        }
+        return $msgs;
+    }
+
+    /**
+     * 根据对话用户ID搜索用户信息
+     * @param array $dialogUserids
+     * @return array
+     */
+    private static function searchUser(array $dialogUserids): array
+    {
+        if (empty($dialogUserids)) {
+            return [];
+        }
+
+        $userInfos = [];
+
+        // 构建用户查询条件
+        $userSearchParams = [
+            'query' => [
+                'bool' => [
+                    'should' => []
+                ]
+            ],
+            'size' => count($dialogUserids) // 确保取到所有符合条件的记录
+        ];
+
+        // 添加所有 dialog_userid 到查询条件
+        foreach ($dialogUserids as $dialogUserid) {
+            $userSearchParams['query']['bool']['should'][] = [
+                'term' => ['dialog_userid' => $dialogUserid]
+            ];
+        }
+
+        // 查询用户信息
+        $userResult = ZincSearchBase::elasticSearch(self::$indexNameUser, $userSearchParams);
+        $userHits = $userResult['data']['hits']['hits'] ?? [];
+
+        // 以 dialog_userid 为键保存用户信息
+        foreach ($userHits as $userHit) {
+            $userSource = $userHit['_source'];
+            $userInfos[$userSource['dialog_userid']] = $userSource;
+        }
+
+        return $userInfos;
+    }
+
+    // ==============================
+    // 生成内容
+    // ==============================
+
+    /**
+     * 生成 dialog_userid
+     *
+     * @param WebSocketDialogUser $dialogUser
+     * @return string
+     */
+    private static function generateDialogUserid(WebSocketDialogUser $dialogUser): string
+    {
+        return "{$dialogUser->dialog_id}_{$dialogUser->userid}";
+    }
+
+    /**
+     * 生成文档内容
+     *
+     * @param WebSocketDialogMsg $dialogMsg
+     * @param WebSocketDialogUser $dialogUser
+     * @return array
+     */
+    private static function generateMsgData(WebSocketDialogMsg $dialogMsg, WebSocketDialogUser $dialogUser): array
+    {
+        return [
+            '_id' => self::$indexNameMsg . "_" . $dialogMsg->id . "_" . $dialogUser->userid,
+            'dialog_userid' => self::generateDialogUserid($dialogUser),
+            'to_userid' => $dialogUser->userid,
+
+            'id' => $dialogMsg->id,
+            'dialog_id' => $dialogMsg->dialog_id,
+            'dialog_type' => $dialogMsg->dialog_type,
+            'session_id' => $dialogMsg->session_id,
+            'userid' => $dialogMsg->userid,
+            'type' => $dialogMsg->type,
+            'key' => $dialogMsg->key,
+            'created_at' => $dialogMsg->created_at,
+            'updated_at' => $dialogMsg->updated_at,
+        ];
+    }
+    private static function generateUserData(WebSocketDialogUser $dialogUser): array
+    {
+        return [
+            '_id' => self::$indexNameUser . "_" . $dialogUser->id,
+            'dialog_userid' => self::generateDialogUserid($dialogUser),
+
+            'id' => $dialogUser->id,
+            'dialog_id' => $dialogUser->dialog_id,
+            'userid' => $dialogUser->userid,
+            'top_at' => $dialogUser->top_at,
+            'last_at' => $dialogUser->last_at,
+            'mark_unread' => $dialogUser->mark_unread,
+            'silence' => $dialogUser->silence,
+            'hide' => $dialogUser->hide,
+            'color' => $dialogUser->color,
+            'created_at' => $dialogUser->created_at,
+            'updated_at' => $dialogUser->updated_at,
+        ];
+    }
+
+    // ==============================
+    // 基本方法
+    // ==============================
+
+    /**
+     * 同步消息（建议在异步进程中使用）
+     *
+     * @param WebSocketDialogMsg $dialogMsg
+     * @return bool
+     */
+    public static function sync(WebSocketDialogMsg $dialogMsg): bool
+    {
+        if (!self::ensureIndex()) {
+            return false;
+        }
+
+        if ($dialogMsg->bot) {
+            // 如果是机器人消息，跳过
+            return true;
+        }
+
+        try {
+            // 获取此会话的所有用户
+            $dialogUsers = WebSocketDialogUser::whereDialogId($dialogMsg->dialog_id)->get();
+
+            if ($dialogUsers->isEmpty()) {
+                return true;
+            }
+
+            $msgs = [];
+            $users = [];
+            foreach ($dialogUsers as $dialogUser) {
+                if (empty($dialogMsg->key)) {
+                    // 如果消息没有关键词，跳过
+                    continue;
+                }
+                if ($dialogUser->userid == 0) {
+                    // 跳过系统用户
+                    continue;
+                }
+                $msgs[] = self::generateMsgData($dialogMsg, $dialogUser);
+                $users[$dialogUser->id] = self::generateUserData($dialogUser);
+            }
+
+            if ($msgs) {
+                // 批量写入消息
+                ZincSearchBase::addDocs(self::$indexNameMsg, $msgs);
+            }
+
+            if ($users) {
+                // 批量写入用户
+                ZincSearchBase::addDocs(self::$indexNameUser, array_values($users));
+            }
+
+            return true;
+        } catch (\Exception $e) {
+            Log::error('sync: ' . $e->getMessage());
+            return false;
+        }
+    }
+
+    /**
+     * 批量同步消息（建议在异步进程中使用）
+     *
+     * @param WebSocketDialogMsg[] $dialogMsgs
+     * @return int 成功同步的消息数
+     */
+    public static function batchSync($dialogMsgs): int
+    {
+        if (!self::ensureIndex()) {
+            return 0;
+        }
+
+        $count = 0;
+        try {
+            $msgs = [];
+            $users = [];
+            $userDialogs = [];
+
+            // 预处理：收集所有涉及的对话ID
+            $dialogIds = [];
+            foreach ($dialogMsgs as $dialogMsg) {
+                $dialogIds[] = $dialogMsg->dialog_id;
+            }
+            $dialogIds = array_unique($dialogIds);
+
+            // 获取所有相关的用户-对话关系
+            if (!empty($dialogIds)) {
+                $dialogUsers = WebSocketDialogUser::whereIn('dialog_id', $dialogIds)->get();
+
+                // 按对话ID组织用户
+                foreach ($dialogUsers as $dialogUser) {
+                    $userDialogs[$dialogUser->dialog_id][] = $dialogUser;
+                }
+            }
+
+            // 为每条消息准备所有相关用户的文档
+            foreach ($dialogMsgs as $dialogMsg) {
+                if (!isset($userDialogs[$dialogMsg->dialog_id])) {
+                    // 如果该会话没有用户，跳过
+                    continue;
+                }
+                if ($dialogMsg->bot) {
+                    // 如果是机器人消息，跳过
+                    continue;
+                }
+                /** @var WebSocketDialogUser $dialogUser */
+                foreach ($userDialogs[$dialogMsg->dialog_id] as $dialogUser) {
+                    if (empty($dialogMsg->key)) {
+                        // 如果消息没有关键词，跳过
+                        continue;
+                    }
+                    if ($dialogUser->userid == 0) {
+                        // 跳过系统用户
+                        continue;
+                    }
+                    $msgs[] = self::generateMsgData($dialogMsg, $dialogUser);
+                    $users[$dialogUser->id] = self::generateUserData($dialogUser);
+                    $count++;
+                }
+            }
+
+            if ($msgs) {
+                // 批量写入消息
+                ZincSearchBase::addDocs(self::$indexNameMsg, $msgs);
+            }
+
+            if ($users) {
+                // 批量写入用户
+                ZincSearchBase::addDocs(self::$indexNameUser, array_values($users));
+            }
+
+        } catch (\Exception $e) {
+            Log::error('batchSync: ' . $e->getMessage());
+        }
+
+        return $count;
+    }
+
+    /**
+     * 同步用户（建议在异步进程中使用）
+     * @param WebSocketDialogUser $dialogUser
+     * @return bool
+     */
+    public static function userSync(WebSocketDialogUser $dialogUser): bool
+    {
+        if (!self::ensureIndex()) {
+            return false;
+        }
+        $data = self::generateUserData($dialogUser);
+
+        // 生成查询用户条件
+        $searchParams = [
+            'query' => [
+                'bool' => [
+                    'must' => [
+                        ['term' => ['dialog_userid' => $data['dialog_userid']]]
+                    ]
+                ]
+            ],
+            'size' => 1
+        ];
+
+        try {
+            // 查询用户是否存在
+            $result = ZincSearchBase::elasticSearch(self::$indexNameUser, $searchParams);
+            $hits = $result['data']['hits']['hits'] ?? [];
+
+            // 同步用户（存在更新、不存在添加）
+            $result = ZincSearchBase::addDoc(self::$indexNameUser, $data);
+            if (!isset($result['success'])) {
+                return false;
+            }
+
+            // 用户不存在，同步消息
+            if (empty($hits)) {
+                $lastId = 0;        // 上次同步的最后ID
+                $batchSize = 500;   // 每批处理的消息数量
+
+                // 分批同步消息
+                do {
+                    // 获取一批
+                    $dialogMsgs = WebSocketDialogMsg::whereDialogId($dialogUser->dialog_id)
+                        ->where('id', '>', $lastId)
+                        ->orderBy('id')
+                        ->limit($batchSize)
+                        ->get();
+
+                    if ($dialogMsgs->isEmpty()) {
+                        break;
+                    }
+
+                    // 同步数据
+                    ZincSearchDialogMsg::batchSync($dialogMsgs);
+
+                    // 更新最后ID
+                    $lastId = $dialogMsgs->last()->id;
+                } while (count($dialogMsgs) == $batchSize);
+            }
+
+            return true;
+        } catch (\Exception $e) {
+            Log::error('userSync: ' . $e->getMessage());
+            return false;
+        }
+    }
+
+    /**
+     * 删除（建议在异步进程中使用）
+     *
+     * @param WebSocketDialogMsg|WebSocketDialogUser|int $data
+     * @return int
+     */
+    public static function delete(mixed $data): int
+    {
+        $batchSize = 500;   // 每批处理的文档数量
+        $totalDeleted = 0;  // 总共删除的文档数量
+        $from = 0;
+
+        // 根据数据类型生成查询条件
+        if ($data instanceof WebSocketDialogMsg) {
+            $query = [
+                'field' => 'id',
+                'term' => (string) $data->id
+            ];
+        } elseif ($data instanceof WebSocketDialogUser) {
+            $query = [
+                'field' => 'dialog_userid',
+                'term' => self::generateDialogUserid($data),
+            ];
+        } else {
+            $query = [
+                'field' => 'id',
+                'term' => (string) $data
+            ];
+        }
+
+        try {
+            while (true) {
+                // 根据消息ID查找相关文档
+                $result = ZincSearchBase::advancedSearch(self::$indexNameMsg, [
+                    'search_type' => 'term',
+                    'query' => $query,
+                    'from' => $from,
+                    'max_results' => $batchSize
+                ]);
+                $hits = $result['data']['hits']['hits'] ?? [];
+
+                // 如果没有更多文档，退出循环
+                if (empty($hits)) {
+                    break;
+                }
+
+                // 删除本批次找到的所有文档
+                foreach ($hits as $hit) {
+                    if (isset($hit['_id'])) {
+                        ZincSearchBase::deleteDoc(self::$indexNameMsg, $hit['_id']);
+                        $totalDeleted++;
+                    }
+                }
+
+                // 如果返回的文档数少于批次大小，说明已经没有更多文档了
+                if (count($hits) < $batchSize) {
+                    break;
+                }
+
+                // 移动到下一批
+                $from += $batchSize;
+            }
+        } catch (\Exception $e) {
+            Log::error('delete: ' . $e->getMessage());
+        }
+
+        return $totalDeleted;
+    }
+}

app/Module/ZincSearch/ZincSearchKeyValue.php

@@ -0,0 +1,276 @@
+<?php
+
+namespace App\Module\ZincSearch;
+
+/**
+ * ZincSearch 键值存储类
+ *
+ * 使用方法:
+ *
+ * 1. 基础方法
+ *     - 确保索引存在: ensureIndex();
+ *     - 清空所有数据: clear();
+ *
+ * 2. 基本操作
+ *    - 设置键值: set('site_name', '我的网站');
+ *    - 设置复杂数据: set('site_config', ['logo' => 'logo.png', 'theme' => 'dark']);
+ *    - 合并现有数据: set('site_config', ['footer' => '版权所有'], true);
+ *    - 获取键值: $siteName = get('site_name');
+ *    - 获取键值带默认值: $theme = get('theme', 'light');
+ *    - 删除键值: delete('temporary_data');
+ *
+ * 3. 批量操作
+ *    - 批量设置: batchSet(['user_count' => 100, 'active_users' => 50]);
+ *    - 批量获取: $stats = batchGet(['user_count', 'active_users']);
+ */
+class ZincSearchKeyValue
+{
+    /**
+     * 索引名称
+     */
+    protected static string $indexName = 'keyValue';
+
+    // ==============================
+    // 基础方法
+    // ==============================
+
+    /**
+     * 确保索引存在
+     */
+    public static function ensureIndex(): bool
+    {
+        if (!ZincSearchBase::indexExists(self::$indexName)) {
+            $mappings = [
+                'properties' => [
+                    'key' => ['type' => 'keyword', 'index' => true],
+                    'value' => ['type' => 'text', 'index' => true],
+                    'created_at' => ['type' => 'date', 'index' => true],
+                    'updated_at' => ['type' => 'date', 'index' => true]
+                ]
+            ];
+            $result = ZincSearchBase::createIndex(self::$indexName, $mappings);
+            return $result['success'] ?? false;
+        }
+        return true;
+    }
+
+    /**
+     * 清空所有键值
+     *
+     * @return bool 是否成功
+     */
+    public static function clear(): bool
+    {
+        // 检查索引是否存在
+        if (!ZincSearchBase::indexExists(self::$indexName)) {
+            return true;
+        }
+
+        // 删除再重建索引
+        $deleteResult = ZincSearchBase::deleteIndex(self::$indexName);
+        if (!($deleteResult['success'] ?? false)) {
+            return false;
+        }
+
+        return self::ensureIndex();
+    }
+
+    // ==============================
+    // 基本操作
+    // ==============================
+
+    /**
+     * 设置键值
+     *
+     * @param string $key 键名
+     * @param mixed $value 值
+     * @param bool $merge 是否合并现有数据(如果值是数组)
+     * @return bool 是否成功
+     */
+    public static function set(string $key, mixed $value, bool $merge = false): bool
+    {
+        if (!self::ensureIndex()) {
+            return false;
+        }
+
+        // 检查键是否已存在
+        if ($merge && is_array($value)) {
+            $existingData = self::get($key);
+            if (is_array($existingData)) {
+                $value = array_merge($existingData, $value);
+            }
+        }
+
+        // 检查是否存在相同键的文档 - 使用精确查询而不是普通搜索
+        $searchParams = [
+            'search_type' => 'term',
+            'query' => [
+                'field' => 'key',
+                'term' => $key
+            ],
+            'from' => 0,
+            'max_results' => 1
+        ];
+
+        $result = ZincSearchBase::advancedSearch(self::$indexName, $searchParams);
+        $docs = $result['data']['hits']['hits'] ?? [];
+        $now = date('c');
+
+        if (!empty($docs)) {
+            $docId = $docs[0]['_id'] ?? null;
+            if ($docId) {
+                // 更新现有文档
+                $docData = [
+                    'key' => $key,
+                    'value' => $value,
+                    'updated_at' => $now
+                ];
+                $updateResult = ZincSearchBase::updateDoc(self::$indexName, $docId, $docData);
+                return $updateResult['success'] ?? false;
+            }
+        }
+
+        // 创建新文档
+        $docData = [
+            'key' => $key,
+            'value' => $value,
+            'created_at' => $now,
+            'updated_at' => $now
+        ];
+        $addResult = ZincSearchBase::addDoc(self::$indexName, $docData);
+        return $addResult['success'] ?? false;
+    }
+
+    /**
+     * 获取键值
+     *
+     * @param string $key 键名
+     * @param mixed $default 默认值
+     * @return mixed 值或默认值
+     */
+    public static function get(string $key, mixed $default = null): mixed
+    {
+        if (!self::ensureIndex() || empty($key)) {
+            return $default;
+        }
+
+        // 精确匹配键名
+        $searchParams = [
+            'search_type' => 'term',
+            'query' => [
+                'field' => 'key',
+                'term' => $key
+            ],
+            'from' => 0,
+            'max_results' => 1
+        ];
+
+        $result = ZincSearchBase::advancedSearch(self::$indexName, $searchParams);
+        if (!($result['success'] ?? false)) {
+            return $default;
+        }
+
+        $hits = $result['data']['hits']['hits'] ?? [];
+        if (empty($hits)) {
+            return $default;
+        }
+
+        return $hits[0]['_source']['value'] ?? $default;
+    }
+
+    /**
+     * 删除键值
+     *
+     * @param string $key 键名
+     * @return bool 是否成功
+     */
+    public static function delete(string $key): bool
+    {
+        if (!self::ensureIndex() || empty($key)) {
+            return false;
+        }
+
+        // 查找文档ID
+        $searchParams = [
+            'search_type' => 'term',
+            'query' => [
+                'field' => 'key',
+                'term' => $key
+            ],
+            'from' => 0,
+            'max_results' => 1
+        ];
+
+        $result = ZincSearchBase::advancedSearch(self::$indexName, $searchParams);
+        if (!($result['success'] ?? false)) {
+            return false;
+        }
+
+        $hits = $result['data']['hits']['hits'] ?? [];
+        if (empty($hits)) {
+            return true; // 不存在视为删除成功
+        }
+
+        $docId = $hits[0]['_id'] ?? null;
+        if (empty($docId)) {
+            return false;
+        }
+
+        $deleteResult = ZincSearchBase::deleteDoc(self::$indexName, $docId);
+        return $deleteResult['success'] ?? false;
+    }
+
+    // ==============================
+    // 批量操作
+    // ==============================
+
+    /**
+     * 批量设置键值对
+     *
+     * @param array $keyValues 键值对数组
+     * @return bool 是否全部成功
+     */
+    public static function batchSet(array $keyValues): bool
+    {
+        if (!self::ensureIndex() || empty($keyValues)) {
+            return false;
+        }
+
+        $docs = [];
+        $now = date('c');
+
+        foreach ($keyValues as $key => $value) {
+            $docs[] = [
+                'key' => $key,
+                'value' => $value,
+                'created_at' => $now,
+                'updated_at' => $now
+            ];
+        }
+
+        $result = ZincSearchBase::addDocs(self::$indexName, $docs);
+        return $result['success'] ?? false;
+    }
+
+    /**
+     * 批量获取键值
+     *
+     * @param array $keys 键名数组
+     * @return array 键值对数组
+     */
+    public static function batchGet(array $keys): array
+    {
+        if (!self::ensureIndex() || empty($keys)) {
+            return [];
+        }
+
+        $results = [];
+
+        // 遍历查询每个键
+        foreach ($keys as $key) {
+            $results[$key] = self::get($key);
+        }
+
+        return $results;
+    }
+}

app/Observers/AbstractObserver.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Observers;
+
+use Hhxsv5\LaravelS\Swoole\Task\Task;
+
+class AbstractObserver
+{
+    /**
+     * @param $task
+     * @return void
+     */
+    public static function taskDeliver($task)
+    {
+        if (app()->bound('swoole')) {
+            Task::deliver($task);
+        }
+    }
+}

app/Observers/WebSocketDialogMsgObserver.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Observers;
+
+use App\Models\WebSocketDialogMsg;
+use App\Tasks\ZincSearchSyncTask;
+
+class WebSocketDialogMsgObserver extends AbstractObserver
+{
+    /**
+     * Handle the WebSocketDialogMsg "created" event.
+     *
+     * @param  \App\Models\WebSocketDialogMsg  $webSocketDialogMsg
+     * @return void
+     */
+    public function created(WebSocketDialogMsg $webSocketDialogMsg)
+    {
+        self::taskDeliver(new ZincSearchSyncTask('sync', $webSocketDialogMsg->toArray()));
+    }
+
+    /**
+     * Handle the WebSocketDialogMsg "updated" event.
+     *
+     * @param  \App\Models\WebSocketDialogMsg  $webSocketDialogMsg
+     * @return void
+     */
+    public function updated(WebSocketDialogMsg $webSocketDialogMsg)
+    {
+        self::taskDeliver(new ZincSearchSyncTask('sync', $webSocketDialogMsg->toArray()));
+    }
+
+    /**
+     * Handle the WebSocketDialogMsg "deleted" event.
+     *
+     * @param  \App\Models\WebSocketDialogMsg  $webSocketDialogMsg
+     * @return void
+     */
+    public function deleted(WebSocketDialogMsg $webSocketDialogMsg)
+    {
+        self::taskDeliver(new ZincSearchSyncTask('delete', $webSocketDialogMsg->toArray()));
+    }
+
+    /**
+     * Handle the WebSocketDialogMsg "restored" event.
+     *
+     * @param  \App\Models\WebSocketDialogMsg  $webSocketDialogMsg
+     * @return void
+     */
+    public function restored(WebSocketDialogMsg $webSocketDialogMsg)
+    {
+        //
+    }
+
+    /**
+     * Handle the WebSocketDialogMsg "force deleted" event.
+     *
+     * @param  \App\Models\WebSocketDialogMsg  $webSocketDialogMsg
+     * @return void
+     */
+    public function forceDeleted(WebSocketDialogMsg $webSocketDialogMsg)
+    {
+        //
+    }
+}

app/Observers/WebSocketDialogUserObserver.php

@@ -4,9 +4,10 @@ namespace App\Observers;
 
 use App\Models\Deleted;
 use App\Models\WebSocketDialogUser;
+use App\Tasks\ZincSearchSyncTask;
 use Carbon\Carbon;
 
-class WebSocketDialogUserObserver
+class WebSocketDialogUserObserver extends AbstractObserver
 {
     /**
      * Handle the WebSocketDialogUser "created" event.
@@ -29,6 +30,7 @@ class WebSocketDialogUserObserver
             }
         }
         Deleted::forget('dialog', $webSocketDialogUser->dialog_id, $webSocketDialogUser->userid);
+        self::taskDeliver(new ZincSearchSyncTask('userSync', $webSocketDialogUser->toArray()));
     }
 
     /**
@@ -39,7 +41,7 @@ class WebSocketDialogUserObserver
      */
     public function updated(WebSocketDialogUser $webSocketDialogUser)
     {
-        //
+        self::taskDeliver(new ZincSearchSyncTask('userSync', $webSocketDialogUser->toArray()));
     }
 
     /**
@@ -51,6 +53,7 @@ class WebSocketDialogUserObserver
     public function deleted(WebSocketDialogUser $webSocketDialogUser)
     {
         Deleted::record('dialog', $webSocketDialogUser->dialog_id, $webSocketDialogUser->userid);
+        self::taskDeliver(new ZincSearchSyncTask('deleteUser', $webSocketDialogUser->toArray()));
     }
 
     /**

app/Providers/EventServiceProvider.php

@@ -7,11 +7,13 @@ use App\Models\ProjectTask;
 use App\Models\ProjectTaskUser;
 use App\Models\ProjectUser;
 use App\Models\WebSocketDialog;
+use App\Models\WebSocketDialogMsg;
 use App\Models\WebSocketDialogUser;
 use App\Observers\ProjectObserver;
 use App\Observers\ProjectTaskObserver;
 use App\Observers\ProjectTaskUserObserver;
 use App\Observers\ProjectUserObserver;
+use App\Observers\WebSocketDialogMsgObserver;
 use App\Observers\WebSocketDialogObserver;
 use App\Observers\WebSocketDialogUserObserver;
 use Illuminate\Auth\Events\Registered;
@@ -43,6 +45,7 @@ class EventServiceProvider extends ServiceProvider
         ProjectTaskUser::observe(ProjectTaskUserObserver::class);
         ProjectUser::observe(ProjectUserObserver::class);
         WebSocketDialog::observe(WebSocketDialogObserver::class);
+        WebSocketDialogMsg::observe(WebSocketDialogMsgObserver::class);
         WebSocketDialogUser::observe(WebSocketDialogUserObserver::class);
     }
 }

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,37 +211,63 @@ 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] ?? [];
-    }
+    /** ***************************************************************************************** */
+    /** ***************************************************************************************** */
+    /** ***************************************************************************************** */
 
     /**
-     * 批量设置上下文数据
+     * 更新请求的基本URL
      *
-     * @param array<string, mixed> $data
-     * @param string|null $requestId
+     * @param Request $request
      * @return void
      */
-    public static function setMultiple(array $data, ?string $requestId = null): void
+    public static function updateBaseUrl($request)
     {
-        $requestId = $requestId ?? self::getCurrentRequestId();
-        if ($requestId === null) {
+        if ($request->path() !== 'api/system/setting') {
             return;
         }
+        $schemeAndHttpHost = $request->getSchemeAndHttpHost();
+        if (str_contains($schemeAndHttpHost, '127.0.0.1') || str_contains($schemeAndHttpHost, 'localhost')) {
+            return;
+        }
+        \Cache::forever('RequestContext::base_url', $schemeAndHttpHost);
+    }
 
-        self::$context[$requestId] ??= [];
-        self::$context[$requestId] = array_merge(self::$context[$requestId], $data);
+    /**
+     * 替换请求的基本URL
+     *
+     * @param string $url
+     * @return string
+     */
+    public static function replaceBaseUrl(string $url): string
+    {
+        // 先提取主机部分
+        $pattern = '/^(https?:\/\/[^\/?#:]+(:\d+)?)/i';
+        if (!preg_match($pattern, $url, $matches)) {
+            return $url; // 如果不是有效URL直接返回
+        }
+
+        $schemeAndHttpHost = $matches[1] ?? '';
+        if (!$schemeAndHttpHost) {
+            return $url;
+        }
+
+        // 只检查主机部分是否为本地主机
+        if (str_contains($schemeAndHttpHost, '127.0.0.1') || str_contains($schemeAndHttpHost, 'localhost')) {
+            $baseUrl = \Cache::get('RequestContext::base_url');
+            if ($baseUrl) {
+                return $baseUrl . substr($url, strlen($schemeAndHttpHost));
+            }
+        }
+
+        return $url;
+    }
+
+    /**
+     * 清除基本URL缓存
+     */
+    public static function clearBaseUrlCache(): void
+    {
+        \Cache::forget('RequestContext::base_url');
     }
 }

app/Tasks/AbstractTask.php

@@ -1,6 +1,8 @@
 <?php
 namespace App\Tasks;
 
+@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
+
 use App\Models\TaskWorker;
 use App\Module\Base;
 use Carbon\Carbon;

app/Tasks/AppPushTask.php

@@ -6,8 +6,6 @@ use App\Models\ProjectTask;
 use App\Module\Base;
 use Carbon\Carbon;
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
 class AppPushTask extends AbstractTask
 {
     public function __construct()

app/Tasks/AutoArchivedTask.php

@@ -1,8 +1,6 @@
 <?php
 namespace App\Tasks;
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
 use App\Models\ProjectTask;
 use App\Module\Base;
 use Carbon\Carbon;
@@ -44,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)
@@ -65,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/CheckinRemindTask.php

@@ -13,8 +13,6 @@ use App\Module\Timer;
 use Cache;
 use Carbon\Carbon;
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
 class CheckinRemindTask extends AbstractTask
 {
     public function __construct()

app/Tasks/CloseMeetingRoomTask.php

@@ -9,8 +9,6 @@ use Carbon\Carbon;
 use App\Models\WebSocketDialogMsg;
 use Illuminate\Support\Facades\Cache;
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
 class CloseMeetingRoomTask extends AbstractTask
 {
     public function __construct()

app/Tasks/DeleteBotMsgTask.php

@@ -2,8 +2,6 @@
 
 namespace App\Tasks;
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
 use App\Models\UserBot;
 use App\Models\WebSocketDialogMsg;
 use Carbon\Carbon;

app/Tasks/DeleteTmpTask.php

@@ -5,6 +5,7 @@ namespace App\Tasks;
 use App\Models\File;
 use App\Models\TaskWorker;
 use App\Models\Tmp;
+use App\Models\UserDevice;
 use App\Models\WebSocketTmpMsg;
 use App\Module\Base;
 use Carbon\Carbon;
@@ -33,89 +34,75 @@ class DeleteTmpTask extends AbstractTask
     public function start()
     {
         switch ($this->data) {
-            /**
-             * 表pre_tmp_msgs
-             */
-            case 'wg_tmp_msgs':
-                {
-                    WebSocketTmpMsg::where('created_at', '<', Carbon::now()->subHours($this->hours))
-                        ->orderBy('id')
-                        ->chunk(500, function ($msgs) {
-                            /** @var WebSocketTmpMsg $msg */
-                            foreach ($msgs as $msg) {
-                                $msg->delete();
-                            }
-                        });
-                }
-                break;
-
-            /**
-             * 表pre_tmp
-             */
-            case 'tmp':
-                {
-                    Tmp::where('created_at', '<', Carbon::now()->subHours($this->hours))
-                        ->orderBy('id')
-                        ->chunk(500, function ($tmps) {
-                            /** @var Tmp $tmp */
-                            foreach ($tmps as $tmp) {
-                                $tmp->delete();
-                            }
-                        });
-                }
-                break;
-
-            /**
-             * 表pre_task_worker
-             */
-            case 'task_worker':
-                {
-                    TaskWorker::onlyTrashed()
-                        ->where('deleted_at', '<', Carbon::now()->subHours($this->hours))
-                        ->orderBy('id')
-                        ->forceDelete();
-                }
-                break;
-
-            /**
-             * 表pre_file
-             */
-            case 'file':
-                {
-                    $day = intval(env("AUTO_EMPTY_FILE_RECYCLE", 365));
-                    if ($day <= 0) {
-                        return;
-                    }
-                    File::onlyTrashed()
-                        ->where('deleted_at', '<', Carbon::now()->subHours($day))
-                        ->orderBy('id')
-                        ->chunk(500, function ($files) {
-                            /** @var File $file */
-                            foreach ($files as $file) {
-                                $file->forceDeleteFile();
-                            }
-                        });
-                }
-                break;
-
-            /**
-             * tmp_file 删除临时文件
-             */
-            case 'tmp_file':
-                {
-                    $day = intval(env("AUTO_EMPTY_TEMP_FILE", 30));
-                    if ($day <= 0) {
-                        return;
-                    }
-                    $files = Base::recursiveFiles(public_path('uploads/tmp'));
-                    foreach ($files as $file) {
-                        $time = @filemtime($file);
-                        if ($time && $time < time() - 3600 * 24 * $day) {
-                            unlink($file);
+            case 'tmp_msgs':
+                WebSocketTmpMsg::where('created_at', '<', Carbon::now()->subHours($this->hours))
+                    ->orderBy('id')
+                    ->chunk(500, function ($msgs) {
+                        /** @var WebSocketTmpMsg $msg */
+                        foreach ($msgs as $msg) {
+                            $msg->delete();
                         }
+                    });
+                break;
+
+            case 'tmp':
+                Tmp::where('created_at', '<', Carbon::now()->subHours($this->hours))
+                    ->orderBy('id')
+                    ->chunk(500, function ($tmps) {
+                        /** @var Tmp $tmp */
+                        foreach ($tmps as $tmp) {
+                            $tmp->delete();
+                        }
+                    });
+                break;
+
+            case 'task_worker':
+                TaskWorker::onlyTrashed()
+                    ->where('deleted_at', '<', Carbon::now()->subHours($this->hours))
+                    ->orderBy('id')
+                    ->forceDelete();
+                break;
+
+            case 'file':
+                $day = intval(env("AUTO_EMPTY_FILE_RECYCLE", 365));
+                if ($day <= 0) {
+                    return;
+                }
+                File::onlyTrashed()
+                    ->where('deleted_at', '<', Carbon::now()->subHours($day))
+                    ->orderBy('id')
+                    ->chunk(500, function ($files) {
+                        /** @var File $file */
+                        foreach ($files as $file) {
+                            $file->forceDeleteFile();
+                        }
+                    });
+                break;
+
+            case 'tmp_file':
+                $day = intval(env("AUTO_EMPTY_TEMP_FILE", 30));
+                if ($day <= 0) {
+                    return;
+                }
+                $files = Base::recursiveFiles(public_path('uploads/tmp'));
+                foreach ($files as $file) {
+                    $time = @filemtime($file);
+                    if ($time && $time < time() - 3600 * 24 * $day) {
+                        unlink($file);
                     }
                 }
                 break;
+
+            case 'user_device':
+                UserDevice::where('expired_at', '<', Carbon::now()->subHours($this->hours))
+                    ->orderBy('id')
+                    ->chunk(500, function ($devices) {
+                        /** @var UserDevice $device */
+                        foreach ($devices as $device) {
+                            UserDevice::forget($device);
+                        }
+                    });
+                break;
         }
     }
 

app/Tasks/EmailNoticeTask.php

@@ -1,8 +1,6 @@
 <?php
 namespace App\Tasks;
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
 use App\Models\Setting;
 use App\Models\User;
 use App\Models\WebSocketDialogMsg;

app/Tasks/JokeSoupTask.php

@@ -2,14 +2,11 @@
 
 namespace App\Tasks;
 
+use App\Module\AI;
 use App\Module\Base;
-use App\Module\Extranet;
 use Cache;
 use Carbon\Carbon;
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
-
 /**
  * 获取笑话、心灵鸡汤
  *
@@ -29,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/LineTask.php

@@ -4,9 +4,6 @@ namespace App\Tasks;
 
 use App\Models\WebSocket;
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
-
 /**
  * 上线、离线通知
  * Class LineTask

app/Tasks/LoopTask.php

@@ -8,9 +8,6 @@ use App\Models\ProjectTask;
 use App\Models\ProjectTaskUser;
 use Carbon\Carbon;
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
-
 /**
  * 任务重复周期
  */
@@ -29,6 +26,10 @@ class LoopTask extends AbstractTask
         ])->chunkById(100, function ($list) {
             /** @var ProjectTask $item */
             foreach ($list as $item) {
+                if ($item->parent_id > 0) {
+                    // 如果是子任务则不处理
+                    continue;
+                }
                 try {
                     $task = $item->copyTask();
                     // 工作流
@@ -39,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) {
@@ -63,6 +64,18 @@ class LoopTask extends AbstractTask
                         $task->start_at = Carbon::parse($task->loop_at);
                         $task->end_at = $task->start_at->clone()->addSeconds($diffSecond);
                     }
+                    // 处理子任务
+                    $subTasks = ProjectTask::whereParentId($item->id)->get();
+                    if (!$subTasks->isEmpty()) {
+                        foreach ($subTasks as $subTask) {
+                            $newSubTask = $subTask->copyTask();
+                            $newSubTask->parent_id = $task->id;
+                            $newSubTask->start_at = $task->start_at;
+                            $newSubTask->end_at = $task->end_at;
+                            $newSubTask->save();
+                        }
+                    }
+                    //
                     $task->refreshLoop(true);
                     $task->addLog("创建任务来自周期任务ID：{$item->id}", [], $task->userid);
                     // 清空旧周期

app/Tasks/PushTask.php

@@ -1,8 +1,6 @@
 <?php
 namespace App\Tasks;
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
 use App\Models\WebSocket;
 use App\Models\WebSocketTmpMsg;
 use App\Module\Base;

app/Tasks/PushUmengMsg.php

@@ -1,8 +1,6 @@
 <?php
 namespace App\Tasks;
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
 use App\Models\UmengAlias;
 use App\Module\Base;
 

app/Tasks/UnclaimedTaskRemindTask.php

@@ -10,8 +10,6 @@ use Carbon\Carbon;
 use App\Models\WebSocketDialogMsg;
 use Illuminate\Support\Facades\Cache;
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
 class UnclaimedTaskRemindTask extends AbstractTask
 {
     public function __construct()

app/Tasks/UpdateSessionTitleViaAiTask.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Tasks;
+
+use App\Models\WebSocketDialogSession;
+use App\Module\AI;
+use App\Module\Base;
+
+/**
+ * 通过AI接口更新对话标题
+ */
+class UpdateSessionTitleViaAiTask extends AbstractTask
+{
+    protected $sessionId;
+    protected $msgText;
+
+    public function __construct($sessionId, $msgText)
+    {
+        parent::__construct();
+        $this->sessionId = $sessionId;
+        $this->msgText = $msgText;
+    }
+
+    public function start()
+    {
+        if (empty($this->sessionId) || empty($this->msgText)) {
+            return;
+        }
+
+        $session = WebSocketDialogSession::whereId($this->sessionId)->first();
+        if (!$session) {
+            return;
+        }
+
+        $result = AI::generateTitle($this->msgText);
+        if (Base::isError($result)) {
+            return;
+        }
+
+        $newTitle = $result['data']['title'];
+        if ($newTitle && $newTitle != $session->title) {
+            $session->title = Base::cutStr($newTitle, 100);
+            $session->save();
+        }
+    }
+
+    public function end()
+    {
+
+    }
+}

app/Tasks/WebSocketDialogMsgTask.php

@@ -2,8 +2,6 @@
 
 namespace App\Tasks;
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
 use App\Models\User;
 use App\Models\WebSocketDialog;
 use App\Models\WebSocketDialogMsg;
@@ -119,14 +117,20 @@ class WebSocketDialogMsgTask extends AbstractTask
                 $mention = array_intersect([0, $userid], $mentions) ? 1 : 0;
                 $silence = $mention ? false : $silence;
                 $dot = $msg->type === 'record' ? 1 : 0;
-                WebSocketDialogMsgRead::createInstance([
+                $msgRead = WebSocketDialogMsgRead::createInstance([
                     'dialog_id' => $msg->dialog_id,
                     'msg_id' => $msg->id,
                     'userid' => $userid,
                     'mention' => $mention,
                     'silence' => $silence,
                     'dot' => $dot,
-                ])->saveOrIgnore();
+                ]);
+                if ($msgRead->saveOrIgnore()) {
+                    if ($dialog->session_id && $dialog->session_id != $msg->session_id) {
+                        $msgRead->read_at = Carbon::now();
+                        $msgRead->save();
+                    }
+                }
                 $array[$userid] = [
                     'userid' => $userid,
                     'mention' => $mention,
@@ -186,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)
@@ -201,7 +207,7 @@ class WebSocketDialogMsgTask extends AbstractTask
                     Doo::setLanguage($lang);
                     $umengMsg = [
                         'title' => $umengTitle,
-                        'body' => WebSocketDialogMsg::previewMsg($msg),
+                        'body' => $umengBody,
                         'description' => "MID:{$msg->id}",
                         'seconds' => 3600,
                         'badge' => 1,

app/Tasks/ZincSearchSyncTask.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Tasks;
+
+use App\Models\WebSocketDialogMsg;
+use App\Models\WebSocketDialogUser;
+use App\Module\Apps;
+use App\Module\ZincSearch\ZincSearchDialogMsg;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Cache;
+
+/**
+ * 同步聊天数据到ZincSearch
+ */
+class ZincSearchSyncTask extends AbstractTask
+{
+    private $action;
+
+    private $data;
+
+    public function __construct($action = null, $data = null)
+    {
+        parent::__construct(...func_get_args());
+        $this->action = $action;
+        $this->data = $data;
+    }
+
+    public function start()
+    {
+        if (!Apps::isInstalled("search")) {
+            // 如果没有安装搜索模块，则不执行
+            return;
+        }
+
+        switch ($this->action) {
+            case 'sync':
+                // 同步消息数据
+                ZincSearchDialogMsg::sync(WebSocketDialogMsg::fillInstance($this->data));
+                break;
+
+            case 'delete':
+                // 删除消息数据
+                ZincSearchDialogMsg::delete(WebSocketDialogMsg::fillInstance($this->data));
+                break;
+
+            case 'userSync':
+                // 同步用户数据
+                ZincSearchDialogMsg::userSync(WebSocketDialogUser::fillInstance($this->data));
+                break;
+
+            case 'deleteUser':
+                // 删除用户数据
+                ZincSearchDialogMsg::delete(WebSocketDialogUser::fillInstance($this->data));
+                break;
+
+            default:
+                // 增量更新
+                $this->incrementalUpdate();
+                break;
+        }
+    }
+
+    /**
+     * 增量更新
+     * @return void
+     */
+    private function incrementalUpdate()
+    {
+        // 120分钟执行一次
+        $time = intval(Cache::get("ZincSearchSyncTask:Time"));
+        if (time() - $time < 120 * 60) {
+            return;
+        }
+
+        // 执行开始，120分钟后缓存标记失效
+        Cache::put("ZincSearchSyncTask:Time", time(), Carbon::now()->addMinutes(120));
+
+        // 开始执行同步
+        @shell_exec("php /var/www/artisan zinc:sync-user-msg --i");
+
+        // 执行完成，5分钟后缓存标记失效（5分钟任务可重复执行）
+        Cache::put("ZincSearchSyncTask:Time", time(), Carbon::now()->addMinutes(5));
+    }
+
+    public function end()
+    {
+    }
+}

bin/https

@@ -155,8 +155,8 @@ install() {
     cat >${sitePath}/ssl.conf <<EOF
 server_name ${domain};
 listen 443 ssl;
-ssl_certificate /etc/nginx/conf.d/site/ssl/${domain}.crt;
-ssl_certificate_key /etc/nginx/conf.d/site/ssl/${domain}.key;
+ssl_certificate /var/www/docker/nginx/site/ssl/${domain}.crt;
+ssl_certificate_key /var/www/docker/nginx/site/ssl/${domain}.key;
 ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
 ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;
 ssl_prefer_server_ciphers on;

composer.json

@@ -11,6 +11,8 @@
         "php": "^8.0",
         "ext-curl": "*",
         "ext-dom": "*",
+        "ext-ffi": "*",
+        "ext-fileinfo": "*",
         "ext-gd": "*",
         "ext-imagick": "*",
         "ext-json": "*",
@@ -32,10 +34,14 @@
         "league/html-to-markdown": "^5.1",
         "maatwebsite/excel": "^3.1.31",
         "madnest/madzipper": "^v1.1.0",
+        "matomo/device-detector": "^6.4",
         "mews/captcha": "^3.2.6",
         "orangehill/iseed": "^3.0.1",
         "overtrue/pinyin": "^4.0",
+        "phpoffice/phppresentation": "^1.1",
+        "phpoffice/phpword": "^1.3",
         "predis/predis": "^1.1.7",
+        "smalot/pdfparser": "^2.11",
         "symfony/mailer": "^6.0"
     },
     "require-dev": {
@@ -84,7 +90,10 @@
     "config": {
         "optimize-autoloader": true,
         "preferred-install": "dist",
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

database/migrations/2022_05_22_225924_add_projects_personal.php

@@ -22,7 +22,7 @@ class AddProjectsPersonal extends Migration
         });
         if ($isAdd) {
             // 更新数据
-            \App\Models\Project::whereName('个人项目')->chunkById(100, function ($lists) {
+            \App\Models\Project::where('name','like', '%个人项目%')->chunkById(100, function ($lists) {
                 /** @var \App\Models\Project $item */
                 foreach ($lists as $item) {
                     if ($item->desc == '注册时系统自动创建项目，你可以自由删除。') {

database/migrations/2025_02_21_225057_update_ai_models_table.php

@@ -0,0 +1,50 @@
+<?php
+
+use App\Models\Setting;
+use App\Module\Base;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateAiModelsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $row = Setting::whereName('aibotSetting')->first();
+        if (empty($row)) {
+            return;
+        }
+        $value = Base::json2array($row->getRawOriginal('setting'));
+        foreach ($value as $key => $item) {
+            if (str_ends_with($key, '_models')) {
+                $value[$key] = preg_replace('/\s*:\s*/', ' | ', $item);
+            }
+        }
+        $row->setting = Base::array2json($value);
+        $row->save();
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        $row = Setting::whereName('aibotSetting')->first();
+        if (empty($row)) {
+            return;
+        }
+        $value = Base::json2array($row->getRawOriginal('setting'));
+        foreach ($value as $key => $item) {
+            if (str_ends_with($key, '_models')) {
+                $value[$key] = preg_replace('/\s*\|\s*/', ': ', $item);
+            }
+        }
+        $row->setting = Base::array2json($value);
+        $row->save();
+    }
+}

database/migrations/2025_02_25_105201_update_web_socket_dialog_msgs_session_id.php

@@ -0,0 +1,54 @@
+<?php
+
+use App\Models\WebSocketDialog;
+use App\Models\WebSocketDialogMsg;
+use App\Models\WebSocketDialogSession;
+use App\Module\Base;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateWebSocketDialogMsgsSessionId extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.email'])
+            ->join('web_socket_dialog_users as du', 'web_socket_dialogs.id', '=', 'du.dialog_id')
+            ->join('users as u', 'du.userid', '=', 'u.userid')
+            ->where('u.email', 'like', 'ai-%@bot.system')
+            ->where('web_socket_dialogs.type', 'user')
+            ->get();
+        foreach ($list as $item) {
+            $msg = WebSocketDialogMsg::whereDialogId($item->id)->whereSessionId(0)->orderBy('id')->first();
+            if ($msg || empty($item->session_id)) {
+                $title = $msg?->key;
+                $session = WebSocketDialogSession::createInstance([
+                    'dialog_id' => $item->id,
+                    'title' => $title ? Base::cutStr($title, 100) : 'Unknown',
+                    'created_at' => $item->created_at,
+                ]);
+                $session->save();
+                if (empty($item->session_id)) {
+                    $item->session_id = $session->id;
+                    $item->save();
+                }
+                if ($msg) {
+                    WebSocketDialogMsg::whereDialogId($item->id)->whereSessionId(0)->update(['session_id' => $session->id]);
+                }
+            }
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

database/migrations/2025_03_15_164703_create_report_links_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateReportLinksTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('report_links', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('rid')->nullable()->default(0)->index()->comment('报告ID');
+            $table->integer('num')->nullable()->default(0)->comment('累计访问');
+            $table->string('code')->nullable()->default('')->comment('链接码');
+            $table->bigInteger('userid')->nullable()->default(0)->index()->comment('会员ID');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('report_links');
+    }
+}

database/migrations/2025_04_19_084905_create_user_devices_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateUserDevicesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (Schema::hasTable('user_devices'))
+            return;
+
+        Schema::create('user_devices', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('userid')->index()->nullable()->default(0)->comment('会员ID');
+            $table->string('hash')->index()->nullable()->default('')->comment('TOKEN MD5');
+            $table->longText('detail')->nullable()->comment('详细信息');
+            $table->timestamp('expired_at')->nullable()->comment('过期时间');
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('user_devices');
+    }
+}