build

- 支持 background 参数
- iframe 模式添加安全距离
- iframe 支持 dootask/tools

.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

@@ -133,7 +133,7 @@ jobs:
           tools: composer:v2
 
       - name: Install Dependencies
-        run: composer install --no-dev --optimize-autoloader
+        run: composer install
 
       - name: Create Vendor Archive
         run: tar -czf vendor.tar.gz vendor/
@@ -299,7 +299,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

@@ -29,3 +29,4 @@ vars.yaml
 laravels.conf
 laravels.pid
 README_LOCAL.md
+dootask.lock

CHANGELOG.md

@@ -2,6 +2,389 @@
 
 All notable changes to this project will be documented in this file.
 
+## [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

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

@@ -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) {
+        go(function () use ($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)) {
+                $base64 = base64_encode(Base::array2string([
+                    'file' => $zipFile,
+                ]));
+                $fileUrl = Base::fillUrl('api/approve/down?key=' . urlencode($base64));
+                Session::put('approve::export:userid', $user->userid);
+                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)

app/Http/Controllers/Api/DialogController.php

@@ -12,11 +12,12 @@ use App\Models\File;
 use App\Models\User;
 use App\Module\Base;
 use App\Module\Timer;
+use App\Models\Setting;
 use App\Module\Extranet;
 use App\Module\TimeRange;
 use App\Module\MsgTool;
-use App\Module\Table\OnlineData;
 use App\Models\FileContent;
+use App\Models\ProjectTask;
 use App\Models\AbstractModel;
 use App\Models\WebSocketDialog;
 use App\Models\WebSocketDialogMsg;
@@ -26,6 +27,8 @@ use App\Models\WebSocketDialogMsgRead;
 use App\Models\WebSocketDialogMsgTodo;
 use App\Models\WebSocketDialogMsgTranslate;
 use App\Models\WebSocketDialogSession;
+use App\Module\Table\OnlineData;
+use App\Module\ZincSearch\ZincSearchDialogMsg;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
 
 /**
@@ -117,34 +120,11 @@ class DialogController extends AbstractController
             return Base::retError('请输入搜索关键词');
         }
         // 搜索会话
-        $list = DB::table('web_socket_dialog_users as u')
-            ->select(['d.*', 'u.top_at', 'u.last_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
-            ->join('web_socket_dialogs as d', 'u.dialog_id', '=', 'd.id')
-            ->where('u.userid', $user->userid)
-            ->where('d.name', 'LIKE', "%{$key}%")
-            ->whereNull('d.deleted_at')
-            ->orderByDesc('u.top_at')
-            ->orderByDesc('u.last_at')
-            ->take(20)
-            ->get()
-            ->map(function($item) use ($user) {
-                return WebSocketDialog::synthesizeData($item, $user->userid);
-            })
-            ->all();
+        $take = 20;
+        $list = WebSocketDialog::searchDialog($user->userid, $key, $take);
         // 搜索联系人
-        if (count($list) < 20 && Base::judgeClientVersion("0.21.60")) {
-            $users = 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(20 - count($list))
-                ->get();
+        if (count($list) < $take && Base::judgeClientVersion("0.21.60")) {
+            $users = User::searchUser($key, $take - count($list));
             $users->transform(function (User $item) use ($user) {
                 $id = 'u:' . $item->userid;
                 $lastAt = null;
@@ -170,29 +150,16 @@ class DialogController extends AbstractController
             $list = array_merge($list, $users->toArray());
         }
         // 搜索消息会话
-        if (count($list) < 20) {
-            $prefix = DB::getTablePrefix();
-            if (preg_match('/[+\-><()~*"@]/', $key)) {
-                $against = "\"{$key}\"";
-            } else {
-                $against = "*{$key}*";
+        if (count($list) < $take) {
+            $searchResults = ZincSearchDialogMsg::search($user->userid, $key, 0, $take - count($list));
+            if ($searchResults) {
+                foreach ($searchResults as $item) {
+                    if ($dialog = WebSocketDialog::find($item['id'])) {
+                        $dialog = array_merge($dialog->toArray(), $item);
+                        $list[] = WebSocketDialog::synthesizeData($dialog, $user->userid);
+                    }
+                }
             }
-            $msgs = 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', $user->userid)
-                ->where('m.bot', 0)
-                ->whereNull('d.deleted_at')
-                ->whereRaw("MATCH({$prefix}m.key) AGAINST('{$against}' IN BOOLEAN MODE)")
-                ->orderByDesc('m.id')
-                ->take(20 - count($list))
-                ->get()
-                ->map(function($item) use ($user) {
-                    return WebSocketDialog::synthesizeData($item, $user->userid);
-                })
-                ->all();
-            $list = array_merge($list, $msgs);
         }
         //
         return Base::retSuccess('success', $list);
@@ -252,14 +219,10 @@ class DialogController extends AbstractController
         //
         $dialog_id = intval(Request::input('dialog_id'));
         //
-        $item = 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', $user->userid)
-            ->where('d.id', $dialog_id)
-            ->whereNull('d.deleted_at')
-            ->first();
-        return Base::retSuccess('success', WebSocketDialog::synthesizeData($item, $user->userid));
+        $dialog = WebSocketDialog::checkDialog($dialog_id);
+        $data = WebSocketDialog::synthesizeData($dialog, $user->userid);
+        //
+        return Base::retSuccess('success', $data);
     }
 
     /**
@@ -366,8 +329,6 @@ class DialogController extends AbstractController
         ]);
     }
 
-
-
     /**
      * @api {get} api/dialog/hide          09. 会话隐藏
      *
@@ -686,15 +647,18 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/search          14. 搜索消息位置
+     * @api {get} api/dialog/msg/search          14. 搜索消息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup dialog
      * @apiName msg__search
      *
-     * @apiParam {Number} dialog_id         对话ID
      * @apiParam {String} key               搜索关键词
+     * @apiParam {Number} [dialog_id]       对话ID（存在则搜索消息在对话的位置）
+     * @apiParam {Number} [take]            搜索数量
+     * - dialog_id > 0, 默认:200，最大:200
+     * - dialog_id <= 0, 默认:20，最大:50
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -702,22 +666,38 @@ class DialogController extends AbstractController
      */
     public function msg__search()
     {
-        User::auth();
+        $user = User::auth();
         //
-        $dialog_id = intval(Request::input('dialog_id'));
         $key = trim(Request::input('key'));
+        $dialogId = intval(Request::input('dialog_id'));
         //
         if (empty($key)) {
             return Base::retError('关键词不能为空');
         }
         //
-        WebSocketDialog::checkDialog($dialog_id);
-        //
-        $data = WebSocketDialogMsg::whereDialogId($dialog_id)
-            ->where('key', 'LIKE', "%{$key}%")
-            ->take(200)
-            ->pluck('id');
-        return Base::retSuccess('success', compact('data'));
+        if ($dialogId > 0) {
+            // 搜索位置
+            WebSocketDialog::checkDialog($dialogId);
+            //
+            $data = WebSocketDialogMsg::whereDialogId($dialogId)
+                ->where('key', 'LIKE', "%{$key}%")
+                ->take(Base::getPaginate(200, 200, 'take'))
+                ->pluck('id');
+            return Base::retSuccess('success', compact('data'));
+        } else {
+            // 搜索消息
+            $list = [];
+            $searchResults = ZincSearchDialogMsg::search($user->userid, $key, 0, Base::getPaginate(50, 20, 'take'));
+            if ($searchResults) {
+                foreach ($searchResults as $item) {
+                    if ($dialog = WebSocketDialog::find($item['id'])) {
+                        $dialog = array_merge($dialog->toArray(), $item);
+                        $list[] = WebSocketDialog::synthesizeData($dialog, $user->userid);
+                    }
+                }
+            }
+            return Base::retSuccess('success', ['data' => $list]);
+        }
     }
 
     /**
@@ -1060,10 +1040,13 @@ class DialogController extends AbstractController
         $dialogIds = $dialog_ids ? explode(',', $dialog_ids) : [$dialog_id ?: 0];
         foreach ($dialogIds as $dialog_id) {
             //
-            WebSocketDialog::checkDialog($dialog_id);
+            $dialog = WebSocketDialog::checkDialog($dialog_id);
             //
             if ($update_id > 0) {
                 $action = $update_mark ? "update-$update_id" : "change-$update_id";
+                if (!$user->bot && !$dialog->isSelfDialog()) {
+                    Setting::validateMsgLimit('edit', $update_id);
+                }
             } elseif ($reply_id > 0) {
                 $action = "reply-$reply_id";
                 if ($reply_check === 'yes') {
@@ -1319,7 +1302,79 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {post} api/dialog/msg/sendfile          25. 文件上传
+     * @api {post} api/dialog/msg/convertrecord          25. 录音转文字
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__convertrecord
+     *
+     * @apiParam {String} base64                语音base64
+     * @apiParam {Number} duration              语音时长（毫秒）
+     * @apiParam {String} [language]            识别语言
+     * - 比如：zh
+     * - 默认：自动识别
+     * - 格式：符合 ISO_639 标准
+     * - 此参数不一定起效果，AI会根据语音和language参考翻译识别结果
+     * @apiParam {String} [translate]           翻译识别结果
+     * - 比如：zh
+     * - 默认：不翻译结果
+     * - 格式：符合 ISO_639 标准
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function msg__convertrecord()
+    {
+        $user = User::auth();
+        $user->checkChatInformation();
+        //
+        $path = "uploads/tmp/chat/" . date("Ym") . "/" . $user->userid . "/";
+        $base64 = Request::input('base64');
+        $language = Request::input('language');
+        $translate = Request::input('translate');
+        $duration = intval(Request::input('duration'));
+        if ($duration < 600) {
+            return Base::retError('说话时间太短');
+        }
+        // 保存录音
+        $data = Base::record64save([
+            "base64" => $base64,
+            "path" => $path,
+        ]);
+        if (Base::isError($data)) {
+            return Base::retError($data['msg']);
+        }
+        $recordData = $data['data'];
+        // 转文字
+        $extParams = [];
+        if ($language) {
+            $extParams = [
+                'language' => $language === 'zh-CHT' ? 'zh' : $language,
+                'prompt' => "将此语音识别为“" . Doo::getLanguages($language) . "”。",
+            ];
+        }
+        $result = Extranet::openAItranscriptions($recordData['file'], $extParams);
+        if (Base::isError($result)) {
+            return $result;
+        }
+        if (strlen($result['data']) < 1) {
+            return Base::retError('转文字失败');
+        }
+        // 翻译
+        if ($translate) {
+            $result = Extranet::openAItranslations($result['data'], Doo::getLanguages($translate));
+            if (Base::isError($result)) {
+                return $result;
+            }
+        }
+        // 返回
+        return $result;
+    }
+
+    /**
+     * @api {post} api/dialog/msg/sendfile          26. 文件上传
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1351,7 +1406,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {post} api/dialog/msg/sendfiles          26. 群发文件上传
+     * @api {post} api/dialog/msg/sendfiles          27. 群发文件上传
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1407,7 +1462,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/sendfileid          27. 通过文件ID发送文件
+     * @api {get} api/dialog/msg/sendfileid          28. 通过文件ID发送文件
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1417,6 +1472,7 @@ class DialogController extends AbstractController
      * @apiParam {Number} file_id           消息ID
      * @apiParam {Array} dialogids          转发给的对话ID
      * @apiParam {Array} userids            转发给的成员ID
+     * @apiParam {String} leave_message     转发留言
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -1429,55 +1485,63 @@ class DialogController extends AbstractController
         $file_id = intval(Request::input("file_id"));
         $dialogids = Request::input('dialogids');
         $userids = Request::input('userids');
+        $leave_message = Request::input('leave_message');
         //
         if (empty($dialogids) && empty($userids)) {
-            return Base::retError("请选择转发对话或成员");
+            return Base::retError("请选择对话或成员");
         }
         //
         $file = File::permissionFind($file_id, $user);
         $fileLink = $file->getShareLink($user->userid);
-        $fileMsg = "<a class=\"mention file\" href=\"{{RemoteURL}}single/file/{$fileLink['code']}\" target=\"_blank\">~{$file->getNameAndExt()}</a>";
+        $fileMsg = "<p><a class=\"mention file\" href=\"{{RemoteURL}}single/file/{$fileLink['code']}\" target=\"_blank\">~{$file->getNameAndExt()}</a></p>";
+        if ($leave_message) {
+            $fileMsg .= "<p>{$leave_message}</p>";
+        }
         //
-        return AbstractModel::transaction(function() use ($user, $fileMsg, $userids, $dialogids) {
-            $msgs = [];
-            $already = [];
-            if ($dialogids) {
-                if (!is_array($dialogids)) {
-                    $dialogids = [$dialogids];
-                }
-                foreach ($dialogids as $dialogid) {
-                    $res = WebSocketDialogMsg::sendMsg(null, $dialogid, 'text', ['text' => $fileMsg], $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' => $fileMsg], $user->userid);
-                        if (Base::isSuccess($res)) {
-                            $msgs[] = $res['data'];
-                        }
-                    }
-                }
-            }
-            return Base::retSuccess('发送成功', [
-                'msgs' => $msgs
-            ]);
-        });
+        return WebSocketDialogMsg::sendMsgBatch($user, $userids, $dialogids, $fileMsg);
     }
 
     /**
-     * @api {post} api/dialog/msg/sendanon          28. 发送匿名消息
+     * @api {get} api/dialog/msg/sendtaskid          29. 通过任务ID发送任务
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__sendtaskid
+     *
+     * @apiParam {Number} task_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 msg__sendtaskid()
+    {
+        $user = User::auth();
+        //
+        $task_id = intval(Request::input("task_id"));
+        $dialogids = Request::input('dialogids');
+        $userids = Request::input('userids');
+        $leave_message = Request::input('leave_message');
+        //
+        if (empty($dialogids) && empty($userids)) {
+            return Base::retError("请选择对话或成员");
+        }
+        //
+        $task = ProjectTask::userTask($task_id, null);
+        $taskMsg = "<p><span class=\"mention task\" data-id=\"{$task_id}\">#{$task->name}</span></p>";
+        if ($leave_message) {
+            $taskMsg .= "<p>{$leave_message}</p>";
+        }
+        //
+        return WebSocketDialogMsg::sendMsgBatch($user, $userids, $dialogids, $taskMsg);
+    }
+
+    /**
+     * @api {post} api/dialog/msg/sendanon          30. 发送匿名消息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1533,7 +1597,68 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {post} api/dialog/msg/sendlocation          29. 发送位置消息
+     * @api {post} api/dialog/msg/sendbot          31. 发送机器人消息
+     *
+     * @apiDescription 需要token身份，通过机器人发送消息给指定用户
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__sendbot
+     *
+     * @apiParam {Number} userid            对方会员ID
+     * @apiParam {String} text              消息内容，markdown格式
+     * @apiParam {String} [bot_type]        机器人类型
+     * - system-msg: 系统消息（默认）
+     * - task-alert: 任务提醒
+     * - check-in: 签到打卡
+     * - approval-alert: 审批
+     * - meeting-alert: 会议通知
+     * @apiParam {Boolean} [silence]        静默发送
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function msg__sendbot()
+    {
+        User::auth();
+        //
+        $userid = intval(Request::input('userid'));
+        $text = trim(Request::input('text'));
+        $botType = trim(Request::input('bot_type', 'system-msg'));
+        $silence = Request::input('silence', false);
+        //
+        $toUser = User::whereUserid($userid)->first();
+        if (empty($toUser) || $toUser->bot) {
+            return Base::retError("机器人消息仅允许发送给个人");
+        }
+        if ($toUser->isDisable()) {
+            return Base::retError("对方已离职");
+        }
+        $strlen = mb_strlen($text);
+        if ($strlen < 1) {
+            return Base::retError('消息内容不能为空');
+        }
+        if ($strlen > 2000) {
+            return Base::retError('消息内容最大不能超过2000字');
+        }
+        //
+        $botUser = User::botGetOrCreate($botType);
+        if (empty($botUser)) {
+            return Base::retError('机器人不存在');
+        }
+        $dialog = WebSocketDialog::checkUserDialog($botUser, $toUser->userid);
+        if (empty($dialog)) {
+            return Base::retError('机器人会话不存在');
+        }
+        $msgData = [
+            'type' => 'md',
+            'text' => $text,
+        ];
+        return WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', $msgData, $botUser->userid, false, false, $silence);
+    }
+
+    /**
+     * @api {post} api/dialog/msg/sendlocation          32. 发送位置消息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1593,7 +1718,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/readlist          30. 获取消息阅读情况
+     * @api {get} api/dialog/msg/readlist          33. 获取消息阅读情况
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1622,7 +1747,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/detail          31. 消息详情
+     * @api {get} api/dialog/msg/detail          34. 消息详情
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1682,7 +1807,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/download          32. 文件下载
+     * @api {get} api/dialog/msg/download          35. 文件下载
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1723,7 +1848,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/withdraw          33. 聊天消息撤回
+     * @api {get} api/dialog/msg/withdraw          36. 聊天消息撤回
      *
      * @apiDescription 消息撤回限制24小时内，需要token身份
      * @apiVersion 1.0.0
@@ -1744,12 +1869,17 @@ class DialogController extends AbstractController
         if (empty($msg)) {
             return Base::retError("消息不存在或已被删除");
         }
+        $dialog = WebSocketDialog::checkDialog($msg->dialog_id);
+        //
+        if (!$user->bot && !$dialog->isSelfDialog()) {
+            Setting::validateMsgLimit('rev', $msg);
+        }
         $msg->withdrawMsg();
         return Base::retSuccess("success");
     }
 
     /**
-     * @api {get} api/dialog/msg/voice2text          34. 语音消息转文字
+     * @api {get} api/dialog/msg/voice2text          37. 语音消息转文字
      *
      * @apiDescription 将语音消息转文字，需要token身份
      * @apiVersion 1.0.0
@@ -1801,7 +1931,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/translation          35. 翻译消息
+     * @api {get} api/dialog/msg/translation          38. 翻译消息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1870,7 +2000,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/mark          36. 消息标记操作
+     * @api {get} api/dialog/msg/mark          39. 消息标记操作
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -1934,7 +2064,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/silence          37. 消息免打扰
+     * @api {get} api/dialog/msg/silence          40. 消息免打扰
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -1997,7 +2127,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/forward          38. 转发消息给
+     * @api {get} api/dialog/msg/forward          41. 转发消息给
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2008,7 +2138,7 @@ class DialogController extends AbstractController
      * @apiParam {Array} dialogids              转发给的对话ID
      * @apiParam {Array} userids                转发给的成员ID
      * @apiParam {Number} show_source           是否显示原发送者信息
-     * @apiParam {Array} leave_message          转发留言
+     * @apiParam {String} leave_message         转发留言
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -2025,7 +2155,7 @@ class DialogController extends AbstractController
         $leave_message = Request::input('leave_message');
         //
         if (empty($dialogids) && empty($userids)) {
-            return Base::retError("请选择转发对话或成员");
+            return Base::retError("请选择对话或成员");
         }
         //
         $msg = WebSocketDialogMsg::whereId($msg_id)->first();
@@ -2038,7 +2168,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/emoji          39. emoji回复
+     * @api {get} api/dialog/msg/emoji          42. emoji回复
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2073,7 +2203,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/tag          40. 标注/取消标注
+     * @api {get} api/dialog/msg/tag          43. 标注/取消标注
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2102,7 +2232,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/todo          41. 设待办/取消待办
+     * @api {get} api/dialog/msg/todo          44. 设待办/取消待办
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2145,7 +2275,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/todolist          42. 获取消息待办情况
+     * @api {get} api/dialog/msg/todolist          45. 获取消息待办情况
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2175,7 +2305,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/done          43. 完成待办
+     * @api {get} api/dialog/msg/done          46. 完成待办
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2228,7 +2358,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/color          44. 设置颜色
+     * @api {get} api/dialog/msg/color          47. 设置颜色
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2269,7 +2399,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/group/add          45. 新增群组
+     * @api {get} api/dialog/group/add          48. 新增群组
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -2331,7 +2461,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/group/edit          46. 修改群组
+     * @api {get} api/dialog/group/edit          49. 修改群组
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -2393,7 +2523,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/group/adduser          47. 添加群成员
+     * @api {get} api/dialog/group/adduser          50. 添加群成员
      *
      * @apiDescription  需要token身份
      * - 有群主时：只有群主可以邀请
@@ -2429,7 +2559,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/group/deluser          48. 移出（退出）群成员
+     * @api {get} api/dialog/group/deluser          51. 移出（退出）群成员
      *
      * @apiDescription  需要token身份
      * - 只有群主、邀请人可以踢人
@@ -2473,7 +2603,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/group/transfer          49. 转让群组
+     * @api {get} api/dialog/group/transfer          52. 转让群组
      *
      * @apiDescription  需要token身份
      * - 只有群主且是个人类型群可以解散
@@ -2522,7 +2652,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/group/disband          50. 解散群组
+     * @api {get} api/dialog/group/disband          53. 解散群组
      *
      * @apiDescription  需要token身份
      * - 只有群主且是个人类型群可以解散
@@ -2550,7 +2680,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/group/searchuser          51. 搜索个人群（仅限管理员）
+     * @api {get} api/dialog/group/searchuser          54. 搜索个人群（仅限管理员）
      *
      * @apiDescription  需要token身份，用于创建部门搜索个人群组
      * @apiVersion 1.0.0
@@ -2579,7 +2709,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {post} api/dialog/okr/add          52. 创建OKR评论会话
+     * @api {post} api/dialog/okr/add          55. 创建OKR评论会话
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -2618,7 +2748,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {post} api/dialog/okr/push          53. 推送OKR相关信息
+     * @api {post} api/dialog/okr/push          56. 推送OKR相关信息
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -2654,7 +2784,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {post} api/dialog/msg/wordchain          54. 发送接龙消息
+     * @api {post} api/dialog/msg/wordchain          57. 发送接龙消息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2740,7 +2870,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {post} api/dialog/msg/vote          55. 发起投票
+     * @api {post} api/dialog/msg/vote          58. 发起投票
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2856,7 +2986,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/top          56. 置顶/取消置顶
+     * @api {get} api/dialog/msg/top          59. 置顶/取消置顶
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2916,7 +3046,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/topinfo          57. 获取置顶消息
+     * @api {get} api/dialog/msg/topinfo          60. 获取置顶消息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2943,7 +3073,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/applied          58. 标记消息已应用
+     * @api {get} api/dialog/msg/applied          61. 标记消息已应用
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2992,7 +3122,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/sticker/search          59. 搜索在线表情
+     * @api {get} api/dialog/sticker/search          62. 搜索在线表情
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -3016,7 +3146,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/config          60. 获取会话配置
+     * @api {get} api/dialog/config          63. 获取会话配置
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -3052,7 +3182,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {post} api/dialog/config/save          61. 保存会话配置
+     * @api {post} api/dialog/config/save          64. 保存会话配置
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -3090,7 +3220,7 @@ class DialogController extends AbstractController
             ]
         )) {
             WebSocketDialogMsg::sendMsg(null, $dialog_id, 'notice', [
-                'notice' => $value ? ("修改提示词：" . $value) : "取消提示词",
+                'notice' => $value ? ("修改提示词：" . Base::cutStr($value, 100)) : "取消提示词",
             ], User::userid(), true, true);
         }
 
@@ -3098,7 +3228,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/session/create          62. AI-开启新会话
+     * @api {get} api/dialog/session/create          65. AI-开启新会话
      *
      * @apiDescription 需要token身份，仅限与AI用户会话
      * @apiVersion 1.0.0
@@ -3106,6 +3236,7 @@ class DialogController extends AbstractController
      * @apiName session_create
      *
      * @apiParam {Number} dialog_id         对话ID
+     * @apiParam {Number} [userid]          用户ID（与 dialog_id 二选一，userid 优先）
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -3113,11 +3244,16 @@ class DialogController extends AbstractController
      */
     public function session__create()
     {
-        User::auth();
+        $user = User::auth();
         //
         $dialog_id = intval(Request::input('dialog_id'));
+        $userid = intval(Request::input('userid'));
         //
-        $dialog = WebSocketDialog::checkDialog($dialog_id);
+        if ($userid) {
+            $dialog = WebSocketDialog::checkUserDialog($user, $userid);
+        } else {
+            $dialog = WebSocketDialog::checkDialog($dialog_id);
+        }
         //
         if ($dialog->type != 'user') {
             return Base::retError('当前对话不支持');
@@ -3131,9 +3267,7 @@ class DialogController extends AbstractController
             return Base::retError('当前对话不支持');
         }
         //
-        $session = WebSocketDialogSession::whereDialogId($dialog->id)
-            ->whereTitle('')
-            ->first();
+        $session = WebSocketDialogSession::whereDialogId($dialog->id)->whereTitle('')->first();
         if ($session) {
             $dialog->session_id = $session->id;
             $dialog->save();
@@ -3153,7 +3287,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/session/list          63. AI-获取会话列表
+     * @api {get} api/dialog/session/list          66. AI-获取会话列表
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -3193,7 +3327,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/session/open          64. AI-打开会话
+     * @api {get} api/dialog/session/open          67. AI-打开会话
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0

app/Http/Controllers/Api/FileController.php

@@ -87,6 +87,7 @@ class FileController extends AbstractController
                 }
                 return Base::retError($msg, $data);
             }
+            $fileLink->increment("num");
         } else {
             return Base::retError('参数错误');
         }
@@ -106,6 +107,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 +120,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 +134,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();
         // 搜索共享的
@@ -501,6 +507,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,
@@ -575,10 +585,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':
@@ -630,6 +642,8 @@ class FileController extends AbstractController
     {
         User::auth();
         //
+        File::isNeedInstallApp('office');
+        //
         $config = Request::input('config');
         $token = \Firebase\JWT\JWT::encode($config, env('APP_KEY') ,'HS256');
         return Base::retSuccess('成功', [
@@ -655,6 +669,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 +680,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 +791,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('历史数据不存在或已被删除');

app/Http/Controllers/Api/ProjectController.php

@@ -29,6 +29,7 @@ use App\Models\ProjectColumn;
 use App\Models\ProjectInvite;
 use App\Models\ProjectFlowItem;
 use App\Models\ProjectTaskFile;
+use App\Models\ProjectTaskTag;
 use App\Models\ProjectTaskUser;
 use App\Models\WebSocketDialog;
 use App\Exceptions\ApiException;
@@ -424,7 +425,7 @@ class ProjectController extends AbstractController
      */
     public function invite()
     {
-        User::auth();
+        $user = User::auth();
         //
         $project_id = intval(Request::input('project_id'));
         $refresh = Request::input('refresh', 'no');
@@ -440,17 +441,17 @@ class ProjectController extends AbstractController
         if (empty($projectInvite)) {
             $projectInvite = ProjectInvite::createInstance([
                 'project_id' => $project->id,
-                'code' => Base::generatePassword(64),
+                'code' => base64_encode("{$project->id},{$user->userid}," . Base::generatePassword()),
             ]);
             $projectInvite->save();
         } else {
             if ($refresh == 'yes') {
-                $projectInvite->code = Base::generatePassword(64);
+                $projectInvite->code = base64_encode("{$project->id},{$user->userid}," . Base::generatePassword());
                 $projectInvite->save();
             }
         }
         return Base::retSuccess('success', [
-            'url' => Base::fillUrl('manage/project/invite?code=' . $projectInvite->code),
+            'url' => Base::fillUrl('manage/project/invite/' . $projectInvite->code),
             'num' => $projectInvite->num
         ]);
     }
@@ -941,7 +942,9 @@ class ProjectController extends AbstractController
      * @apiName task__lists
      *
      * @apiParam {Object} [keys]             搜索条件
-     * - keys.name: ID、任务名称
+     * - keys.name: ID、任务名称、任务描述
+     * - keys.tag: 标签名称
+     * - keys.status: 任务状态 (completed: 已完成、uncompleted: 未完成、flow-xx: 流程状态ID)
      *
      * @apiParam {Number} [project_id]       项目ID
      * @apiParam {Number} [parent_id]        主任务ID（project_id && parent_id ≤ 0 时 仅查询自己参与的任务）
@@ -994,7 +997,29 @@ class ProjectController extends AbstractController
             if (Base::isNumber($keys['name'])) {
                 $builder->where("project_tasks.id", intval($keys['name']));
             } else {
-                $builder->where("project_tasks.name", "like", "%{$keys['name']}%");
+                $builder->where(function ($query) use ($keys) {
+                    $query->where("project_tasks.name", "like", "%{$keys['name']}%");
+                    $query->orWhere("project_tasks.desc", "like", "%{$keys['name']}%");
+                });
+            }
+        }
+        if ($keys['tag']) {
+            $builder->whereHas('taskTag', function ($query) use ($keys) {
+                $query->where('project_task_tags.name', $keys['tag']);
+            });
+        }
+        if ($keys['status']) {
+            if ($keys['status'] == 'completed') {
+                $builder->whereNotNull('project_tasks.complete_at');
+            } elseif ($keys['status'] == 'uncompleted') {
+                $builder->whereNull('project_tasks.complete_at');
+            } elseif (str_starts_with($keys['status'], 'flow-')) {
+                $flow = str_replace('flow-', '', $keys['status']);
+                if (Base::isNumber($flow)) {
+                    $builder->where('project_tasks.flow_item_id', intval($flow));
+                } elseif ($flow) {
+                    $builder->where('project_tasks.flow_item_name', 'like', "%{$flow}%");
+                }
             }
         }
         //
@@ -1234,7 +1259,7 @@ class ProjectController extends AbstractController
         $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid);
         //
         go(function () use ($user, $userid, $time, $type, $botUser, $dialog) {
-            Coroutine::sleep(0.1);
+            Coroutine::sleep(1);
             $headings = [];
             $headings[] = Doo::translate('任务ID');
             $headings[] = Doo::translate('父级任务ID');
@@ -1370,7 +1395,7 @@ class ProjectController extends AbstractController
                     'type' => 'content',
                     'title' => $content[0]['content'],
                     'content' => $content,
-                ], $botUser->userid, false, false, true);
+                ], $botUser->userid, true, false, true);
                 return;
             }
             //
@@ -1404,7 +1429,7 @@ class ProjectController extends AbstractController
                     'type' => 'content',
                     'title' => $content[0]['content'],
                     'content' => $content,
-                ], $botUser->userid, false, false, true);
+                ], $botUser->userid, true, false, true);
                 return;
             }
             //
@@ -1431,7 +1456,7 @@ class ProjectController extends AbstractController
                     'name' => $fileName,
                     'size' => filesize($zipPath),
                     'url' => $fileUrl,
-                ], $botUser->userid, false, false, true);
+                ], $botUser->userid, true, false, true);
             } else {
                 $content[] = [
                     'content' => "打包失败，请稍后再试...",
@@ -1441,9 +1466,15 @@ class ProjectController extends AbstractController
                     'type' => 'content',
                     'title' => $content[0]['content'],
                     'content' => $content,
-                ], $botUser->userid, false, false, true);
+                ], $botUser->userid, true, false, true);
             }
         });
+        //
+        WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+            'type' => 'content',
+            'content' => '正在导出任务统计，请稍等...',
+        ], $botUser->userid, true, false, true);
+        //
         return Base::retSuccess('success');
     }
 
@@ -1463,103 +1494,156 @@ class ProjectController extends AbstractController
     {
         $user = User::auth('admin');
         //
-        $headings = [];
-        $headings[] = Doo::translate('任务ID');
-        $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('创建人');
-        $data = [];
+        $botUser = User::botGetOrCreate('system-msg');
+        if (empty($botUser)) {
+            return Base::retError('系统机器人不存在');
+        }
+        $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid);
         //
-        ProjectTask::with(['taskTag'])
-            ->whereNull('complete_at')
-            ->whereNotNull('end_at')
-            ->where('end_at', '<=', Carbon::now())
-            ->orderBy('end_at')
-            ->chunk(100, function ($tasks) use (&$data) {
-                /** @var ProjectTask $task */
-                foreach ($tasks as $task) {
-                    $taskStartTime = Carbon::parse($task->start_at ?: $task->created_at)->timestamp;
-                    $totalTime = time() - $taskStartTime; //开发测试总用时
-                    $planTime = '-';//任务计划用时
-                    $overTime = '-';//超时时间
-                    if ($task->end_at) {
-                        $startTime = Carbon::parse($task->start_at)->timestamp;
-                        $endTime = Carbon::parse($task->end_at)->timestamp;
-                        $planTotalTime = $endTime - $startTime;
-                        $residueTime = $planTotalTime - $totalTime;
-                        if ($residueTime < 0) {
-                            $overTime = Doo::translate(Timer::timeFormat(abs($residueTime)));
+        go(function () use ($botUser, $dialog, $user) {
+            Coroutine::sleep(1);
+            //
+            $headings = [];
+            $headings[] = Doo::translate('任务ID');
+            $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('创建人');
+            $data = [];
+            //
+            $content = [];
+            $content[] = [
+                'content' => '导出超期任务已完成',
+                'style' => 'font-weight: bold;padding-bottom: 4px;',
+            ];
+            //
+            ProjectTask::with(['taskTag'])
+                ->whereNull('complete_at')
+                ->whereNotNull('end_at')
+                ->where('end_at', '<=', Carbon::now())
+                ->orderBy('end_at')
+                ->chunk(100, function ($tasks) use (&$data) {
+                    /** @var ProjectTask $task */
+                    foreach ($tasks as $task) {
+                        $taskStartTime = Carbon::parse($task->start_at ?: $task->created_at)->timestamp;
+                        $totalTime = time() - $taskStartTime; //开发测试总用时
+                        $planTime = '-';//任务计划用时
+                        $overTime = '-';//超时时间
+                        if ($task->end_at) {
+                            $startTime = Carbon::parse($task->start_at)->timestamp;
+                            $endTime = Carbon::parse($task->end_at)->timestamp;
+                            $planTotalTime = $endTime - $startTime;
+                            $residueTime = $planTotalTime - $totalTime;
+                            if ($residueTime < 0) {
+                                $overTime = Doo::translate(Timer::timeFormat(abs($residueTime)));
+                            }
+                            $planTime = Doo::translate(Timer::timeDiff($startTime, $endTime));
                         }
-                        $planTime = Doo::translate(Timer::timeDiff($startTime, $endTime));
+                        $ownerIds = $task->taskUser->where('owner', 1)->pluck('userid')->toArray();
+                        $ownerNames = [];
+                        foreach ($ownerIds as $ownerId) {
+                            $ownerNames[] = Base::filterEmoji(User::userid2nickname($ownerId)) . " (ID: {$ownerId})";
+                        }
+                        $data[] = [
+                            $task->id,
+                            $task->parent_id ?: '-',
+                            Base::filterEmoji($task->project?->name) ?: '-',
+                            Base::filterEmoji($task->name),
+                            $task->taskTag->map(function ($tag) {
+                                return Base::filterEmoji($tag->name);
+                            })->join(', ') ?: '-',
+                            $task->start_at ?: '-',
+                            $task->end_at ?: '-',
+                            $planTime,
+                            $overTime,
+                            implode(', ', $ownerNames),
+                            Base::filterEmoji(User::userid2nickname($task->userid)) . " (ID: {$task->userid})",
+                        ];
                     }
-                    $ownerIds = $task->taskUser->where('owner', 1)->pluck('userid')->toArray();
-                    $ownerNames = [];
-                    foreach ($ownerIds as $ownerId) {
-                        $ownerNames[] = Base::filterEmoji(User::userid2nickname($ownerId)) . " (ID: {$ownerId})";
-                    }
-                    $data[] = [
-                        $task->id,
-                        $task->parent_id ?: '-',
-                        Base::filterEmoji($task->project?->name) ?: '-',
-                        Base::filterEmoji($task->name),
-                        $task->taskTag->map(function ($tag) {
-                            return Base::filterEmoji($tag->name);
-                        })->join(', ') ?: '-',
-                        $task->start_at ?: '-',
-                        $task->end_at ?: '-',
-                        $planTime,
-                        $overTime,
-                        implode(', ', $ownerNames),
-                        Base::filterEmoji(User::userid2nickname($task->userid)) . " (ID: {$task->userid})",
-                    ];
-                }
-            });
-        if (empty($data)) {
-            return Base::retError('没有任何数据');
-        }
+                });
+            if (empty($data)) {
+                $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($data)->setStyles(["A1:J1" => ["font" => ["bold" => true]]])
+            ];
+            //
+            $fileName = $title . '_' . Timer::time() . '.xls';
+            $filePath = "temp/task/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, '.xls') . ".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,
+                ]));
+                $fileUrl = Base::fillUrl('api/project/task/down?key=' . urlencode($base64));
+                Session::put('task::export:userid', $user->userid);
+                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($data)->setStyles(["A1:J1" => ["font" => ["bold" => true]]])
-        ];
+        WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+            'type' => 'content',
+            'content' => '正在导出超期任务，请稍等...',
+        ], $botUser->userid, true, false, true);
         //
-        $fileName = $title . '_' . Timer::time() . '.xls';
-        $filePath = "temp/task/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, '.xls') . ".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('task::export:userid', $user->userid);
-            return Base::retSuccess('success', [
-                'size' => Base::twoFloat(filesize($zipPath) / 1024, true),
-                'url' => Base::fillUrl('api/project/task/down?key=' . urlencode($base64)),
-            ]);
-        } else {
-            return Base::retError('打包失败，请稍后再试...');
-        }
+        return Base::retSuccess('success');
     }
 
     /**
@@ -1759,6 +1843,13 @@ class ProjectController extends AbstractController
         //
         ProjectPermission::userTaskPermission(Project::userProject($task->project_id), ProjectPermission::TASK_REMOVE, $task);
         //
+        $task->addLog('删除附件：' . $file->name, [
+            'file_id' => $file->id,
+            'name' => $file->name,
+            'size' => $file->size,
+            'path' => $file->getRawOriginal('path'),
+            'thumb' => $file->getRawOriginal('thumb'),
+        ]);
         $task->pushMsg('filedelete', $file);
         $file->delete();
         //
@@ -1800,6 +1891,7 @@ class ProjectController extends AbstractController
                 'update_at' => Carbon::parse($file->updated_at)->toDateTimeString()
             ]);
         }
+        File::isNeedInstallApp($file->ext);
         //
         $data = $file->toArray();
         $data['path'] = $file->getRawOriginal('path');
@@ -2029,14 +2121,17 @@ class ProjectController extends AbstractController
         //
         $task = ProjectTask::userTask($task_id);
         //
-        $project = Project::userProject($task->project_id);
-        $permissionKey = ProjectPermission::TASK_UPDATE;
-        if (Arr::exists($param, 'times')) {
-            $permissionKey = ProjectPermission::TASK_TIME;
-        } else if (Arr::exists($param, 'flow_item_id')) {
-            $permissionKey = ProjectPermission::TASK_STATUS;
+        if ($task->hasOwner()) {
+            // 已经存在负责人，则需要检查权限（即：没有任务负责人时，不检查权限）
+            $project = Project::userProject($task->project_id);
+            $permissionKey = ProjectPermission::TASK_UPDATE;
+            if (Arr::exists($param, 'times')) {
+                $permissionKey = ProjectPermission::TASK_TIME;
+            } else if (Arr::exists($param, 'flow_item_id')) {
+                $permissionKey = ProjectPermission::TASK_STATUS;
+            }
+            ProjectPermission::userTaskPermission($project, $permissionKey, $task);
         }
-        ProjectPermission::userTaskPermission($project, $permissionKey, $task);
         //
         $taskUser = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($task_id)->get();
         $owners = $taskUser->where('owner', 1)->pluck('userid')->toArray();
@@ -2298,8 +2393,8 @@ class ProjectController extends AbstractController
      * @apiGroup project
      * @apiName task__flow
      *
-     * @apiParam {Number} task_id               任务ID
-     * @apiParam {Number} project_id            项目ID - 存在时只返回这个项目的
+     * @apiParam {Number} [task_id]             任务ID
+     * @apiParam {Number} [project_id]          项目ID（存在时只返回这个项目的工作流，主要用于任务移动到其他项目时）
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -2393,6 +2488,11 @@ class ProjectController extends AbstractController
      * @apiParam {Number} flow_item_id          工作流id
      * @apiParam {Array} owner                  负责人
      * @apiParam {Array} assist                 协助人
+     * @apiParam {String} [completed]           是否已完成
+     * - 没有 工作流id 时此参数才生效
+     * - 有值表示已完成
+     * - 空值表示未完成
+     * - 不存在不改变状态
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -2409,7 +2509,7 @@ class ProjectController extends AbstractController
         $flow_item_id = intval(Request::input('flow_item_id'));
         $owner = Request::input('owner', []);
         $assist = Request::input('assist', []);
-        $completeAt = trim(Request::input('complete_at', ''));
+        $completed = Request::exists('completed') ? (bool)Request::input('completed') : null;
         //
         $task = ProjectTask::userTask($task_id);
         //
@@ -2430,13 +2530,13 @@ class ProjectController extends AbstractController
             if (empty($flowItem)) {
                 return Base::retError('任务状态不存在');
             }
-        } else if (!$flow_item_id && !$completeAt) {
+        } else {
             if (projectFlowItem::whereProjectId($project->id)->count() > 0) {
                 return Base::retError('请选择移动后状态', [], 102);
             }
         }
         //
-        $task->moveTask($project_id, $column_id, $flow_item_id, $owner, $assist, $completeAt);
+        $task->moveTask($project_id, $column_id, $flow_item_id, $owner, $assist, $completed);
         //
         $data = [];
         $mainTask = ProjectTask::userTask($task_id)?->toArray();
@@ -2586,7 +2686,7 @@ class ProjectController extends AbstractController
             $builder->with(['projectTask:id,parent_id,name'])->whereProjectId($project->id)->whereTaskOnly(0);
         }
         //
-        $list = $builder->orderByDesc('created_at')->paginate(Base::getPaginate(100, 20));
+        $list = $builder->orderByDesc('created_at')->orderByDesc('id')->paginate(Base::getPaginate(100, 20));
         $list->transform(function (ProjectLog $log) use ($task_id) {
             $timestamp = Carbon::parse($log->created_at)->timestamp;
             if ($task_id === 0) {
@@ -2808,8 +2908,8 @@ class ProjectController extends AbstractController
             $template->update($data);
         } else {
             $templateCount = ProjectTaskTemplate::where('project_id', $projectId)->count();
-            if ($templateCount >= 20) {
-                return Base::retError('每个项目最多添加20个模板');
+            if ($templateCount >= 50) {
+                return Base::retError('每个项目最多添加50个模板');
             }
             $template = ProjectTaskTemplate::create($data);
         }
@@ -2892,7 +2992,7 @@ class ProjectController extends AbstractController
     /**
      * @api {post} api/project/tag/save          51. 保存标签
      *
-     * @apiDescription 需要token身份（修改：项目负责人；添加：项目所有成员）
+     * @apiDescription 需要token身份（修改：项目负责人、标签创建者；添加：项目所有成员）
      * @apiVersion 1.0.0
      * @apiGroup project
      * @apiName tag__save
@@ -2933,22 +3033,69 @@ class ProjectController extends AbstractController
             'color' => $color,
             'userid' => $user->userid
         ];
-        $project = Project::userProject($projectId, true, $id > 0 ? true : null);
+        $project = Project::userProject($projectId);
         if ($id > 0) {
             $tag = ProjectTag::where('id', $id)
                 ->where('project_id', $projectId)
                 ->first();
+            if (!$project->owner && $tag->userid != $user->userid) {
+                return Base::retError('没有权限修改标签');
+            }
             if (!$tag) {
                 return Base::retError('标签不存在或已被删除');
             }
-            $tag->update($data);
+            AbstractModel::transaction(function () use ($data, $tag, $project) {
+                $tagWhere = [
+                    'project_id' => $tag->project_id,
+                    'name' => $tag->name,
+                ];
+                // 获取使用该标签的任务ID
+                $taskIds = ProjectTaskTag::where($tagWhere)->pluck('task_id')->toArray();
+                // 更新任务
+                if (!empty($taskIds)) {
+                    ProjectTask::whereIn('id', $taskIds)->update(['updated_at' => Carbon::now()]);
+                }
+                // 更新任务标签
+                ProjectTaskTag::where($tagWhere)->update([
+                    'color' => $data['color'],
+                    'name' => $data['name'],
+                ]);
+                // 更新标签
+                $project->addLog("修改标签", [
+                    'change' => [
+                        [
+                            'type' => 'tag',
+                            'name' => $tag->name,
+                            'color' => $tag->color
+                        ],
+                        [
+                            'type' => 'tag',
+                            'name' => $data['name'],
+                            'color' => $data['color']
+                        ]
+                    ],
+                ]);
+                $tag->update($data);
+            });
         } else {
             $tagCount = ProjectTag::where('project_id', $projectId)->count();
-            if ($tagCount >= 20) {
-                return Base::retError('每个项目最多添加20个标签');
+            if ($tagCount >= 100) {
+                return Base::retError('每个项目最多添加100个标签');
             }
+            if (ProjectTag::where([
+                'project_id' => $projectId,
+                'name' => $name,
+            ])->exists()) {
+                return Base::retError('标签已存在');
+            }
+            $project->addLog("添加标签", [
+                'change' => [
+                    'type' => 'tag',
+                    'name' => $name,
+                    'color' => $color
+                ]
+            ]);
             $tag = ProjectTag::create($data);
-            $project->addLog("添加标签【" . $tag->name . "】");
         }
         return Base::retSuccess('保存成功', $tag);
     }
@@ -2956,7 +3103,7 @@ class ProjectController extends AbstractController
     /**
      * @api {get} api/project/tag/delete          52. 删除标签
      *
-     * @apiDescription 需要token身份（限：项目负责人）
+     * @apiDescription 需要token身份（限：项目负责人、标签创建者）
      * @apiVersion 1.0.0
      * @apiGroup project
      * @apiName tag__delete
@@ -2969,7 +3116,7 @@ class ProjectController extends AbstractController
      */
     public function tag__delete()
     {
-        User::auth();
+        $user = User::auth();
         //
         $id = intval(Request::input('id'));
         if (!$id) {
@@ -2979,9 +3126,35 @@ class ProjectController extends AbstractController
         if (!$tag) {
             return Base::retError('标签不存在或已被删除');
         }
-        Project::userProject($tag->project_id, true, true);
-        $tag->delete();
-        return Base::retSuccess('删除成功');
+        $project = Project::userProject($tag->project_id);
+        if (!$project->owner && $tag->userid != $user->userid) {
+            return Base::retError('没有权限删除标签');
+        }
+        //
+        return AbstractModel::transaction(function () use ($tag, $project) {
+            $tagWhere = [
+                'project_id' => $tag->project_id,
+                'name' => $tag->name,
+            ];
+            // 获取使用该标签的任务ID
+            $taskIds = ProjectTaskTag::where($tagWhere)->pluck('task_id')->toArray();
+            // 更新任务
+            if (!empty($taskIds)) {
+                ProjectTask::whereIn('id', $taskIds)->update(['updated_at' => Carbon::now()]);
+            }
+            // 删除任务标签
+            ProjectTaskTag::where($tagWhere)->delete();
+            // 删除标签
+            $project->addLog("删除标签", [
+                'change' => [
+                    'type' => 'tag',
+                    'name' => $tag->name,
+                    'color' => $tag->color
+                ],
+            ]);
+            $tag->delete();
+            return Base::retSuccess('删除成功');
+        });
     }
 
     /**

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,12 +77,14 @@ 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: 汇报时间
@@ -90,10 +105,19 @@ 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])) {
@@ -121,6 +145,7 @@ class ReportController extends AbstractController
     /**
      * @api {get} api/report/store          03. 保存并发送工作汇报
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName store
@@ -196,7 +221,6 @@ class ReportController extends AbstractController
                 $report->updateInstance([
                     "title" => $input["title"],
                     "type" => $input["type"],
-                    "content" => htmlspecialchars($input["content"]),
                 ]);
             } else {
                 // 生成唯一标识
@@ -210,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"]) {
@@ -246,6 +284,7 @@ class ReportController extends AbstractController
     /**
      * @api {get} api/report/template          04. 生成汇报模板
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName template
@@ -417,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     返回信息（错误描述）
@@ -430,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
@@ -494,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
@@ -511,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
@@ -535,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,6 +2,7 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Models\UserDevice;
 use App\Models\WebSocketDialog;
 use App\Models\WebSocketDialogMsg;
 use Request;
@@ -19,9 +20,11 @@ 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',
@@ -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();
         //
@@ -287,6 +295,7 @@ class SystemController extends AbstractController
      * @apiParam {String} type
      * - get: 获取（默认）
      * - save: 保存设置（参数：[...]）
+     * @apiParam {String} filter    过滤字段（可选）
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -296,7 +305,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') {
@@ -311,10 +323,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') && $item) {
+                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);
                 }
             }
@@ -345,7 +365,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/setting/aibot_defmodels          05. 获取AI默认模型
+     * @api {get} api/system/setting/aibot_defmodels          06. 获取AI默认模型
      *
      * @apiDescription 获取AI机器人默认模型
      * @apiVersion 1.0.0
@@ -383,7 +403,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/setting/checkin          06. 获取签到设置、保存签到设置（限管理员）
+     * @api {get} api/system/setting/checkin          07. 获取签到设置、保存签到设置（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -436,16 +456,22 @@ 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'])) {
+                        if (empty($all['locat_bd_lbs_key'])) {
+                            return Base::retError('请填写百度地图AK');
+                        }
+                        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 (!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');
                     }
                 }
             }
@@ -489,7 +515,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/setting/apppush          07. 获取APP推送设置、保存APP推送设置（限管理员）
+     * @api {get} api/system/setting/apppush          08. 获取APP推送设置、保存APP推送设置（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -534,7 +560,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/setting/thirdaccess          08. 第三方帐号（限管理员）
+     * @api {get} api/system/setting/thirdaccess          09. 第三方帐号（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -604,7 +630,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/setting/file          09. 文件设置（限管理员）
+     * @api {get} api/system/setting/file          10. 文件设置（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -644,7 +670,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/demo          10. 获取演示帐号
+     * @api {get} api/system/demo          11. 获取演示帐号
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -668,7 +694,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/priority          11. 任务优先级
+     * @api {post} api/system/priority          12. 任务优先级
      *
      * @apiDescription 获取任务优先级、保存任务优先级
      * @apiVersion 1.0.0
@@ -717,7 +743,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/column/template          12. 创建项目模板
+     * @api {post} api/system/column/template          13. 创建项目模板
      *
      * @apiDescription 获取创建项目模板、保存创建项目模板
      * @apiVersion 1.0.0
@@ -764,7 +790,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/license          13. License
+     * @api {post} api/system/license          14. License
      *
      * @apiDescription 获取License信息、保存License（限管理员）
      * @apiVersion 1.0.0
@@ -795,6 +821,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' => []
         ];
@@ -803,7 +830,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'])) {
@@ -833,7 +860,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/info          14. 获取终端详细信息
+     * @api {get} api/system/get/info          15. 获取终端详细信息
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -862,7 +889,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ip          15. 获取IP地址
+     * @api {get} api/system/get/ip          16. 获取IP地址
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -877,7 +904,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/cnip          16. 是否中国IP地址
+     * @api {get} api/system/get/cnip          17. 是否中国IP地址
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -894,7 +921,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ipgcj02          17. 获取IP地址经纬度
+     * @api {get} api/system/get/ipgcj02          18. 获取IP地址经纬度
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -911,7 +938,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ipinfo          18. 获取IP地址详细信息
+     * @api {get} api/system/get/ipinfo          19. 获取IP地址详细信息
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -928,7 +955,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/imgupload          19. 上传图片
+     * @api {post} api/system/imgupload          20. 上传图片
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -937,7 +964,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]           压缩方式（等比缩放）
@@ -994,7 +1021,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/imgview          20. 浏览图片空间
+     * @api {get} api/system/get/imgview          21. 浏览图片空间
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1091,16 +1118,16 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/fileupload          21. 上传文件
+     * @api {post} api/system/fileupload          22. 上传文件
      *
      * @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     返回信息（错误描述）
@@ -1135,7 +1162,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/updatelog          22. 获取更新日志
+     * @api {get} api/system/get/updatelog          23. 获取更新日志
      *
      * @apiDescription 获取更新日志
      * @apiVersion 1.0.0
@@ -1168,7 +1195,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', [
@@ -1178,7 +1205,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/email/check          23. 邮件发送测试（限管理员）
+     * @api {get} api/system/email/check          24. 邮件发送测试（限管理员）
      *
      * @apiDescription 测试配置邮箱是否能发送邮件
      * @apiVersion 1.0.0
@@ -1224,7 +1251,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/checkin/export          24. 导出签到数据（限管理员）
+     * @api {get} api/system/checkin/export          25. 导出签到数据（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -1240,7 +1267,7 @@ class SystemController extends AbstractController
      */
     public function checkin__export()
     {
-        User::auth('admin');
+        $user = User::auth('admin');
         //
         $setting = Base::setting('checkinSetting');
         if ($setting['open'] !== 'open') {
@@ -1270,130 +1297,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]);
+        go(function () use ($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)) {
+                $base64 = base64_encode(Base::array2string([
+                    'file' => $zipFile,
+                ]));
+                $fileUrl = Base::fillUrl('api/system/checkin/down?key=' . urlencode($base64));
+                Session::put('checkin::export:userid', $user->userid);
+                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          25. 下载导出的签到数据
+     * @api {get} api/system/checkin/down          26. 下载导出的签到数据
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -1419,7 +1499,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/version          26. 获取版本号
+     * @api {get} api/system/version          27. 获取版本号
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -1427,23 +1507,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))) {
@@ -1452,11 +1538,14 @@ class SystemController extends AbstractController
                 $i++;
             }
         }
+        if (Request::hasHeader('version')) {
+            return Base::retSuccess('success', $array);
+        }
         return $array;
     }
 
     /**
-     * @api {get} api/system/prefetch          27. 预加载的资源
+     * @api {get} api/system/prefetch          28. 预加载的资源
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -1496,11 +1585,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) {
@@ -1515,6 +1606,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/Api/UsersController.php

@@ -19,6 +19,7 @@ use App\Models\UserBot;
 use App\Models\WebSocket;
 use App\Models\UmengAlias;
 use App\Models\UserDelete;
+use App\Models\UserDevice;
 use App\Models\UserTransfer;
 use App\Models\AbstractModel;
 use App\Models\UserCheckinFace;
@@ -154,7 +155,7 @@ class UsersController extends AbstractController
         //
         if (!Project::withTrashed()->whereUserid($user->userid)->wherePersonal(1)->exists()) {
             Project::createProject([
-                'name' => Doo::translate('个人项目'),
+                'name' => "📝 " . Doo::translate('个人项目'),
                 'desc' => Doo::translate('注册时系统自动创建项目，你可以自由删除。'),
                 'personal' => 1,
             ], $user->userid);
@@ -267,7 +268,23 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/reg/needinvite          06. 是否需要邀请码
+     * @api {get} api/users/logout          06. 退出登录
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup users
+     * @apiName logout
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     */
+    public function logout()
+    {
+        UserDevice::forget();
+        return Base::retSuccess('退出成功');
+    }
+
+    /**
+     * @api {get} api/users/reg/needinvite          07. 是否需要邀请码
      *
      * @apiDescription 用于判断注册是否需要邀请码
      * @apiVersion 1.0.0
@@ -286,7 +303,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/info          07. 获取我的信息
+     * @api {get} api/users/info          08. 获取我的信息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -336,7 +353,52 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/editdata          08. 修改自己的资料
+     * @api {get} api/users/info/departments          09. 获取我的部门列表
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup users
+     * @apiName info__departments
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     * @apiSuccessExample {json} data:
+    [
+        {
+            "id": 1,
+            "name": "部门1",
+            "parent_id": 0,
+            "owner_userid": 1
+        },
+     ]
+     */
+    public function info__departments()
+    {
+        $user = User::auth();
+        
+        // 获取部门列表
+        $list = UserDepartment::select(['id', 'owner_userid', 'parent_id', 'name'])
+            ->whereIn('id', $user->department)
+            ->take(10)
+            ->get()
+            ->toArray();
+
+        // 将 owner_userid 等于当前用户的部门排在前面
+        usort($list, function($a, $b) use ($user) {
+            if ($a['owner_userid'] == $user->userid && $b['owner_userid'] != $user->userid) {
+                return -1;
+            } elseif ($a['owner_userid'] != $user->userid && $b['owner_userid'] == $user->userid) {
+                return 1;
+            }
+            return 0;
+        });
+
+        return Base::retSuccess('success', $list);
+    }
+
+    /**
+     * @api {get} api/users/editdata          10. 修改自己的资料
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -428,7 +490,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/editpass          09. 修改自己的密码
+     * @api {get} api/users/editpass          11. 修改自己的密码
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -469,7 +531,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/search          10. 搜索会员列表
+     * @api {get} api/users/search          12. 搜索会员列表
      *
      * @apiDescription 搜索会员列表
      * @apiVersion 1.0.0
@@ -477,7 +539,7 @@ class UsersController extends AbstractController
      * @apiName searchinfo
      *
      * @apiParam {Object} keys          搜索条件
-     * - keys.key                           昵称、拼音、邮箱关键字
+     * - keys.key                           会员ID、昵称、拼音、邮箱关键字
      * - keys.disable                       0-排除离职（默认），1-仅离职，2-含离职
      * - keys.bot                           0-排除机器人（默认），1-仅机器人，2-含机器人
      * - keys.project_id                    在指定项目ID
@@ -517,6 +579,8 @@ class UsersController extends AbstractController
         if ($keys['key']) {
             if (str_contains($keys['key'], "@")) {
                 $builder->where("email", "like", "%{$keys['key']}%");
+            } elseif (Base::isNumber($keys['key'])) {
+                $builder->where("userid", intval($keys['key']));
             } else {
                 $builder->where(function($query) use ($keys) {
                     $query->where("nickname", "like", "%{$keys['key']}%")
@@ -611,7 +675,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/search/ai          11. 获取AI机器人
+     * @api {get} api/users/search/ai          13. 获取AI机器人
      *
      * @apiDescription 搜索会员列表
      * @apiVersion 1.0.0
@@ -630,7 +694,7 @@ class UsersController extends AbstractController
         //
         $type = trim(Request::input('type'));
         $botName = "ai-{$type}";
-        if (!UserBot::isAiBot("{$botName}@bot.system")) {
+        if (!UserBot::systemBotName($botName)) {
             return Base::retError('AI机器人不存在');
         }
         //
@@ -642,7 +706,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/basic          12. 获取指定会员基础信息
+     * @api {get} api/users/basic          14. 获取指定会员基础信息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -685,7 +749,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/lists          13. 会员列表（限管理员）
+     * @api {get} api/users/lists          15. 会员列表（限管理员）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -834,7 +898,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/operation          14. 操作会员（限管理员）
+     * @api {get} api/users/operation          16. 操作会员（限管理员）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -925,8 +989,7 @@ class UsersController extends AbstractController
                 return UserCheckinMac::saveMac($userInfo->userid, $array);
 
             case 'checkin_face':
-                $faceimg = $data['checkin_face'] ? $data['checkin_face'] : '';
-
+                $faceimg = $data['checkin_face'] ?: '';
                 return UserCheckinFace::saveFace($userInfo->userid, $userInfo->nickname, $faceimg, "管理员上传");
 
             case 'department':
@@ -1092,7 +1155,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/email/verification          15. 邮箱验证
+     * @api {get} api/users/email/verification          17. 邮箱验证
      *
      * @apiDescription 不需要token身份
      * @apiVersion 1.0.0
@@ -1140,7 +1203,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/umeng/alias          16. 设置友盟别名
+     * @api {get} api/users/umeng/alias          18. 设置友盟别名
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1154,6 +1217,7 @@ class UsersController extends AbstractController
      * @apiParam {String} [userAgent]     浏览器信息
      * @apiParam {String} [deviceModel]   设备型号
      * @apiParam {String} [isNotified]    是否有通知权限（0不通知、1通知）
+     * @apiParam {Number} [isDebug]       是否调试（0不调试、1调试）
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -1162,6 +1226,10 @@ class UsersController extends AbstractController
     public function umeng__alias()
     {
         $data = Request::input();
+        // 判断是否调试
+        if (intval($data['isDebug'])) {
+            return Base::retError('调试模式下不允许使用');
+        }
         // 表单验证
         Base::validator($data, [
             'alias.required' => '别名不能为空',
@@ -1192,6 +1260,7 @@ class UsersController extends AbstractController
             $row->update([
                 'ua' => $data['userAgent'],
                 'device' => $data['deviceModel'],
+                'device_hash' => UserDevice::check(),
                 'version' => $version,
                 'is_notified' => $isNotified,
                 'updated_at' => Carbon::now()
@@ -1201,6 +1270,7 @@ class UsersController extends AbstractController
         $row = UmengAlias::createInstance(array_merge($inArray, [
             'ua' => $data['userAgent'],
             'device' => $data['deviceModel'],
+            'device_hash' => UserDevice::check(),
             'version' => $version,
             'is_notified' => $isNotified,
         ]));
@@ -1212,7 +1282,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/meeting/open          17. 【会议】创建会议、加入会议
+     * @api {get} api/users/meeting/open          19. 【会议】创建会议、加入会议
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -1330,7 +1400,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/meeting/link          18. 【会议】获取分享链接
+     * @api {get} api/users/meeting/link          20. 【会议】获取分享链接
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -1359,7 +1429,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/meeting/tourist          19. 【会议】游客信息
+     * @api {get} api/users/meeting/tourist          21. 【会议】游客信息
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -1382,7 +1452,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/meeting/invitation          20. 【会议】发送邀请
+     * @api {get} api/users/meeting/invitation          22. 【会议】发送邀请
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -1429,7 +1499,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/email/send          21. 发送邮箱验证码
+     * @api {get} api/users/email/send          23. 发送邮箱验证码
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -1469,7 +1539,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/email/edit          22. 修改邮箱
+     * @api {get} api/users/email/edit          24. 修改邮箱
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -1514,7 +1584,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/delete/account          23. 删除帐号
+     * @api {get} api/users/delete/account          25. 删除帐号
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -1576,7 +1646,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/department/list          24. 部门列表（限管理员）
+     * @api {get} api/users/department/list          26. 部门列表（限管理员）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1595,7 +1665,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/department/add          25. 新建、修改部门（限管理员）
+     * @api {get} api/users/department/add          27. 新建、修改部门（限管理员）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1653,19 +1723,22 @@ class UsersController extends AbstractController
             if (empty($parentDepartment)) {
                 return Base::retError('上级部门不存在或已被删除');
             }
-            if ($parentDepartment->parent_id > 0) {
-                return Base::retError('上级部门层级错误');
+            if (count($parentDepartment->parents()) > 2) {
+                return Base::retError('部门层级最多只能创建3级');
             }
-            if (UserDepartment::whereParentId($parent_id)->count() > 20) {
+            if ($id > 0 && UserDepartment::whereParentId($id)->whereId($parent_id)->exists()) {
+                return Base::retError('不能选择自己的子部门作为上级部门');
+            }
+            if (UserDepartment::whereParentId($parent_id)->count() >= 20) {
                 return Base::retError('每个部门最多只能创建20个子部门');
             }
-            if ($id > 0 && UserDepartment::whereParentId($id)->exists()) {
-                return Base::retError('含有子部门无法修改上级部门');
-            }
         }
         if (empty($owner_userid) || !User::whereUserid($owner_userid)->exists()) {
             return Base::retError('请选择正确的部门负责人');
         }
+        if (UserDepartment::whereOwnerUserid($owner_userid)->count() >= 10) {
+            return Base::retError('每个用户最多只能负责10个部门');
+        }
         //
         $userDepartment->saveDepartment([
             'name' => $name,
@@ -1674,11 +1747,11 @@ class UsersController extends AbstractController
         ], $dialog_useid);
         Cache::forever("UserDepartment::rand", Base::generatePassword());
         //
-        return Base::retSuccess($parent_id > 0 ? '保存成功' : '新建成功');
+        return Base::retSuccess($id > 0 ? '保存成功' : '新建成功');
     }
 
     /**
-     * @api {get} api/users/department/del          26. 删除部门（限管理员）
+     * @api {get} api/users/department/del          28. 删除部门（限管理员）
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1701,6 +1774,9 @@ class UsersController extends AbstractController
         if (empty($userDepartment)) {
             return Base::retError('部门不存在或已被删除');
         }
+        if (UserDepartment::whereParentId($id)->exists()) {
+            return Base::retError('含有子部门无法删除');
+        }
         $userDepartment->deleteDepartment();
         Cache::forever("UserDepartment::rand", Base::generatePassword());
         //
@@ -1708,7 +1784,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/checkin/get          27. 获取签到设置
+     * @api {get} api/users/checkin/get          29. 获取签到设置
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1735,7 +1811,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {post} api/users/checkin/save          28. 保存签到设置
+     * @api {post} api/users/checkin/save          30. 保存签到设置
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1810,7 +1886,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/checkin/list          29. 获取签到数据
+     * @api {get} api/users/checkin/list          31. 获取签到数据
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1857,7 +1933,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/socket/status          30. 获取socket状态
+     * @api {get} api/users/socket/status          32. 获取socket状态
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1880,7 +1956,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/key/client          31. 客户端KEY
+     * @api {get} api/users/key/client          33. 客户端KEY
      *
      * @apiDescription 获取客户端KEY，用于加密数据发送给服务端
      * @apiVersion 1.0.0
@@ -1922,7 +1998,51 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/bot/info          32. 机器人信息
+     * @api {get} api/users/bot/list          34. 机器人列表
+     *
+     * @apiDescription 需要token身份，获取我的机器人列表
+     * @apiVersion 1.0.0
+     * @apiGroup users
+     * @apiName bot__list
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function bot__list()
+    {
+        // 获取当前认证用户
+        $user = User::auth();
+
+        // 使用连表查询一次性获取所有机器人数据
+        $bots = User::join('user_bots', 'user_bots.bot_id', '=', 'users.userid')
+            ->where('user_bots.userid', $user->userid)
+            ->select([
+                'users.userid',
+                'users.nickname',
+                'users.userimg',
+                'user_bots.clear_day',
+                'user_bots.webhook_url'
+            ])
+            ->orderByDesc('id')
+            ->get()
+            ->toArray();
+        foreach ($bots as &$bot) {
+            $bot['id'] = $bot['userid'];
+            $bot['name'] = $bot['nickname'];
+            $bot['avatar'] = $bot['userimg'];
+            $bot['system_name'] = UserBot::systemBotName($bot['name']);
+            unset($bot['userid'], $bot['nickname'], $bot['userimg']);
+        }
+
+        // 返回成功响应，将机器人列表包装在list字段中
+        return Base::retSuccess('success', [
+            'list' => $bots
+        ]);
+    }
+
+    /**
+     * @api {get} api/users/bot/info          35. 机器人信息
      *
      * @apiDescription 需要token身份，获取我的机器人信息
      * @apiVersion 1.0.0
@@ -1973,14 +2093,14 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {post} api/users/bot/edit          33. 编辑机器人
+     * @api {post} api/users/bot/edit          36. 添加、编辑机器人
      *
      * @apiDescription 需要token身份，编辑 我的机器人 或 管理员修改系统机器人 信息
      * @apiVersion 1.0.0
      * @apiGroup users
      * @apiName bot__edit
      *
-     * @apiParam {Number} id            机器人ID
+     * @apiParam {Number} [id]          机器人ID（编辑时必填，留空为添加）
      * @apiParam {String} [name]        机器人名称
      * @apiParam {String} [avatar]      机器人头像
      * @apiParam {Number} [clear_day]   清理天数（仅 我的机器人）
@@ -1995,10 +2115,19 @@ class UsersController extends AbstractController
         $user = User::auth();
         //
         $botId = intval(Request::input('id'));
-        $botUser = User::whereUserid($botId)->whereBot(1)->first();
-        if (empty($botUser)) {
-            return Base::retError('机器人不存在');
+        if (empty($botId)) {
+            $res = UserBot::newbot($user->userid, trim(Request::input('name')));
+            if (Base::isError($res)) {
+                return $res;
+            }
+            $botUser = $res['data'];
+        } else {
+            $botUser = User::whereUserid($botId)->whereBot(1)->first();
+            if (empty($botUser)) {
+                return Base::retError('机器人不存在');
+            }
         }
+        //
         $userBot = UserBot::whereBotId($botUser->userid)->whereUserid($user->userid)->first();
         if (empty($userBot)) {
             if (UserBot::systemBotName($botUser->email)) {
@@ -2055,17 +2184,68 @@ class UsersController extends AbstractController
             $data['clear_day'] = $userBot->clear_day;
             $data['webhook_url'] = $userBot->webhook_url;
         }
-        return Base::retSuccess('修改成功', $data);
+        return Base::retSuccess($botId ? '修改成功' : '添加成功', $data);
     }
 
     /**
-     * @api {get} api/users/share/list          34. 获取分享列表
+     * @api {get} api/users/bot/delete          37. 删除机器人
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup users
+     * @apiName bot__delete
+     *
+     * @apiParam {Number} id            机器人ID
+     * @apiParam {String} remark        删除备注
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function bot__delete()
+    {
+        $user = User::auth();
+        //
+        $botId = intval(Request::input('id'));
+        $remark = trim(Request::input('remark'));
+        //
+        if (empty($remark)) {
+            return Base::retError('请输入删除备注');
+        }
+        if (mb_strlen($remark) > 255) {
+            return Base::retError('删除备注长度限制255个字');
+        }
+        //
+        $botUser = User::whereUserid($botId)->whereBot(1)->first();
+        if (empty($botUser)) {
+            return Base::retError('机器人不存在');
+        }
+        $userBot = UserBot::whereBotId($botUser->userid)->whereUserid($user->userid)->first();
+        if (empty($userBot)) {
+            if (UserBot::systemBotName($botUser->email)) {
+                // 系统机器人（仅限管理员）
+                return Base::retError('系统机器人不能删除');
+            } else {
+                // 其他用户的机器人（仅限主人）
+                return Base::retError('不是你的机器人');
+            }
+        }
+        //
+        if (!$botUser->deleteUser($remark)) {
+            return Base::retError('删除失败');
+        }
+        return Base::retSuccess('删除成功');
+    }
+
+    /**
+     * @api {get} api/users/share/list          38. 获取分享列表
      *
      * @apiVersion 1.0.0
      * @apiGroup users
      * @apiName share__list
      *
      * @apiParam {String} [type]            分享类型：file-文件，text-列表 默认file
+     * @apiParam {String} [key]             搜索关键词（用于搜索会话）
      * @apiParam {Number} [pid]             父级文件id，用于获取子目录和上传到指定目录的id
      * @apiParam {Number} [upload_file_id]  上传文件id
      *
@@ -2077,6 +2257,7 @@ class UsersController extends AbstractController
     {
         $user = User::auth();
         $type = Request::input('type', 'file');
+        $key = Request::input('key');
         $pid = intval(Request::input('pid', -1));
         $uploadFileId = intval(Request::input('upload_file_id', -1));
         // 上传文件
@@ -2109,10 +2290,14 @@ class UsersController extends AbstractController
                     'icon' => url("images/file/light/folder.png"),
                     'extend' => ['upload_file_id' => 0],
                     'name' => Doo::translate('文件'),
+                    'sort' => Carbon::parse("9999")->timestamp,
                 ];
             }
-            $dialogList = WebSocketDialog::getDialogList($user->userid);
-            foreach ($dialogList['data'] as $dialog) {
+            $dialogTake = 50;
+            $dialogList = WebSocketDialog::searchDialog($user->userid, $key, $dialogTake);
+            $dialogIds = [];
+            $itemUrl = $type == "file" ? Base::fillUrl("api/dialog/msg/sendfiles") : Base::fillUrl("api/dialog/msg/sendtext");
+            foreach ($dialogList as $dialog) {
                 if ($dialog['avatar']) {
                     $avatar = url($dialog['avatar']);
                 } else if ($dialog['type'] == 'user') {
@@ -2129,7 +2314,8 @@ class UsersController extends AbstractController
                     'type' => 'item',
                     'name' => $dialog['name'],
                     'icon' => $avatar,
-                    'url' => $type == "file" ? Base::fillUrl("api/dialog/msg/sendfiles") : Base::fillUrl("api/dialog/msg/sendtext"),
+                    'url' => $itemUrl,
+                    'sort' => Carbon::parse($dialog['last_at'])->timestamp,
                     'extend' => [
                         'dialog_ids' => $dialog['id'],
                         'text_type' => 'text',
@@ -2137,6 +2323,33 @@ class UsersController extends AbstractController
                         'silence' => 'no'
                     ]
                 ];
+                $dialogIds[] = $dialog['id'];
+            }
+            if ($key && count($dialogList) < $dialogTake) {
+                $dialogUsers = User::searchUser($key, $dialogTake - count($dialogList));
+                foreach ($dialogUsers as $item) {
+                    $dialog = WebSocketDialog::getUserDialog($user->userid, $item->userid, now()->addDay());
+                    if ($dialog && !in_array($dialog->id, $dialogIds)) {
+                        $lists[] = [
+                            'type' => 'item',
+                            'name' => $item->nickname,
+                            'icon' => $item->userimg,
+                            'url' => $itemUrl,
+                            'sort' => Carbon::parse($item->line_at)->timestamp,
+                            'extend' => [
+                                'dialog_ids' => $dialog->id,
+                                'text_type' => 'text',
+                                'reply_id' => 0,
+                                'silence' => 'no'
+                            ]
+                        ];
+                        $dialogIds[] = $dialog->id;
+                    }
+                }
+                // 根据 $lists sort 从大到小排序
+                usort($lists, function ($a, $b) {
+                    return $b['sort'] <=> $a['sort'];
+                });
             }
         }
         // 返回
@@ -2144,7 +2357,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/annual/report          35. 年度报告
+     * @api {get} api/users/annual/report          39. 年度报告
      *
      * @apiVersion 1.0.0
      * @apiGroup users
@@ -2311,4 +2524,97 @@ class UsersController extends AbstractController
         //
         return Base::retSuccess('success', $data);
     }
+
+    /**
+     * @api {get} api/users/device/list          40. 获取设备列表
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup users
+     * @apiName device__list
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function device__list()
+    {
+        $user = User::auth();
+        //
+        $list = UserDevice::whereUserid($user->userid)->orderByDesc('id')->take(UserDevice::$deviceLimit)->get();
+        //
+        return Base::retSuccess('success', [
+            'list' => $list
+        ]);
+    }
+
+    /**
+     * @api {get} api/users/device/logout          41. 登出设备（删除设备）
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup users
+     * @apiName device__logout
+     *
+     * @apiParam {Number} id             设备id
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function device__logout()
+    {
+        $user = User::auth();
+        //
+        $id = intval(Request::input('id'));
+        if (empty($id)) {
+            return Base::retError('参数错误');
+        }
+        $userDevice = UserDevice::whereUserid($user->userid)->whereId($id)->first();
+        if (empty($userDevice)) {
+            return Base::retError('设备不存在或已被删除');
+        }
+        UserDevice::forget($userDevice->id);
+        //
+        return Base::retSuccess('操作成功');
+    }
+
+    /**
+     * @api {get} api/users/device/edit          42. 编辑设备
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup users
+     * @apiName device__edit
+     *
+     * @apiParam {Object} detail                    设备信息
+     * @apiParam {String} detail.device_name        设备名称
+     * @apiParam {String} detail.app_brand          设备品牌
+     * @apiParam {String} detail.app_model          设备型号
+     * @apiParam {String} detail.app_os             设备操作系统
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function device__edit()
+    {
+        User::auth();
+        //
+        $detail = Request::input();
+        $detail = array_intersect_key($detail, array_flip([ 'device_name', 'app_brand', 'app_model','app_os']));
+        if (empty($detail)) {
+            return Base::retError('参数错误');
+        }
+        //
+        $row = UserDevice::record();
+        if (empty($row)) {
+            return Base::retError('设备不存在或已被删除');
+        }
+        $deviceInfo = array_merge(Base::json2array($row->detail), $detail);
+        $row->detail = Base::array2json($deviceInfo);
+        $row->save();
+        //
+        return Base::retSuccess('保存成功');
+    }
 }

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;
 
 
 /**
@@ -85,6 +83,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 +248,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 +266,8 @@ class IndexController extends InvokeController
         Task::deliver(new UnclaimedTaskRemindTask());
         // 关闭会议室
         Task::deliver(new CloseMeetingRoomTask());
+        // ZincSearch 同步
+        Task::deliver(new ZincSearchSyncTask());
 
         return "success";
     }
@@ -321,7 +331,7 @@ class IndexController extends InvokeController
                 "file" => Request::file('file'),
                 "type" => 'publish',
                 "path" => $draftPath,
-                "fileName" => true,
+                "saveName" => true,
             ]);
         }
 
@@ -468,7 +478,7 @@ class IndexController extends InvokeController
                                 action: "eeuiAppSendMessage",
                                 data: [
                                     {
-                                        action: 'setPageData',
+                                        action: 'setPageData',  // 设置页面数据
                                         data: {
                                             showProgress: true,
                                             titleFixed: true,
@@ -476,7 +486,7 @@ class IndexController extends InvokeController
                                         }
                                     },
                                     {
-                                        action: 'createTarget',
+                                        action: 'createTarget', // 创建目标（访问新地址）
                                         url: "{$redirectUrl}",
                                     }
                                 ]
@@ -490,7 +500,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 +508,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

@@ -24,6 +24,9 @@ class WebApi
         RequestContext::set('start_time', microtime(true));
         RequestContext::set('header_language', $request->header('language'));
 
+        // 更新请求的基本URL
+        RequestContext::updateBaseUrl($request);
+
         // 加载Doo类
         Doo::load();
 

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/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;
@@ -117,7 +118,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',    // 这一排是要转换的，无法使用本地播放
     ];
 
     /**
@@ -978,4 +979,41 @@ class File extends AbstractModel
         ];
         Task::deliver(new PushTask($params));
     }
+
+    /**
+     * 根据文件类型判断是否需要安装应用
+     * @param $type
+     * @return void
+     */
+    public static function isNeedInstallApp($type): void
+    {
+        // 文件类型与应用的映射配置
+        $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']);
+            }
+        }
+    }
 }

app/Models/Project.php

@@ -221,6 +221,7 @@ class Project extends AbstractModel
                     'important' => 1
                 ], function () use ($userid) {
                     return [
+                        'important' => 1,
                         'bot' => User::isBot($userid) ? 1 : 0,
                     ];
                 });
@@ -419,6 +420,7 @@ class Project extends AbstractModel
             $hasStart = false;
             $hasEnd = false;
             $upTaskList = [];
+            $projectUserids = $this->relationUserids();
             foreach ($flows as $item) {
                 $id = intval($item['id']);
                 $turns = Base::arrayRetainInt($item['turns'] ?: [], true);
@@ -435,6 +437,12 @@ class Project extends AbstractModel
                 if ($userlimit && empty($userids)) {
                     throw new ApiException("状态[{$item['name']}]设置错误，设置限制负责人时必须填写状态负责人");
                 }
+                foreach ($userids as $userid) {
+                    if (!in_array($userid, $projectUserids)) {
+                        $nickname = User::userid2nickname($userid);
+                        throw new ApiException("状态[{$item['name']}]设置错误，状态负责人[{$nickname}]不在项目成员内");
+                    }
+                }
                 $flow = ProjectFlowItem::updateInsert([
                     'id' => $id,
                     'project_id' => $this->id,

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

@@ -36,7 +36,6 @@ namespace App\Models;
 class ProjectTag extends AbstractModel
 {
     protected $hidden = [
-        'created_at',
         'updated_at',
     ];
 

app/Models/ProjectTask.php

@@ -618,7 +618,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"])) {
@@ -627,14 +632,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'])) {
@@ -730,7 +735,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);
                 }
@@ -771,6 +778,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;
@@ -836,7 +844,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]
@@ -871,6 +892,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) {
@@ -891,7 +913,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()) {
@@ -1120,9 +1144,6 @@ class ProjectTask extends AbstractModel
      */
     public function copyTask()
     {
-        if ($this->parent_id > 0) {
-            throw new ApiException('子任务禁止复制');
-        }
         return AbstractModel::transaction(function() {
             // 复制任务
             $task = $this->replicate();
@@ -1183,6 +1204,7 @@ class ProjectTask extends AbstractModel
                     'important' => 1
                 ], function () use ($userid) {
                     return [
+                        'important' => 1,
                         'bot' => User::isBot($userid) ? 1 : 0,
                     ];
                 });
@@ -1329,6 +1351,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) {
@@ -1338,6 +1363,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('子任务未完成', [
@@ -1348,6 +1376,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 = '已完成';
                 }
@@ -1394,11 +1432,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 = "任务归档";
@@ -1407,13 +1446,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,
@@ -1802,16 +1848,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;
@@ -1845,6 +1905,7 @@ 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;
@@ -1854,17 +1915,15 @@ class ProjectTask extends AbstractModel
                     $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;
@@ -1895,6 +1954,7 @@ class ProjectTask extends AbstractModel
                 $contexts[] = "任务截止时间：" . $this->end_at;
             }
         }
+        $contexts[] = "当前系统时间：" . Carbon::now()->toDateTimeString();
         if ($this->content) {
             $taskDesc = $this->content?->getContentInfo();
             if ($taskDesc) {

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

@@ -74,7 +74,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
@@ -66,7 +69,7 @@ class Setting extends AbstractModel
                 }
                 $array = [];
                 $aiList = ['openai', 'claude', 'deepseek', 'gemini', 'grok', 'ollama', 'zhipu', 'qianwen', 'wenxin'];
-                $fieldList = ['key', 'models', 'model', 'base_url', 'agency', 'temperature', 'system', 'secret'];
+                $fieldList = ['key', 'secret', 'models', 'model', 'base_url', 'agency', 'temperature', 'system'];
                 foreach ($aiList as $aiName) {
                     foreach ($fieldList as $fieldName) {
                         $key = $aiName . '_' . $fieldName;
@@ -121,50 +124,49 @@ class Setting extends AbstractModel
     {
         return match ($ai) {
             'openai' => [
-                'gpt-4 | GPT-4',
-                'gpt-4-turbo | GPT-4 Turbo',
+                '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',
-                'o1-mini | GPT-o1 Mini',
+                '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'
             ],
             'gemini' => [
+                'gemini-2.5-pro-preview-05-06 (thinking) | Gemini 2.5 Pro Preview',
                 'gemini-2.0-flash | Gemini 2.0 Flash',
-                'gemini-2.0-flash-lite-preview-02-05 | Gemini 2.0 Flash-Lite Preview',
+                '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-2-vision-1212 | Grok 2 Vision 1212',
-                'grok-2-vision | Grok 2 Vision',
-                'grok-2-vision-latest | Grok 2 Vision Latest',
-                'grok-2-1212 | Grok 2 1212',
-                'grok-2 | Grok 2',
-                'grok-2-latest | Grok 2 Latest',
-                'grok-vision-beta | Grok Vision Beta',
-                'grok-beta | Grok Beta',
+                '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',
@@ -263,4 +265,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,6 +33,7 @@ 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 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)
@@ -45,6 +47,54 @@ 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

@@ -10,6 +10,7 @@ use App\Module\Table\OnlineData;
 use App\Services\RequestContext;
 use Cache;
 use Carbon\Carbon;
+use Request;
 
 /**
  * App\Models\User
@@ -255,6 +256,18 @@ class User extends AbstractModel
         return false;
     }
 
+    /**
+     * 返回是否用户机器人
+     * @return bool
+     */
+    public function isUserBot()
+    {
+        if (preg_match('/^user-(.*?)@bot\.system$/', $this->email)) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * 判断是否管理员
      */
@@ -423,6 +436,19 @@ class User extends AbstractModel
         return $user->nickname;
     }
 
+    /**
+     * 临时日志记录
+     * @param $message
+     * @return void
+     */
+    private static function tmpLog($message)
+    {
+        if (Request::input('log') !== 'yes') {
+            return;
+        }
+        info("[User] [" . date("Y-m-d H:i:s") . "] " . $message);
+    }
+
     /**
      * 用户身份认证（获取用户信息）
      * @param null $identity 判断身份
@@ -432,9 +458,20 @@ class User extends AbstractModel
     {
         $user = self::authInfo();
         if (!$user) {
-            if (Base::token()) {
+            self::tmpLog('auth failed');
+            $token = Base::token();
+            if ($token) {
+                UserDevice::forget($token);
+                self::tmpLog('auth token found: ' . Base::array2json([
+                        'header' => Request::header(),
+                        'input' => Request::input(),
+                    ]));
                 throw new ApiException('身份已失效,请重新登录', [], -1);
             } else {
+                self::tmpLog('auth no token found: ' . Base::array2json([
+                        'header' => Request::header(),
+                        'input' => Request::input(),
+                    ]));
                 throw new ApiException('请登录后继续...', [], -1);
             }
         }
@@ -453,32 +490,54 @@ class User extends AbstractModel
      */
     private static function authInfo()
     {
+        self::tmpLog('auth start');
         if (RequestContext::has('auth')) {
+            // 缓存
+            self::tmpLog('auth from cache');
             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) {
+            // 没有登录
+            self::tmpLog('auth no login');
+            return RequestContext::save('auth', false);
         }
-        return RequestContext::save('auth', false);
+        if (Doo::userExpired()) {
+            // 登录过期
+            self::tmpLog('auth expired');
+            return RequestContext::save('auth', false);
+        }
+        if (!UserDevice::check()) {
+            // token 不存在
+            self::tmpLog('auth token not found');
+            return RequestContext::save('auth', false);
+        }
+        $user = self::whereUserid(Doo::userId())->whereEmail(Doo::userEmail())->whereEncrypt(Doo::userEncrypt())->first();
+        if (!$user) {
+            // 登录信息不匹配
+            self::tmpLog('auth user not found');
+            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();
+        }
+        self::tmpLog('auth success: ' . $user->userid . ' - ' . $user->email);
+        return RequestContext::save('auth', $user);
     }
 
     /**
@@ -502,6 +561,7 @@ class User extends AbstractModel
         } else {
             $token = Doo::userToken();
         }
+        UserDevice::record($token);
         unset($userinfo->encrypt);
         unset($userinfo->password);
         return $userinfo->token = $token;
@@ -719,4 +779,26 @@ class User extends AbstractModel
         }
         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

@@ -55,16 +55,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 邮箱 或 邮箱前缀
@@ -452,4 +442,39 @@ class UserBot extends AbstractModel
             default => [],
         };
     }
+
+    /**
+     * 创建我的机器人
+     * @param $userid
+     * @param $botName
+     * @return array
+     */
+    public static function newbot($userid, $botName)
+    {
+        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个字符组成。");
+        }
+        $data = User::botGetOrCreate("user-" . Base::generatePassword(), [
+            'nickname' => $botName
+        ], $userid);
+        if (empty($data)) {
+            return Base::retError("创建失败。");
+        }
+        $dialog = WebSocketDialog::checkUserDialog($data, $userid);
+        if ($dialog) {
+            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

@@ -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

@@ -34,6 +34,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 +146,7 @@ class UserDepartment extends AbstractModel
         });
         // 解散群组
         $dialog = WebSocketDialog::find($this->dialog_id);
-        if ($dialog) {
-            $dialog->deleteDialog();
-        }
+        $dialog?->deleteDialog();
         //
         $this->delete();
     }

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
+     */
+    private 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/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;
@@ -447,10 +474,10 @@ 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) {
                         WebSocketDialogMsg::sendMsg(null, $this->id, 'notice', [
@@ -666,6 +693,39 @@ 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;
+    }
+
+    /**
+     * 检查是否是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 +734,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 +750,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);
@@ -842,7 +912,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) {
@@ -856,49 +926,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/WebSocketDialogMsg.php

@@ -379,7 +379,6 @@ class WebSocketDialogMsg extends AbstractModel
             'dialog_id' => $this->dialog_id,
         ];
         $dialog = WebSocketDialog::find($this->dialog_id);
-        $dialog->pushMsg('update', $upData);
         //
         $retData = [
             'add' => [],
@@ -426,6 +425,7 @@ class WebSocketDialogMsg extends AbstractModel
             }
         }
         //
+        $dialog->pushMsg('update', $upData);
         return Base::retSuccess($this->todo ? '设置成功' : '取消成功', $retData);
     }
 
@@ -456,27 +456,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 +469,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 +540,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();
@@ -943,7 +940,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);
@@ -951,6 +948,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') {
@@ -966,6 +964,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);
         }
@@ -994,31 +1005,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);
             }
         }
         // 过滤标签
@@ -1048,10 +1046,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            动作
@@ -1252,6 +1281,55 @@ 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;
 
 /**
@@ -82,18 +82,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, $originalTitle));
     }
 }

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)
@@ -1476,14 +1483,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
@@ -1850,18 +1879,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 +1901,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 +1928,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 +1940,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 +1985,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 +2022,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 +2115,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 +2129,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 +2187,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 +2198,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 +2253,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 +2581,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 +3038,26 @@ class Base
      */
     public static function markdown2html($markdown)
     {
-        $converter = new CommonMarkConverter();
         try {
+            $converter = new CommonMarkConverter();
             return $converter->convert($markdown);
-        } catch (CommonMarkException $e) {
+        } catch (\League\CommonMark\Exception\CommonMarkException $e) {
             return $markdown;
         }
     }
+
+    /**
+     * html 转 MD(markdown)
+     * @param $html
+     * @return mixed|string
+     */
+    public static function html2markdown($html)
+    {
+        try {
+            $converter = new HtmlConverter();
+            return $converter->convert($html);
+        } catch (\Exception) {
+            return $html;
+        }
+    }
 }

app/Module/Doo.php

@@ -47,6 +47,7 @@ class Doo
                 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);
@@ -181,12 +182,12 @@ class Doo
 
     /**
      * 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 $expiredAt === 'forever' ? null : $expiredAt;
     }
 
     /**
@@ -263,7 +264,9 @@ class Doo
      */
     public static function tokenDecode($token): array
     {
-        return Base::json2array(self::string(self::doo()->tokenDecode($token)));
+        $array = Base::json2array(self::string(self::doo()->tokenDecode($token)));
+        $array['expired_at'] = $array['expired_at'] === 'forever' ? null : $array['expired_at'];
+        return $array;
     }
 
     /**
@@ -359,6 +362,15 @@ class Doo
         return self::string(self::doo()->dooSN());
     }
 
+    /**
+     * 获取当前版本
+     * @return string
+     */
+    public static function dooVersion(): string
+    {
+        return self::string(self::doo()->version());
+    }
+
     /**
      * 生成PGP密钥对
      * @param $name

app/Module/Extranet.php

@@ -15,9 +15,10 @@ class Extranet
     /**
      * 通过 openAI 语音转文字
      * @param string $filePath
+     * @param array $extParams
      * @return array
      */
-    public static function openAItranscriptions($filePath)
+    public static function openAItranscriptions($filePath, $extParams = [])
     {
         if (!file_exists($filePath)) {
             return Base::retError("语音文件不存在");
@@ -27,7 +28,6 @@ class Extranet
         if ($systemSetting['voice2text'] !== 'open' || empty($aibotSetting['openai_key'])) {
             return Base::retError("语音转文字功能未开启");
         }
-        //
         $extra = [
             'Content-Type' => 'multipart/form-data',
             'Authorization' => 'Bearer ' . $aibotSetting['openai_key'],
@@ -36,19 +36,26 @@ class Extranet
             $extra['CURLOPT_PROXY'] = $aibotSetting['openai_agency'];
             $extra['CURLOPT_PROXYTYPE'] = str_contains($aibotSetting['openai_agency'], 'socks') ? CURLPROXY_SOCKS5 : CURLPROXY_HTTP;
         }
-        $res = Ihttp::ihttp_request('https://api.openai.com/v1/audio/transcriptions', [
+        $post = array_merge($extParams, [
             'file' => new \CURLFile($filePath),
-            'model' => 'whisper-1'
-        ], $extra, 15);
-        if (Base::isError($res)) {
-            return Base::retError("语音转文字失败", $res);
+            'model' => 'whisper-1',
+        ]);
+        $cacheKey = "openAItranscriptions::" . md5($filePath . '_' . Base::array2json($extra) . '_' . Base::array2json($extParams));
+        $result = Cache::remember($cacheKey, Carbon::now()->addDays(), function() use ($extra, $post) {
+            $res = Ihttp::ihttp_request('https://api.openai.com/v1/audio/transcriptions', $post, $extra, 15);
+            if (Base::isError($res)) {
+                return Base::retError("语音转文字失败", $res);
+            }
+            $resData = Base::json2array($res['data']);
+            if (empty($resData['text'])) {
+                return Base::retError("语音转文字失败", $resData);
+            }
+            return Base::retSuccess("success", $resData['text']);
+        });
+        if (Base::isError($result)) {
+            Cache::forget($cacheKey);
         }
-        $resData = Base::json2array($res['data']);
-        if (empty($resData['text'])) {
-            return Base::retError("语音转文字失败", $resData);
-        }
-        //
-        return Base::retSuccess("success", $resData['text']);
+        return $result;
     }
 
     /**
@@ -72,32 +79,49 @@ class Extranet
             $extra['CURLOPT_PROXY'] = $aibotSetting['openai_agency'];
             $extra['CURLOPT_PROXYTYPE'] = str_contains($aibotSetting['openai_agency'], 'socks') ? CURLPROXY_SOCKS5 : CURLPROXY_HTTP;
         }
-        $res = Ihttp::ihttp_request('https://api.openai.com/v1/chat/completions', json_encode([
+        $post = json_encode([
             "model" => "gpt-4o-mini",
             "messages" => [
                 [
                     "role" => "system",
-                    "content" => "你是一个专业的翻译器，翻译的结果尽量符合“项目任务管理系统”的使用，并且翻译的结果不用额外添加换行尽量保持原格式，将提供的文本翻译成“{$targetLanguage}”语言。"
+                    "content" => <<<EOF
+                        你是一名专业翻译人员，请将 <translation_original_text> 标签内的内容翻译为{$targetLanguage}。
+
+                        翻译要求：
+                        - 翻译结果需符合“项目任务管理系统”的专业术语和使用场景。
+                        - 保持原文格式、结构和排版不变。
+                        - 语言表达准确、简洁，符合项目管理领域的行业规范。
+                        - 注意专业术语的一致性和连贯性。
+                        EOF
                 ],
                 [
                     "role" => "user",
-                    "content" => $text
+                    "content" => "<translation_original_text>{$text}</translation_original_text>"
                 ]
             ]
-        ]), $extra, 15);
-        if (Base::isError($res)) {
-            return Base::retError("翻译失败", $res);
+        ]);
+        $cacheKey = "openAItranslations::" . md5(Base::array2json($extra) . '_' . Base::array2json($post));
+        $result = Cache::remember($cacheKey, Carbon::now()->addDays(), function() use ($extra, $post) {
+            $res = Ihttp::ihttp_request('https://api.openai.com/v1/chat/completions', $post, $extra, 15);
+            if (Base::isError($res)) {
+                return Base::retError("翻译失败", $res);
+            }
+            $resData = Base::json2array($res['data']);
+            if (empty($resData['choices'])) {
+                return Base::retError("翻译失败", $resData);
+            }
+            $result = $resData['choices'][0]['message']['content'];
+            $result = preg_replace('/^\"|\"$/', '', trim($result));
+            $result = preg_replace('/<\/*translation_original_text>/', '', trim($result));
+            if (empty($result)) {
+                return Base::retError("翻译失败", $result);
+            }
+            return Base::retSuccess("success", $result);
+        });
+        if (Base::isError($result)) {
+            Cache::forget($cacheKey);
         }
-        $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);
+        return $result;
     }
 
     /**

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

@@ -3,82 +3,99 @@
 namespace App\Module;
 
 use Exception;
-use Illuminate\Support\Facades\Log;
-use PhpOffice\PhpWord\IOFactory;
-use Smalot\PdfParser\Parser;
+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 文件路径
-     * @return string
+     * @param string $filePath
      * @throws Exception
      */
-    public function extractText(string $filePath): string
+    public function __construct(string $filePath)
     {
         if (!file_exists($filePath)) {
-            throw new Exception("文件不存在: {$filePath}");
-        }
-
-        $fileExtension = strtolower(pathinfo($filePath, PATHINFO_EXTENSION));
-
-        try {
-            return match($fileExtension) {
-                'pdf'   => $this->extractFromPDF($filePath),
-                'docx'  => $this->extractFromDOCX($filePath),
-                'ipynb' => $this->extractFromIPYNB($filePath),
-                default => $this->extractFromOtherFile($filePath),
-            };
-        } catch (Exception $e) {
-            Log::error('文本提取失败', [
-                'file' => $filePath,
-                'error' => $e->getMessage()
-            ]);
-            throw $e;
+            throw new Exception("File does not exist: {$filePath}");
         }
+        $this->filePath = $filePath;
+        $this->fileMimeType = FileFacade::mimeType($filePath);
+        $this->fileExtension = $this->detectFileType();
     }
 
     /**
-     * 从PDF文件中提取文本
-     *
-     * @param string $filePath
+     * 从文件中提取文本
      * @return string
      * @throws Exception
      */
-    protected function extractFromPDF(string $filePath): string
+    public function extractContent(): string
     {
-        try {
-            $parser = new Parser();
-            $pdf = $parser->parseFile($filePath);
+        return match ($this->fileExtension) {
+            // Word文档
+            'docx' => $this->parseWordDocument(),
 
-            return $pdf->getText();
-        } catch (Exception $e) {
-            Log::error('PDF解析失败', [
-                'file' => $filePath,
-                'error' => $e->getMessage()
-            ]);
-            throw new Exception("PDF文本提取失败: " . $e->getMessage());
-        }
+            // Excel文档
+            'xlsx', 'xls', 'csv' => $this->parseSpreadsheet(),
+
+            // PowerPoint文档
+            'ppt', 'pptx' => $this->parsePresentation(),
+
+            // PDF文档
+            'pdf' => $this->parsePdf(),
+
+            // RTF文档
+            'rtf' => $this->parseRtf(),
+
+            // 其他文本文件
+            default => $this->parseOther(),
+        };
     }
 
     /**
-     * 从DOCX文件中提取文本
-     *
-     * @param string $filePath
+     * 获取文件类型
      * @return string
-     * @throws Exception
      */
-    protected function extractFromDOCX(string $filePath): string
+    private function detectFileType(): string
     {
-        $phpWord = IOFactory::load($filePath);
+        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";
+                        }
+                    }
                 }
             }
         }
@@ -87,67 +104,126 @@ class TextExtractor
     }
 
     /**
-     * 从Jupyter Notebook文件中提取文本
-     *
-     * @param string $filePath
+     * Parse spreadsheet files (.xlsx, .xls, .csv)
      * @return string
-     * @throws Exception
      */
-    protected function extractFromIPYNB(string $filePath): string
+    private function parseSpreadsheet(): string
     {
-        $content = file_get_contents($filePath);
-        $notebook = json_decode($content, true);
+        $spreadsheet = SpreadsheetIOFactory::load($this->filePath);
+        $text = '';
 
-        if (json_last_error() !== JSON_ERROR_NONE) {
-            throw new Exception("IPYNB文件解析失败: " . json_last_error_msg());
-        }
+        // Extract text from all worksheets
+        foreach ($spreadsheet->getWorksheetIterator() as $worksheet) {
+            $text .= 'Worksheet: ' . $worksheet->getTitle() . "\n";
 
-        $extractedText = '';
+            foreach ($worksheet->getRowIterator() as $row) {
+                $cellIterator = $row->getCellIterator();
+                $cellIterator->setIterateOnlyExistingCells(false);
+                $rowText = '';
 
-        foreach ($notebook['cells'] ?? [] as $cell) {
-            if (in_array($cell['cell_type'] ?? '', ['markdown', 'code']) && isset($cell['source'])) {
-                $source = $cell['source'];
-                $extractedText .= is_array($source)
-                    ? implode("\n", $source)
-                    : $source;
-                $extractedText .= "\n";
+                foreach ($cellIterator as $cell) {
+                    $value = $cell->getValue();
+                    if (!empty($value)) {
+                        $rowText .= $value . "\t";
+                    }
+                }
+
+                if (!empty(trim($rowText))) {
+                    $text .= trim($rowText) . "\n";
+                }
             }
+
+            $text .= "\n";
         }
 
-        return $extractedText;
+        return $text;
     }
 
     /**
-     * 从其他类型文件中提取文本
-     *
-     * @param string $filePath
+     * Parse presentation files (.ppt, .pptx)
      * @return string
      * @throws Exception
      */
-    protected function extractFromOtherFile(string $filePath): string
+    private function parsePresentation(): string
     {
-        if ($this->isBinaryFile($filePath)) {
-            throw new Exception("无法读取该类型文件的文本内容");
+        $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 file_get_contents($filePath);
+        return $text;
     }
 
     /**
-     * 检查文件是否为二进制文件
-     *
-     * @param string $filePath
-     * @return bool
+     * Parse PDF files (requires additional library like Smalot\PdfParser)
+     * @return string
+     * @throws Exception
      */
-    protected function isBinaryFile(string $filePath): bool
+    private function parsePdf(): string
     {
-        $finfo = finfo_open(FILEINFO_MIME);
-        $mimeType = finfo_file($finfo, $filePath);
-        finfo_close($finfo);
+        // 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");
+        }
 
-        return !str_contains($mimeType, 'text/')
-            && !str_contains($mimeType, 'application/json')
-            && !str_contains($mimeType, 'application/xml');
+        $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);
     }
 
     /** ********************************************************************* */
@@ -157,26 +233,27 @@ class TextExtractor
     /**
      * 获取文件内容
      * @param $filePath
-     * @param float|int $maxSize 最大文件大小，单位字节，默认300KB
-     * @return string
+     * @param int $fileMaxSize      最大文件大小，单位字节，默认1024KB
+     * @param int $contentMaxSize   最大内容大小，单位字节，默认300KB
+     * @return array
      */
-    public static function getFileContent($filePath, float|int $maxSize = 300 * 1024)
+    public static function extractFile($filePath, int $fileMaxSize = 1024, int $contentMaxSize = 300): array
     {
         if (!file_exists($filePath) || !is_file($filePath)) {
-            return "(Failed to read contents of {$filePath})";
+            return Base::retError("Failed to read contents of {$filePath}");
         }
-        if (filesize($filePath) > $maxSize) {
-            return "(File size exceeds " . Base::readableBytes($maxSize) . ", unable to display content)";
+        if (filesize($filePath) > $fileMaxSize * 1024) {
+            return Base::retError("File size exceeds " . Base::readableBytes($fileMaxSize * 1024) . ", unable to display content");
         }
-        $te = new self();
         try {
-            $isBinary = $te->isBinaryFile($filePath);
-            if ($isBinary) {
-                return "(Binary file, unable to display content)";
+            $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 $te->extractText($filePath);
+            return Base::retSuccess("success", $content);
         } catch (Exception $e) {
-            return "(Failed to read contents of {$filePath}: {$e->getMessage()})";
+            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

@@ -139,4 +139,64 @@ class RequestContext
         self::$context[$requestId] ??= [];
         self::$context[$requestId] = array_merge(self::$context[$requestId], $data);
     }
+
+    /** ***************************************************************************************** */
+    /** ***************************************************************************************** */
+    /** ***************************************************************************************** */
+
+    /**
+     * 更新请求的基本URL
+     *
+     * @param Request $request
+     * @return void
+     */
+    public static function updateBaseUrl($request)
+    {
+        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);
+    }
+
+    /**
+     * 替换请求的基本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;

app/Tasks/BotReceiveMsgTask.php

@@ -5,21 +5,22 @@ namespace App\Tasks;
 use App\Models\FileContent;
 use App\Models\Project;
 use App\Models\ProjectTask;
+use App\Models\Report;
 use App\Models\User;
 use App\Models\UserBot;
+use App\Models\UserDepartment;
 use App\Models\WebSocketDialog;
 use App\Models\WebSocketDialogConfig;
 use App\Models\WebSocketDialogMsg;
+use App\Module\Apps;
 use App\Module\Base;
 use App\Module\Doo;
 use App\Module\Ihttp;
 use App\Module\TextExtractor;
 use Carbon\Carbon;
+use Exception;
 use DB;
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
-
 /**
  * 推送会话消息
  * Class BotReceiveMsgTask
@@ -87,8 +88,16 @@ class BotReceiveMsgTask extends AbstractTask
         }
 
         // 提取指令
-        $command = $this->extractCommand($msg, $botUser->isAiBot(), $this->mention);
-        if (empty($command)) {
+        try {
+            $command = $this->extractCommand($msg, $botUser, $this->mention);
+            if (empty($command)) {
+                return;
+            }
+        } catch (Exception $e) {
+            WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'template', [
+                'type' => 'content',
+                'content' => $e->getMessage() ?: "指令解析失败。",
+            ], $botUser->userid, false, false, true);    // todo 未能在任务end事件来发送任务
             return;
         }
 
@@ -196,32 +205,11 @@ class BotReceiveMsgTask extends AbstractTask
                  * 创建
                  */
                 case '/newbot':
-                    if (User::select(['users.*'])
-                            ->join('user_bots', 'users.userid', '=', 'user_bots.bot_id')
-                            ->where('users.bot', 1)
-                            ->where('user_bots.userid', $msg->userid)
-                            ->count() >= 50) {
-                        $content = "超过最大创建数量。";
-                        break;
-                    }
-                    if (strlen($array[1]) < 2 || strlen($array[1]) > 20) {
-                        $content = "机器人名称由2-20个字符组成。";
-                        break;
-                    }
-                    $data = User::botGetOrCreate("user-" . Base::generatePassword(), [
-                        'nickname' => $array[1]
-                    ], $msg->userid);
-                    if (empty($data)) {
-                        $content = "创建失败。";
-                        break;
-                    }
-                    $dialog = WebSocketDialog::checkUserDialog($data, $msg->userid);
-                    if ($dialog) {
-                        WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
-                            'type' => '/hello',
-                            'title' => '创建成功。',
-                            'data' => $data,
-                        ], $data->userid);    // todo 未能在任务end事件来发送任务
+                    $res = UserBot::newbot($msg->userid, $array[1]);
+                    if (Base::isError($res)) {
+                        $content = $res['msg'];
+                    } else {
+                        $data = $res['data'];
                     }
                     break;
 
@@ -412,12 +400,17 @@ class BotReceiveMsgTask extends AbstractTask
      */
     private function botWebhookBusiness(string $command, WebSocketDialogMsg $msg, User $botUser, WebSocketDialog $dialog)
     {
-        $serverUrl = 'http://' . env('APP_IPPR') . '.3';
+        $serverUrl = 'http://nginx';
         $userBot = null;
         $extras = [];
+        $replyText = null;
         $errorContent = null;
         if ($botUser->isAiBot($type)) {
             // AI机器人
+            if (Base::val($msg->msg, 'forward_data.leave')) {
+                // AI机器人不处理带有留言的转发消息，因为他要处理那条留言消息
+                return;
+            }
             $setting = Base::setting('aibotSetting');
             $extras = [
                 'model_type' => match ($type) {
@@ -437,14 +430,38 @@ class BotReceiveMsgTask extends AbstractTask
             if ($msg->msg['model_name']) {
                 $extras['model_name'] = $msg->msg['model_name'];
             }
+            // 提取模型“思考”参数
+            $thinkPatterns = [
+                "/^(.+?)(\s+|\s*[_-]\s*)(think|thinking|reasoning)\s*$/",
+                "/^(.+?)\s*\(\s*(think|thinking|reasoning)\s*\)\s*$/"
+            ];
+            $thinkMatch = [];
+            foreach ($thinkPatterns as $pattern) {
+                if (preg_match($pattern, $extras['model_name'], $thinkMatch)) {
+                    break;
+                }
+            }
+            if ($thinkMatch && !empty($thinkMatch[1])) {
+                $extras['model_name'] = $thinkMatch[1];
+                $extras['max_tokens'] = 20000;
+                $extras['thinking'] = 4096;
+                $extras['temperature'] = 1.0;
+            }
+            // 设定会话ID
             if ($dialog->session_id) {
                 $extras['context_key'] = 'session_' . $dialog->session_id;
             }
+            // 设置文心一言的API密钥
             if ($type === 'wenxin') {
                 $extras['api_key'] .= ':' . $setting['wenxin_secret'];
             }
-            if ($type === 'ollama' && empty($extras['api_key'])) {
-                $extras['api_key'] = Base::strRandom(6);
+            if ($type === 'ollama') {
+                if (empty($extras['base_url'])) {
+                    $errorContent = '机器人未启用。';
+                }
+                if (empty($extras['api_key'])) {
+                    $extras['api_key'] = Base::strRandom(6);
+                }
             }
             if (empty($extras['api_key'])) {
                 $errorContent = '机器人未启用。';
@@ -452,28 +469,17 @@ class BotReceiveMsgTask extends AbstractTask
             if (in_array($this->client['platform'], ['win', 'mac', 'web']) && !Base::judgeClientVersion("0.41.11", $this->client['version'])) {
                 $errorContent = '当前客户端版本低（所需版本≥v0.41.11）。';
             }
-
+            if (!Apps::isInstalled('ai')) {
+                $errorContent = '应用「AI Robot」未安装';
+            }
             if ($msg->reply_id > 0) {
-                $replyMsg = WebSocketDialogMsg::find($msg->reply_id);
-                $replyCommand = null;
-                if ($replyMsg) {
-                    switch ($replyMsg->type) {
-                        case 'text':
-                            $replyCommand = $this->extractCommand($replyMsg, true);
-                            if ($replyCommand) {
-                                $replyCommand = Base::cutStr($replyCommand, 20000);
-                            }
-                            break;
-                        case 'file':
-                            $msgData = Base::json2array($replyMsg->getRawOriginal('msg'));
-                            $replyCommand = TextExtractor::getFileContent(public_path($msgData['path']));
-                            break;
-                    }
-                }
-                if ($replyCommand) {
+                $replyCommand = $this->extractReplyCommand($msg->reply_id, $botUser);
+                if (Base::isError($replyCommand)) {
+                    $errorContent = $replyCommand['msg'];
+                } else {
                     $command = <<<EOF
                         <quoted_content>
-                        {$replyCommand}
+                        {$replyCommand['data']}
                         </quoted_content>
 
                         The content within the above quoted_content tags is a citation.
@@ -482,10 +488,21 @@ class BotReceiveMsgTask extends AbstractTask
                         EOF;
                 }
             }
-            $this->AIGenerateSystemMessageOrBeforeText($msg->userid, $dialog, $extras);
+            $this->AIGenerateSystemMessage($msg->userid, $dialog, $extras);
             $webhookUrl = "{$serverUrl}/ai/chat";
         } else {
             // 用户机器人
+            if ($botUser->isUserBot() && str_starts_with($command, '/')) {
+                // 用户机器人不处理指令类型命令
+                return;
+            }
+
+            if ($msg->reply_id > 0) {
+                $replyCommand = $this->extractReplyCommand($msg->reply_id, $botUser);
+                if (Base::isSuccess($replyCommand)) {
+                    $replyText = $replyCommand['data'] ?: '';
+                }
+            }
             $userBot = UserBot::whereBotId($botUser->userid)->first();
             $webhookUrl = $userBot?->webhook_url;
         }
@@ -503,6 +520,7 @@ class BotReceiveMsgTask extends AbstractTask
         try {
             $data = [
                 'text' => $command,
+                'reply_text' => $replyText,
                 'token' => User::generateToken($botUser),
                 'dialog_id' => $dialog->id,
                 'dialog_type' => $dialog->type,
@@ -513,6 +531,18 @@ class BotReceiveMsgTask extends AbstractTask
                 'version' => Base::getVersion(),
                 'extras' => Base::array2json($extras)
             ];
+            if ($botUser->isAiBot()) {
+                // AI机器人需要用户信息
+                $userInfo = User::find($msg->userid);
+                $data['msg_user'] = [
+                    'userid' => $userInfo->userid,
+                    'email' => $userInfo->email,
+                    'nickname' => $userInfo->nickname,
+                    'profession' => $userInfo->profession,
+                    'lang' => $userInfo->lang,
+                    'token' => Doo::tokenEncode($userInfo->userid, $userInfo->email, $userInfo->encrypt, 3),
+                ];
+            }
             $res = Ihttp::ihttp_post($webhookUrl, $data, 30);
             if ($userBot) {
                 $userBot->webhook_num++;
@@ -564,16 +594,18 @@ class BotReceiveMsgTask extends AbstractTask
     /**
      * 提取消息指令（提取消息内容）
      * @param WebSocketDialogMsg $msg
-     * @param bool $isAiBot
+     * @param User $botUser
      * @param bool $mention
      * @return string
+     * @throws Exception
      */
-    private function extractCommand(WebSocketDialogMsg $msg, bool $isAiBot = false, bool $mention = false)
+    private function extractCommand(WebSocketDialogMsg $msg, User $botUser, bool $mention = false)
     {
         if ($msg->type !== 'text') {
             return '';
         }
-        $original = $msg->msg['text'];
+
+        $original = $msg->msg['text'] ?: '';
         if ($mention) {
             $original = preg_replace("/<span class=\"mention user\" data-id=\"(\d+)\">(.*?)<\/span>/", "", $original);
         }
@@ -584,60 +616,125 @@ class BotReceiveMsgTask extends AbstractTask
             }
             return $command;
         }
-        $aiContents = [];
-        if ($isAiBot) {
+
+        if ($botUser->isAiBot()) {
+            // AI 机器人
+            $contents = [];
             if (preg_match_all("/<span class=\"mention task\" data-id=\"(\d+)\">(.*?)<\/span>/", $original, $match)) {
+                // 任务
                 $taskIds = Base::newIntval($match[1]);
                 foreach ($taskIds as $index => $taskId) {
-                    $taskName = addslashes($match[2][$index]) . " (ID:{$taskId})";
-                    $taskContext = "任务状态：不存在或已删除";
                     $taskInfo = ProjectTask::with(['content'])->whereId($taskId)->first();
-                    if ($taskInfo) {
-                        $taskName = addslashes($taskInfo->name) . " (ID:{$taskId})";
-                        $taskContext = implode("\n", $taskInfo->AIContext());
+                    if (!$taskInfo) {
+                        throw new Exception("任务不存在或已被删除");
                     }
-                    $aiContents[] = "<task_content path=\"{$taskName}\">\n{$taskContext}\n</task_content>";
+                    $taskName = addslashes($taskInfo->name) . " (ID:{$taskId})";
+                    $taskContext = implode("\n", $taskInfo->AIContext());
+                    $contents[] = "<task_content path=\"{$taskName}\">\n{$taskContext}\n</task_content>";
                     $original = str_replace($match[0][$index], "'{$taskName}' (see below for task_content tag)", $original);
                 }
             }
-            if (preg_match_all("/<a class=\"mention file\" href=\"([^\"']+?)\"[^>]*?>(.*?)<\/a>/", $original, $match)) {
-                $filePaths = $match[1];
-                foreach ($filePaths as $index => $filePath) {
-                    if (preg_match("/single\/file\/(.*?)$/", $filePath, $fileMatch)) {
-                        $fileName = addslashes($match[2][$index]);
-                        $fileContent = "文件状态：不存在或已删除";
+            if (preg_match_all("/<a class=\"mention ([^'\"]*)\" href=\"([^\"']+?)\"[^>]*?>[~%]([^>]*)<\/a>/", $original, $match)) {
+                // 文件、报告
+                $urlPaths = $match[2];
+                foreach ($urlPaths as $index => $urlPath) {
+                    $pathTag = null;
+                    $pathName = null;
+                    $pathContent = null;
+                    // 文件
+                    if (preg_match("/single\/file\/(.*?)$/", $urlPath, $fileMatch)) {
                         $fileInfo = FileContent::idOrCodeToContent($fileMatch[1]);
-                        if ($fileInfo && isset($fileInfo->content['url'])) {
-                            $filePath = public_path($fileInfo->content['url']);
-                            if (file_exists($filePath)) {
-                                $fileName .= " (ID:{$fileInfo->id})";
-                                $fileContent = TextExtractor::getFileContent($filePath);
-                            }
+                        if (!$fileInfo || !isset($fileInfo->content['url'])) {
+                            throw new Exception("文件不存在或已被删除");
                         }
-                        $aiContents[] = "<file_content path=\"{$fileName}\">\n{$fileContent}\n</file_content>";
-                        $original = str_replace($match[0][$index], "'{$fileName}' (see below for file_content tag)", $original);
+                        $urlPath = public_path($fileInfo->content['url']);
+                        if (!file_exists($urlPath)) {
+                            throw new Exception("文件不存在或已被删除");
+                        }
+                        $fileResult = TextExtractor::extractFile($urlPath);
+                        if (Base::isError($fileResult)) {
+                            throw new Exception("文件读取失败：" . $fileResult['msg']);
+                        }
+                        $pathTag = "file_content";
+                        $pathName = addslashes($match[3][$index]) . " (ID:{$fileInfo->id})";
+                        $pathContent = $fileResult['data'];
+                    }
+                    // 报告
+                    elseif (preg_match("/single\/report\/detail\/(.*?)$/", $urlPath, $reportMatch)) {
+                        $reportInfo = Report::idOrCodeToContent($reportMatch[1]);
+                        if (!$reportInfo) {
+                            throw new Exception("报告不存在或已被删除");
+                        }
+                        $pathTag = "report_content";
+                        $pathName = addslashes($match[3][$index]) . " (ID:{$reportInfo->id})";
+                        $pathContent = $reportInfo->content;
+                    }
+                    if ($pathTag) {
+                        $contents[] = "<{$pathTag} path=\"{$pathName}\">\n{$pathContent}\n</{$pathTag}>";
+                        $original = str_replace($match[0][$index], "'{$pathName}' (see below for {$pathTag} tag)", $original);
                     }
                 }
             }
+            $original = Base::html2markdown($original);
+            if ($contents) {
+                // 添加tag内容
+                $original .= "\n\n" . implode("\n\n", $contents);
+            }
+            return $original;
+        } elseif ($botUser->isUserBot()) {
+            // 用户机器人
+            return Base::html2markdown($original);
+        } else {
+            // 其他机器人（系统）
+            return trim(strip_tags($original));
         }
-        $command = trim(strip_tags($original));
-        if ($aiContents) {
-            $command .= "\n\n" . implode("\n\n", $aiContents);
-        }
-        return $command ?: '';
     }
 
     /**
-     * 生成AI系统提示词或前置消息
+     * 提取回复消息指令
+     * @param $id
+     * @param User $botUser
+     * @return array
+     */
+    private function extractReplyCommand($id, User $botUser)
+    {
+        $replyMsg = WebSocketDialogMsg::find($id);
+        $replyCommand = null;
+        if ($replyMsg) {
+            switch ($replyMsg->type) {
+                case 'text':
+                    try {
+                        $replyCommand = $this->extractCommand($replyMsg, $botUser);
+                    } catch (Exception) {
+                        return Base::retError('error', "引用消息解析失败。");
+                    }
+                    break;
+                case 'file':
+                    if ($botUser->isAiBot()) {
+                        $msgData = Base::json2array($replyMsg->getRawOriginal('msg'));
+                        $fileResult = TextExtractor::extractFile(public_path($msgData['path']));
+                        if (Base::isError($fileResult)) {
+                            return Base::retError('error', $fileResult['msg']);
+                        } else {
+                            $replyCommand = $fileResult['data'];
+                        }
+                    }
+                    break;
+            }
+        }
+        return Base::retSuccess('success', $replyCommand);
+    }
+
+    /**
+     * 生成AI系统提示词
      * @param int|null $userid
      * @param WebSocketDialog $dialog
      * @param array $extras
      * @return void
      */
-    private function AIGenerateSystemMessageOrBeforeText(int|null $userid, WebSocketDialog $dialog, array &$extras)
+    private function AIGenerateSystemMessage(int|null $userid, WebSocketDialog $dialog, array &$extras)
     {
-        $system_message = null;
-        $before_text = [];
+        $system_messages = [];
         switch ($dialog->type) {
             case "user":
                 $aiPrompt = WebSocketDialogConfig::where([
@@ -646,7 +743,7 @@ class BotReceiveMsgTask extends AbstractTask
                     'type' => 'ai_prompt',
                 ])->value('value');
                 if ($aiPrompt) {
-                    $system_message = $aiPrompt;
+                    $extras['system_message'] = $aiPrompt;
                 }
                 break;
             case "group":
@@ -656,16 +753,14 @@ class BotReceiveMsgTask extends AbstractTask
                     case 'project':
                         $projectInfo = Project::whereDialogId($dialog->id)->first();
                         if ($projectInfo) {
-                            $projectText = "当前我在项目【{$projectInfo->name}】中";
-                            if ($projectInfo->archived_at) {
-                                $projectText .= "，此项目已经归档";
-                            }
-                            $before_text[] = $projectText;
-                            if ($projectInfo->desc) {
-                                $before_text[] = "项目描述：{$projectInfo->desc}";
-                            }
-                            $before_text[] = <<<EOF
-                                如果你判断我想要添加任务，请按照以下格式回复：
+                            $projectDesc = $projectInfo->desc ?: "-";
+                            $projectStatus = $projectInfo->archived_at ? '已归档' : '正在进行中';
+                            $system_messages[] = <<<EOF
+                                当前我在项目【{$projectInfo->name}】中
+                                项目描述：{$projectDesc}
+                                项目状态：{$projectStatus}
+
+                                如果你判断我想要或需要添加任务，请按照以下格式回复：
 
                                 ::: create-task-list
                                 title: 任务标题1
@@ -680,15 +775,14 @@ class BotReceiveMsgTask extends AbstractTask
                     case 'task':
                         $taskInfo = ProjectTask::with(['content'])->whereDialogId($dialog->id)->first();
                         if ($taskInfo) {
-                            $taskName = addslashes($taskInfo->name) . " (ID:{$taskInfo->id})";
                             $taskContext = implode("\n", $taskInfo->AIContext());
-                            if ($taskContext) {
-                                $before_text[] = "当前我在任务 '{$taskName}' (see below for task_content tag) 对话中\n\n<task_content path=\"{$taskName}\">\n{$taskContext}\n</task_content>";
-                            } else {
-                                $before_text[] = "当前我在任务 '{$taskName}' 对话中";
-                            }
-                            $before_text[] = <<<EOF
-                                如果你判断我想要添加子任务，请按照以下格式回复：
+                            $system_messages[] = <<<EOF
+                                当前我在任务【{$taskInfo->name}】中
+                                当前时间：{$taskInfo->updated_at}
+                                任务ID：{$taskInfo->id}
+                                {$taskContext}
+
+                                如果你判断我想要或需要添加子任务，请按照以下格式回复：
 
                                 ::: create-subtask-list
                                 title: 子任务标题1
@@ -697,17 +791,23 @@ class BotReceiveMsgTask extends AbstractTask
                                 EOF;
                         }
                         break;
+                    case 'department':
+                        $userDepartment = UserDepartment::whereDialogId($dialog->id)->first();
+                        if ($userDepartment) {
+                            $system_messages[] = "当前我在【{$userDepartment->name}】的部门群聊中";
+                        }
+                        break;
                     case 'all':
-                        $before_text[] = "当前我团队【全体成员】的群聊中";
+                        $system_messages[] = "当前我在【全体成员】的群聊中";
                         break;
                 }
                 break;
         }
-        if ($system_message) {
-            $extras['system_message'] = $system_message;
+        if ($extras['system_message']) {
+            array_unshift($system_messages, $extras['system_message']);
         }
-        if ($before_text) {
-            $extras['before_text'] = Base::newTrim($before_text);
+        if ($system_messages) {
+            $extras['system_message'] = implode("\n\n====\n\n", Base::newTrim($system_messages));
         }
     }
 }

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

@@ -7,9 +7,6 @@ use App\Module\Extranet;
 use Cache;
 use Carbon\Carbon;
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
-
 /**
  * 获取笑话、心灵鸡汤
  *

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();
                     // 工作流
@@ -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,48 @@
+<?php
+
+namespace App\Tasks;
+
+use App\Models\WebSocketDialogSession;
+use App\Module\Base;
+use App\Module\Extranet;
+
+/**
+ * 通过AI接口更新对话标题
+ */
+class UpdateSessionTitleViaAiTask extends AbstractTask
+{
+    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;
+        }
+
+        $res = Extranet::openAIGenerateTitle($this->msgText);
+        if (Base::isError($res)) {
+            return;
+        }
+
+        $newTitle = $res['data'];
+        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,7 @@
         "php": "^8.0",
         "ext-curl": "*",
         "ext-dom": "*",
+        "ext-ffi": "*",
         "ext-fileinfo": "*",
         "ext-gd": "*",
         "ext-imagick": "*",
@@ -33,9 +34,11 @@
         "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",
@@ -87,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,

composer.lock

@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ef4844086b8b7fde7050b10a9d4e436a",
+    "content-hash": "c0fa92e60d19e0c371dc4d62c6555058",
     "packages": [
         {
             "name": "asm89/stack-cors",
-            "version": "v2.2.0",
+            "version": "v2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/asm89/stack-cors.git",
-                "reference": "50f57105bad3d97a43ec4a485eb57daf347eafea"
+                "reference": "acf3142e6c5eafa378dc8ef3c069ab4558993f70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/asm89/stack-cors/zipball/50f57105bad3d97a43ec4a485eb57daf347eafea",
-                "reference": "50f57105bad3d97a43ec4a485eb57daf347eafea",
+                "url": "https://api.github.com/repos/asm89/stack-cors/zipball/acf3142e6c5eafa378dc8ef3c069ab4558993f70",
+                "reference": "acf3142e6c5eafa378dc8ef3c069ab4558993f70",
                 "shasum": ""
             },
             "require": {
@@ -58,9 +58,9 @@
             ],
             "support": {
                 "issues": "https://github.com/asm89/stack-cors/issues",
-                "source": "https://github.com/asm89/stack-cors/tree/v2.2.0"
+                "source": "https://github.com/asm89/stack-cors/tree/v2.3.0"
             },
-            "time": "2023-11-14T13:51:46+00:00"
+            "time": "2025-03-13T08:50:04+00:00"
         },
         {
             "name": "brick/math",
@@ -982,16 +982,16 @@
         },
         {
             "name": "firebase/php-jwt",
-            "version": "v6.11.0",
+            "version": "v6.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712"
+                "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/8f718f4dfc9c5d5f0c994cdfd103921b43592712",
-                "reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/d1e91ecf8c598d073d0995afa8cd5c75c6e19e66",
+                "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66",
                 "shasum": ""
             },
             "require": {
@@ -1039,9 +1039,9 @@
             ],
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.11.0"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.11.1"
             },
-            "time": "2025-01-23T05:11:06+00:00"
+            "time": "2025-04-09T20:32:01+00:00"
         },
         {
             "name": "fruitcake/laravel-cors",
@@ -1335,16 +1335,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.9.2",
+            "version": "7.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "d281ed313b989f213357e3be1a179f02196ac99b"
+                "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b",
-                "reference": "d281ed313b989f213357e3be1a179f02196ac99b",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
+                "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
                 "shasum": ""
             },
             "require": {
@@ -1441,7 +1441,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.9.2"
+                "source": "https://github.com/guzzle/guzzle/tree/7.9.3"
             },
             "funding": [
                 {
@@ -1457,20 +1457,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-24T11:22:20+00:00"
+            "time": "2025-03-27T13:37:11+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.0.4",
+            "version": "2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455"
+                "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
-                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/7c69f28996b0a6920945dd20b3857e499d9ca96c",
+                "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c",
                 "shasum": ""
             },
             "require": {
@@ -1524,7 +1524,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.0.4"
+                "source": "https://github.com/guzzle/promises/tree/2.2.0"
             },
             "funding": [
                 {
@@ -1540,20 +1540,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-10-17T10:06:22+00:00"
+            "time": "2025-03-27T13:27:01+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.7.0",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201"
+                "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
-                "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16",
+                "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16",
                 "shasum": ""
             },
             "require": {
@@ -1640,7 +1640,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.7.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.7.1"
             },
             "funding": [
                 {
@@ -1656,7 +1656,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-18T11:15:46+00:00"
+            "time": "2025-03-27T12:30:47+00:00"
         },
         {
             "name": "hedeqiang/umeng",
@@ -2195,16 +2195,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.6.1",
+            "version": "2.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "d990688c91cedfb69753ffc2512727ec646df2ad"
+                "reference": "06c3b0bf2540338094575612f4a1778d0d2d5e94"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d990688c91cedfb69753ffc2512727ec646df2ad",
-                "reference": "d990688c91cedfb69753ffc2512727ec646df2ad",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/06c3b0bf2540338094575612f4a1778d0d2d5e94",
+                "reference": "06c3b0bf2540338094575612f4a1778d0d2d5e94",
                 "shasum": ""
             },
             "require": {
@@ -2298,7 +2298,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-29T14:10:59+00:00"
+            "time": "2025-04-18T21:09:27+00:00"
         },
         {
             "name": "league/config",
@@ -2623,16 +2623,16 @@
         },
         {
             "name": "maatwebsite/excel",
-            "version": "3.1.63",
+            "version": "3.1.64",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SpartnerNL/Laravel-Excel.git",
-                "reference": "fccd234da23b39ab03e1a1f6fe9178fb96ec1be1"
+                "reference": "e25d44a2d91da9179cd2d7fec952313548597a79"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/fccd234da23b39ab03e1a1f6fe9178fb96ec1be1",
-                "reference": "fccd234da23b39ab03e1a1f6fe9178fb96ec1be1",
+                "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/e25d44a2d91da9179cd2d7fec952313548597a79",
+                "reference": "e25d44a2d91da9179cd2d7fec952313548597a79",
                 "shasum": ""
             },
             "require": {
@@ -2688,7 +2688,7 @@
             ],
             "support": {
                 "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues",
-                "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.63"
+                "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.64"
             },
             "funding": [
                 {
@@ -2700,7 +2700,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-02-19T14:24:57+00:00"
+            "time": "2025-02-24T11:12:50+00:00"
         },
         {
             "name": "madnest/madzipper",
@@ -2948,6 +2948,76 @@
             },
             "time": "2022-12-02T22:17:43+00:00"
         },
+        {
+            "name": "matomo/device-detector",
+            "version": "6.4.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/matomo-org/device-detector.git",
+                "reference": "270bbc41f80994e80805ac377b67324eba53c412"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/270bbc41f80994e80805ac377b67324eba53c412",
+                "reference": "270bbc41f80994e80805ac377b67324eba53c412",
+                "shasum": ""
+            },
+            "require": {
+                "mustangostang/spyc": "*",
+                "php": "^7.2|^8.0"
+            },
+            "replace": {
+                "piwik/device-detector": "self.version"
+            },
+            "require-dev": {
+                "matthiasmullie/scrapbook": "^1.4.7",
+                "mayflower/mo4-coding-standard": "^v9.0.0",
+                "phpstan/phpstan": "^1.10.44",
+                "phpunit/phpunit": "^8.5.8",
+                "psr/cache": "^1.0.1",
+                "psr/simple-cache": "^1.0.1",
+                "slevomat/coding-standard": "<8.16.0",
+                "symfony/yaml": "^5.1.7"
+            },
+            "suggest": {
+                "doctrine/cache": "Can directly be used for caching purpose",
+                "ext-yaml": "Necessary for using the Pecl YAML parser"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeviceDetector\\": ""
+                },
+                "exclude-from-classmap": [
+                    "Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "The Matomo Team",
+                    "email": "hello@matomo.org",
+                    "homepage": "https://matomo.org/team/"
+                }
+            ],
+            "description": "The Universal Device Detection library, that parses User Agents and detects devices (desktop, tablet, mobile, tv, cars, console, etc.), clients (browsers, media players, mobile apps, feed readers, libraries, etc), operating systems, devices, brands and models.",
+            "homepage": "https://matomo.org",
+            "keywords": [
+                "devicedetection",
+                "parser",
+                "useragent"
+            ],
+            "support": {
+                "forum": "https://forum.matomo.org/",
+                "issues": "https://github.com/matomo-org/device-detector/issues",
+                "source": "https://github.com/matomo-org/matomo",
+                "wiki": "https://dev.matomo.org/"
+            },
+            "time": "2025-02-26T17:37:32+00:00"
+        },
         {
             "name": "mews/captcha",
             "version": "3.3.0",
@@ -3123,6 +3193,60 @@
             ],
             "time": "2024-11-12T12:43:37+00:00"
         },
+        {
+            "name": "mustangostang/spyc",
+            "version": "0.6.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mustangostang/spyc.git",
+                "reference": "4627c838b16550b666d15aeae1e5289dd5b77da0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mustangostang/spyc/zipball/4627c838b16550b666d15aeae1e5289dd5b77da0",
+                "reference": "4627c838b16550b666d15aeae1e5289dd5b77da0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.3.*@dev"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.5.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "Spyc.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "mustangostang",
+                    "email": "vlad.andersen@gmail.com"
+                }
+            ],
+            "description": "A simple YAML loader/dumper class for PHP",
+            "homepage": "https://github.com/mustangostang/spyc/",
+            "keywords": [
+                "spyc",
+                "yaml",
+                "yml"
+            ],
+            "support": {
+                "issues": "https://github.com/mustangostang/spyc/issues",
+                "source": "https://github.com/mustangostang/spyc/tree/0.6.3"
+            },
+            "time": "2019-09-10T13:16:29+00:00"
+        },
         {
             "name": "myclabs/php-enum",
             "version": "1.8.5",
@@ -3357,16 +3481,16 @@
         },
         {
             "name": "nette/utils",
-            "version": "v4.0.5",
+            "version": "v4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"
+                "reference": "ce708655043c7050eb050df361c5e313cf708309"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
-                "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
+                "url": "https://api.github.com/repos/nette/utils/zipball/ce708655043c7050eb050df361c5e313cf708309",
+                "reference": "ce708655043c7050eb050df361c5e313cf708309",
                 "shasum": ""
             },
             "require": {
@@ -3437,9 +3561,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.5"
+                "source": "https://github.com/nette/utils/tree/v4.0.6"
             },
-            "time": "2024-08-07T15:39:19+00:00"
+            "time": "2025-03-30T21:06:30+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -3566,27 +3690,27 @@
         },
         {
             "name": "orangehill/iseed",
-            "version": "v3.1.0",
+            "version": "v3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/orangehill/iseed.git",
-                "reference": "8f1970930e6ec3c7a1c8cd001adf88f58e904525"
+                "reference": "bfe8f5882641f70b309cd01e30f02e8e9d09b492"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/orangehill/iseed/zipball/8f1970930e6ec3c7a1c8cd001adf88f58e904525",
-                "reference": "8f1970930e6ec3c7a1c8cd001adf88f58e904525",
+                "url": "https://api.github.com/repos/orangehill/iseed/zipball/bfe8f5882641f70b309cd01e30f02e8e9d09b492",
+                "reference": "bfe8f5882641f70b309cd01e30f02e8e9d09b492",
                 "shasum": ""
             },
             "require": {
-                "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
                 "php": "^7.2|^8.0.2"
             },
             "require-dev": {
-                "illuminate/filesystem": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-                "laravel/framework": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "illuminate/filesystem": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+                "laravel/framework": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
                 "mockery/mockery": "^1.0.0",
-                "phpunit/phpunit": "^8.0"
+                "phpunit/phpunit": "^8.0|^11.5.3"
             },
             "type": "library",
             "extra": {
@@ -3623,9 +3747,9 @@
             ],
             "support": {
                 "issues": "https://github.com/orangehill/iseed/issues",
-                "source": "https://github.com/orangehill/iseed/tree/v3.1.0"
+                "source": "https://github.com/orangehill/iseed/tree/v3.1.1"
             },
-            "time": "2025-02-13T10:49:30+00:00"
+            "time": "2025-03-04T07:56:48+00:00"
         },
         {
             "name": "overtrue/http",
@@ -3758,6 +3882,103 @@
             ],
             "time": "2023-04-27T10:17:12+00:00"
         },
+        {
+            "name": "pclzip/pclzip",
+            "version": "2.8.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ivanlanin/pclzip.git",
+                "reference": "19dd1de9d3f5fc4d7d70175b4c344dee329f45fd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ivanlanin/pclzip/zipball/19dd1de9d3f5fc4d7d70175b4c344dee329f45fd",
+                "reference": "19dd1de9d3f5fc4d7d70175b4c344dee329f45fd",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "pclzip.lib.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1"
+            ],
+            "authors": [
+                {
+                    "name": "Vincent Blavet"
+                }
+            ],
+            "description": "A PHP library that offers compression and extraction functions for Zip formatted archives",
+            "homepage": "http://www.phpconcept.net/pclzip",
+            "keywords": [
+                "php",
+                "zip"
+            ],
+            "support": {
+                "issues": "https://github.com/ivanlanin/pclzip/issues",
+                "source": "https://github.com/ivanlanin/pclzip/tree/master"
+            },
+            "time": "2014-06-05T11:42:24+00:00"
+        },
+        {
+            "name": "phpoffice/common",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPOffice/Common.git",
+                "reference": "5a2eeb82d4dfce4ce2163819063ba6f5a80c3e91"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPOffice/Common/zipball/5a2eeb82d4dfce4ce2163819063ba6f5a80c3e91",
+                "reference": "5a2eeb82d4dfce4ce2163819063ba6f5a80c3e91",
+                "shasum": ""
+            },
+            "require": {
+                "pclzip/pclzip": "^2.8",
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "phpmd/phpmd": "2.*",
+                "phpstan/phpstan": "^0.12.88 || ^1.0.0",
+                "phpunit/phpunit": ">=7"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PhpOffice\\Common\\": "src/Common/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-only"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Baker"
+                },
+                {
+                    "name": "Franck Lefevre",
+                    "homepage": "http://rootslabs.net"
+                }
+            ],
+            "description": "PHPOffice Common",
+            "homepage": "http://phpoffice.github.io",
+            "keywords": [
+                "common",
+                "component",
+                "office",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPOffice/Common/issues",
+                "source": "https://github.com/PHPOffice/Common/tree/1.0.5"
+            },
+            "time": "2025-02-28T12:39:45+00:00"
+        },
         {
             "name": "phpoffice/math",
             "version": "0.2.0",
@@ -3810,6 +4031,75 @@
             },
             "time": "2024-08-12T07:30:45+00:00"
         },
+        {
+            "name": "phpoffice/phppresentation",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPOffice/PHPPresentation.git",
+                "reference": "7a70b57df7ed3f05316aff2b83c307c61144b951"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPOffice/PHPPresentation/zipball/7a70b57df7ed3f05316aff2b83c307c61144b951",
+                "reference": "7a70b57df7ed3f05316aff2b83c307c61144b951",
+                "shasum": ""
+            },
+            "require": {
+                "ext-xml": "*",
+                "ext-zip": "*",
+                "php": "^7.1|^8.0",
+                "phpoffice/common": "^1",
+                "phpoffice/phpspreadsheet": "^1.9.0"
+            },
+            "require-dev": {
+                "phpmd/phpmd": "2.*",
+                "phpstan/phpstan": "^0.12.88 || ^1.0.0",
+                "phpunit/phpunit": ">=7.0"
+            },
+            "suggest": {
+                "ext-gd": "Required to add images"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PhpOffice\\PhpPresentation\\": "src/PhpPresentation/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-only"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Baker"
+                },
+                {
+                    "name": "Franck Lefevre",
+                    "homepage": "http://rootslabs.net"
+                },
+                {
+                    "name": "Ivan Lanin",
+                    "homepage": "http://ivan.lanin.org"
+                }
+            ],
+            "description": "PHPPresentation - Read, Create and Write Presentations documents in PHP",
+            "homepage": "http://phpoffice.github.io",
+            "keywords": [
+                "LibreOffice",
+                "PowerPoint",
+                "odp",
+                "php",
+                "ppt",
+                "pptx",
+                "presentations"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPOffice/PHPPresentation/issues",
+                "source": "https://github.com/PHPOffice/PHPPresentation/tree/1.1.0"
+            },
+            "time": "2024-09-01T07:45:31+00:00"
+        },
         {
             "name": "phpoffice/phpspreadsheet",
             "version": "1.29.10",
@@ -4575,16 +4865,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.7",
+            "version": "v0.12.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c"
+                "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
-                "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/85057ceedee50c49d4f6ecaff73ee96adb3b3625",
+                "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625",
                 "shasum": ""
             },
             "require": {
@@ -4648,9 +4938,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.7"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.8"
             },
-            "time": "2024-12-10T01:58:33+00:00"
+            "time": "2025-03-16T03:05:19+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -4880,16 +5170,16 @@
         },
         {
             "name": "smalot/pdfparser",
-            "version": "v2.11.0",
+            "version": "v2.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/smalot/pdfparser.git",
-                "reference": "ac8e6678b0940e4b2ccd5caadd3fb18e68093be6"
+                "reference": "8440edbf58c8596074e78ada38dcb0bd041a5948"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/smalot/pdfparser/zipball/ac8e6678b0940e4b2ccd5caadd3fb18e68093be6",
-                "reference": "ac8e6678b0940e4b2ccd5caadd3fb18e68093be6",
+                "url": "https://api.github.com/repos/smalot/pdfparser/zipball/8440edbf58c8596074e78ada38dcb0bd041a5948",
+                "reference": "8440edbf58c8596074e78ada38dcb0bd041a5948",
                 "shasum": ""
             },
             "require": {
@@ -4925,9 +5215,9 @@
             ],
             "support": {
                 "issues": "https://github.com/smalot/pdfparser/issues",
-                "source": "https://github.com/smalot/pdfparser/tree/v2.11.0"
+                "source": "https://github.com/smalot/pdfparser/tree/v2.12.0"
             },
-            "time": "2024-08-16T06:48:03+00:00"
+            "time": "2025-03-31T13:16:09+00:00"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -7718,16 +8008,16 @@
         },
         {
             "name": "composer/class-map-generator",
-            "version": "1.6.0",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/class-map-generator.git",
-                "reference": "ffe442c5974c44a9343e37a0abcb1cc37319f5b9"
+                "reference": "134b705ddb0025d397d8318a75825fe3c9d1da34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/ffe442c5974c44a9343e37a0abcb1cc37319f5b9",
-                "reference": "ffe442c5974c44a9343e37a0abcb1cc37319f5b9",
+                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/134b705ddb0025d397d8318a75825fe3c9d1da34",
+                "reference": "134b705ddb0025d397d8318a75825fe3c9d1da34",
                 "shasum": ""
             },
             "require": {
@@ -7771,7 +8061,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/class-map-generator/issues",
-                "source": "https://github.com/composer/class-map-generator/tree/1.6.0"
+                "source": "https://github.com/composer/class-map-generator/tree/1.6.1"
             },
             "funding": [
                 {
@@ -7787,7 +8077,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-05T10:05:34+00:00"
+            "time": "2025-03-24T13:50:44+00:00"
         },
         {
             "name": "doctrine/cache",
@@ -7995,26 +8285,29 @@
         },
         {
             "name": "doctrine/deprecations",
-            "version": "1.1.4",
+            "version": "1.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9"
+                "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9",
-                "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38",
+                "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
+            "conflict": {
+                "phpunit/phpunit": "<=7.5 || >=13"
+            },
             "require-dev": {
-                "doctrine/coding-standard": "^9 || ^12",
-                "phpstan/phpstan": "1.4.10 || 2.0.3",
+                "doctrine/coding-standard": "^9 || ^12 || ^13",
+                "phpstan/phpstan": "1.4.10 || 2.1.11",
                 "phpstan/phpstan-phpunit": "^1.0 || ^2",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "suggest": {
@@ -8034,9 +8327,9 @@
             "homepage": "https://www.doctrine-project.org/",
             "support": {
                 "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/1.1.4"
+                "source": "https://github.com/doctrine/deprecations/tree/1.1.5"
             },
-            "time": "2024-12-07T21:18:45+00:00"
+            "time": "2025-04-07T20:06:18+00:00"
         },
         {
             "name": "doctrine/event-manager",
@@ -8461,16 +8754,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.17.0",
+            "version": "2.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "075bc0c26631110584175de6523ab3f1652eb28e"
+                "reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/075bc0c26631110584175de6523ab3f1652eb28e",
-                "reference": "075bc0c26631110584175de6523ab3f1652eb28e",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e",
+                "reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e",
                 "shasum": ""
             },
             "require": {
@@ -8520,7 +8813,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.17.0"
+                "source": "https://github.com/filp/whoops/tree/2.18.0"
             },
             "funding": [
                 {
@@ -8528,7 +8821,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-01-25T12:00:00+00:00"
+            "time": "2025-03-15T12:00:00+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -10755,16 +11048,16 @@
         },
         {
             "name": "swoole/ide-helper",
-            "version": "6.0.0",
+            "version": "6.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swoole/ide-helper.git",
-                "reference": "86a61562a1f1634339ee52f3b8988591f51a2799"
+                "reference": "6f12243dce071714c5febe059578d909698f9a52"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swoole/ide-helper/zipball/86a61562a1f1634339ee52f3b8988591f51a2799",
-                "reference": "86a61562a1f1634339ee52f3b8988591f51a2799",
+                "url": "https://api.github.com/repos/swoole/ide-helper/zipball/6f12243dce071714c5febe059578d909698f9a52",
+                "reference": "6f12243dce071714c5febe059578d909698f9a52",
                 "shasum": ""
             },
             "type": "library",
@@ -10781,9 +11074,9 @@
             "description": "IDE help files for Swoole.",
             "support": {
                 "issues": "https://github.com/swoole/ide-helper/issues",
-                "source": "https://github.com/swoole/ide-helper/tree/6.0.0"
+                "source": "https://github.com/swoole/ide-helper/tree/6.0.2"
             },
-            "time": "2025-01-03T19:08:24+00:00"
+            "time": "2025-03-23T07:31:41+00:00"
         },
         {
             "name": "symfony/yaml",

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_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');
+    }
+}

database/migrations/2025_04_21_113033_add_device_hash_to_umeng_alias_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddDeviceHashToUmengAliasTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('umeng_alias', function (Blueprint $table) {
+            if (!Schema::hasColumn('umeng_alias', 'device_hash')) {
+                $table->string('device_hash')->index()->nullable()->after('device')->comment('设备哈希值，用于关联UserDevice表');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('umeng_alias', function (Blueprint $table) {
+            $table->dropColumn('device_hash');
+        });
+    }
+}

docker-compose.yml

@@ -1,17 +1,18 @@
 services:
   php:
     container_name: "dootask-php-${APP_ID}"
-    image: "kuaifan/php:swoole-8.0.rc18"
-    shm_size: "2gb"
+    image: "kuaifan/php:swoole-8.0.rc21"
+    shm_size: 2G
     ulimits:
       core:
         soft: 0
         hard: 0
     volumes:
+      - shared_data:/usr/share/dootask
       - ./docker/crontab/crontab.conf:/etc/supervisor/conf.d/crontab.conf
       - ./docker/php/php.conf:/etc/supervisor/conf.d/php.conf
       - ./docker/php/php.ini:/usr/local/etc/php/php.ini
-      - ./docker/log/supervisor:/var/log/supervisor
+      - ./docker/logs/supervisor:/var/log/supervisor
       - ./:/var/www
     environment:
       LANG: "C.UTF-8"
@@ -21,12 +22,18 @@ services:
       MYSQL_DB_NAME: "${DB_DATABASE}"
       MYSQL_USERNAME: "${DB_USERNAME}"
       MYSQL_PASSWORD: "${DB_PASSWORD}"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:${LARAVELS_LISTEN_PORT}/health"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
     networks:
-      extnetwork:
-        ipv4_address: "${APP_IPPR}.2"
+      - extnetwork
     depends_on:
-      - redis
-      - mariadb
+      mariadb:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
     restart: unless-stopped
 
   nginx:
@@ -34,30 +41,34 @@ services:
     image: "nginx:alpine"
     ports:
       - "${APP_PORT}:80"
-      - "${APP_SSL_PORT:-}:443"
+      - "${APP_SSL_PORT:-0}:443"
     volumes:
-      - ./docker/nginx:/etc/nginx/conf.d
-      - ./public:/var/www/public
+      - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf
+      - ./:/var/www
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost/health"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    depends_on:
+      php:
+        condition: service_healthy
     networks:
-      extnetwork:
-        ipv4_address: "${APP_IPPR}.3"
-    links:
-      - php
-      - office
-      - fileview
-      - drawio-webapp
-      - drawio-export
-      - minder
-      - okr
-      - ai
+      - extnetwork
     restart: unless-stopped
 
   redis:
     container_name: "dootask-redis-${APP_ID}"
     image: "redis:alpine"
+    volumes:
+      - redis_data:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
     networks:
-      extnetwork:
-        ipv4_address: "${APP_IPPR}.4"
+      - extnetwork
     restart: unless-stopped
 
   mariadb:
@@ -73,161 +84,40 @@ services:
       MYSQL_DATABASE: "${DB_DATABASE}"
       MYSQL_USER: "${DB_USERNAME}"
       MYSQL_PASSWORD: "${DB_PASSWORD}"
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "${DB_USERNAME}", "-p${DB_PASSWORD}"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
     networks:
-      extnetwork:
-        ipv4_address: "${APP_IPPR}.5"
+      - extnetwork
     restart: unless-stopped
 
-  office:
-    container_name: "dootask-office-${APP_ID}"
-    image: "onlyoffice/documentserver:8.2.2.1"
+  appstore:
+    container_name: "dootask-appstore-${APP_ID}"
+    privileged: true
+    image: "dootask/appstore:0.1.8"
     volumes:
-      - ./docker/office/logs:/var/log/onlyoffice
-      - ./docker/office/data:/var/www/onlyoffice/Data
-      - ./docker/office/etc/documentserver/default.json:/etc/onlyoffice/documentserver/default.json
-      - ./docker/office/resources/require.js:/var/www/onlyoffice/documentserver/web-apps/vendor/requirejs/require.js
-      - ./docker/office/resources/common/main/resources/img/header:/var/www/onlyoffice/documentserver/web-apps/apps/common/main/resources/img/header
-      - ./docker/office/resources/documenteditor/main/resources/css/app.css:/var/www/onlyoffice/documentserver/web-apps/apps/documenteditor/main/resources/css/app.css
-      - ./docker/office/resources/documenteditor/mobile/css/526.caf35c11a8d72ca5ac85.css:/var/www/onlyoffice/documentserver/web-apps/apps/documenteditor/mobile/css/526.caf35c11a8d72ca5ac85.css
-      - ./docker/office/resources/presentationeditor/main/resources/css/app.css:/var/www/onlyoffice/documentserver/web-apps/apps/presentationeditor/main/resources/css/app.css
-      - ./docker/office/resources/presentationeditor/mobile/css/923.f9cf19de1a25c2e7bf8b.css:/var/www/onlyoffice/documentserver/web-apps/apps/presentationeditor/mobile/css/923.f9cf19de1a25c2e7bf8b.css
-      - ./docker/office/resources/spreadsheeteditor/main/resources/css/app.css:/var/www/onlyoffice/documentserver/web-apps/apps/spreadsheeteditor/main/resources/css/app.css
-      - ./docker/office/resources/spreadsheeteditor/mobile/css/611.1bef49f175e18fc085db.css:/var/www/onlyoffice/documentserver/web-apps/apps/spreadsheeteditor/mobile/css/611.1bef49f175e18fc085db.css
+      - shared_data:/usr/share/dootask
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./:/var/www
     environment:
-      JWT_SECRET: ${APP_KEY}
+      HOST_PWD: "${PWD}"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost/health"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
     networks:
-      extnetwork:
-        ipv4_address: "${APP_IPPR}.6"
-    restart: unless-stopped
-
-  fileview:
-    container_name: "dootask-fileview-${APP_ID}"
-    image: "kuaifan/fileview:4.2.0-SNAPSHOT-RC25"
-    environment:
-      KK_CONTEXT_PATH: "/fileview"
-      KK_OFFICE_PREVIEW_SWITCH_DISABLED: true
-      KK_FILE_UPLOAD_ENABLED: true
-      KK_MEDIA: "mp3,wav,mp4,mov,avi,wmv"
-    networks:
-      extnetwork:
-        ipv4_address: "${APP_IPPR}.7"
-    restart: unless-stopped
-
-  drawio-webapp:
-    container_name: "dootask-drawio-webapp-${APP_ID}"
-    image: "jgraph/drawio:24.7.17"
-    volumes:
-      - ./docker/drawio/webapp/index.html:/usr/local/tomcat/webapps/draw/index.html
-      - ./docker/drawio/webapp/stencils:/usr/local/tomcat/webapps/draw/stencils
-      - ./docker/drawio/webapp/js/app.min.js:/usr/local/tomcat/webapps/draw/js/app.min.js
-      - ./docker/drawio/webapp/js/croppie/croppie.min.css:/usr/local/tomcat/webapps/draw/js/croppie/croppie.min.css
-      - ./docker/drawio/webapp/js/diagramly/ElectronApp.js:/usr/local/tomcat/webapps/draw/js/diagramly/ElectronApp.js
-    networks:
-      extnetwork:
-        ipv4_address: "${APP_IPPR}.8"
-    depends_on:
-      - drawio-export
-    restart: unless-stopped
-
-  drawio-export:
-    container_name: "dootask-drawio-export-${APP_ID}"
-    image: "kuaifan/export-server:0.0.1"
-    networks:
-      extnetwork:
-        ipv4_address: "${APP_IPPR}.9"
-    volumes:
-      - ./docker/drawio/export/fonts:/usr/share/fonts/drawio
-    restart: unless-stopped
-
-  minder:
-    container_name: "dootask-minder-${APP_ID}"
-    image: "kuaifan/minder:0.1.3"
-    networks:
-      extnetwork:
-        ipv4_address: "${APP_IPPR}.10"
-    restart: unless-stopped
-
-  approve:
-    container_name: "dootask-approve-${APP_ID}"
-    image: "kuaifan/dooapprove:0.1.5"
-    environment:
-      TZ: "${TIMEZONE:-PRC}"
-      MYSQL_HOST: "${DB_HOST}"
-      MYSQL_PORT: "${DB_PORT}"
-      MYSQL_DBNAME: "${DB_DATABASE}"
-      MYSQL_USERNAME: "${DB_USERNAME}"
-      MYSQL_PASSWORD: "${DB_PASSWORD}"
-      MYSQL_Prefix: "${DB_PREFIX}approve_"
-      DEMO_DATA: true
-      KEY: ${APP_KEY}
-    networks:
-      extnetwork:
-        ipv4_address: "${APP_IPPR}.11"
-    depends_on:
-      - mariadb
-    restart: unless-stopped
-
-  ai:
-    container_name: "dootask-ai-${APP_ID}"
-    image: "kuaifan/dootask-ai:0.3.4"
-    environment:
-      REDIS_HOST: "${REDIS_HOST}"
-      REDIS_PORT: "${REDIS_PORT}"
-      TIMEOUT: 600
-    networks:
-      extnetwork:
-        ipv4_address: "${APP_IPPR}.12"
-    depends_on:
-      - redis
-    restart: unless-stopped
-
-  okr:
-    container_name: "dootask-okr-${APP_ID}"
-    image: "kuaifan/doookr:0.4.5"
-    environment:
-      TZ: "${TIMEZONE:-PRC}"
-      DOO_TASK_URL: "http://${APP_IPPR}.3"
-      MYSQL_HOST: "${DB_HOST}"
-      MYSQL_PORT: "${DB_PORT}"
-      MYSQL_DBNAME: "${DB_DATABASE}"
-      MYSQL_USERNAME: "${DB_USERNAME}"
-      MYSQL_PASSWORD: "${DB_PASSWORD}"
-      MYSQL_PREFIX: "${DB_PREFIX}"
-      DEMO_DATA: true
-      KEY: ${APP_KEY}
-    networks:
-      extnetwork:
-        ipv4_address: "${APP_IPPR}.13"
-    depends_on:
-      - mariadb
-    restart: unless-stopped
-
-  face:
-    container_name: "dootask-face-${APP_ID}"
-    image: "hitosea2020/dooface:0.0.1"
-    ports:
-      - "7788:7788"
-    environment:
-      TZ: "${TIMEZONE:-PRC}"
-      STORAGE: mysql
-      MYSQL_HOST: "${DB_HOST}"
-      MYSQL_PORT: "${DB_PORT}"
-      MYSQL_USERNAME: "${DB_USERNAME}"
-      MYSQL_PASSWORD: "${DB_PASSWORD}"
-      MYSQL_DB_NAME: "${DB_DATABASE}"
-      DB_PREFIX: "${DB_PREFIX}"
-      REPORT_API: "http://${APP_IPPR}.3:80/api/public/checkin/report"
-    depends_on:
-      - mariadb
-    networks:
-      extnetwork:
-        ipv4_address: "${APP_IPPR}.14"
+      - extnetwork
     restart: unless-stopped
 
 networks:
   extnetwork:
     name: "dootask-networks-${APP_ID}"
-    ipam:
-      config:
-        - subnet: "${APP_IPPR}.0/24"
-          gateway: "${APP_IPPR}.1"
+
+volumes:
+  shared_data:
+    name: "dootask-shared-data-${APP_ID}"
+  redis_data:
+    name: "dootask-redis-data-${APP_ID}"

docker/appstore/.gitignore

@@ -0,0 +1,5 @@
+apps/*
+config/*
+log/*
+temp/*
+!.gitkeep

docker/drawio/export/fonts/.gitignore

@@ -1 +0,0 @@
-

docker/drawio/webapp/README.md

@@ -1,3 +0,0 @@
-# Change
-
-diff https://github.com/jgraph/drawio/tree/acd938b1e42cff3be3b629e6239cdec9a9baddcc

docker/drawio/webapp/index.html

@@ -1,468 +0,0 @@
-<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=5" ><![endif]-->
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Flowchart Maker &amp; Online Diagram Software</title>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="Description" content="draw.io is free online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams">
-    <meta name="Keywords" content="drawio, diagram, online, flow chart, flowchart maker, uml, erd">
-    <meta itemprop="name" content="draw.io - free flowchart maker and diagrams online">
-	<meta itemprop="description" content="draw.io is a free online diagramming application and flowchart maker . You can use it to create UML, entity relationship,
-		org charts, BPMN and BPM, database schema and networks. Also possible are telecommunication network, workflow, flowcharts, maps overlays and GIS, electronic 
-		circuit and social network diagrams.">
-	<meta itemprop="image" content="https://lh4.googleusercontent.com/-cLKEldMbT_E/Tx8qXDuw6eI/AAAAAAAAAAs/Ke0pnlk8Gpg/w500-h344-k/BPMN%2Bdiagram%2Brc2f.png">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-	<meta name="msapplication-config" content="images/browserconfig.xml">
-    <meta name="mobile-web-app-capable" content="yes">
-	<meta name="theme-color" content="#d89000">
-	<script id="geBootstrap" type="text/javascript">
-		window.EXPORT_URL = window.location.origin + "/drawio/export/";
-		window.DRAWIO_LIGHTBOX_URL = window.location.origin + "/drawio/webapp";
-		setInterval(function() {window.ICONSEARCH_PATH = window.location.origin + "/drawio/iconsearch";}, 1000)
-
-		/**
-		 * URL Parameters and protocol description are here:
-		 *
-		 * https://www.drawio.com/doc/faq/supported-url-parameters
-		 *
-		 * Parameters for developers:
-		 *
-		 * - dev=1: For developers only
-		 * - test=1: For developers only
-		 * - export=URL for export: For developers only
-		 * - ignoremime=1: For developers only (see DriveClient.js). Use Cmd-S to override mime.
-		 * - createindex=1: For developers only (see etc/build/README)
-		 * - filesupport=0: For developers only (see Editor.js in core)
-		 * - savesidebar=1: For developers only (see Sidebar.js)
-		 * - pages=1: For developers only (see Pages.js)
-		 * - lic=email: For developers only (see LicenseServlet.java)
-		 * --
-		 * - networkshapes=1: For testing network shapes (temporary)
-		 */
-		var urlParams = (function()
-		{
-			var result = new Object();
-			var params = window.location.search.slice(1).split('&');
-			
-			for (var i = 0; i < params.length; i++)
-			{
-				var idx = params[i].indexOf('=');
-				
-				if (idx > 0)
-				{
-					result[params[i].substring(0, idx)] = params[i].substring(idx + 1);
-				}
-			}
-			
-			return result;
-		})();
-		
-		// Forces CDN caches by passing URL parameters via URL hash
-		if (window.location.hash != null && window.location.hash.substring(0, 2) == '#P')
-		{
-			try
-			{
-				urlParams = JSON.parse(decodeURIComponent(window.location.hash.substring(2)));
-				
-				if (urlParams.hash != null)
-				{
-					window.location.hash = urlParams.hash;
-				}
-			}
-			catch (e)
-			{
-				// ignore
-			}
-		}
-		
-		// Global variable for desktop
-		var mxIsElectron = navigator.userAgent != null && navigator.userAgent.toLowerCase().indexOf(' electron/') > -1 && 
-							navigator.userAgent.indexOf(' draw.io/') > -1;
-
-		// Redirects page if required
-		if (urlParams['dev'] != '1')
-		{
-			(function()
-			{
-				var proto = window.location.protocol;
-				
-				if (!mxIsElectron)
-				{
-					var host = window.location.host;
-		
-					// Redirects apex, drive and rt to www
-					if (host === 'draw.io' || host === 'rt.draw.io' || host === 'drive.draw.io')
-					{
-						host = 'www.draw.io';
-					}
-					
-					var href = proto + '//' + host + window.location.href.substring(
-							window.location.protocol.length +
-							window.location.host.length + 2);
-		
-					// Redirects if href changes
-					if (href != window.location.href)
-					{
-						window.location.href = href;
-					}
-				}
-			})();
-		}
-		
-		/**
-		 * Adds meta tag to the page.
-		 */
-		function mxmeta(name, content, httpEquiv)
-		{
-			try
-			{
-				var s = document.createElement('meta');
-				
-				if (name != null) 
-				{
-					s.setAttribute('name', name);
-				}
-
-				s.setAttribute('content', content);
-				
-				if (httpEquiv != null) 
-				{
-					s.setAttribute('http-equiv', httpEquiv);
-				}
-
-			  	var t = document.getElementsByTagName('meta')[0];
-			  	t.parentNode.insertBefore(s, t);
-			}
-			catch (e)
-			{
-				// ignore
-			}
-		};
-		
-		/**
-		 * Synchronously adds scripts to the page.
-		 */
-		function mxscript(src, onLoad, id, dataAppKey, noWrite, onError)
-		{
-			var defer = onLoad == null && !noWrite;
-			
-			if ((urlParams['dev'] != '1' && typeof document.createElement('canvas').getContext === "function") ||
-				onLoad != null || noWrite)
-			{
-				var s = document.createElement('script');
-				s.setAttribute('type', 'text/javascript');
-				s.setAttribute('defer', 'true');
-				s.setAttribute('src', src);
-
-				if (id != null)
-				{
-					s.setAttribute('id', id);
-				}
-				
-				if (dataAppKey != null)
-				{
-					s.setAttribute('data-app-key', dataAppKey);
-				}
-				
-				if (onLoad != null)
-				{
-					var r = false;
-				
-					s.onload = s.onreadystatechange = function()
-					{
-						if (!r && (!this.readyState || this.readyState == 'complete'))
-						{
-				      		r = true;
-				      		onLoad();
-						}
-				  	};
-				}
-
-				if (onError != null)
-				{
-					s.onerror = function(e)
-					{
-						onError('Failed to load ' + src, e);
-					};
-				}
-			  	
-			  	var t = document.getElementsByTagName('script')[0];
-			  	
-			  	if (t != null)
-			  	{
-			  		t.parentNode.insertBefore(s, t);
-			  	}
-			}
-			else
-			{
-				document.write('<script src="' + src + '"' + ((id != null) ? ' id="' + id +'" ' : '') +
-					((dataAppKey != null) ? ' data-app-key="' + dataAppKey +'" ' : '') + '></scr' + 'ipt>');
-			}
-		};
-
-		/**
-		 * Asynchronously adds scripts to the page.
-		 */
-		function mxinclude(src)
-		{
-			var g = document.createElement('script');
-			g.type = 'text/javascript';
-			g.async = true;
-			g.src = src;
-			
-		    var s = document.getElementsByTagName('script')[0];
-		    s.parentNode.insertBefore(g, s);
-		};
-		
-		/**
-		 * Adds meta tags with application name (depends on offline URL parameter)
-		 */
-		(function()
-		{
-			var name = 'diagrams.net';
-			mxmeta('apple-mobile-web-app-title', name);
-			mxmeta('application-name', name);
-
-			if (mxIsElectron)
-			{
-				mxmeta(null, 'default-src \'self\'; script-src \'self\' \'sha256-6g514VrT/cZFZltSaKxIVNFF46+MFaTSDTPB8WfYK+c=\'; connect-src \'self\' https://*.draw.io https://*.diagrams.net https://fonts.googleapis.com https://fonts.gstatic.com; img-src * data:; media-src *; font-src *; frame-src \'none\'; style-src \'self\' \'unsafe-inline\' https://fonts.googleapis.com; base-uri \'none\';child-src \'self\';object-src \'none\';', 'Content-Security-Policy');
-			}
-		})();
-		
-		// Checks for local storage
-		var isLocalStorage = false;
-		
-		try
-		{
-			isLocalStorage = urlParams['local'] != '1' && typeof(localStorage) != 'undefined';
-		}
-		catch (e)
-		{
-			// ignored
-		}
-
-		var mxScriptsLoaded = false, mxWinLoaded = false;
-		
-		function checkAllLoaded()
-		{
-			if (mxScriptsLoaded && mxWinLoaded)
-			{
-				App.main();				
-			}
-		};
-		
-		var t0 = new Date();
-
-		// Changes paths for local development environment
-		if (urlParams['dev'] == '1')
-		{
-			// Used to request grapheditor/mxgraph sources in dev mode
-			var mxDevUrl = '';
-			
-			// Used to request draw.io sources in dev mode
-			var drawDevUrl = '';
-			var geBasePath = 'js/grapheditor';
-			var mxBasePath = 'mxgraph/src';
-			
-			if (document.location.protocol == 'file:')
-			{
-				// Forces includes for dev environment in node.js
-				mxForceIncludes = true;
-			}
-
-			mxForceIncludes = false;
-
-			mxscript(drawDevUrl + 'js/PreConfig.js');
-			mxscript(drawDevUrl + 'js/diagramly/Init.js');
-			mxscript(geBasePath + '/Init.js');
-			mxscript(mxBasePath + '/mxClient.js');
-			
-			// Adds all JS code that depends on mxClient. This indirection via Devel.js is
-			// required in some browsers to make sure mxClient.js (and the files that it
-			// loads asynchronously) are available when the code loaded in Devel.js runs.
-			mxscript(drawDevUrl + 'js/diagramly/Devel.js');
-			
-			// Electron
-			if (mxIsElectron)
-			{
-				mxscript('js/diagramly/DesktopLibrary.js');
-				mxscript('js/diagramly/ElectronApp.js');
-			}
-			
-			mxscript(drawDevUrl + 'js/PostConfig.js');
-		}
-		else
-		{
-			(function()
-			{
-				var hostName = window.location.hostname;
-				
-				// Supported domains are *.draw.io and the packaged version in Quip
-				var supportedDomain = (hostName.substring(hostName.length - 8, hostName.length) === '.draw.io') ||
-					(hostName.substring(hostName.length - 13, hostName.length) === '.diagrams.net');
-				
-				function loadAppJS()
-				{
-					mxscript('js/app.min.js', function()
-					{
-						mxScriptsLoaded = true;
-						checkAllLoaded();
-						
-						// Electron
-						if (mxIsElectron)
-						{
-							mxscript('js/diagramly/DesktopLibrary.js', function()
-							{
-								mxscript('js/diagramly/ElectronApp.js', function()
-								{
-									mxscript('js/extensions.min.js', function()
-									{
-										mxscript('js/stencils.min.js', function()
-										{
-											mxscript('js/shapes-14-6-5.min.js', function()
-											{
-												mxscript('js/PostConfig.js');
-											});
-										});
-									});
-								});
-							});
-						}
-						else if (!supportedDomain || navigator.onLine)
-						{
-							mxscript('js/PostConfig.js');
-						}
-					});
-				};
-				
-				if (!supportedDomain || mxIsElectron || navigator.onLine)
-				{
-					mxscript('js/PreConfig.js', loadAppJS);
-				}
-				else
-				{
-					loadAppJS();
-				}
-			})();
-		}
-
-		// Adds basic error handling
-		window.onerror = function()
-		{
-			var status = document.getElementById('geStatus');
-			
-			if (status != null)
-			{
-				status.innerHTML = 'Page could not be loaded. Please try refreshing.';
-			}
-		};
-	</script>
-    <link rel="icon" href="favicon.ico" sizes="any">
-    <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
-    <link rel="stylesheet" type="text/css" href="styles/grapheditor.css">
-	<link rel="stylesheet" media="(forced-colors: active)" href="styles/high-contrast.css" id="high-contrast-stylesheet">
-    <link rel="canonical" href="https://app.diagrams.net">
-	<link rel="manifest" href="images/manifest.json">
-	<link rel="shortcut icon" href="favicon.ico">
-	<style type="text/css">
-		body { overflow:hidden; }
-		div.picker { z-index: 10007; }
-		.geSidebarContainer .geTitle input {
-			font-size:8pt;
-			color:#606060;
-		}
-		.geBlock {
-			display: none;
-			z-index:-3;
-			margin:100px;
-			margin-top:40px;
-			margin-bottom:30px;
-			padding:20px;
-			text-align:center;
-			min-width:50%;
-		}
-		.geBlock h1, .geBlock h2 {
-			margin-top:0px;
-			padding-top:0px;
-		}
-		.geEditor *:not(.geScrollable)::-webkit-scrollbar {
-		    width:10px;
-		    height:10px;
-		}
-		.geEditor ::-webkit-scrollbar-track {
-			background-clip:padding-box;
-			border:solid transparent;
-			border-width:1px;
-		}
-		.geEditor ::-webkit-scrollbar-corner {
-			background-color:transparent;
-		}
-		.geEditor ::-webkit-scrollbar-thumb {
-			background-color:rgba(0,0,0,.1);
-			background-clip:padding-box;
-			border:solid transparent;
-			border-radius:10px;
-		}
-		.geEditor ::-webkit-scrollbar-thumb:hover {
-			background-color:rgba(0,0,0,.4);
-		}
-		.geTemplate {
-			border:1px solid transparent;
-			display:inline-block;
-			_display:inline;
-			vertical-align:top;
-			border-radius:3px;
-			overflow:hidden;
-			font-size:14pt;
-			cursor:pointer;
-			margin:5px;
-		}
-	</style>
-	<!-- Workaround for binary XHR in IE 9/10, see App.loadUrl -->
-	<!--[if (IE 9)|(IE 10)]><!-->
-		<script type="text/vbscript">
-			Function mxUtilsBinaryToArray(Binary)
-				Dim i
-				ReDim byteArray(LenB(Binary))
-				For i = 1 To LenB(Binary)
-					byteArray(i-1) = AscB(MidB(Binary, i, 1))
-				Next
-				mxUtilsBinaryToArray = byteArray
-			End Function
-		</script>
-	<!--<![endif]-->
-</head>
-<body class="geEditor">
-<div id="geInfo">
-	<div class="geBlock">
-		<h1>Flowchart Maker and Online Diagram Software</h1>
-		<p>
-			draw.io is free online diagram software. You can use it as a flowchart maker, network diagram software, to create UML online, as an ER diagram tool, 
-			to design database schema, to build BPMN online, as a circuit diagram maker, and more. draw.io can import .vsdx, Gliffy&trade; and Lucidchart&trade; files .
-		</p>
-		<h2 id="geStatus">Loading...</h2>
-		<p>
-			Please ensure JavaScript is enabled.
-		</p>
-	</div>
-</div>
-<script id="geMain" type="text/javascript">
-/**
- * Main
- */
-if (urlParams['dev'] != '1' && typeof document.createElement('canvas').getContext === "function")
-{
-	window.addEventListener('load', function()
-	{
-		mxWinLoaded = true;
-		checkAllLoaded();
-	});
-}
-else
-{
-	App.main();
-}
-</script>
-</body>
-</html>

docker/drawio/webapp/js/croppie/croppie.min.css

@@ -1 +0,0 @@
-.croppie-container{width:100%;height:100%}.croppie-container .cr-image{z-index:-1;position:absolute;top:0;left:0;transform-origin:0 0;max-height:none;max-width:none}.croppie-container .cr-boundary{position:relative;overflow:hidden;margin:0 auto;z-index:1;width:100%;height:100%}.croppie-container .cr-resizer,.croppie-container .cr-viewport{position:absolute;border:2px solid #fff;margin:auto;top:0;bottom:0;right:0;left:0;box-shadow:0 0 2000px 2000px rgba(0,0,0,.5);z-index:0}.croppie-container .cr-resizer{z-index:2;box-shadow:none;pointer-events:none}.croppie-container .cr-resizer-horisontal,.croppie-container .cr-resizer-vertical{position:absolute;pointer-events:all}.croppie-container .cr-resizer-horisontal::after,.croppie-container .cr-resizer-vertical::after{display:block;position:absolute;box-sizing:border-box;border:1px solid #000;background:#fff;width:10px;height:10px;content:''}.croppie-container .cr-resizer-vertical{bottom:-5px;cursor:row-resize;width:100%;height:10px}.croppie-container .cr-resizer-vertical::after{left:50%;margin-left:-5px}.croppie-container .cr-resizer-horisontal{right:-5px;cursor:col-resize;width:10px;height:100%}.croppie-container .cr-resizer-horisontal::after{top:50%;margin-top:-5px}.croppie-container .cr-original-image{display:none}.croppie-container .cr-vp-circle{border-radius:50%}.croppie-container .cr-overlay{z-index:1;position:absolute;cursor:move;touch-action:none}.croppie-container .cr-slider-wrap{width:75%;margin:15px auto;text-align:center}.croppie-result{position:relative;overflow:hidden}.croppie-result img{position:absolute}.croppie-container .cr-image,.croppie-container .cr-overlay,.croppie-container .cr-viewport{-webkit-transform:translateZ(0);-moz-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0)}.cr-slider{-webkit-appearance:none;width:300px;max-width:100%;padding-top:8px;padding-bottom:8px;background-color:transparent}.cr-slider::-webkit-slider-runnable-track{width:100%;height:3px;background:rgba(0,0,0,.5);border:0;border-radius:3px}.cr-slider::-webkit-slider-thumb{-webkit-appearance:none;border:none;height:16px;width:16px;border-radius:50%;background:#ddd;margin-top:-6px}.cr-slider:focus{outline:0}.cr-slider::-moz-range-track{width:100%;height:3px;background:rgba(0,0,0,.5);border:0;border-radius:3px}.cr-slider::-moz-range-thumb{border:none;height:16px;width:16px;border-radius:50%;background:#ddd;margin-top:-6px}.cr-slider:-moz-focusring{outline:1px solid #fff;outline-offset:-1px}.cr-slider::-ms-track{width:100%;height:5px;background:0 0;border-color:transparent;border-width:6px 0;color:transparent}.cr-slider::-ms-fill-lower{background:rgba(0,0,0,.5);border-radius:10px}.cr-slider::-ms-fill-upper{background:rgba(0,0,0,.5);border-radius:10px}.cr-slider::-ms-thumb{border:none;height:16px;width:16px;border-radius:50%;background:#ddd;margin-top:1px}.cr-slider:focus::-ms-fill-lower{background:rgba(0,0,0,.5)}.cr-slider:focus::-ms-fill-upper{background:rgba(0,0,0,.5)}.cr-rotate-controls{position:absolute;bottom:5px;left:5px;z-index:1}.cr-rotate-controls button{border:0;background:0 0}.cr-rotate-controls i:before{display:inline-block;font-style:normal;font-weight:900;font-size:22px}.cr-rotate-l i:before{content:'↺'}.cr-rotate-r i:before{content:'↻'}