build

# Conflicts:
#	app/Http/Controllers/Api/SystemController.php
#	public/site/en/about.html
#	public/site/en/download.html
#	public/site/en/help.html
#	public/site/en/index.html
#	public/site/en/log.html
#	public/site/en/price.html
#	public/site/en/product.html
#	public/site/en/solutions.html
#	public/site/zh/about.html
#	public/site/zh/download.html
#	public/site/zh/help.html
#	public/site/zh/index.html
#	public/site/zh/log.html
#	public/site/zh/price.html
#	public/site/zh/product.html
#	public/site/zh/solutions.html
#	resources/mobile

.env.docker

@@ -10,6 +10,7 @@ APP_URL=http://localhost
 APP_ID=
 APP_IPPR=
 APP_PORT=2222
+APP_SSL_PORT=
 APP_DEV_PORT=
 
 LOG_CHANNEL=stack
@@ -56,9 +57,6 @@ PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
 PUSHER_APP_CLUSTER=mt1
 
-JUKE_KEY_JOKE=
-JUKE_KEY_SOUP=
-
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 

.github/workflows/publish-desktop.yml

@@ -1,33 +0,0 @@
-name: Publish Desktop
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  build:
-    runs-on: macos-latest
-    environment: build
-
-    if: startsWith(github.event.ref, 'refs/tags/v')
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Use Node.js 16.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 16.x
-
-      - name: Build
-        env:
-          APPLEID: ${{ secrets.APPLEID }}
-          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
-          CSC_LINK: ${{ secrets.CSC_LINK }}
-          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-          DP_KEY: ${{ secrets.DP_KEY }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          GH_REPOSITORY: ${{ github.repository }}
-        run: ./cmd electron all
-

.github/workflows/publish.yml

@@ -0,0 +1,261 @@
+name: "Publish"
+
+on:
+  push:
+    branches:
+      - "pro"
+      - "dev"
+
+jobs:
+  check-version:
+    permissions:
+      contents: read
+    runs-on: ubuntu-latest
+    outputs:
+      should_release: ${{ steps.check-tag.outputs.should_release }}
+      version: ${{ steps.get-version.outputs.version }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get version from package.json
+        id: get-version
+        run: |
+          VERSION=$(node -p "require('./package.json').version")
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+      - name: Check if tag exists
+        id: check-tag
+        run: |
+          VERSION=${{ steps.get-version.outputs.version }}
+          if git ls-remote --tags origin | grep -q "refs/tags/v${VERSION}$"; then
+            echo "This version v${VERSION} has been released"
+            echo "should_release=false" >> $GITHUB_OUTPUT
+          else
+            echo "Version v${VERSION} has not been released, continue building"
+            echo "should_release=true" >> $GITHUB_OUTPUT
+          fi
+
+  create-release:
+    needs: check-version
+    if: needs.check-version.outputs.should_release == 'true'
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    outputs:
+      release_id: ${{ steps.create-release.outputs.result }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Create Release
+        id: create-release
+        uses: actions/github-script@v7
+        with:
+          script: |
+            // 获取最新的 tag
+            const { data: tags } = await github.rest.repos.listTags({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              per_page: 1
+            });
+
+            // 获取提交日志
+            let changelog = '';
+            if (tags.length > 0) {
+              const { data: commits } = await github.rest.repos.compareCommits({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                base: tags[0].name,
+                head: 'HEAD'
+              });
+
+              // 按类型分组提交
+              const groups = {
+                'feat:': { title: '## Features', commits: new Set() },
+                'fix:': { title: '## Bug Fixes', commits: new Set() },
+                'perf:': { title: '## Performance Improvements', commits: new Set() }
+              };
+
+              // 分类收集提交，使用 Set 去重
+              commits.commits.forEach(commit => {
+                const message = commit.commit.message.split('\n')[0].trim();
+                for (const [prefix, group] of Object.entries(groups)) {
+                  if (message.startsWith(prefix)) {
+                    // 移除前缀后添加到对应分组
+                    const cleanMessage = message.slice(prefix.length).trim();
+                    group.commits.add(cleanMessage);  // 使用 Set.add 自动去重
+                    break;
+                  }
+                }
+              });
+
+              // 生成更新日志
+              const sections = [];
+              for (const group of Object.values(groups)) {
+                if (group.commits.size > 0) {
+                  sections.push(`${group.title}\n\n${Array.from(group.commits).map(msg => `- ${msg}`).join('\n')}`);
+                }
+              }
+
+              if (sections.length > 0) {
+                changelog = '# Changelog\n\n' + sections.join('\n\n');
+              }
+            }
+
+            // 创建 release
+            const { data } = await github.rest.repos.createRelease({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              tag_name: `v${{ needs.check-version.outputs.version }}`,
+              name: `${{ needs.check-version.outputs.version }}`,
+              body: changelog || 'No significant changes in this release.',
+              draft: true,
+              prerelease: false
+            })
+            return data.id
+
+  build-client:
+    needs: [ check-version, create-release ]
+    if: needs.check-version.outputs.should_release == 'true'
+    permissions:
+      contents: write
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: "macos-latest"
+            build_type: "mac"
+          - platform: "ubuntu-latest"
+            build_type: "android"
+          - platform: "windows-latest"
+            build_type: "windows"
+
+    runs-on: ${{ matrix.platform }}
+    environment: build
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+
+      # Android 构建步骤
+      - name: (Android) Build Js
+        if: matrix.build_type == 'android'
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 10
+          max_attempts: 3
+          command: |
+            git submodule init
+            git submodule update --remote "resources/mobile"
+            ./cmd appbuild publish
+
+      - name: (Android) Setup JDK 11
+        if: matrix.build_type == 'android'
+        uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: "11"
+
+      - name: (Android) Build App
+        if: matrix.build_type == 'android'
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 20
+          max_attempts: 5
+          command: |
+            cd resources/mobile/platforms/android/eeuiApp
+            chmod +x ./gradlew
+            ./gradlew assembleRelease --quiet
+
+      - name: (Android) Upload File
+        if: matrix.build_type == 'android'
+        env:
+          PUBLISH_KEY: ${{ secrets.PUBLISH_KEY }}
+        run: |
+          node ./electron/build.js android-upload
+
+      - name: (Android) Upload Release
+        if: matrix.build_type == 'android'
+        uses: actions/github-script@v7
+        env:
+          RELEASE_ID: ${{ needs.create-release.outputs.release_id }}
+        with:
+          script: |
+            const fs = require('fs');
+            const path = require('path');
+            const globby = require('globby');
+
+            // 查找 APK 文件
+            const files = await globby('resources/mobile/platforms/android/eeuiApp/app/build/outputs/apk/release/*.apk');
+
+            for (const file of files) {
+              const data = await fs.promises.readFile(file);
+
+              await github.rest.repos.uploadReleaseAsset({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                release_id: process.env.RELEASE_ID,
+                name: path.basename(file),
+                data: data
+              });
+            }
+
+      # Mac 构建步骤
+      - name: (Mac) Build Client
+        if: matrix.build_type == 'mac'
+        env:
+          APPLEID: ${{ secrets.APPLEID }}
+          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+          CSC_LINK: ${{ secrets.CSC_LINK }}
+          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+          PUBLISH_KEY: ${{ secrets.PUBLISH_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+        run: |
+          ./cmd electron mac
+
+      # Windows 构建步骤
+      - name: (Windows) Build Client
+        if: matrix.build_type == 'windows'
+        env:
+          PUBLISH_KEY: ${{ secrets.PUBLISH_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+        shell: bash
+        run: |
+          ./cmd electron win
+
+  publish-release:
+    needs: [ check-version, create-release, build-client ]
+    if: needs.check-version.outputs.should_release == 'true' && github.ref == 'refs/heads/pro'
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Publish Release
+        uses: actions/github-script@v7
+        env:
+          RELEASE_ID: ${{ needs.create-release.outputs.release_id }}
+        with:
+          script: |
+            github.rest.repos.updateRelease({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              release_id: process.env.RELEASE_ID,
+              draft: false,
+              prerelease: false
+            })
+
+      - name: Publish Official
+        env:
+          PUBLISH_KEY: ${{ secrets.PUBLISH_KEY }}
+        run: |
+          node ./electron/build.js published

.gitignore

@@ -1,6 +1,7 @@
 /node_modules
 /public/hot
 /public/tmp
+/public/summary
 /public/uploads/*
 /public/.well-known
 /public/.user.ini
@@ -26,3 +27,4 @@ laravels-timer-process.pid
 vars.yaml
 laravels.conf
 laravels.pid
+README_LOCAL.md

.prefetch

@@ -0,0 +1,110 @@
+office/web-apps/apps/api/documents/api.js?hash={version}
+
+office/{path}/fonts/000
+office/{path}/fonts/020
+office/{path}/fonts/020
+office/{path}/fonts/020
+office/{path}/fonts/022
+office/{path}/fonts/022
+office/{path}/fonts/022
+office/{path}/fonts/023
+office/{path}/fonts/023
+office/{path}/fonts/023
+office/{path}/fonts/024
+office/{path}/fonts/024
+office/{path}/fonts/024
+office/{path}/fonts/027
+office/{path}/fonts/027
+office/{path}/fonts/028
+office/{path}/fonts/028
+office/{path}/fonts/029
+office/{path}/fonts/029
+office/{path}/fonts/030
+office/{path}/fonts/030
+office/{path}/fonts/036
+office/{path}/fonts/036
+office/{path}/fonts/037
+office/{path}/fonts/037
+office/{path}/fonts/038
+office/{path}/fonts/038
+office/{path}/fonts/039
+office/{path}/fonts/039
+office/{path}/fonts/058
+office/{path}/fonts/058
+office/{path}/fonts/058
+office/{path}/fonts/059
+office/{path}/fonts/059
+office/{path}/fonts/059
+office/{path}/fonts/060
+office/{path}/fonts/060
+office/{path}/fonts/060
+office/{path}/fonts/061
+office/{path}/fonts/061
+office/{path}/fonts/061
+office/{path}/fonts/063
+office/{path}/fonts/065
+office/{path}/fonts/066
+office/{path}/fonts/081
+office/{path}/fonts/081
+office/{path}/fonts/081
+office/{path}/fonts/138
+office/{path}/fonts/184
+office/{path}/fonts/184
+office/{path}/sdkjs/cell/sdk-all-min.js
+office/{path}/sdkjs/cell/sdk-all.js
+office/{path}/sdkjs/common/AllFonts.js
+office/{path}/sdkjs/common/AllFonts.js
+office/{path}/sdkjs/common/AllFonts.js
+office/{path}/sdkjs/common/Charts/ChartStyles.js
+office/{path}/sdkjs/common/Charts/ChartStyles.js
+office/{path}/sdkjs/common/Charts/ChartStyles.js
+office/{path}/sdkjs/common/Images/fonts_thumbnail_ea@2x.png.bin
+office/{path}/sdkjs/common/Images/fonts_thumbnail_ea@2x.png.bin
+office/{path}/sdkjs/common/Images/fonts_thumbnail_ea@2x.png.bin
+office/{path}/sdkjs/common/libfont/engine/fonts.js
+office/{path}/sdkjs/common/libfont/engine/fonts.js
+office/{path}/sdkjs/common/libfont/engine/fonts.js
+office/{path}/sdkjs/common/libfont/engine/fonts.wasm
+office/{path}/sdkjs/common/libfont/engine/fonts.wasm
+office/{path}/sdkjs/common/libfont/engine/fonts.wasm
+office/{path}/sdkjs/slide/sdk-all-min.js
+office/{path}/sdkjs/slide/sdk-all.js
+office/{path}/sdkjs/word/sdk-all-min.js
+office/{path}/sdkjs/word/sdk-all.js
+office/{path}/web-apps/apps/documenteditor/main/app.js
+office/{path}/web-apps/apps/documenteditor/main/code.js
+office/{path}/web-apps/apps/documenteditor/main/locale/zh.json
+office/{path}/web-apps/apps/documenteditor/main/resources/css/app.css
+office/{path}/web-apps/apps/documenteditor/main/resources/img/iconssmall@2.5x.svg
+office/{path}/web-apps/apps/presentationeditor/main/app.js
+office/{path}/web-apps/apps/presentationeditor/main/code.js
+office/{path}/web-apps/apps/presentationeditor/main/locale/zh.json
+office/{path}/web-apps/apps/presentationeditor/main/resources/css/app.css
+office/{path}/web-apps/apps/presentationeditor/main/resources/img/iconsbig@2.5x.svg
+office/{path}/web-apps/apps/presentationeditor/main/resources/img/iconsbig@2x.png
+office/{path}/web-apps/apps/presentationeditor/main/resources/img/iconssmall@2.5x.svg
+office/{path}/web-apps/apps/spreadsheeteditor/main/app.js
+office/{path}/web-apps/apps/spreadsheeteditor/main/code.js
+office/{path}/web-apps/apps/spreadsheeteditor/main/locale/zh.json
+office/{path}/web-apps/apps/spreadsheeteditor/main/resources/css/app.css
+office/{path}/web-apps/apps/spreadsheeteditor/main/resources/formula-lang/zh_desc.json
+office/{path}/web-apps/apps/spreadsheeteditor/main/resources/img/iconssmall@2.5x.svg
+office/{path}/web-apps/apps/spreadsheeteditor/main/resources/img/iconssmall@2x.png
+office/{path}/web-apps/vendor/xregexp/xregexp-all-min.js
+office/{path}/web-apps/vendor/xregexp/xregexp-all-min.js
+office/{path}/web-apps/vendor/xregexp/xregexp-all-min.js
+
+drawio/webapp/js/app.min.js
+drawio/webapp/js/extensions.min.js
+drawio/webapp/js/shapes-14-6-5.min.js
+drawio/webapp/js/stencils.min.js
+drawio/webapp/math/es5/core.js
+drawio/webapp/math/es5/input/asciimath.js
+drawio/webapp/math/es5/input/tex.js
+drawio/webapp/math/es5/output/svg.js
+drawio/webapp/math/es5/output/svg/fonts/tex.js
+drawio/webapp/styles/grapheditor.css
+
+minder/css/chunk-vendors.fe9c56c6.css
+minder/js/app.aa385de3.js
+minder/js/chunk-vendors.cc7455b8.js

CHANGELOG.md

@@ -2,6 +2,788 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.40.78]
+
+### Bug Fixes
+
+- 修复退出群组不完全的问题
+- 修复退出还能收到推送的情况
+- 修复账号被禁用之后还能收到推送和邮件
+- 任务首次聊天发表情失败的情况
+- AI聊天缺少最后一句话的情况
+- 文件打包下载
+
+### Performance
+
+- 优化会话成员列表查询
+- 重复添加任务的情况
+- 重复添加任务列表的情况
+- 优化消息样式
+- 优化websocket消息
+- 优化快捷选择
+- 延期任务支持快选时间
+- 优化消息阅读机制
+- 新增文件打包下载权限设置
+- 升级electron框架
+- 优化深色主题
+- 优化表情包资源
+- 优化客户端子窗口
+- 优化项目列表
+- 优化录制语音消息
+- 优化任务内容
+- 优化任务提交添加继续
+- 移动端审批窗口点击人员头像直接进入会话
+- 新增系统别名设置
+
+## [0.40.40]
+
+### Bug Fixes
+
+- 任务内容保存后图片消失的情况
+- 修复上传超大尺寸图片
+
+### Performance
+
+- 优化窗口加载速度
+- 优化国际化
+- 优化图片上传
+- 优化用户在线状态
+- 优化小屏幕登录页
+- 优化本地资源
+- 优化iOS上传图片颠倒的问题
+- 优化桌面端通知图标
+- 优化资源预取
+- 优化emoji表情回复的判断
+- 更新office组件
+- 优化审批功能
+- 优化客户端升级
+- 优化客户端
+- 优化签到错误提示
+- 优化图片选择器
+- 优化邮件通知
+- 修复iOS下载中文名乱码的问题
+
+## [0.39.97]
+
+### Bug Fixes
+
+- IOS16-无法打开定位签到的问题
+
+### Performance
+
+- 优化初始化数据
+- 优化一处定位签到的问题
+- 升级海豚表情包
+- 优化新窗口链接打开逻辑
+- 添加会议机器人快捷菜单
+
+## [0.39.88]
+
+### Bug Fixes
+
+- 翻译聊天内容参数错误
+
+### Performance
+
+- 优化使用默认浏览器打开链接
+- 添加定位签到
+- 优化打开会议
+- 优化打开会话逻辑
+
+## [0.39.73]
+
+### Bug Fixes
+
+- 无法打开项目的情况
+- 搜索特殊字符报错的情况
+
+### Features
+
+- 添加定位签到
+
+### Performance
+
+- 优化从审批点击头像发起会话
+
+## [0.39.66]
+
+### Bug Fixes
+
+- 修复会话内加载待办为空的情况
+
+### Performance
+
+- 图片浏览
+- 优化会话搜索
+- 优化国际化语言
+- 优化消息已读逻辑
+- 优化app新版本提示
+- 优化文字头像
+- 优化修改任务load
+
+## [0.39.52]
+
+### Bug Fixes
+
+- 无法清理数据缓存的情况
+
+### Performance
+
+- 优化预览消息
+- 优化移动端输入法换行
+- 审批消息预览图片
+- 删除冗余字段
+- 优化索引
+- 优化国际化语言
+- 优化会话查询
+
+## [0.39.39]
+
+### Bug Fixes
+
+- 目录拼错的情况
+- 设置子任务时间主任务出现1970的情况
+- 消息溢出的情况
+
+### Features
+
+- 消息翻译支持切换语言
+
+### Performance
+
+- 优化国际化语言
+- 审批支持点击头像进入私聊
+- 优化删除临时文件
+- 优化缩略图
+
+## [0.39.21]
+
+### Bug Fixes
+
+- 无法设置修改子任务时间的情况
+- 判断广告页逻辑错误
+- 下载页控制台报错处理
+
+### Performance
+
+- 优化长按消息菜单显示逻辑
+- 优化会话全屏输入功能菜单固定下方
+- 优化聊天输入时页面乱滚动的情况
+- 优化导出统计国际化
+- 支持会员选择窗标题省略号点击查看全标题
+- 任务内容加载太久显示load
+- 任务日志显示子任务关联
+- 审批评论图片浏览可滑动连续查看
+- 审批评论优化显示缩略图
+- 任务变化通知加上任务标题
+- 新任务提醒区分协助还是负责
+- 优化审批通知标题
+- 优化推送预览
+- 优化md标题样式
+- 新增查看更新日志
+
+### Styling
+
+- 推广页样式调整
+
+## [0.38.94]
+
+### Performance
+
+- 优化国际化、优化显示
+
+## [0.38.91]
+
+### Bug Fixes
+
+- 周报默认内容已完成工作负责人不显示的情况
+- 无法清除计划时间
+- 选择时间起始不正确的问题
+- 修复iOS日历无法正常显示的情况
+- 签到信息预览错误
+
+### Performance
+
+- 优化人脸签到设置
+- 优化消息搜索速度
+- 优化显示
+- 优化图片压缩
+- 优化cmd命令
+
+## [0.38.73]
+
+### Performance
+
+- 优化显示效果
+
+## [0.38.70]
+
+### Bug Fixes
+
+- 推送失败的情况
+- 导出签到数据快速选择时间
+- 搜索区域无法回车搜索的问题
+- 未领任务提醒机器人无须加入项目
+- 日历中总是显示时间相差一个月
+
+### Documentation
+
+- 更新docker-compose
+
+### Features
+
+- 支持人脸打卡设备
+
+### Performance
+
+- 升级onlyoffice
+- 优化人脸签到功能
+- 优化加载通讯录数量
+- 优化继续添加任务数据处理
+- 优化翻译
+- 更新gpt的一些模型
+- 优化消息组件
+- 优化后端翻译
+- 优化创建任务提示时间冲突的逻辑
+- 人脸打卡配置
+- 签到设置保存
+- 签到设备显示
+- 打卡标签页
+
+## [0.38.27]
+
+### Bug Fixes
+
+- 修复表情回应一处报错
+- 任务到期时间不变颜色
+- 聊天提及内容错位的情况
+- 首次修改任务时间不提示时间冲突的问题
+- 添加任务时不设置时间无须提示任务冲突
+- 负责人修改后不显示在仪表盘的情况
+- 添加任务选择今天时间无效的情况
+- 修复url-token登录异常问题
+
+### Features
+
+- 官网侧边导航按钮新增谷歌分析事件追踪
+
+### Performance
+
+- 优化翻译
+- 优化时间组件
+- 优化日历样式
+- 手机端消息菜单居中
+- 优化数据库外部访问方式
+- 优化消息选择文本
+- 优化表情搜索
+- 任务描述再次点击隐藏菜单
+- 优化工作包括模板
+- 仪表盘任务列表支持折叠
+- 新增修改任务时间权限
+- 优化子任务读取失败
+
+## [0.37.98]
+
+### Bug Fixes
+
+- 修复任务可见性为非项目人员时项目负责人不可见的bug
+- 修改谷歌分析以及谷歌推广文件命名
+- 修改谷歌分析代码
+- 删除打印
+- 修改关于我们页面公司介绍文案
+
+### Features
+
+- 网页右下角导航改为点击显示以及手机端点击拨打电话直接拨号
+- 更改审批版本
+- 官网新增谷歌分析代码
+- 页面新增谷歌分析
+
+### Performance
+
+- 1.优化审批流程-审批人审核过后自动通过  2. 优化审批评论图片可以左右滑动查看
+
+## [0.37.76]
+
+### Bug Fixes
+
+- 无法下载大文件
+- 修改关于我们页面公司介绍文案
+
+### Performance
+
+- 优化聊天视频预览
+- 优化打包下载
+- 支持上传mov、webm视频
+
+## [0.37.71]
+
+### Bug Fixes
+
+- 切换对话之后无法通过右键@
+
+### Performance
+
+- 通讯录菜单添加会议
+- 优化文件里预览图片
+- 优化消息描述
+
+## [0.37.65]
+
+### Features
+
+- 操作人员离职对okr的移交处理
+
+## [0.37.62]
+
+### Bug Fixes
+
+- 如果项目没有流程，无法选择移动后的状态，也没办法确定移动
+
+### Performance
+
+- 优化视频播放
+- 新增通讯录菜单
+- 优化快捷创建群组
+- 优化回复消息自动@逻辑
+- 甘特图兼容移动端
+
+## [0.37.50]
+
+### Bug Fixes
+
+- 更新可见性后仍存在对话会话列表
+- 消息输入框回复冲突
+
+### Features
+
+- 更新approve容器
+- 添加智谱清言机器人
+
+### Performance
+
+- 团队管理选择离职时根据离职时间排序
+- 移动端支持快速编辑描述选择
+- 优化离职数据移交
+- 优化举报功能
+- 优化网络重连后会话数据逻辑
+- 优化甘特图移动端交互
+- 优化md编辑器
+
+## [0.37.32]
+
+### Performance
+
+- 优化查看任务附件菜单
+- 独立窗口未激活阅读逻辑
+- 新消息在会话列表时间与消息里不一致
+- 优化Android点击发送按钮效果
+- 支持修改消息待办
+- 延期任务时间支持按天
+- 优化待办消息样式
+- 优化移动端子任务列表显示
+- 语音消息转文字
+- 更新语音消息插件
+- 优化设置样式
+
+## [0.37.17]
+
+### Bug Fixes
+
+- 修复官网帮助中心英文页面头部导航缺失问题
+- 安装系统部分情况没有数据
+- 修复举报样式错乱
+
+### Features
+
+- 语音消息未阅读红点提示
+- 修复移动任务中选完成进行移动没有设置完成时间的bug
+- 新增右侧底部导航
+- 添加举报功能
+
+### Performance
+
+- 优化转发消息数据显示
+- Ipad 发送消息后出现页面跳动的情况
+- 仪表盘隐藏未到开始时间的任务
+- 优化查看任务修改历史
+- 优化聊天工具栏样式
+- 优化更新聊天中的待办
+- 优化图标功能提示
+- 审批和任务通知优化
+- 优化按钮没有对应类型，控制台报错
+
+## [0.36.97]
+
+### Bug Fixes
+
+- 任务描述保存图片失败
+
+### Performance
+
+- 转发消息至群聊时支持@留言
+- 自动发布Android
+
+## [0.36.91]
+
+### Bug Fixes
+
+- 上一版本导致的无法@
+
+### Performance
+
+- 优化代码
+- 优化查看文件历史
+- 支持查看任务描述修改历史
+- 任务描述支持清单
+
+## [0.36.84]
+
+### Bug Fixes
+
+- 修复关闭侧边回复窗口导致会话不正常的情况
+
+### Performance
+
+- 消息内容支持待办列表
+- 优化自动识别发送消息类型
+- 聊天输入框粘贴格式优化
+- 优化网络错误提示
+
+## [0.36.78]
+
+### Bug Fixes
+
+- 解决 Unable to preventDefault inside passive event listener 报错
+- 截图粘贴出现两张图的情况
+- 聊天输入中文过程跟placeholder内容叠加的问题
+
+## [0.36.75]
+
+### Bug Fixes
+
+- Added non-passive event listener to a scroll-blocking 'touchstart' event
+
+### Performance
+
+- 下载pdf使用自带浏览器
+- 优化消息加载中效果
+- 审批内容禁止转发
+- 滑动快捷表情选择
+- 优化聊天输入框
+- Update chat editor
+- 优化机器人回复
+- 优化android体验
+
+## [0.36.60]
+
+### Performance
+
+- 优化使用默认浏览器打开规则
+- 优化聊天图片上传
+- 临时帐号别名
+- Tab icon load error
+- 优化会议
+- 创建会议不需要加入机器人
+- 暗黑模式下窗口背景色兼容问题
+- 优化网络检查
+- 客户端会议优化
+
+## [0.36.49]
+
+### Performance
+
+- 优化会议室
+
+## [0.36.44]
+
+### Bug Fixes
+
+- 部分情况出现注册失败
+- 最小化阅读窗口新建窗口不自动激活
+- 独立窗口不更新消息
+
+### Performance
+
+- 优化数据读取机制
+- 优化缓存规则
+- 优化完成待办数据推送
+- 评论审批图片和投票深色按钮
+
+## [0.36.36]
+
+### Bug Fixes
+
+- 修改回复、转发消息后引用的部分消失
+
+### Performance
+
+- 优化任务日志内容
+- 查看版本免请求接口
+- 添加任务时选择任务位置内容溢出
+- 消息支持style
+- 回复消息列表隐藏顶部loading
+- 支持FCM推送
+- 设置华为推送自分类
+- 优化添加任务可见性点击效果
+
+## [0.36.26]
+
+### Bug Fixes
+
+- 关闭文件后无法再次打开
+
+### Performance
+
+- 优化数据结构
+- 接龙优化为清空内容默认删除
+- 支持取消发送中的消息
+- 1. 强化接龙接口本地时间戳问题   2. 接龙消息点展开按钮后做缓存处理
+
+## [0.36.15]
+
+### Bug Fixes
+
+- 消息太长导致菜单无法正常显示
+- 项目数量不正确的情况
+- 部分未读和待办信息不显示的情况
+- 审批中心修复loadIng效果
+
+### Performance
+
+- 自动识别md格式发送
+- 优化回复、转发消息数据结构
+- 优化iOS端数据读取失败的情况
+- 回复消息时自动@提及
+- 优化会话数据结构
+
+## [0.35.90]
+
+### Bug Fixes
+
+- 子窗口出现重新登录的情况
+
+### Performance
+
+- 聊天文件发送进度
+- 拨打电话确认提示
+- 优化预加载文件
+
+## [0.35.84]
+
+### Bug Fixes
+
+- 回复消息点击到原文无效
+
+### Performance
+
+- 优化接口时间
+- 优化审批对话按钮配色
+
+## [0.35.76]
+
+### Bug Fixes
+
+- 客户端无法打开excel文件
+- 修复投票实名逻辑
+
+### Features
+
+- 升级okr
+
+### Performance
+
+- 优化文件功能按钮
+- 文件上传支持覆盖上传
+- 优化app等比显示
+- 优化发送文件预览
+- 消息发送中禁止右键菜单
+- 部分搜索框图标抖动
+- 优化复制功能
+- 优化pdf文件预览
+- 优化投票接口，加上事务锁
+- 优化接龙接口，加上事务锁
+- 优化转发消息样式
+- 接龙接口-强化排序
+- 审批按钮色微调
+- 统一审批中心的按钮色
+- 转发会议亮色皮肤问题，转发文件宽度铺满
+- 优化app数据交互
+
+### Styling
+
+- 调整代码格式
+
+## [0.35.48]
+
+### Bug Fixes
+
+- 修复搜索偶尔无效的情况
+
+### Features
+
+- 升级okr
+
+### Performance
+
+- 优化文件预览
+- 滑动列表自动隐藏键盘
+- 优化时间格式
+- 适配nodejs 20
+
+## [0.35.40]
+
+### Bug Fixes
+
+- 部分手机出现非正常滚动到底部的情况
+- Dootask官网标题
+- Dootask官网调整
+- 修复导出任务统计没有按创建时间来的bug
+
+### Features
+
+- 新增不显示会话功能
+- 升级okr
+
+### Performance
+
+- 修改消息换行优化
+- 优化预加载资源
+- 优化pdf文件预览
+- 优化签到消息
+- 优化登录
+- 优化安装脚本
+- 优化消息时间格式
+- 优化app功能
+
+## [0.35.20]
+
+### Features
+
+- 发起投票功能添加缓存记录选中效果
+- 导出的签到数据和审批数据换成xlsx，因老版本的xls会出现兼容性问题
+
+### Performance
+
+- 默认映射443端口
+- 优化子窗口
+- 优化发布接口 删除目录的逻辑
+
+## [0.35.10]
+
+### Bug Fixes
+
+- 修改消息导致最后消息改变
+- 显示无关系的子任务、指定成员可见消息推送
+- 调整gemini机器人设置参数
+
+### Performance
+
+- 更新说明文档
+- 优化客户端
+- 默认关闭端到端加密传输
+
+## [0.34.95]
+
+### Bug Fixes
+
+- 调整发送参数逻辑
+- 推送标题存在换行时不显示
+- 修复下载文件大小为0时报错
+- 更改其他版本的链接
+- 修复价格页面样式
+- 发布接口，调整缓存时间为两小时
+- 修复okr定时处理信息不发送
+- 项目已归档，任务面板也没有这三个任务，但是每次新增报告，都会弹任务出来
+- 修改下载页面按钮布局样式
+
+### Features
+
+- 升级okr
+- 优化内置浏览器
+- Gemini机器人添加代理参数
+- 发布接口只保留最近两个版本
+- 官网添加其他版本的按钮
+- 统一表为utf8mb4_unicode_ci
+
+### Performance
+
+- 优化ai机器人
+- Okr和审批优化
+- 优化pdf在线预览
+- 优化客户端打开服务器链接
+- 签到设置，有些客户服务器安全体系会拦截 curl -sSL 关键字，优化为cmd不传值
+- 签到设置，有些客户服务器安全体系会拦截 curl -sSL 关键字，优化为base64返回
+
+## [0.34.66]
+
+### Performance
+
+- 升级okr容器
+- 新增禁止私聊、群聊功能
+- 更换笑话和鸡汤接口
+
+## [0.34.59]
+
+### Bug Fixes
+
+- 部分机型首次打开聊天窗口不显示聊天记录的问题
+
+### Performance
+
+- 修复一些问题
+- IOS打开键盘时看不见通知的情况
+- 优化系统参数
+- 优化菜单显示位置
+- 优化获取最近消息
+- 优化请求时间
+- 优化触摸长按和右键菜单共存
+
+## [0.34.46]
+
+### Bug Fixes
+
+- 重复通知
+- 修复投票进度的算法
+
+### Performance
+
+- 优化发送消息接口
+- 优化搜索提示
+- 优化消息列表
+- 优化消息保存覆盖
+- 优化快捷表情发送消息时关闭延迟的问题
+- 升级okr
+
+## [0.34.28]
+
+### Features
+
+- 更新okr
+- 添加年度报告接口
+
+### Performance
+
+- 年度报告接口	 - 查询条件优化
+- 升级okr, ai
+- 年度汇报接口返回用户头像
+- 年度报告接口	 - 增加用户信息字段返回
+- 去掉未使用的引用
+- 优化滑动返回动画效果
+- 消息置顶滚动恢复
+- 优化消息Load效果
+
+## [0.33.98]
+
+### Bug Fixes
+
+- 消息阅读回馈
+
+### Performance
+
+- 消息首次加载数据优化
+- 优化打包下载
+
 ## [0.33.91]
 
 ### Bug Fixes
@@ -17,15 +799,12 @@ All notable changes to this project will be documented in this file.
 - 优化报告未读接口
 - 优化图片显示
 - 优化代码
-- 优化代码
 - 代码整理
 - 优化待审批流程数量接口
 - 代码优化
 - 优化未读消息提示
 - 优化预览消息
 - 优化缓存数据
-- 代码优化
-- 代码整理
 - 任务可见性用户 - 分表优化
 - 代码命名优化
 - 移动任务后，对应项目路径也要更改显示
@@ -59,19 +838,23 @@ All notable changes to this project will be documented in this file.
 - 优化未读消息提示动画
 - 优化消息更新机制
 - 优化缓存
-- 优化用户选择器
 
 ## [0.33.41]
 
 ### Bug Fixes
 
-- 更新导致的小问题
 - 更新导致的小问题
 
 ### Performance
 
 - 优化任务修改
 
+## [0.33.37]
+
+### Bug Fixes
+
+- 更新导致的小问题
+
 ## [0.33.34]
 
 ### Bug Fixes
@@ -98,7 +881,6 @@ All notable changes to this project will be documented in this file.
 - Okr版本升级
 - 1.数据库迁移文件修复  2.转发样式优化
 - 兼容okr1.1版本
-- 兼容okr1.1版本
 - 整体数据库索引和字段类型优化
 - 项目列表数据库查询优化
 
@@ -173,7 +955,6 @@ All notable changes to this project will be documented in this file.
 - 添加一个 @我的 消息标签
 - 转发消息 - 添加单选模式
 - 转发消息 - 添加来源显示
-- 翻译
 - 首页改版 - 100%
 - 新增项目任务创建权限功能 - 90%
 - 更换calendar
@@ -183,10 +964,8 @@ All notable changes to this project will be documented in this file.
 
 - 优化消息阅读逻辑
 - 微应用优化
-- 微应用优化
 - 优化未读消息机制
 - 优化重连时消息列表跳回第一页的情况
-- 优化未读消息机制
 - 优化消息更新太快导致不更新数据的情况
 - 机器人添加清空上下文菜单
 - 优化翻译
@@ -195,22 +974,16 @@ All notable changes to this project will be documented in this file.
 - 优化扫一扫登录功能
 - 优化头像
 - 兼容okr1.1版本
-- 兼容okr1.1版本
-- 兼容okr1.1版本
 - 接龙和投票的样式优化
 - 逻辑强化
-- 未读消息优化
 - 搜索消息时按esc取消搜索
 - 接龙优化
-- 接龙优化
 - 移动设备优化消息输入框菜单
 - 优化消息输入框@所有人暗黑样式
 - 优化@人名换行的情况
 - 样式优化
 - 优化导出任务统计
-- 样式调优
 - 客户端下载按钮，仪表盘不显示
-- 未读消息优化
 - 细节优化
 
 ## [0.32.17]
@@ -219,7 +992,6 @@ All notable changes to this project will be documented in this file.
 
 - 修复打包下载问题
 - 1. 修复 windows端  右键发送 是直接发送了，没有出现使用md格式发送  2.其他bug修复
-- 修复打包下载问题
 - 修复统一打包下载命名
 
 ### Features
@@ -258,7 +1030,6 @@ All notable changes to this project will be documented in this file.
 - 文件共享只读禁止下载文件
 - 保存任务详情至文件的方法 添加失败日志
 - 翻译
-- 翻译
 - 新增实现文件夹下载以及多文件压缩下载功能
 - 任务可以筛选未设置时间的
 - 临时账号可以主动跟机器人聊天
@@ -267,14 +1038,11 @@ All notable changes to this project will be documented in this file.
 
 - Office只读模式，隐藏下载按钮
 - 优化实现文件夹下载以及多文件压缩下载功能
-- 优化实现文件夹下载以及多文件压缩下载功能
 - 机器人设置页面，点点点看不到内容，需要给弹窗看详细内容
 - 文件选中后，移动端页面宽度放不下对应内容
 - 文件选中后，移动端页面宽度放不下对应内容，没有滚动条
 - 压缩下载改名打包下载
 - 复制链接去除主题语言参数
-- 优化实现文件夹下载以及多文件压缩下载功能
-- 优化实现文件夹下载以及多文件压缩下载功能
 
 ## [0.31.75]
 
@@ -416,14 +1184,12 @@ All notable changes to this project will be documented in this file.
 - 去掉test信息
 - 按照dootask启动原始尺寸截取使用说明的图
 - 修改边栏目录滚动效果
-- 修改边栏目录滚动效果
 - 官网使用说明的图重新截取更换
 - 优化官网布局与样式
 - 修复下载英文页面跳转
 
 ### Features
 
-- 新增创建聊天关联id
 - 新增创建聊天关联id
 - Okr信息面板新增"打开OKR"按钮
 - 新增OKR信息推送
@@ -510,7 +1276,6 @@ All notable changes to this project will be documented in this file.
 - 优化会员选择器
 - 优化图片压缩
 - 回复图片显示图片搜略图
-- 优化会员选择器
 - 会员选择下拉框提示
 
 ## [0.27.26]
@@ -541,7 +1306,6 @@ All notable changes to this project will be documented in this file.
 
 - 修复获取聊天列表的接口
 - 添加密码账号长度限制
-- 添加密码账号长度限制
 - Dootask对接系统分享 - 添加头像返回
 - 兼容加密bug问题处理
 - Dootask对接系统分享
@@ -591,7 +1355,6 @@ All notable changes to this project will be documented in this file.
 
 ### Bug Fixes
 
-- 审批流程静态页
 - 审批流程静态页
 
 ### Performance
@@ -1876,7 +2639,6 @@ All notable changes to this project will be documented in this file.
 - 优化甘特图
 - 优化任务列表切换显示
 - 更新icon图标库
-- 更新icon图标库
 - 已删除任务详情任务描述改为只读
 - 已删除任务操作文案及显示优化
 - 项目--删除任务查看详情页功能
@@ -1967,7 +2729,6 @@ All notable changes to this project will be documented in this file.
 - 报表导出任务没有流程日志判断优化
 - 修复登录页设置下拉显示不全的情况
 - 处理回滚后异常代码
-- 处理回滚后异常代码
 - 【系统设置】邮件设置提前小时数双向绑定无效问题修改
 
 ### Features
@@ -2055,7 +2816,6 @@ All notable changes to this project will be documented in this file.
 - 调整消息置顶标识位置
 - 消息列表详情增加'置顶'标识
 - 项目列表置顶优化
-- 项目列表置顶优化
 - 【文件】剪切后加'取消剪切'按钮
 - 消息会话右键时隐藏滚动条
 - 页面高度足够时只滚动项目部分
@@ -2156,7 +2916,6 @@ All notable changes to this project will be documented in this file.
 - 该文件版本已经改变了。该页面将被重新加载
 - 点击切换语言一级菜单出现的兼容问题
 - 上传文件夹
-- 该文件版本已经改变了。该页面将被重新加载
 - 团队管理新增身份筛选项
 - 任务文件支持更多格式上传
 
@@ -2194,7 +2953,6 @@ All notable changes to this project will be documented in this file.
 - 任务中没有聊天记录时，发送图片无法成功
 - 修复消息撤回文字提示在第一条时会被顶部遮住的问题
 - 修复个人对话为空时无法重复打开该对话的问题
-- 修复消息撤回文字提示在第一条时会被顶部遮住的问题
 - MacOS客户端首次不加载角标的问题
 - 工作流列表接口用作筛选时不用传多余参数
 
@@ -2295,7 +3053,6 @@ All notable changes to this project will be documented in this file.
 
 - 工作报告优化
 - 规范代码
-- 工作报告优化
 - 共享文件删除、移动改为仅限所有者或创建者操作
 
 ## [0.6.38]
@@ -2575,7 +3332,6 @@ All notable changes to this project will be documented in this file.
 
 ### Performance
 
-- 客户端新窗口打开文件
 - 客户端窗口标题
 - 领取任务流程
 - 到期时间格式化
@@ -2588,7 +3344,6 @@ All notable changes to this project will be documented in this file.
 
 - 客户端文件窗口样式
 - Iview
-- Iview
 - 排序箭头颜色
 
 ## [0.4.28]

README.md

@@ -2,7 +2,7 @@
 
 English | **[中文文档](./README_CN.md)**
 
-- [Screenshot Preview](README_PREVIEW.md)
+- [Screenshot preview](./README_PREVIEW.md)
 - [Demo site](http://www.dootask.com/)
 
 **QQ Group**
@@ -12,8 +12,9 @@ Group No.: `546574618`
 ## Setup
 
 - `Docker v20.10+` & `Docker Compose v2.0+` must be installed
-- System: `Centos/Debian/Ubuntu/macOS`
+- 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
 
 ### Deployment (Pro Edition)
 
@@ -28,7 +29,7 @@ git clone -b pro --depth=1 https://gitee.com/aipaw/dootask.git
 # 2、Enter directory
 cd dootask
 
-# 3、Installation（Custom port installation: ./cmd install --port 2222）
+# 3、Installation（Custom port installation, as: ./cmd install --port 80）
 ./cmd install
 ```
 
@@ -42,7 +43,8 @@ cd dootask
 ### Change port
 
 ```bash
-./cmd port 2222
+# This method only replaces the HTTP port. To replace the HTTPS port, please read the SSL configuration below
+./cmd port 80
 ```
 
 ### Change App Url
@@ -66,11 +68,13 @@ cd dootask
 
 ### Development compilation
 
+- `NodeJs 20+` must be installed
+
 ```bash
-# Development mode, Mac OS only
+# Development
 ./cmd dev
    
-# Production projects, macOS only
+# Production (This is web client. For App/PC/Mac clients, Please read README-CLIENT.md)
 ./cmd prod  
 ```
 
@@ -84,11 +88,19 @@ cd dootask
 ./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 test "your command"             # To run a phpunit command
-./cmd mysql "your command"            # To run a mysql command (backup: Backup database, recovery: Restore database)
+./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)
 ```
 
-### NGINX PROXY SSL
+### SSL configuration
+
+#### Method 1: Automatic configuration
+
+```bash 
+# Running commands in a project
+./cmd https
+```
+
+#### Or Method 2: Nginx Agent Configuration
 
 ```bash 
 # 1、Nginx config add
@@ -96,8 +108,8 @@ 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
-./cmd https
+# 2、Running commands in a project (If you unconfigure the NGINX agent, run: ./cmd https close)
+./cmd https agent
 ```
 
 ## Upgrade

README_CLIENT.md

@@ -1,21 +0,0 @@
-# 客户端说明
-
-## 1、App客户端
-
-#### 1.1、说明
-目录 `resources/mobile`，使用`eeui.app`框架，遵从eeui的开发文档进行打包开发app
-
-#### 1.2、编译App
-1. 在项目目录执行 `./cmd appbuild` 编译
-2. 进入 `resources/mobile` eeui框架内打包Android或iOS应用
-
-
-## 2、PC/Mac客户端
-
-#### 2.1、说明
-目录 `electron`，使用`electron`框架，遵从electron的开发文档进行打包客户端
-
-#### 2.2、编译客户端
-在项目目录执行 `./cmd electron` 根据提示编译
-
-

README_CN.md

@@ -2,7 +2,7 @@
 
 **[English](./README.md)** | 中文文档
 
-- [截图预览](README_PREVIEW.md)
+- [截图预览](./README_PREVIEW.md)
 - [演示站点](http://www.dootask.com/)
 
 **QQ交流群**
@@ -12,8 +12,9 @@
 ## 安装程序
 
 - 必须安装：`Docker v20.10+` 和 `Docker Compose v2.0+`
-- 支持环境：`Centos/Debian/Ubuntu/macOS`
+- 支持环境：`Centos/Debian/Ubuntu/macOS/Windows`
 - 硬件建议：2核4G以上
+- 特别说明：Windows 用户请使用 `git bash` 或者 `cmder` 运行命令
 
 ### 部署项目（Pro版）
 
@@ -28,7 +29,7 @@ git clone -b pro --depth=1 https://gitee.com/aipaw/dootask.git
 # 2、进入目录
 cd dootask
 
-# 3、一键安装项目（自定义端口安装 ./cmd install --port 2222）
+# 3、一键安装项目（自定义端口安装，如：./cmd install --port 80）
 ./cmd install
 ```
 
@@ -42,7 +43,8 @@ cd dootask
 ### 更换端口
 
 ```bash
-./cmd port 2222
+# 此方法仅更换http端口，更换https端口请阅读下面SSL配置
+./cmd port 80
 ```
 
 ### 更换URL
@@ -66,11 +68,13 @@ cd dootask
 
 ### 开发编译
 
+- 请确保你已经安装了 `NodeJs 20+`
+
 ```bash
-# 开发模式，仅限macOS
+# 开发模式
 ./cmd dev
    
-# 编译项目，仅限macOS
+# 编译项目（这是网页端的，App/Pc/Mac客户端请查看 README_CLIENT.md）
 ./cmd prod  
 ```
 
@@ -85,11 +89,19 @@ cd dootask
 ./cmd redis "your command"            # 运行 redis 命令
 ./cmd composer "your command"         # 运行 composer 命令
 ./cmd supervisorctl "your command"    # 运行 supervisorctl 命令
-./cmd test "your command"             # 运行 phpunit 命令
-./cmd mysql "your command"            # 运行 mysql 命令 (backup: 备份数据库，recovery: 还原数据库)
+./cmd mysql "your command"            # 运行 mysql 命令 (backup: 备份数据库，recovery: 还原数据库，open: 开启数据库外部端口访问，close: 关闭数据库外部端口访问)
 ```
 
-### NGINX 代理 SSL
+### SSL 配置
+
+#### 方法1：自动配置
+
+```bash 
+# 在项目下运行命令，根据提示执行即可
+./cmd https
+```
+
+#### （或者）方法2：Nginx 代理配置
 
 ```bash 
 # 1、Nginx 代理配置添加
@@ -97,8 +109,8 @@ 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、在项目下运行命令
-./cmd https
+# 2、在项目下运行命令（如果取消 Nginx 代理配置请运行：./cmd https close）
+./cmd https agent
 ```
 
 ## 升级更新

README_PUBLISH.md

@@ -1,26 +1,31 @@
-# 发布说明
+# 发布
 
-## 发布前
+## 准备工作
 
 1. 添加环境变量 `APPLEID`、`APPLEIDPASS` 用于公证
 2. 添加环境变量 `CSC_LINK`、`CSC_KEY_PASSWORD` 用于签名
-3. 添加环境变量 `GH_TOKEN`、`GH_REPOSITORY` 用于发布到GitHub
-4. 添加环境变量 `DP_KEY` 用于发布到私有服务器
+3. 添加环境变量 `GITHUB_TOKEN`、`GITHUB_REPOSITORY` 用于发布到GitHub（GitHub Actions 发布不需要）
+4. 添加环境变量 `PUBLISH_KEY` 用于发布到私有服务器
 
-## 通过 GitHub Actions 发布
+## 发布版本
 
-1. 执行 `npm run version` 生成版本
-2. 执行 `npm run build` 编译前端
-3. 执行 `git commit` 提交并推送
-4. 添加并推送标签
+```shell
+npm run translate   # 翻译（可选）
+npm run version     # 生成版本
+npm run build       # 编译前端
+```
 
-## 本地发布
+说明：
 
-1. 执行 `npm run version` 生成版本
-2. 执行 `npm run build` 编译前端
-3. 执行 `./cmd electron` 相关操作
+- 执行 `npm run build` 作用是生成网页端；
+- 客户端 (Windows、Mac、Android) 会通过 GitHub Actions 自动生成并发布；所以，如果要自动发布只需要提交git并推送即可；
+- 如果想手动生成客户端执行 `./cmd electron` 根据提示选择操作。
 
-## 编译App
 
-1. 执行 `./cmd appbuild` 或 `./cmd appbuild setting` 编译
-2. 进入 `resources/mobile` eeui框架内打包Android或iOS应用
+## 编译 App
+
+```shell
+./cmd appbuild publish  # 编译生成App需要的资源
+```
+
+编译完后进入 `resources/mobile` EEUI框架目录内打包 Android 或 iOS 应用（Android 以实现 GitHub Actions 自动发布）

_ide_helper.php

@@ -16045,7 +16045,7 @@
                     /**
          * 
          *
-         * @see \Maatwebsite\Excel\Mixins\DownloadCollection::downloadExcel()
+         * @see \Maatwebsite\Excel\Mixins\DownloadCollectionMixin::downloadExcel()
          * @param string $fileName
          * @param string|null $writerType
          * @param mixed $withHeadings
@@ -16059,7 +16059,7 @@
                     /**
          * 
          *
-         * @see \Maatwebsite\Excel\Mixins\StoreCollection::storeExcel()
+         * @see \Maatwebsite\Excel\Mixins\StoreCollectionMixin::storeExcel()
          * @param string $filePath
          * @param string|null $disk
          * @param string|null $writerType
@@ -16439,6 +16439,247 @@
          
     }
      
+}
+
+    namespace Laravolt\Avatar { 
+            /**
+     * 
+     *
+     */ 
+        class Facade {
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function setGenerator($generator)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->setGenerator($generator);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function create($name)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->create($name);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function applyTheme($config)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->applyTheme($config);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function addTheme($name, $config)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->addTheme($name, $config);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function toBase64()
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->toBase64();
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function save($path, $quality = 90)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->save($path, $quality);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function toSvg()
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->toSvg();
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function toGravatar($param = null)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->toGravatar($param);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function getInitial()
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->getInitial();
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function getImageObject()
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->getImageObject();
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function buildAvatar()
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->buildAvatar();
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function getAttribute($key)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->getAttribute($key);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function setTheme($theme)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->setTheme($theme);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function setBackground($hex)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->setBackground($hex);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function setForeground($hex)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->setForeground($hex);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function setDimension($width, $height = null)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->setDimension($width, $height);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function setFontSize($size)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->setFontSize($size);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function setFontFamily($font)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->setFontFamily($font);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function setBorder($size, $color, $radius = 0)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->setBorder($size, $color, $radius);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function setBorderRadius($radius)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->setBorderRadius($radius);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function setShape($shape)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->setShape($shape);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function setChars($chars)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->setChars($chars);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */ 
+        public static function setFont($font)
+        {
+                        /** @var \Laravolt\Avatar\Avatar $instance */
+                        return $instance->setFont($font);
+        }
+         
+    }
+     
 }
 
     namespace Maatwebsite\Excel\Facades { 
@@ -16467,9 +16708,10 @@
                     /**
          * 
          *
+         * @param string|null $disk Fallback for usage with named properties
          * @param object $export
          * @param string $filePath
-         * @param string|null $disk
+         * @param string|null $diskName
          * @param string $writerType
          * @param mixed $diskOptions
          * @return bool 
@@ -16477,10 +16719,10 @@
          * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
          * @static 
          */ 
-        public static function store($export, $filePath, $diskName = null, $writerType = null, $diskOptions = [])
+        public static function store($export, $filePath, $diskName = null, $writerType = null, $diskOptions = [], $disk = null)
         {
                         /** @var \Maatwebsite\Excel\Excel $instance */
-                        return $instance->store($export, $filePath, $diskName, $writerType, $diskOptions);
+                        return $instance->store($export, $filePath, $diskName, $writerType, $diskOptions, $disk);
         }
                     /**
          * 
@@ -16698,7 +16940,7 @@
          * @param $pathToFile string The file to open
          * @param \Madnest\Madzipper\Repositories\RepositoryInterface|string $type The type of the archive, defaults to zip, possible are zip, phar
          * @throws \RuntimeException
-         * @throws \Exception
+         * @throws Exception
          * @throws \InvalidArgumentException
          * @return \Madnest\Madzipper\Madzipper Madzipper instance
          * @static 
@@ -16712,7 +16954,7 @@
          * Create a new zip archive or open an existing one.
          *
          * @param string $pathToFile
-         * @throws \Exception
+         * @throws Exception
          * @return self 
          * @static 
          */ 
@@ -16725,7 +16967,7 @@
          * Create a new phar file or open one.
          *
          * @param string $pathToFile
-         * @throws \Exception
+         * @throws Exception
          * @return self 
          * @static 
          */ 
@@ -16738,7 +16980,7 @@
          * Create a new rar file or open one.
          *
          * @param string $pathToFile
-         * @throws \Exception
+         * @throws Exception
          * @return self 
          * @static 
          */ 
@@ -16755,7 +16997,7 @@
          * @param $path string The path to extract to
          * @param array $files An array of files
          * @param int $methodFlags The Method the files should be treated
-         * @throws \Exception
+         * @throws Exception
          * @return void 
          * @static 
          */ 
@@ -16782,7 +17024,7 @@
          * Gets the content of a single file if available.
          *
          * @param $filePath string The full path (including all folders) of the file in the zip
-         * @throws \Exception
+         * @throws Exception
          * @return mixed returns the content or throws an exception
          * @static 
          */ 
@@ -18774,6 +19016,64 @@ namespace  {
                 /**
              * 
              *
+             * @see \Maatwebsite\Excel\Mixins\DownloadQueryMacro::__invoke()
+             * @param string $fileName
+             * @param string|null $writerType
+             * @param mixed $withHeadings
+             * @static 
+             */ 
+            public static function downloadExcel($fileName, $writerType = null, $withHeadings = false)
+            {
+                                return \Illuminate\Database\Eloquent\Builder::downloadExcel($fileName, $writerType, $withHeadings);
+            }
+             
+                /**
+             * 
+             *
+             * @see \Maatwebsite\Excel\Mixins\StoreQueryMacro::__invoke()
+             * @param string $filePath
+             * @param string|null $disk
+             * @param string|null $writerType
+             * @param mixed $withHeadings
+             * @static 
+             */ 
+            public static function storeExcel($filePath, $disk = null, $writerType = null, $withHeadings = false)
+            {
+                                return \Illuminate\Database\Eloquent\Builder::storeExcel($filePath, $disk, $writerType, $withHeadings);
+            }
+             
+                /**
+             * 
+             *
+             * @see \Maatwebsite\Excel\Mixins\ImportMacro::__invoke()
+             * @param string $filename
+             * @param string|null $disk
+             * @param string|null $readerType
+             * @static 
+             */ 
+            public static function import($filename, $disk = null, $readerType = null)
+            {
+                                return \Illuminate\Database\Eloquent\Builder::import($filename, $disk, $readerType);
+            }
+             
+                /**
+             * 
+             *
+             * @see \Maatwebsite\Excel\Mixins\ImportAsMacro::__invoke()
+             * @param string $filename
+             * @param callable $mapping
+             * @param string|null $disk
+             * @param string|null $readerType
+             * @static 
+             */ 
+            public static function importAs($filename, $mapping, $disk = null, $readerType = null)
+            {
+                                return \Illuminate\Database\Eloquent\Builder::importAs($filename, $mapping, $disk, $readerType);
+            }
+             
+                /**
+             * 
+             *
              * @see \App\Providers\AppServiceProvider::boot()
              * @static 
              */ 
@@ -20814,6 +21114,7 @@ namespace  {
             class View extends \Illuminate\Support\Facades\View {}
             class Flare extends \Facade\Ignition\Facades\Flare {}
             class Image extends \Intervention\Image\Facades\Image {}
+            class Avatar extends \Laravolt\Avatar\Facade {}
             class Excel extends \Maatwebsite\Excel\Facades\Excel {}
             class Madzipper extends \Madnest\Madzipper\Facades\Madzipper {}
             class Captcha extends \Mews\Captcha\Facades\Captcha {}

app/Events/ServerStartEvent.php

@@ -1,27 +0,0 @@
-<?php
-
-
-namespace App\Events;
-
-use Hhxsv5\LaravelS\Swoole\Events\ServerStartInterface;
-use Swoole\Http\Server;
-
-class ServerStartEvent implements ServerStartInterface
-{
-
-    public function __construct()
-    {
-    }
-
-    public function handle(Server $server)
-    {
-        $server->startMsecTime = $this->msecTime();
-    }
-
-    private function msecTime()
-    {
-        list($msec, $sec) = explode(' ', microtime());
-        $time = explode(".", $sec . ($msec * 1000));
-        return $time[0];
-    }
-}

app/Events/WorkerStartEvent.php

@@ -3,7 +3,6 @@
 namespace App\Events;
 
 use App\Models\WebSocket;
-use Cache;
 use Hhxsv5\LaravelS\Swoole\Events\WorkerStartInterface;
 use Swoole\Http\Server;
 
@@ -16,9 +15,15 @@ class WorkerStartEvent implements WorkerStartInterface
 
     public function handle(Server $server, $workerId)
     {
-        if (isset($server->startMsecTime) && Cache::get("swooleServerStartMsecTime") != $server->startMsecTime) {
-            Cache::forever("swooleServerStartMsecTime", $server->startMsecTime);
-            WebSocket::query()->delete();
+        // 仅在Worker进程启动时执行一次初始化代码
+        $initTable = app('swoole')->initFlagTable;
+        if ($initTable->incr('init_flag', 'value') === 1) {
+            $this->handleFirstWorkerTasks();
         }
     }
+
+    private function handleFirstWorkerTasks()
+    {
+        WebSocket::query()->delete();
+    }
 }

app/Exceptions/Handler.php

@@ -3,9 +3,11 @@
 namespace App\Exceptions;
 
 use App\Module\Base;
+use App\Module\Image;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Support\Facades\Log;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Throwable;
 
 class Handler extends ExceptionHandler
@@ -51,6 +53,11 @@ class Handler extends ExceptionHandler
      */
     public function render($request, Throwable $e)
     {
+        if ($e instanceof NotFoundHttpException) {
+            if ($result = $this->ImagePathHandler($request)) {
+                return $result;
+            }
+        }
         if ($e instanceof ApiException) {
             return response()->json(Base::retError($e->getMessage(), $e->getData(), $e->getCode()));
         } elseif ($e instanceof ModelNotFoundException) {
@@ -78,4 +85,144 @@ class Handler extends ExceptionHandler
             parent::report($e);
         }
     }
+
+    /**
+     * 图片路径处理
+     * @param $request
+     * @return \Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\BinaryFileResponse|null
+     */
+    private function ImagePathHandler($request)
+    {
+        $path = $request->path();
+
+        // 处理图片
+        $patternCrop = '/^(uploads\/.*\.(png|jpg|jpeg))\/crop\/([^\/]+)$/';
+        $patternThumb = '/^(uploads\/.*)_thumb\.(png|jpg|jpeg)$/';
+        $matchesCrop = null;
+        $matchesThumb = null;
+        if (preg_match($patternCrop, $path, $matchesCrop) || preg_match($patternThumb, $path, $matchesThumb)) {
+            // 获取参数
+            if ($matchesCrop) {
+                $file = $matchesCrop[1];
+                $ext = $matchesCrop[2];
+                $rules = preg_replace('/\s+/', '', $matchesCrop[3]);
+                $rules = str_replace(['=', '&'], [':', ','], $rules);
+                $rules = explode(',', $rules);
+            } elseif ($matchesThumb) {
+                $file = $matchesThumb[1];
+                $ext = $matchesThumb[2];
+                $rules = ['percentage:320x0'];
+            } else {
+                return null;
+            }
+            if (empty($rules)) {
+                return null;
+            }
+
+            // 提取年月
+            $Ym = date("Ym");
+            if (preg_match('/\/(\d{6})\//', $file, $ms)) {
+                $Ym = $ms[1];
+            }
+
+            // 文件存在直接返回
+            $dirName = str_replace(['/', '.'], '_', $file);
+            $fileName = str_replace([':', ','], ['-', '_'], implode(',', $rules)) . '.' . $ext;
+            $savePath = public_path('uploads/tmp/crop/' . $Ym . '/' . $dirName . '/' . $fileName);
+            if (file_exists($savePath)) {
+                // 设置头部声明图片缓存
+                return response()->file($savePath, [
+                    'Pragma' => 'public',
+                    'Cache-Control' => 'max-age=1814400',
+                    'Expires' => gmdate('D, d M Y H:i:s', time() + 1814400) . ' GMT',
+                    'Last-Modified' => gmdate('D, d M Y H:i:s', filemtime($savePath)) . ' GMT',
+                    'ETag' => md5_file($savePath)
+                ]);
+            }
+
+            // 文件不存在处理
+            $sourcePath = public_path($file);
+            if (!file_exists($sourcePath)) {
+                return null;
+            }
+
+            // 判断删除多余文件
+            $saveDir = dirname($savePath);
+            if (is_dir($saveDir)) {
+                $items = glob($saveDir . '/*');
+                if (count($items) > 5) {
+                    usort($items, function ($a, $b) {
+                        return filemtime($b) - filemtime($a);
+                    });
+                    $itemsToDelete = array_slice($items, 5);
+                    foreach ($itemsToDelete as $item) {
+                        if (is_file($item)) {
+                            unlink($item);
+                        }
+                    }
+                }
+            } else {
+                Base::makeDir($saveDir);
+            }
+
+            // 处理图片
+            try {
+                $handle = 0;
+                $image = new Image($sourcePath);
+                foreach ($rules as $rule) {
+                    if (!str_contains($rule, ':')) {
+                        continue;
+                    }
+                    [$type, $value] = explode(':', $rule);
+                    if (!in_array($type, ['ratio', 'size', 'percentage', 'cover', 'contain'])) {
+                        continue;
+                    }
+                    switch ($type) {
+                        // 按比例裁剪
+                        case 'ratio':
+                            if (is_numeric($value)) {
+                                $image->ratioCrop($value);
+                                $handle++;
+                            }
+                            break;
+
+                        // 按尺寸缩放
+                        case 'size':
+                            $size = Base::newIntval(explode('x', $value));
+                            if (count($size) === 2) {
+                                $image->resize($size[0], $size[1]);
+                                $handle++;
+                            }
+                            break;
+
+                        // 按尺寸缩放
+                        case 'percentage':
+                        case 'cover':
+                        case 'contain':
+                            $size = Base::newIntval(explode('x', $value));
+                            if (count($size) === 2) {
+                                $image->thumb($size[0], $size[1], $type);
+                                $handle++;
+                            }
+                            break;
+                    }
+                }
+                if ($handle > 0) {
+                    $image->saveTo($savePath);
+                    Image::compressImage($savePath, 80);
+                    return response()->file($savePath, [
+                        'Pragma' => 'public',
+                        'Cache-Control' => 'max-age=1814400',
+                        'Expires' => gmdate('D, d M Y H:i:s', time() + 1814400) . ' GMT',
+                        'Last-Modified' => gmdate('D, d M Y H:i:s', filemtime($savePath)) . ' GMT',
+                        'ETag' => md5_file($savePath)
+                    ]);
+                } else {
+                    $image->destroy();
+                }
+            } catch (\ImagickException) { }
+        }
+
+        return null;
+    }
 }

app/Helpers/Function.php

@@ -3,7 +3,7 @@
 if (!function_exists('asset_main')) {
     function asset_main($path, $secure = null)
     {
-        return preg_replace("/^https*:\/\//", "//", app('url')->asset($path, $secure));
+        return preg_replace("/^https?:\/\//", "//", app('url')->asset($path, $secure));
     }
 }
 

app/Http/Controllers/Api/ApproveController.php

@@ -9,6 +9,8 @@ use Madzipper;
 use Carbon\Carbon;
 use App\Models\User;
 use App\Module\Base;
+use App\Module\Doo;
+use App\Module\Timer;
 use App\Module\Ihttp;
 use App\Tasks\PushTask;
 use App\Module\BillExport;
@@ -37,8 +39,9 @@ class ApproveController extends AbstractController
     /**
      * @api {get} api/approve/verifyToken          01. 验证APi登录
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
-     * @apiGroup users
+     * @apiGroup approve
      * @apiName verifyToken
      *
      * @apiSuccess {String} version
@@ -207,7 +210,7 @@ class ApproveController extends AbstractController
             if ($id != $user->userid) {
                 $dialog = WebSocketDialog::checkUserDialog($botUser, $id);
                 $processInst['comment_user_id'] = $user->userid;
-                $processInst['comment_content'] = json_decode($data['content'], true)['content'];
+                $processInst['comment_contents'] = json_decode($data['content'], true) ?? [];
                 $this->approveMsg('approve_comment_notifier', $dialog, $botUser, $processInst, $processInst);
             }
         }
@@ -262,7 +265,7 @@ class ApproveController extends AbstractController
             $this->approveMsg('approve_reviewer', $dialog, $botUser, $val, $process, $pass);
         }
         // 发起人
-        if ($process['is_finished'] == true) {
+        if ($process['is_finished']) {
             $dialog = WebSocketDialog::checkUserDialog($botUser, $process['start_user_id']);
             if (!empty($dialog)) {
                 $this->approveMsg('approve_submitter', $dialog, $botUser, ['userid' => $data['userid']], $process, $pass);
@@ -284,7 +287,7 @@ class ApproveController extends AbstractController
         }
 
         // 抄送人
-        $notifier = $this->handleProcessNode($process, $task['step']);
+        $notifier = $this->handleProcessNode($process);
         if ($notifier && $pass == 'pass') {
             foreach ($notifier as $val) {
                 $dialog = WebSocketDialog::checkUserDialog($botUser, $val['target_id']);
@@ -756,7 +759,7 @@ class ApproveController extends AbstractController
         if (empty($name) || empty($date)) {
             return Base::retError('参数错误');
         }
-        if (!(is_array($date) && Base::isDate($date[0]) && Base::isDate($date[1]))) {
+        if (!(is_array($date) && Timer::isDate($date[0]) && Timer::isDate($date[1]))) {
             return Base::retError('日期选择错误');
         }
         if (Carbon::parse($date[1])->timestamp - Carbon::parse($date[0])->timestamp > 35 * 86400) {
@@ -772,32 +775,31 @@ class ApproveController extends AbstractController
         $res = Base::arrayKeyToUnderline($process['data']);
         //
         $headings = [];
-        $headings[] = '申请编号';
-        $headings[] = '标题';
-        $headings[] = '申请状态';
-        $headings[] = '发起时间';
-        $headings[] = '完成时间';
-        $headings[] = '发起人工号';
-        $headings[] = '发起人User ID';
-        $headings[] = '发起人姓名';
-        $headings[] = '发起人部门';
-        $headings[] = '发起人部门ID';
-        $headings[] = '部门负责人';
-        $headings[] = '历史审批人';
-        $headings[] = '历史办理人';
-        $headings[] = '审批记录';
-        $headings[] = '当前处理人';
-        $headings[] = '审批节点';
-        $headings[] = '审批人数';
-        $headings[] = '审批耗时';
-        $headings[] = '假期类型';
-        $headings[] = '开始时间';
-        $headings[] = '结束时间';
-        $headings[] = '时长';
-        $headings[] = '请假事由';
-        $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('请假单位');
         //
-        $sheets = [];
         $datas = [];
         foreach ($res as $val) {
             //
@@ -816,12 +818,12 @@ class ApproveController extends AbstractController
             // 计算审批耗时
             $startTime = Carbon::parse($val['start_time'])->timestamp;
             $endTime = $val['end_time'] ? Carbon::parse($val['end_time'])->timestamp : time();
-            $approval_time = Base::timeDiff($startTime, $endTime); // 审批耗时
+            $approval_time = Doo::translate(Timer::timeDiff($startTime, $endTime)); // 审批耗时
             // 计算时长
             $varStartTime = Carbon::parse($val['var']['start_time']);
             $varEndTime = Carbon::parse($val['var']['end_time']);
             $duration = $varEndTime->floatDiffInHours($varStartTime);
-            $duration_unit = '小时'; // 时长单位
+            $duration_unit = Doo::translate('小时'); // 时长单位
             $datas[] = [
                 $val['id'], // 申请编号
                 $val['proc_def_name'], // 标题
@@ -853,20 +855,20 @@ class ApproveController extends AbstractController
             return Base::retError('没有任何数据');
         }
         //
-        $title = "Sheet1";
+        $title = Doo::translate("审批记录");
         $sheets = [
             BillExport::create()->setTitle($title)->setHeadings($headings)->setData($datas)->setStyles(["A1:Y1" => ["font" => ["bold" => true]]])
         ];
         //
-        $fileName = '审批记录_' . Base::time() . '.xls';
-        $filePath = "temp/approve/export/" . date("Ym", Base::time());
+        $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, '.xls') . ".zip";
+        $zipFile = "app/" . $filePath . "/" . Base::rightDelete($fileName, '.xlsx') . ".zip";
         $zipPath = storage_path($zipFile);
         if (file_exists($zipPath)) {
             Base::deleteDirAndFile($zipPath, true);
@@ -899,14 +901,14 @@ class ApproveController extends AbstractController
             3 => '拒绝',
             4 => '撤回'
         );
-        return isset($state_map[$state]) ? $state_map[$state] : '';
+        return $state_map[$state] ?? '';
     }
 
     /**
      * @api {get} api/approve/down          19. 下载导出的审批数据
      *
      * @apiVersion 1.0.0
-     * @apiGroup system
+     * @apiGroup approve
      * @apiName down
      *
      * @apiParam {String} key               通过export接口得到的下载钥匙
@@ -966,7 +968,6 @@ class ApproveController extends AbstractController
         return $res;
     }
 
-
     // 审批机器人消息
     public function approveMsg($type, $dialog, $botUser, $toUser, $process, $action = null)
     {
@@ -978,50 +979,71 @@ class ApproveController extends AbstractController
             'department' => $process['department'],
             'type' => $process['var']['type'],
             'start_time' => $process['var']['start_time'],
-            'start_day_of_week' => '周' . Base::getTimeWeek(Carbon::parse($process['var']['start_time'])->timestamp),
+            'start_day_of_week' => '周' . Timer::getWeek(Carbon::parse($process['var']['start_time'])->timestamp),
             'end_time' => $process['var']['end_time'],
-            'end_day_of_week' => '周' . Base::getTimeWeek(Carbon::parse($process['var']['end_time'])->timestamp),
+            'end_day_of_week' => '周' . Timer::getWeek(Carbon::parse($process['var']['end_time'])->timestamp),
             'description' => $process['var']['description'],
             'comment_nickname' => $process['comment_user_id'] ? User::userid2nickname($process['comment_user_id']) : '',
-            'comment_content' => $process['comment_content'] ?? ''
+            'comment_content' => $process['comment_contents']['content'] ?? '',
+            'comment_pictures' => $process['comment_contents']['pictures'] ?? []
         ];
-        $text = view('push.bot', ['type' => $type, 'action' => $action, 'is_finished' => $process['is_finished'], 'data' => (object)$data])->render();
-        $text = preg_replace("/^\x20+/", "", $text);
-        $text = preg_replace("/\n\x20+/", "\n", $text);
-        $msg_action = null;
+        $thumb = null;
+        if ($type === 'approve_reviewer') {
+            $thumb = $process['var']['other'];
+        } elseif ($type === 'approve_comment_notifier') {
+            $thumb = $data['comment_pictures'] ? $data['comment_pictures'][0] : null;
+        }
+        if ($thumb && file_exists(public_path($thumb))) {
+            $imageSize = getimagesize(public_path($thumb));
+            $data['thumb'] = [
+                'url' => $thumb,
+                'width' => $imageSize[0],
+                'height' => $imageSize[1]
+            ];
+        }
+        $msgAction = null;
+        $msgData = [
+            'type' => $type,
+            'action' => $action,
+            'is_finished' => $process['is_finished'],
+            'data' => $data
+        ];
+        $msgData['title'] = match ($type) {
+            'approve_reviewer' => $data['nickname'] . " 提交的「{$data['proc_def_name']}」待你审批",
+            'approve_notifier' => "抄送 {$data['nickname']} 提交的「{$data['proc_def_name']}」记录",
+            'approve_comment_notifier' => $data['comment_nickname'] . " 评论了 {$data['nickname']} 的「{$data['proc_def_name']}」审批",
+            'approve_submitter' => $action == 'pass' ? "您发起的「{$data['proc_def_name']}」已通过" : "您发起的「{$data['proc_def_name']}」被 {$data['nickname']} 拒绝",
+            default => '不支持的指令',
+        };
         if ($action == 'withdraw' || $action == 'pass' || $action == 'refuse') {
             // 任务完成，给发起人发送消息
             if ($type == 'approve_submitter' && $action != 'withdraw') {
-                return WebSocketDialogMsg::sendMsg($msg_action, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, true);
+                return WebSocketDialogMsg::sendMsg($msgAction, $dialog->id, 'template', $msgData, $botUser->userid, false, false, true);
             }
             // 查找最后一条消息msg_id
-            $msg_action = 'update-' . $toUser['msg_id'];
+            $msgAction = 'change-' . $toUser['msg_id'];
         }
         //
-        try {
-            $msg = WebSocketDialogMsg::sendMsg($msg_action, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, true);
-            // 关联信息
-            if ($action == 'start') {
-                $proc_msg = new ApproveProcMsg();
-                $proc_msg->proc_inst_id = $process['id'];
-                $proc_msg->msg_id = $msg['data']->id;
-                $proc_msg->userid = $toUser['userid'];
-                $proc_msg->save();
-            }
-            // 更新工作报告 未读数量
-            if ($type == 'approve_reviewer' && $toUser['userid']) {
-                $params = [
-                    'userid' => [$toUser['userid'], User::auth()->userid()],
-                    'msg' => [
-                        'type' => 'approve',
-                        'action' => 'unread',
-                        'userid' => $toUser['userid'],
-                    ]
-                ];
-                Task::deliver(new PushTask($params, false));
-            }
-        } catch (\Throwable $th) {
-            //throw $th;
+        $msg = WebSocketDialogMsg::sendMsg($msgAction, $dialog->id, 'template', $msgData, $process['start_user_id'], false, false, true);
+        // 关联信息
+        if ($action == 'start') {
+            $proc_msg = new ApproveProcMsg();
+            $proc_msg->proc_inst_id = $process['id'];
+            $proc_msg->msg_id = $msg['data']->id;
+            $proc_msg->userid = $toUser['userid'];
+            $proc_msg->save();
+        }
+        // 更新审批 未读数量
+        if ($type == 'approve_reviewer' && $toUser['userid']) {
+            $params = [
+                'userid' => [$toUser['userid'], User::userid()],
+                'msg' => [
+                    'type' => 'approve',
+                    'action' => 'unread',
+                    'userid' => $toUser['userid'],
+                ]
+            ];
+            Task::deliver(new PushTask($params, false));
         }
         return true;
     }
@@ -1056,8 +1078,9 @@ class ApproveController extends AbstractController
             }
         }
         // 全局评论
+        unset($res['global_comment']);
         if (isset($res['global_comments'])) {
-            foreach ($res['global_comments'] as $k => &$globalComment) {
+            foreach ($res['global_comments'] as $k => $globalComment) {
                 $info = User::whereUserid($globalComment['user_id'])->first();
                 if (!$info) {
                     continue;
@@ -1065,6 +1088,8 @@ class ApproveController extends AbstractController
                 $res['global_comments'][$k]['userimg'] = User::getAvatar($info->userid, $info->userimg, $info->email, $info->nickname);
                 $res['global_comments'][$k]['nickname'] = $info->nickname;
             }
+        } else {
+            $res['global_comments'] = [];
         }
         $info = User::whereUserid($res['start_user_id'])->first();
         $res['userimg'] = $info ? User::getAvatar($info->userid, $info->userimg, $info->email, $info->nickname) : '';
@@ -1110,7 +1135,7 @@ class ApproveController extends AbstractController
      * @api {get} api/approve/user/status          20. 获取用户审批状态
      *
      * @apiVersion 1.0.0
-     * @apiGroup system
+     * @apiGroup approve
      * @apiName user__status
      *
      * @apiParam {String} userid
@@ -1125,7 +1150,7 @@ class ApproveController extends AbstractController
         $ret = Ihttp::ihttp_get($this->flow_url . '/api/v1/workflow/process/getUserApprovalStatus?' . http_build_query($data));
         $procdef = json_decode($ret['ret'] == 1 ? $ret['data'] : '{}', true);
         if (isset($procdef['status']) && $procdef['status'] == 200) {
-            return Base::retSuccess('success', isset($procdef['data']["proc_def_name"]) ? $procdef['data']["proc_def_name"] : '');
+            return Base::retSuccess('success', $procdef['data']["proc_def_name"] ?? '');
         }
         return Base::retSuccess('success', '');
     }

app/Http/Controllers/Api/ComplaintController.php

@@ -0,0 +1,161 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Request;
+use App\Models\User;
+use App\Module\Base;
+use App\Models\Complaint;
+use App\Models\WebSocketDialog;
+use App\Models\WebSocketDialogMsg;
+
+/**
+ * @apiDefine dialog
+ *
+ * 投诉
+ */
+class ComplaintController extends AbstractController
+{
+    /**
+     * @api {get} api/complaint/lists          01. 获取举报投诉列表
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName lists
+     *
+     * @apiParam {Number} [type]              类型
+     * @apiParam {Number} [status]            状态
+     *
+     * @apiParam {Number} [page]        当前页，默认:1
+     * @apiParam {Number} [pagesize]    每页显示数量，默认:50，最大:100
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function lists()
+    {
+        $user = User::auth();
+        $user->identity('admin');
+        //
+        $type = intval(Request::input('type'));
+        $status = Request::input('status');
+        //
+        $complaints = Complaint::query()
+            ->when($type, function($q) use($type) {
+                $q->where('type', $type);
+            })
+            ->when($status != "", function($q) use($status) {
+                $q->where('status', $status);
+            })
+            ->orderByDesc('id')
+            ->paginate(Base::getPaginate(100, 50));
+        //
+        return Base::retSuccess('success', $complaints);
+    }
+
+    /**
+     * @api {get} api/complaint/submit          02. 举报投诉
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName submit
+     *
+     * @apiParam {Number} dialog_id         对话ID
+     * @apiParam {Number} type              类型
+     * @apiParam {String} reason            原因
+     * @apiParam {String} imgs              图片
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function submit()
+    {
+        $user = User::auth();
+        //
+        $dialog_id = intval(Request::input('dialog_id'));
+        $type = intval(Request::input('type'));
+        $reason = trim(Request::input('reason'));
+        $imgs = Request::input('imgs');
+        //
+        WebSocketDialog::checkDialog($dialog_id);
+        //
+        if (!$type) {
+            return Base::retError('请选择举报类型');
+        }
+        if (!$reason) {
+            return Base::retError('请填写举报原因');
+        }
+        //
+        $report_imgs = [];
+        if (!empty($imgs) && is_array($imgs)) {
+            foreach ($imgs as $img) {
+                $report_imgs[] = Base::unFillUrl($img['path']);
+            }
+        }
+        //
+        Complaint::createInstance([
+            'dialog_id' => $dialog_id,
+            'userid' => $user->userid,
+            'type' => $type,
+            'reason' => $reason,
+            'imgs' => $report_imgs,
+        ])->save();
+        // 通知管理员
+        $botUser = User::botGetOrCreate('system-msg');
+        User::where("identity", "like", "%,admin,%")
+            ->orderByDesc('line_at')
+            ->take(10)
+            ->get()
+            ->each(function ($adminUser) use ($reason, $botUser) {
+                $dialog = WebSocketDialog::checkUserDialog($botUser, $adminUser->userid);
+                if ($dialog) {
+                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                        'type' => 'content',
+                        'title' => '收到新的举报信息',
+                        'content' => "收到新的举报信息：{$reason} (请前往应用查看详情)"
+                    ], $botUser->userid);
+                }
+            });
+        //
+        return Base::retSuccess('success');
+    }
+
+    /**
+     * @api {get} api/complaint/action          03. 举报投诉 - 操作
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName action
+     *
+     * @apiParam {Number} id                ID
+     * @apiParam {Number} type              类型
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function action()
+    {
+        $user = User::auth();
+        $user->identity('admin');
+        //
+        $id = intval(Request::input('id'));
+        $type = trim(Request::input('type'));
+        //
+        if ($type == 'handle') {
+            Complaint::whereId($id)->update([
+                "status" => 1
+            ]);
+        }
+        if ($type == 'delete') {
+            Complaint::whereId($id)->delete();
+        }
+        //
+        return Base::retSuccess('success');
+    }
+}

app/Http/Controllers/Api/FileController.php

@@ -12,6 +12,7 @@ use App\Models\FileLink;
 use App\Models\FileUser;
 use App\Models\User;
 use App\Module\Base;
+use App\Module\Timer;
 use App\Module\Ihttp;
 use Response;
 use Session;
@@ -552,14 +553,14 @@ class FileController extends AbstractController
                 $tmpPath = "uploads/file/document/" . date("Ym") . "/" . $id . "/attached/";
                 Base::makeDir(public_path($tmpPath));
                 $tmpPath .= md5($text) . "." . $matchs[1][$key];
-                if (Base::saveContentImage(public_path($tmpPath), base64_decode($text))) {
+                if (Base::saveContentImage(public_path($tmpPath), base64_decode($text), 90)) {
                     $paramet = getimagesize(public_path($tmpPath));
                     $data['content'] = str_replace($matchs[0][$key], '<img src="' . Base::fillUrl($tmpPath) . '" original-width="' . $paramet[0] . '" original-height="' . $paramet[1] . '"', $data['content']);
                     $isRep = true;
                 }
             }
             $text = strip_tags($data['content']);
-            if ($isRep == true) {
+            if ($isRep) {
                 $content = Base::array2json($data);
             }
         }
@@ -699,6 +700,9 @@ class FileController extends AbstractController
      * @apiName content__upload
      *
      * @apiParam {Number} [pid]             父级ID
+     * @apiParam {Number} [cover]           覆盖已存在的文件
+     * - 0：不覆盖，保留两者（默认）
+     * - 1：覆盖
      * @apiParam {String} [files]           文件名
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
@@ -709,8 +713,9 @@ class FileController extends AbstractController
     {
         $user = User::auth();
         $pid = intval(Request::input('pid'));
+        $overwrite = intval(Request::input('cover'));
         $webkitRelativePath = Request::input('webkitRelativePath');
-        $data = (new File)->contentUpload($user, $pid, $webkitRelativePath);
+        $data = (new File)->contentUpload($user, $pid, $webkitRelativePath, $overwrite);
         return Base::retSuccess($data['data']['name'] . ' 上传成功', $data['addItem']);
     }
 
@@ -1009,15 +1014,37 @@ class FileController extends AbstractController
         }
 
         $user = User::auth();
+        if ($user->isTemp()) {
+            return Base::retError('无法打包下载');
+        }
+        $setting = Base::setting('fileSetting');
+        switch ($setting['permission_pack_type']) {
+            case 'admin':
+                if (!$user->isAdmin()) {
+                    return Base::retError('此功能仅管理员可用');
+                }
+                break;
+            case 'appointAllow':
+                if (!in_array($user->userid, $setting['permission_pack_userids'])) {
+                    return Base::retError('此功能仅指定用户可用');
+                }
+                break;
+            case 'appointProhibit':
+                if (in_array($user->userid, $setting['permission_pack_userids'])) {
+                    return Base::retError('此功能已禁止使用');
+                }
+                break;
+        }
+
         $ids = Request::input('ids');
         $fileName = Request::input('name');
         $fileName = preg_replace("/[\/\\\:\*\?\"\<\>\|]/", "", $fileName);
         if (empty($fileName)) {
             $fileName = 'Package_' . $user->userid;
         }
-        $fileName .= '_' . Base::time() . '.zip';
+        $fileName .= '_' . Timer::time() . '.zip';
 
-        $filePath = "temp/file/pack/" . date("Ym", Base::time());
+        $filePath = "temp/file/pack/" . date("Ym", Timer::time());
         $zipFile = "app/" . $filePath . "/" . $fileName;
         $zipPath = storage_path($zipFile);
 
@@ -1028,6 +1055,12 @@ class FileController extends AbstractController
             return Base::retError('一次最多可以下载100个文件或文件夹');
         }
 
+        $botUser = User::botGetOrCreate('system-msg');
+        if (empty($botUser)) {
+            return Base::retError('系统机器人不存在');
+        }
+        $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid);
+
         $files = [];
         $totalSize = 0;
 
@@ -1053,7 +1086,7 @@ class FileController extends AbstractController
             return Base::retError('创建压缩文件失败');
         }
 
-        go(function () use ($zipPath, $fileUrl, $user, $zip, $files, $fileName, $zipFile) {
+        go(function () use ($zipPath, $fileUrl, $zip, $files, $fileName, $botUser, $dialog) {
             Coroutine::sleep(0.1);
             // 压缩进度
             $progress = 0;
@@ -1079,20 +1112,13 @@ class FileController extends AbstractController
                 ]);
             }
             //
-            $botUser = User::botGetOrCreate('system-msg');
-            if (empty($botUser)) {
-                return;
-            }
-            if ($dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid)) {
-                $text = "<b>文件下载打包已完成。</b>";
-                $text .= "\n\n";
-                $text .= "文件名：{$fileName}";
-                $text .= "\n";
-                $text .= "文件大小：".Base::twoFloat(filesize($zipPath) / 1024, true)."KB";
-                $text .= "\n";
-                $text .= '<a href="' . $fileUrl . '" target="_blank"><button type="button" class="ivu-btn ivu-btn-warning" style="margin-top: 10px;"><span>立即下载</span></button></a>';
-                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, true);
-            }
+            WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                'type' => 'file_download',
+                'title' => '文件下载打包已完成',
+                'name' => $fileName,
+                'size' => filesize($zipPath),
+                'url' => $fileUrl,
+            ], $botUser->userid, false, false, true);
         });
         return Base::retSuccess('success', [
             'name' => $fileName,

app/Http/Controllers/Api/ProjectController.php

@@ -12,6 +12,7 @@ use App\Module\Doo;
 use App\Models\File;
 use App\Models\User;
 use App\Module\Base;
+use App\Module\Timer;
 use Swoole\Coroutine;
 use App\Models\Deleted;
 use App\Models\Project;
@@ -32,6 +33,7 @@ use App\Models\ProjectTaskUser;
 use App\Models\WebSocketDialog;
 use App\Exceptions\ApiException;
 use App\Models\ProjectPermission;
+use App\Models\ProjectTaskContent;
 use App\Models\WebSocketDialogMsg;
 use App\Module\BillMultipleExport;
 use Illuminate\Support\Facades\DB;
@@ -322,7 +324,7 @@ class ProjectController extends AbstractController
             }
             $project->save();
         });
-        $project->pushMsg('update', $project);
+        $project->pushMsg('update');
         //
         return Base::retSuccess('修改成功', $project);
     }
@@ -1002,7 +1004,7 @@ class ProjectController extends AbstractController
         }
         //
         if (is_array($time)) {
-            if (Base::isDateOrTime($time[0]) && Base::isDateOrTime($time[1])) {
+            if (Timer::isDateOrTime($time[0]) && Timer::isDateOrTime($time[1])) {
                 $builder->betweenTime(Carbon::parse($time[0])->startOfDay(), Carbon::parse($time[1])->endOfDay());
             }
         }
@@ -1110,7 +1112,7 @@ class ProjectController extends AbstractController
     /**
      * @api {get} api/project/task/easylists          20. 任务列表-简单的
      *
-     * @apiDescription 需要token身份
+     * @apiDescription 需要token身份，主要用于判断是否有时间冲突的任务
      * @apiVersion 1.0.0
      * @apiGroup project
      * @apiName task__easylists
@@ -1129,23 +1131,24 @@ class ProjectController extends AbstractController
         //
         $taskid = trim(Request::input('taskid'));
         $userid = Request::input('userid');
-        $timerange = Request::input('timerange');
+        $timerange = TimeRange::parse(Request::input('timerange'));
         //
         $list = ProjectTask::with(['taskUser'])
-            ->select('projects.name as project_name', 'project_tasks.id', 'project_tasks.name', 'project_tasks.start_at', 'project_tasks.end_at')
+            ->select([
+                'projects.name as project_name',
+                'project_tasks.id',
+                'project_tasks.name',
+                'project_tasks.start_at',
+                'project_tasks.end_at'
+            ])
             ->join('projects','project_tasks.project_id','=','projects.id')
             ->leftJoin('project_task_users', function ($query) {
                 $query->on('project_tasks.id', '=', 'project_task_users.task_id')->where('project_task_users.owner', '=', 1);
             })
             ->whereIn('project_task_users.userid', is_array($userid) ? $userid : explode(',', $userid) )
-            ->when(!empty($timerange), function ($query) use ($timerange) {
-                if (!is_array($timerange)) {
-                    $timerange = explode(',', $timerange);
-                }
-                if (Base::isDateOrTime($timerange[0]) && Base::isDateOrTime($timerange[1])) {
-                    $query->where('project_tasks.start_at', '<=', Carbon::parse($timerange[1])->endOfDay());
-                    $query->where('project_tasks.end_at', '>=', Carbon::parse($timerange[0])->startOfDay());
-                }
+            ->when($timerange->isExist(), function ($query) use ($timerange) {
+                $query->where('project_tasks.start_at', '<=', $timerange->lastTime()->endOfDay());
+                $query->where('project_tasks.end_at', '>=', $timerange->firstTime()->startOfDay());
             })
             ->when(!empty($taskid), function ($query) use ($taskid) {
                 $query->where('project_tasks.id', "!=", $taskid);
@@ -1194,33 +1197,45 @@ class ProjectController extends AbstractController
         if (count($userid) > 100) {
             return Base::retError('导出成员限制最多100个');
         }
-        if (!(is_array($time) && Base::isDateOrTime($time[0]) && Base::isDateOrTime($time[1]))) {
+        if (!(is_array($time) && Timer::isDateOrTime($time[0]) && Timer::isDateOrTime($time[1]))) {
             return Base::retError('时间选择错误');
         }
         if (Carbon::parse($time[1])->timestamp - Carbon::parse($time[0])->timestamp > 90 * 86400) {
             return Base::retError('时间范围限制最大90天');
         }
-        go(function () use ($user, $userid, $time, $type) {
+        $botUser = User::botGetOrCreate('system-msg');
+        if (empty($botUser)) {
+            return Base::retError('系统机器人不存在');
+        }
+        $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid);
+        //
+        go(function () use ($user, $userid, $time, $type, $botUser, $dialog) {
             Coroutine::sleep(0.1);
             $headings = [];
-            $headings[] = '任务ID';
-            $headings[] = '父级任务ID';
-            $headings[] = '所属项目';
-            $headings[] = '任务标题';
-            $headings[] = '任务开始时间';
-            $headings[] = '任务结束时间';
-            $headings[] = '完成时间';
-            $headings[] = '归档时间';
-            $headings[] = '任务计划用时';
-            $headings[] = '实际完成用时';
-            $headings[] = '超时时间';
-            $headings[] = '开发用时';
-            $headings[] = '验收/测试用时';
-            $headings[] = '负责人';
-            $headings[] = '创建人';
-            $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('超时时间');
+            $headings[] = Doo::translate('开发用时');
+            $headings[] = Doo::translate('验收/测试用时');
+            $headings[] = Doo::translate('负责人');
+            $headings[] = Doo::translate('创建人');
+            $headings[] = Doo::translate('状态');
             $datas = [];
             //
+            $content = [];
+            $content[] = [
+                'content' => '导出任务统计已完成',
+                'style' => 'font-weight: bold;padding-bottom: 4px;',
+            ];
+            //
             $builder = ProjectTask::select(['project_tasks.*', 'project_task_users.userid as ownerid'])
                 ->join('project_task_users', 'project_tasks.id', '=', 'project_task_users.task_id')
                 ->where('project_task_users.owner', 1)
@@ -1230,20 +1245,21 @@ class ProjectController extends AbstractController
                 /** @var ProjectTask $task */
                 foreach ($tasks as $task) {
                     $flowChanges = ProjectTaskFlowChange::whereTaskId($task->id)->get();
-                    $testTime = 0;//验收/测试时间
+                    $testTime = 0; // 测试时间
                     $taskStartTime = $task->start_at ? Carbon::parse($task->start_at)->timestamp : Carbon::parse($task->created_at)->timestamp;
                     $taskCompleteTime = $task->complete_at ? Carbon::parse($task->complete_at)->timestamp : time();
-                    $totalTime = $taskCompleteTime - $taskStartTime; //开发测试总用时
+                    $totalTime = $taskCompleteTime - $taskStartTime; // 任务总用时
                     foreach ($flowChanges as $change) {
-                        if (!str_contains($change->before_flow_item_name, 'end')) {
-                            $upOne = ProjectTaskFlowChange::where('id', '<', $change->id)->whereTaskId($task->id)->orderByDesc('id')->first();
-                            if ($upOne) {
-                                if (str_contains($change->before_flow_item_name, 'test') || str_contains($change->before_flow_item_name, '测试') || strpos($change->before_flow_item_name, '验收') !== false) {
-                                    $testCtime = Carbon::parse($change->created_at)->timestamp;
-                                    $tTime = Carbon::parse($upOne->created_at)->timestamp;
-                                    $tMinusNum = $testCtime - $tTime;
-                                    $testTime += $tMinusNum;
-                                }
+                        if (str_starts_with($change->before_flow_item_name, 'end')) {
+                            continue;
+                        }
+                        $upOne = ProjectTaskFlowChange::where('id', '<', $change->id)->whereTaskId($task->id)->orderByDesc('id')->first();
+                        if ($upOne) {
+                            if (str_starts_with($change->before_flow_item_name, 'test')) {
+                                $testCtime = Carbon::parse($change->created_at)->timestamp;
+                                $tTime = Carbon::parse($upOne->created_at)->timestamp;
+                                $tMinusNum = $testCtime - $tTime;
+                                $testTime += $tMinusNum;
                             }
                         }
                     }
@@ -1251,27 +1267,27 @@ class ProjectController extends AbstractController
                         $lastChange = ProjectTaskFlowChange::whereTaskId($task->id)->orderByDesc('id')->first();
                         $nowTime = time();
                         $unFinishTime = $nowTime - Carbon::parse($lastChange->created_at)->timestamp;
-                        if (str_contains($lastChange->after_flow_item_name, 'test') || str_contains($lastChange->after_flow_item_name, '测试') || strpos($lastChange->after_flow_item_name, '验收') !== false) {
+                        if (str_starts_with($lastChange->after_flow_item_name, 'test')) {
                             $testTime += $unFinishTime;
                         }
                     }
-                    $developTime = $totalTime - $testTime;//开发时间
-                    $planTime = '-';//任务计划用时
-                    $overTime = '-';//超时时间
+                    $developTime = $totalTime - $testTime; // 开发时间
+                    $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 = Base::timeFormat(abs($residueTime));
+                            $overTime = Doo::translate(Timer::timeFormat(abs($residueTime)));
                         }
-                        $planTime = Base::timeDiff($startTime, $endTime);
+                        $planTime = Doo::translate(Timer::timeDiff($startTime, $endTime));
                     }
-                    $actualTime = $task->complete_at ? $totalTime : 0;//实际完成用时
+                    $actualTime = $task->complete_at ? $totalTime : 0; // 实际完成用时
                     $statusText = '未完成';
-                    if ($task->flow_item_name) {
-                        if (str_contains($task->flow_item_name, '已取消')) {
+                    if (str_starts_with($task->flow_item_name, 'end')) {
+                        if (preg_match('/已取消|Cancelled|취소됨|キャンセル済み|Abgebrochen|Annulé|Dibatalkan|Отменено/', $task->flow_item_name)) {
                             $statusText = '已取消';
                             $actualTime = 0;
                             $testTime = 0;
@@ -1306,19 +1322,28 @@ class ProjectController extends AbstractController
                         $task->end_at ?: '-',
                         $task->complete_at ?: '-',
                         $task->archived_at ?: '-',
-                        $planTime ?: '-',
-                        $actualTime ? Base::timeFormat($actualTime) : '-',
+                        $planTime,
+                        $actualTime ? Doo::translate(Timer::timeFormat($actualTime)) : '-',
                         $overTime,
-                        $developTime > 0 ? Base::timeFormat($developTime) : '-',
-                        $testTime > 0 ? Base::timeFormat($testTime) : '-',
+                        $developTime > 0 ? Doo::translate(Timer::timeFormat($developTime)) : '-',
+                        $testTime > 0 ? Doo::translate(Timer::timeFormat($testTime)) : '-',
                         Base::filterEmoji(User::userid2nickname($task->ownerid)) . " (ID: {$task->ownerid})",
                         Base::filterEmoji(User::userid2nickname($task->userid)) . " (ID: {$task->userid})",
-                        $statusText
+                        Doo::translate($statusText),
                     ];
                 }
             });
             if (empty($datas)) {
-                return Base::retError('没有任何数据');
+                $content[] = [
+                    'content' => '没有任何数据',
+                    'style' => 'color: #ff0000;',
+                ];
+                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                    'type' => 'content',
+                    'title' => $content[0]['content'],
+                    'content' => $content,
+                ], $botUser->userid, false, false, true);
+                return;
             }
             //
             $sheets = [];
@@ -1334,15 +1359,27 @@ class ProjectController extends AbstractController
             //
             $fileName = User::userid2nickname($userid[0]) ?: $userid[0];
             if (count($userid) > 1) {
-                $fileName .= "等" . count($userid) . "位成员";
+                $fileName .= '等' . count($userid) . '位成员的任务统计';
+            } else {
+                $fileName .= '的任务统计';
             }
-            $fileName .= '任务统计_' . Base::time() . '.xls';
-            $filePath = "temp/task/export/" . date("Ym", Base::time());
+            $fileName = Doo::translate($fileName) . '_' . 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 . '！');
+                $content[] = [
+                    'content' => "导出失败，{$fileName}！",
+                    'style' => 'color: #ff0000;',
+                ];
+                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                    'type' => 'content',
+                    'title' => $content[0]['content'],
+                    'content' => $content,
+                ], $botUser->userid, false, false, true);
+                return;
             }
+            //
             $xlsPath = storage_path("app/" . $filePath . "/" . $fileName);
             $zipFile = "app/" . $filePath . "/" . Base::rightDelete($fileName, '.xls') . ".zip";
             $zipPath = storage_path($zipFile);
@@ -1360,23 +1397,26 @@ class ProjectController extends AbstractController
                 ]));
                 $fileUrl = Base::fillUrl('api/project/task/down?key=' . urlencode($base64));
                 Session::put('task::export:userid', $user->userid);
-                $botUser = User::botGetOrCreate('system-msg');
-                if (empty($botUser)) {
-                    return;
-                }
-                if ($dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid)) {
-                    $text = "<b>导出任务统计已完成。</b>";
-                    $text .= "\n\n";
-                    $text .= "文件名：{$fileName}";
-                    $text .= "\n";
-                    $text .= "文件大小：" . Base::twoFloat(filesize($zipPath) / 1024, true) . "KB";
-                    $text .= "\n";
-                    $text .= '<a href="' . $fileUrl . '" target="_blank"><button type="button" class="ivu-btn ivu-btn-warning" style="margin-top: 10px;"><span>立即下载</span></button></a>';
-                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, true);
-                }
+                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                    'type' => 'file_download',
+                    'title' => '导出任务统计已完成',
+                    'name' => $fileName,
+                    'size' => filesize($zipPath),
+                    'url' => $fileUrl,
+                ], $botUser->userid, false, false, true);
+            } else {
+                $content[] = [
+                    'content' => "打包失败，请稍后再试...",
+                    'style' => 'color: #ff0000;',
+                ];
+                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                    'type' => 'content',
+                    'title' => $content[0]['content'],
+                    'content' => $content,
+                ], $botUser->userid, false, false, true);
             }
         });
-        return Base::retSuccess('success', ['msg' => '正在打包，请留意系统消息。']);
+        return Base::retSuccess('success');
     }
 
     /**
@@ -1396,16 +1436,16 @@ class ProjectController extends AbstractController
         $user = User::auth('admin');
         //
         $headings = [];
-        $headings[] = '任务ID';
-        $headings[] = '父级任务ID';
-        $headings[] = '所属项目';
-        $headings[] = '任务标题';
-        $headings[] = '任务开始时间';
-        $headings[] = '任务结束时间';
-        $headings[] = '任务计划用时';
-        $headings[] = '超时时间';
-        $headings[] = '负责人';
-        $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('创建人');
         $data = [];
         //
         ProjectTask::whereNull('complete_at')
@@ -1425,9 +1465,9 @@ class ProjectController extends AbstractController
                         $planTotalTime = $endTime - $startTime;
                         $residueTime = $planTotalTime - $totalTime;
                         if ($residueTime < 0) {
-                            $overTime = Base::timeFormat(abs($residueTime));
+                            $overTime = Doo::translate(Timer::timeFormat(abs($residueTime)));
                         }
-                        $planTime = Base::timeDiff($startTime, $endTime);
+                        $planTime = Doo::translate(Timer::timeDiff($startTime, $endTime));
                     }
                     $ownerIds = $task->taskUser->where('owner', 1)->pluck('userid')->toArray();
                     $ownerNames = [];
@@ -1441,7 +1481,7 @@ class ProjectController extends AbstractController
                         Base::filterEmoji($task->name),
                         $task->start_at ?: '-',
                         $task->end_at ?: '-',
-                        $planTime ?: '-',
+                        $planTime,
                         $overTime,
                         implode("、", $ownerNames),
                         Base::filterEmoji(User::userid2nickname($task->userid)) . " (ID: {$task->userid})",
@@ -1452,12 +1492,13 @@ class ProjectController extends AbstractController
             return Base::retError('没有任何数据');
         }
         //
+        $title = Doo::translate('超期任务');
         $sheets = [
-            BillExport::create()->setTitle("超期任务")->setHeadings($headings)->setData($data)->setStyles(["A1:J1" => ["font" => ["bold" => true]]])
+            BillExport::create()->setTitle($title)->setHeadings($headings)->setData($data)->setStyles(["A1:J1" => ["font" => ["bold" => true]]])
         ];
         //
-        $fileName = '超期任务_' . Base::time() . '.xls';
-        $filePath = "temp/task/export/" . date("Ym", Base::time());
+        $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) {
@@ -1544,12 +1585,12 @@ class ProjectController extends AbstractController
         // 项目可见性
         $project_userid = ProjectUser::whereProjectId($task->project_id)->whereOwner(1)->value('userid');     // 项目负责人
         if ($task->visibility != 1 && $user->userid != $project_userid) {
-            $taskUserids = ProjectTaskUser::whereTaskId($task_id)->pluck('userid')->toArray();                //任务负责人、协助人
-            $subTaskUserids = ProjectTaskUser::whereTaskPid($task_id)->pluck('userid')->toArray();            //子任务负责人、协助人
-            $visibleUserids = ProjectTaskVisibilityUser::whereTaskId($task_id)->pluck('userid')->toArray();   //可见人
+            $taskUserids = ProjectTaskUser::whereTaskId($task_id)->pluck('userid')->toArray();                      //任务负责人、协助人
+            $subTaskUserids = ProjectTaskUser::whereTaskPid($task_id)->pluck('userid')->toArray();                  //子任务负责人、协助人
+            $visibleUserids = ProjectTaskVisibilityUser::whereTaskId($task_id)->pluck('userid')->toArray();         //可见人
             $visibleUserids = array_merge($taskUserids, $subTaskUserids, $visibleUserids);
             if (!in_array($user->userid, $visibleUserids)) {
-                return Base::retError('无任务权限');
+                return Base::retError('无任务权限', ['task_id' => $task_id, 'force' => 1], -4002);
             }
         }
         //
@@ -1568,7 +1609,8 @@ class ProjectController extends AbstractController
      * @apiGroup project
      * @apiName task__content
      *
-     * @apiParam {Number} task_id            任务ID
+     * @apiParam {Number} task_id               任务ID
+     * @apiParam {Number} [history_id]          历史ID（获取历史版本）
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -1579,9 +1621,19 @@ class ProjectController extends AbstractController
         User::auth();
         //
         $task_id = intval(Request::input('task_id'));
+        $history_id = intval(Request::input('history_id'));
         //
         $task = ProjectTask::userTask($task_id, null);
         //
+        if ($history_id > 0) {
+            $taskContent = ProjectTaskContent::whereTaskId($task->id)->whereId($history_id)->first();
+            if (empty($taskContent)) {
+                return Base::retError('历史版本不存在');
+            }
+            return Base::retSuccess('success', array_merge($taskContent->getContentInfo(), [
+                'name' => $task->name,
+            ]));
+        }
         if (empty($task->content)) {
             return Base::retSuccess('success', json_decode('{}'));
         }
@@ -1589,7 +1641,39 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/files          26. 获取任务文件列表
+     * @api {get} api/project/task/content_history          26. 获取任务详细历史描述
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup project
+     * @apiName task__content_history
+     *
+     * @apiParam {Number} task_id            任务ID
+     *
+     * @apiParam {Number} [page]            当前页，默认:1
+     * @apiParam {Number} [pagesize]        每页显示数量，默认:20，最大:100
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function task__content_history()
+    {
+        User::auth();
+        //
+        $task_id = intval(Request::input('task_id'));
+        //
+        $task = ProjectTask::userTask($task_id, null);
+        //
+        $data = ProjectTaskContent::select(['id', 'task_id', 'desc', 'userid', 'created_at'])
+            ->whereTaskId($task->id)
+            ->orderByDesc('id')
+            ->paginate(Base::getPaginate(100, 20));
+        return Base::retSuccess('success', $data);
+    }
+
+    /**
+     * @api {get} api/project/task/files          27. 获取任务文件列表
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1614,7 +1698,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/filedelete          27. 删除任务文件
+     * @api {get} api/project/task/filedelete          28. 删除任务文件
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -1640,7 +1724,7 @@ class ProjectController extends AbstractController
         //
         $task = ProjectTask::userTask($file->task_id);
         //
-        ProjectPermission::userTaskPermission(Project::userProject($task->project_id), ProjectPermission::TASK_UPDATE, $task);
+        ProjectPermission::userTaskPermission(Project::userProject($task->project_id), ProjectPermission::TASK_REMOVE, $task);
         //
         $task->pushMsg('filedelete', $file);
         $file->delete();
@@ -1649,7 +1733,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/filedetail          28. 获取任务文件详情
+     * @api {get} api/project/task/filedetail          29. 获取任务文件详情
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1693,7 +1777,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/filedown          29. 下载任务文件
+     * @api {get} api/project/task/filedown          30. 下载任务文件
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1736,11 +1820,11 @@ class ProjectController extends AbstractController
         }
         //
         $filePath = public_path($file->getRawOriginal('path'));
-        return Base::streamDownload($filePath, $file->name);
+        return Base::BinaryFileResponse($filePath, $file->name);
     }
 
     /**
-     * @api {post} api/project/task/add          30. 添加任务
+     * @api {post} api/project/task/add          31. 添加任务
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1826,7 +1910,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/addsub          31. 添加子任务
+     * @api {get} api/project/task/addsub          32. 添加子任务
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -1873,7 +1957,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {post} api/project/task/update          32. 修改任务、子任务
+     * @api {post} api/project/task/update          33. 修改任务、子任务
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -1888,6 +1972,7 @@ class ProjectController extends AbstractController
      * @apiParam {String} [content]             任务详情（子任务不支持）
      * @apiParam {String} [color]               背景色（子任务不支持）
      * @apiParam {Array} [assist]               修改协助人员（子任务不支持）
+     * @apiParam {Number} [visibility]          修改可见性
      * @apiParam {Array} [visibility_appointor] 修改可见性人员
      *
      * @apiParam {Number} [p_level]             优先级相关（子任务不支持）
@@ -1911,11 +1996,13 @@ class ProjectController extends AbstractController
         $task = ProjectTask::userTask($task_id);
         //
         $project = Project::userProject($task->project_id);
-        if (Arr::exists($param, 'flow_item_id')) {
-            ProjectPermission::userTaskPermission($project, ProjectPermission::TASK_STATUS, $task);
-        }else{
-            ProjectPermission::userTaskPermission($project, ProjectPermission::TASK_UPDATE, $task);
+        $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);
         //
         $taskUser = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($task_id)->get();
         $owners = $taskUser->where('owner', 1)->pluck('userid')->toArray();
@@ -1937,7 +2024,7 @@ class ProjectController extends AbstractController
                     $task->pushMsgVisibleAdd($data);
                 }
                 if ($param['visibility_appointor']) {
-                    $newVisibleUserIds = $param['visibility_appointor'] ?? [];
+                    $newVisibleUserIds = is_array($param['visibility_appointor']) ? $param['visibility_appointor'] : [];
                     $deleteUserIds = array_diff($visible, $newVisibleUserIds, $subUserids);
                     $addUserIds = array_diff($newVisibleUserIds, $visible);
                     $task->pushMsgVisibleUpdate($data, $deleteUserIds, $addUserIds);
@@ -1979,7 +2066,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/dialog          33. 创建/获取聊天室
+     * @api {get} api/project/task/dialog          34. 创建/获取聊天室
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2019,7 +2106,7 @@ class ProjectController extends AbstractController
         });
         //
         $task->pushMsg('dialog');
-        $dialogData = WebSocketDialog::find($task->dialog_id)?->formatData($user->userid);
+        $dialogData = WebSocketDialog::synthesizeData($task->dialog_id, $user->userid);
         return Base::retSuccess('success', [
             'id' => $task->id,
             'dialog_id' => $task->dialog_id,
@@ -2028,7 +2115,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/archived          34. 归档任务
+     * @api {get} api/project/task/archived          35. 归档任务
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -2073,7 +2160,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/remove          35. 删除任务
+     * @api {get} api/project/task/remove          36. 删除任务
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -2111,7 +2198,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/resetfromlog          36. 根据日志重置任务
+     * @api {get} api/project/task/resetfromlog          37. 根据日志重置任务
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -2170,7 +2257,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/flow          37. 任务工作流信息
+     * @api {get} api/project/task/flow          38. 任务工作流信息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2259,7 +2346,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/move          38. 任务移动
+     * @api {get} api/project/task/move          39. 任务移动
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -2287,13 +2374,14 @@ 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', ''));
         //
         $task = ProjectTask::userTask($task_id);
         //
         $project = Project::userProject($task->project_id);
         ProjectPermission::userTaskPermission($project, ProjectPermission::TASK_MOVE, $task);
         //
-        if( $task->project_id == $project_id && $task->column_id == $column_id){
+        if ($task->project_id == $project_id && $task->column_id == $column_id) {
             return Base::retSuccess('移动成功', ['id' => $task_id]);
         }
         //
@@ -2302,14 +2390,18 @@ class ProjectController extends AbstractController
         if (empty($column)) {
             return Base::retError('列表不存在');
         }
-        if($flow_item_id){
+        if ($flow_item_id) {
             $flowItem = projectFlowItem::whereProjectId($project->id)->whereId($flow_item_id)->first();
             if (empty($flowItem)) {
                 return Base::retError('任务状态不存在');
             }
+        } else if (!$flow_item_id && !$completeAt) {
+            if (projectFlowItem::whereProjectId($project->id)->count() > 0) {
+                return Base::retError('请选择移动后状态', [], 102);
+            }
         }
         //
-        $task->moveTask($project_id, $column_id, $flow_item_id, $owner, $assist);
+        $task->moveTask($project_id, $column_id, $flow_item_id, $owner, $assist, $completeAt);
         //
         $task = ProjectTask::userTask($task_id);
         //
@@ -2317,7 +2409,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/flow/list          39. 工作流列表
+     * @api {get} api/project/flow/list          40. 工作流列表
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2343,7 +2435,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {post} api/project/flow/save          40. 保存工作流
+     * @api {post} api/project/flow/save          41. 保存工作流
      *
      * @apiDescription 需要token身份（限：项目负责人）
      * @apiVersion 1.0.0
@@ -2377,7 +2469,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/flow/delete          41. 删除工作流
+     * @api {get} api/project/flow/delete          42. 删除工作流
      *
      * @apiDescription 需要token身份（限：项目负责人）
      * @apiVersion 1.0.0
@@ -2409,7 +2501,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/log/lists          42. 获取项目、任务日志
+     * @api {get} api/project/log/lists          43. 获取项目、任务日志
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2439,7 +2531,7 @@ class ProjectController extends AbstractController
             $builder->whereTaskId($task->id);
         } else {
             $project = Project::userProject($project_id);
-            $builder->with(['projectTask:id,parent_id,name'])->whereProjectId($project->id);
+            $builder->with(['projectTask:id,parent_id,name'])->whereProjectId($project->id)->whereTaskOnly(0);
         }
         //
         $list = $builder->orderByDesc('created_at')->paginate(Base::getPaginate(100, 20));
@@ -2450,11 +2542,26 @@ class ProjectController extends AbstractController
             }
             $log->detail = Doo::translate($log->detail);
             $log->time = [
-                'ymd' => date(date("Y", $timestamp) == date("Y", Base::time()) ? "m-d" : "Y-m-d", $timestamp),
+                'ymd' => date(date("Y", $timestamp) == date("Y", Timer::time()) ? "m-d" : "Y-m-d", $timestamp),
                 'hi' => date("h:i", $timestamp) ,
-                'week' => Doo::translate("周" . Base::getTimeWeek($timestamp)),
-                'segment' => Doo::translate(Base::getTimeDayeSegment($timestamp)),
+                'week' => Doo::translate("周" . Timer::getWeek($timestamp)),
+                'segment' => Doo::translate(Timer::getDayeSegment($timestamp)),
             ];
+            $record = Base::json2array($log->record);
+            if (is_array($record['change'])) {
+                foreach ($record['change'] as &$item) {
+                    $item = preg_replace_callback('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', function ($matches) {
+                        $time = strtotime($matches[0]);
+                        $second = date("s", $time);
+                        $second = $second === "00" ? "" : ":$second";
+                        if (date("Y") === date("Y", $time)) {
+                            return date("m-d H:i", $time) . $second;
+                        }
+                        return date("Y-m-d H:i", $time) . $second;
+                    }, $item);
+                }
+                $log->record = $record;
+            }
             return $log;
         });
         //
@@ -2462,7 +2569,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/top          43. 项目置顶
+     * @api {get} api/project/top          44. 项目置顶
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2485,6 +2592,10 @@ class ProjectController extends AbstractController
         }
         $projectUser->top_at = $projectUser->top_at ? null : Carbon::now();
         $projectUser->save();
+        if ($projectUser->project) {
+            $projectUser->project->updated_at = Carbon::now();
+            $projectUser->project->save();
+        }
         return Base::retSuccess("success", [
             'id' => $projectUser->project_id,
             'top_at' => $projectUser->top_at?->toDateTimeString(),
@@ -2492,7 +2603,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/permission          44. 获取项目权限设置
+     * @api {get} api/project/permission          45. 获取项目权限设置
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2518,7 +2629,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/permission/update          45. 项目权限设置
+     * @api {get} api/project/permission/update          46. 项目权限设置
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2552,8 +2663,9 @@ class ProjectController extends AbstractController
             ProjectPermission::TASK_LIST_SORT,
             ProjectPermission::TASK_ADD,
             ProjectPermission::TASK_UPDATE,
-            ProjectPermission::TASK_REMOVE,
+            ProjectPermission::TASK_TIME,
             ProjectPermission::TASK_STATUS,
+            ProjectPermission::TASK_REMOVE,
             ProjectPermission::TASK_ARCHIVED,
             ProjectPermission::TASK_MOVE,
         ]);

app/Http/Controllers/Api/PublicController.php

@@ -2,15 +2,8 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Models\User;
 use App\Models\UserBot;
-use App\Models\UserCheckinMac;
-use App\Models\UserCheckinRecord;
-use App\Models\WebSocketDialog;
-use App\Models\WebSocketDialogMsg;
 use App\Module\Base;
-use Cache;
-use Carbon\Carbon;
 use Request;
 
 /**
@@ -72,7 +65,9 @@ class PublicController extends AbstractController
     }
 
     /**
-     * {post} 签到 - 路由器（openwrt）上报
+     * {post} 签到 - 上报
+     * - 1、路由器（openwrt）签到上报
+     * - 2、考勤机签到上报
      *
      * @apiParam {String}   key
      * @apiParam {String}   mac     使用逗号分割多个
@@ -85,20 +80,30 @@ class PublicController extends AbstractController
         $key = trim(Request::input('key'));
         $mac = trim(Request::input('mac'));
         $time = intval(Request::input('time'));
+        $type = trim(Request::input('type'));
         //
         $setting = Base::setting('checkinSetting');
         if ($setting['open'] !== 'open') {
             return 'function off';
         }
-        if (!in_array('auto', $setting['modes'])) {
-            return 'mode off';
-        }
-        if ($key != $setting['key']) {
-            return 'key error';
-        }
-        if ($error = UserBot::checkinBotCheckin($mac, $time)) {
-            return $error;
+        $alreadyTip = false;
+        if ($type === 'face') {
+            if (!in_array('face', $setting['modes'])) {
+                return 'mode off';
+            }
+            if ($key != $setting['face_key']) {
+                return 'key error';
+            }
+            $alreadyTip = $setting['face_retip'] === 'open';
+        } else {
+            if (!in_array('auto', $setting['modes'])) {
+                return 'mode off';
+            }
+            if ($key != $setting['key']) {
+                return 'key error';
+            }
         }
+        UserBot::checkinBotCheckin($mac, $time, $alreadyTip);
         return 'success';
     }
 }

app/Http/Controllers/Api/ReportController.php

@@ -53,8 +53,8 @@ class ReportController extends AbstractController
                 $builder->whereType($keys['type']);
             }
             if (is_array($keys['created_at'])) {
-                if ($keys['created_at'][0] > 0) $builder->where('created_at', '>=', date('Y-m-d H:i:s', Base::dayTimeF($keys['created_at'][0])));
-                if ($keys['created_at'][1] > 0) $builder->where('created_at', '<=', date('Y-m-d H:i:s', Base::dayTimeE($keys['created_at'][1])));
+                if ($keys['created_at'][0] > 0) $builder->where('created_at', '>=', Base::newCarbon($keys['created_at'][0])->startOfDay());
+                if ($keys['created_at'][1] > 0) $builder->where('created_at', '<=', Base::newCarbon($keys['created_at'][1])->endOfDay());
             }
         }
         $list = $builder->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
@@ -99,14 +99,14 @@ class ReportController extends AbstractController
                 $builder->whereType($keys['type']);
             }
             if (is_array($keys['created_at'])) {
-                if ($keys['created_at'][0] > 0) $builder->where('created_at', '>=', date('Y-m-d H:i:s', Base::dayTimeF($keys['created_at'][0])));
-                if ($keys['created_at'][1] > 0) $builder->where('created_at', '<=', date('Y-m-d H:i:s', Base::dayTimeE($keys['created_at'][1])));
+                if ($keys['created_at'][0] > 0) $builder->where('created_at', '>=', Base::newCarbon($keys['created_at'][0])->startOfDay());
+                if ($keys['created_at'][1] > 0) $builder->where('created_at', '<=', Base::newCarbon($keys['created_at'][1])->endOfDay());
             }
         }
         $list = $builder->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
         if ($list->items()) {
             foreach ($list->items() as $item) {
-                $item->receive_time = ReportReceive::query()->whereRid($item["id"])->whereUserid($user->userid)->value("receive_time");
+                $item->receive_at = ReportReceive::query()->whereRid($item["id"])->whereUserid($user->userid)->value("receive_at");
             }
         }
         return Base::retSuccess('success', $list);
@@ -174,7 +174,7 @@ class ReportController extends AbstractController
 
             foreach ($input["receive"] as $userid) {
                 $input["receive_content"][] = [
-                    "receive_time" => Carbon::now()->toDateTimeString(),
+                    "receive_at" => Carbon::now()->toDateTimeString(),
                     "userid" => $userid,
                     "read" => 0,
                 ];
@@ -259,6 +259,7 @@ class ReportController extends AbstractController
         $offset = abs(intval(Request::input("offset", 0)));
         $id = intval(Request::input("offset", 0));
         $now_dt = trim(Request::input("date")) ? Carbon::parse(Request::input("date")) : Carbon::now();
+
         // 获取开始时间
         if ($type === Report::DAILY) {
             $start_time = Carbon::today();
@@ -280,9 +281,11 @@ class ReportController extends AbstractController
             $start_time->startOfWeek();
             $end_time = Carbon::instance($start_time)->endOfWeek();
         }
+
         // 生成唯一标识
         $sign = Report::generateSign($type, 0, Carbon::instance($start_time));
         $one = Report::whereSign($sign)->whereType($type)->first();
+
         // 如果已经提交了相关汇报
         if ($one && $id > 0) {
             return Base::retSuccess('success', [
@@ -293,8 +296,16 @@ class ReportController extends AbstractController
             ]);
         }
 
+        // 表格头部
+        $labels = [
+            Doo::translate('项目'),
+            Doo::translate('任务'),
+            Doo::translate('负责人'),
+            Doo::translate('备注'),
+        ];
+
         // 已完成的任务
-        $completeContent = "";
+        $completeDatas = [];
         $complete_task = ProjectTask::query()
             ->whereNotNull("complete_at")
             ->whereBetween("complete_at", [$start_time->toDateTimeString(), $end_time->toDateTimeString()])
@@ -306,33 +317,47 @@ class ReportController extends AbstractController
         if ($complete_task->isNotEmpty()) {
             foreach ($complete_task as $task) {
                 $complete_at = Carbon::parse($task->complete_at);
-                $pre = $type == Report::WEEKLY ? ('<span>[' . Doo::translate('周' . ['日', '一', '二', '三', '四', '五', '六'][$complete_at->dayOfWeek]) . ']</span>&nbsp;') : '';
-                $completeContent .= "<li>{$pre}[{$task->project->name}] {$task->name}</li>";
+                $remark = $type == Report::WEEKLY ? ('<div style="text-align:center">[' . Doo::translate('周' . ['日', '一', '二', '三', '四', '五', '六'][$complete_at->dayOfWeek]) . ']</div>') : '&nbsp;';
+                $completeDatas[] = [
+                    $task->project->name,
+                    $task->name,
+                    $task->taskUser->where("owner", 1)->map(function ($item) {
+                        return User::userid2nickname($item->userid);
+                    })->implode(", "),
+                    $remark,
+                ];
             }
-        } else {
-            $completeContent = '<li>&nbsp;</li>';
         }
 
         // 未完成的任务
-        $unfinishedContent = "";
+        $unfinishedDatas = [];
         $unfinished_task = ProjectTask::query()
-            ->whereNull("complete_at")
-            ->whereNotNull("start_at")
-            ->where("end_at", "<", $end_time->toDateTimeString())
+            ->join("projects", "projects.id", "=", "project_tasks.project_id")
+            ->whereNull("projects.archived_at")
+            ->whereNull("project_tasks.complete_at")
+            ->whereNotNull("project_tasks.start_at")
+            ->where("project_tasks.end_at", "<", $end_time->toDateTimeString())
             ->whereHas("taskUser", function ($query) use ($user) {
                 $query->where("userid", $user->userid);
             })
-            ->orderByDesc("id")
+            ->select("project_tasks.*")
+            ->orderByDesc("project_tasks.id")
             ->get();
         if ($unfinished_task->isNotEmpty()) {
             foreach ($unfinished_task as $task) {
                 empty($task->end_at) || $end_at = Carbon::parse($task->end_at);
-                $pre = (!empty($end_at) && $end_at->lt($now_dt)) ? '<span style="color:#ff0000;">[' . Doo::translate('超期') . ']</span>&nbsp;' : '';
-                $unfinishedContent .= "<li>{$pre}[{$task->project->name}] {$task->name}</li>";
+                $remark = (!empty($end_at) && $end_at->lt($now_dt)) ? '<div style="color:#ff0000;text-align:center">[' . Doo::translate('超期') . ']</div>' : '&nbsp;';
+                $unfinishedDatas[] = [
+                    $task->project->name,
+                    $task->name,
+                    $task->taskUser->where("owner", 1)->map(function ($item) {
+                        return User::userid2nickname($item->userid);
+                    })->implode(", "),
+                    $remark,
+                ];
             }
-        } else {
-            $unfinishedContent = '<li>&nbsp;</li>';
         }
+
         // 生成标题
         if ($type === Report::WEEKLY) {
             $title = $user->nickname . "的周报[" . $start_time->format("m/d") . "-" . $end_time->format("m/d") . "]";
@@ -340,22 +365,43 @@ class ReportController extends AbstractController
         } else {
             $title = $user->nickname . "的日报[" . $start_time->format("Y/m/d") . "]";
         }
+        $title = Doo::translate($title);
+
         // 生成内容
-        $content = '<h2>' . Doo::translate('已完成工作') . '</h2><ol>' .
-            $completeContent . '</ol><h2>' .
-            Doo::translate('未完成的工作') . '</h2><ol>' .
-            $unfinishedContent . '</ol>';
+        $contents = [];
+        $contents[] = '<h2>' . Doo::translate('已完成工作') . '</h2>';
+        $contents[] = view('report', [
+            'labels' => $labels,
+            'datas' => $completeDatas,
+        ])->render();
+
+        $contents[] = '<p>&nbsp;</p>';
+        $contents[] = '<h2>' . Doo::translate('未完成的工作') . '</h2>';
+        $contents[] = view('report', [
+            'labels' => $labels,
+            'datas' => $unfinishedDatas,
+        ])->render();
+
         if ($type === Report::WEEKLY) {
-            $content .= "<h2>" . Doo::translate("下周拟定计划") . "[" . $start_time->addWeek()->format("m/d") . "-" . $end_time->addWeek()->format("m/d") . "]</h2><ol><li>&nbsp;</li></ol>";
+            $contents[] = '<p>&nbsp;</p>';
+            $contents[] = "<h2>" . Doo::translate("下周拟定计划") . "[" . $start_time->addWeek()->format("m/d") . "-" . $end_time->addWeek()->format("m/d") . "]</h2>";
+            $contents[] = view('report', [
+                'labels' => [
+                    Doo::translate('计划描述'),
+                    Doo::translate('计划时间'),
+                    Doo::translate('负责人'),
+                ],
+                'datas' => [],
+            ])->render();
         }
+
         $data = [
             "time" => $start_time->toDateTimeString(),
             "sign" => $sign,
             "title" => $title,
-            "content" => $content,
-            "complete_task" => $complete_task,
-            "unfinished_task" => $unfinished_task,
+            "content" => implode("", $contents),
         ];
+
         if ($one) {
             $data['id'] = $one->id;
         }

app/Http/Controllers/Api/SystemController.php

@@ -12,6 +12,7 @@ use Carbon\Carbon;
 use App\Module\Doo;
 use App\Models\User;
 use App\Module\Base;
+use App\Module\Timer;
 use App\Models\Setting;
 use App\Module\Extranet;
 use LdapRecord\Container;
@@ -40,7 +41,7 @@ class SystemController extends AbstractController
      * @apiParam {String} type
      * - get: 获取（默认）
      * - all: 获取所有（需要管理员权限）
-     * - save: 保存设置（参数：['reg', 'reg_identity', 'reg_invite', 'login_code', 'password_policy', 'project_invite', 'chat_information', 'anon_message', 'auto_archived', 'archived_day', 'task_visible', 'task_default_time', 'all_group_mute', 'all_group_autoin', 'image_compress', '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', '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', 'image_compress', 'image_save_local', 'start_home']）
 
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -60,17 +61,24 @@ class SystemController extends AbstractController
                     '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',
                     'image_compress',
                     'image_save_local',
                     'start_home',
@@ -89,6 +97,15 @@ class SystemController extends AbstractController
                     return Base::retError('自动归档时间不可大于100天！');
                 }
             }
+            if ($all['voice2text'] == 'open' && empty(Base::settingFind('aibotSetting', 'openai_key'))) {
+                return Base::retError('开启语音转文字功能需要在应用中开启 ChatGPT AI 机器人。');
+            }
+            if ($all['translation'] == 'open' && empty(Base::settingFind('aibotSetting', 'openai_key'))) {
+                return Base::retError('开启翻译功能需要在应用中开启 ChatGPT AI 机器人。');
+            }
+            if ($all['system_alias'] == env('APP_NAME')) {
+                $all['system_alias'] = '';
+            }
             $setting = Base::setting('system', Base::newTrim($all));
         } else {
             $setting = Base::setting('system');
@@ -96,30 +113,38 @@ class SystemController extends AbstractController
         //
         if ($type == 'all' || $type == 'save') {
             User::auth('admin');
-            $setting['reg_invite'] = $setting['reg_invite'] ?: Base::generatePassword(8);
+            $setting['reg_invite'] = $setting['reg_invite'] ?: Base::generatePassword();
         } else {
             if (isset($setting['reg_invite'])) unset($setting['reg_invite']);
         }
         //
         $setting['reg'] = $setting['reg'] ?: 'open';
         $setting['reg_identity'] = $setting['reg_identity'] ?: 'normal';
+        $setting['temp_account_alias'] = $setting['temp_account_alias'] ?: '';
         $setting['login_code'] = $setting['login_code'] ?: 'auto';
         $setting['password_policy'] = $setting['password_policy'] ?: 'simple';
         $setting['project_invite'] = $setting['project_invite'] ?: 'open';
         $setting['chat_information'] = $setting['chat_information'] ?: 'optional';
         $setting['anon_message'] = $setting['anon_message'] ?: 'open';
+        $setting['voice2text'] = $setting['voice2text'] ?: 'close';
+        $setting['translation'] = $setting['translation'] ?: 'close';
+        $setting['e2e_message'] = $setting['e2e_message'] ?: 'close';
         $setting['auto_archived'] = $setting['auto_archived'] ?: 'close';
         $setting['archived_day'] = floatval($setting['archived_day']) ?: 7;
         $setting['task_visible'] = $setting['task_visible'] ?: 'close';
-        $setting['task_default_time'] = $setting['task_default_time'] ? Base::json2array($setting['task_default_time']) : ['09:00', '18:00'];
         $setting['all_group_mute'] = $setting['all_group_mute'] ?: 'open';
         $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['image_compress'] = $setting['image_compress'] ?: 'open';
         $setting['image_save_local'] = $setting['image_save_local'] ?: '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();
         //
         return Base::retSuccess('success', $setting ?: json_decode('{}'));
     }
@@ -159,11 +184,18 @@ class SystemController extends AbstractController
                     'notice_msg',
                     'msg_unread_user_minute',
                     'msg_unread_group_minute',
+                    'msg_unread_time_ranges',
                     'ignore_addr'
                 ])) {
                     unset($all[$key]);
                 }
             }
+            $ranges = array_map(function ($item) {
+                return !is_array($item) ? explode(',', $item) : $item;
+            }, is_array($all['msg_unread_time_ranges']) ? $all['msg_unread_time_ranges'] : []);
+            $all['msg_unread_time_ranges'] = array_values(array_filter($ranges, function ($item) {
+                return count($item) == 2 && Timer::isTime($item[0]) && Timer::isTime($item[1]);
+            }));
             $setting = Base::setting('emailSetting', Base::newTrim($all));
         } else {
             $setting = Base::setting('emailSetting');
@@ -177,6 +209,7 @@ class SystemController extends AbstractController
         $setting['notice_msg'] = $setting['notice_msg'] ?: 'close';
         $setting['msg_unread_user_minute'] = intval($setting['msg_unread_user_minute'] ?? -1);
         $setting['msg_unread_group_minute'] = intval($setting['msg_unread_group_minute'] ?? -1);
+        $setting['msg_unread_time_ranges'] = is_array($setting['msg_unread_time_ranges']) ? $setting['msg_unread_time_ranges'] : [[]];
         $setting['ignore_addr'] = $setting['ignore_addr'] ?: '';
         //
         if ($type != 'save' && !in_array('admin', $user->identity)) {
@@ -195,7 +228,7 @@ class SystemController extends AbstractController
      *
      * @apiParam {String} type
      * - get: 获取（默认）
-     * - save: 保存设置（参数：['open', 'appid', 'app_certificate']）
+     * - save: 保存设置（参数：['open', 'appid', 'app_certificate', 'api_key', 'api_secret']）
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
      * @apiSuccess {Object} data    返回数据
@@ -215,12 +248,14 @@ class SystemController extends AbstractController
                     'open',
                     'appid',
                     'app_certificate',
+                    'api_key',
+                    'api_secret',
                 ])) {
                     unset($all[$key]);
                 }
             }
             if ($all['open'] === 'open' && (!$all['appid'] || !$all['app_certificate'])) {
-                return Base::retError('请填写完整的参数');
+                return Base::retError('请填写基本配置');
             }
             $setting = Base::setting('meetingSetting', Base::newTrim($all));
         } else {
@@ -231,6 +266,8 @@ class SystemController extends AbstractController
         if (env("SYSTEM_SETTING") == 'disabled') {
             $setting['appid'] = substr($setting['appid'], 0, 4) . str_repeat('*', strlen($setting['appid']) - 8) . substr($setting['appid'], -4);
             $setting['app_certificate'] = substr($setting['app_certificate'], 0, 4) . str_repeat('*', strlen($setting['app_certificate']) - 8) . substr($setting['app_certificate'], -4);
+            $setting['api_key'] = substr($setting['api_key'], 0, 4) . str_repeat('*', strlen($setting['api_key']) - 8) . substr($setting['api_key'], -4);
+            $setting['api_secret'] = substr($setting['api_secret'], 0, 4) . str_repeat('*', strlen($setting['api_secret']) - 8) . substr($setting['api_secret'], -4);
         }
         //
         return Base::retSuccess('success', $setting ?: json_decode('{}'));
@@ -267,7 +304,12 @@ class SystemController extends AbstractController
             'wenxin_secret',
             'wenxin_model',
             'qianwen_key',
-            'qianwen_model'
+            'qianwen_model',
+            'gemini_key',
+            'gemini_model',
+            'gemini_agency',
+            'zhipu_key',
+            'zhipu_model',
         ];
 
         if ($type == 'save') {
@@ -282,29 +324,45 @@ class SystemController extends AbstractController
             }
             $backup = $setting;
             $setting = Base::setting('aibotSetting', Base::newTrim($all));
+            $tempMsg = [
+                'type' => 'content',
+                'content' => '设置成功'
+            ];
             //
             if ($backup['openai_key'] != $setting['openai_key']) {
                 $botUser = User::botGetOrCreate('ai-openai');
                 if ($botUser && $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid)) {
-                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => "设置成功"], $botUser->userid, true, false, true);
+                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', $tempMsg, $botUser->userid, true, false, true);
                 }
             }
             if ($backup['claude_token'] != $setting['claude_token']) {
                 $botUser = User::botGetOrCreate('ai-claude');
                 if ($botUser && $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid)) {
-                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => "设置成功"], $botUser->userid, true, false, true);
+                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', $tempMsg, $botUser->userid, true, false, true);
                 }
             }
             if ($backup['wenxin_key'] != $setting['wenxin_key']) {
                 $botUser = User::botGetOrCreate('ai-wenxin');
                 if ($botUser && $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid)) {
-                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => "设置成功"], $botUser->userid, true, false, true);
+                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', $tempMsg, $botUser->userid, true, false, true);
                 }
             }
             if ($backup['qianwen_key'] != $setting['qianwen_key']) {
                 $botUser = User::botGetOrCreate('ai-qianwen');
                 if ($botUser && $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid)) {
-                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => "设置成功"], $botUser->userid, true, false, true);
+                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', $tempMsg, $botUser->userid, true, false, true);
+                }
+            }
+            if ($backup['gemini_key'] != $setting['gemini_key']) {
+                $botUser = User::botGetOrCreate('ai-gemini');
+                if ($botUser && $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid)) {
+                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', $tempMsg, $botUser->userid, true, false, true);
+                }
+            }
+            if ($backup['zhipu_key'] != $setting['zhipu_key']) {
+                $botUser = User::botGetOrCreate('ai-zhipu');
+                if ($botUser && $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid)) {
+                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', $tempMsg, $botUser->userid, true, false, true);
                 }
             }
         }
@@ -312,6 +370,8 @@ class SystemController extends AbstractController
         $setting['openai_model'] = $setting['openai_model'] ?: 'gpt-3.5-turbo';
         $setting['wenxin_model'] = $setting['wenxin_model'] ?: 'eb-instant';
         $setting['qianwen_model'] = $setting['qianwen_model'] ?: 'qwen-v1';
+        $setting['gemini_model'] = $setting['gemini_model'] ?: 'gemini-1.0-pro';
+        $setting['zhipu_model'] = $setting['zhipu_model'] ?: 'glm-4';
         if (env("SYSTEM_SETTING") == 'disabled') {
             foreach ($keys as $item) {
                 if (strlen($setting[$item]) > 12) {
@@ -356,6 +416,13 @@ class SystemController extends AbstractController
                     'remindin',
                     'remindexceed',
                     'edit',
+                    'face_upload',
+                    'face_remark',
+                    'face_retip',
+                    'locat_remark',
+                    'locat_bd_lbs_key',
+                    'locat_bd_lbs_point', // 格式：{"lng":116.404, "lat":39.915, "radius":500}
+                    'manual_remark',
                     'modes',
                     'key',
                 ])) {
@@ -364,8 +431,28 @@ class SystemController extends AbstractController
             }
             if ($all['open'] === 'close') {
                 $all['key'] = md5(Base::generatePassword(32));
+                $all['face_key'] = md5(Base::generatePassword(32));
+            } else {
+                $botUser = User::botGetOrCreate('check-in');
+                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['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 ($all['modes']) {
+                $all['modes'] = array_intersect($all['modes'], ['auto', 'manual', 'locat', 'face']);
             }
-            $all['modes'] = array_intersect($all['modes'], ['auto', 'manual', 'location']);
             $setting = Base::setting('checkinSetting', Base::newTrim($all));
         } else {
             $setting = Base::setting('checkinSetting');
@@ -375,8 +462,18 @@ class SystemController extends AbstractController
             $setting['key'] = md5(Base::generatePassword(32));
             Base::setting('checkinSetting', $setting);
         }
+        if (empty($setting['face_key'])) {
+            $setting['face_key'] = md5(Base::generatePassword(32));
+            Base::setting('checkinSetting', $setting);
+        }
         //
         $setting['open'] = $setting['open'] ?: 'close';
+        $setting['face_upload'] = $setting['face_upload'] ?: 'close';
+        $setting['face_remark'] = $setting['face_remark'] ?: Doo::translate('考勤机');
+        $setting['face_retip'] = $setting['face_retip'] ?: 'open';
+        $setting['locat_remark'] = $setting['locat_remark'] ?: Doo::translate('定位签到');
+        $setting['locat_bd_lbs_point'] = is_array($setting['locat_bd_lbs_point']) ? $setting['locat_bd_lbs_point'] : ['radius' => 500];
+        $setting['manual_remark'] = $setting['manual_remark'] ?: Doo::translate('手动签到');
         $setting['time'] = $setting['time'] ? Base::json2array($setting['time']) : ['09:00', '18:00'];
         $setting['advance'] = intval($setting['advance']) ?: 120;
         $setting['delay'] = intval($setting['delay']) ?: 120;
@@ -385,6 +482,9 @@ class SystemController extends AbstractController
         $setting['edit'] = $setting['edit'] ?: 'close';
         $setting['modes'] = is_array($setting['modes']) ? $setting['modes'] : [];
         $setting['cmd'] = "curl -sSL '" . Base::fillUrl("api/public/checkin/install?key={$setting['key']}") . "' | sh";
+        if (Base::judgeClientVersion('0.34.67')) {
+            $setting['cmd'] = base64_encode($setting['cmd']);
+        }
         //
         return Base::retSuccess('success', $setting ?: json_decode('{}'));
     }
@@ -505,7 +605,47 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/demo          08. 获取演示帐号
+     * @api {get} api/system/setting/file          08. 文件设置（限管理员）
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName setting__file
+     *
+     * @apiParam {String} type
+     * - get: 获取（默认）
+     * - save: 保存设置（参数：['permission_pack_type', 'permission_pack_userids']）
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function setting__file()
+    {
+        User::auth('admin');
+        //
+        $type = trim(Request::input('type'));
+        if ($type == 'save') {
+            if (env("SYSTEM_SETTING") == 'disabled') {
+                return Base::retError('当前环境禁止修改');
+            }
+            $all = Base::newTrim(Request::input());
+            foreach ($all as $key => $value) {
+                if (!in_array($key, [
+                    'permission_pack_type',
+                    'permission_pack_userids'
+                ])) {
+                    unset($all[$key]);
+                }
+            }
+            $setting = Base::setting('fileSetting', Base::newTrim($all));
+        } else {
+            $setting = Base::setting('fileSetting');
+        }
+        //
+        return Base::retSuccess('success', $setting ?: json_decode('{}'));
+    }
+
+    /**
+     * @api {get} api/system/demo          09. 获取演示帐号
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -529,7 +669,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/priority          09. 任务优先级
+     * @api {post} api/system/priority          10. 任务优先级
      *
      * @apiDescription 获取任务优先级、保存任务优先级
      * @apiVersion 1.0.0
@@ -578,7 +718,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/column/template          10. 创建项目模板
+     * @api {post} api/system/column/template          11. 创建项目模板
      *
      * @apiDescription 获取创建项目模板、保存创建项目模板
      * @apiVersion 1.0.0
@@ -625,7 +765,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/license          11. License
+     * @api {post} api/system/license          12. License
      *
      * @apiDescription 获取License信息、保存License（限管理员）
      * @apiVersion 1.0.0
@@ -680,7 +820,7 @@ class SystemController extends AbstractController
         if ($data['info']['people'] > 0 && $data['user_count'] > $data['info']['people']) {
             $data['error'][] = '终端用户数超过License限制';
         }
-        if ($data['info']['expired_at'] && strtotime($data['info']['expired_at']) <= Base::time()) {
+        if ($data['info']['expired_at'] && strtotime($data['info']['expired_at']) <= Timer::time()) {
             $data['error'][] = '终端License已过期';
         }
         //
@@ -688,7 +828,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/info          12. 获取终端详细信息
+     * @api {get} api/system/get/info          13. 获取终端详细信息
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -717,7 +857,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ip          13. 获取IP地址
+     * @api {get} api/system/get/ip          14. 获取IP地址
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -732,7 +872,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/cnip          14. 是否中国IP地址
+     * @api {get} api/system/get/cnip          15. 是否中国IP地址
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -749,7 +889,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ipgcj02          15. 获取IP地址经纬度
+     * @api {get} api/system/get/ipgcj02          16. 获取IP地址经纬度
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -766,7 +906,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ipinfo          16. 获取IP地址详细信息
+     * @api {get} api/system/get/ipinfo          17. 获取IP地址详细信息
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -783,7 +923,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/imgupload          17. 上传图片
+     * @api {post} api/system/imgupload          18. 上传图片
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -795,10 +935,10 @@ class SystemController extends AbstractController
      * @apiParam {String} filename          post-文件名
      * @apiParam {Number} [width]           压缩图片宽（默认0）
      * @apiParam {Number} [height]          压缩图片高（默认0）
-     * @apiParam {String} [whcut]           压缩方式
-     * - 1：裁切（默认，宽、高非0有效）
-     * - 0：缩放
-     * - -1或'auto'：保持等比裁切
+     * @apiParam {String} [whcut]           压缩方式（等比缩放）
+     * - cover：完全覆盖容器，可能图片部分不可见（width、height必须大于0）
+     * - contain：完全装入容器，可能容器部分显示空白（width、height必须大于0）
+     * - percentage：完全装入容器，可能容器有一边尺寸不足（默认，假如：width=200、height=0，则宽度最大不超过200、高度自动）
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -811,11 +951,15 @@ class SystemController extends AbstractController
         }
         $width = intval(Request::input('width'));
         $height = intval(Request::input('height'));
-        $whcut = intval(Request::input('whcut', 1));
-        $scale = [2160, 4160, -1];
-        if ($width > 0 || $height > 0) {
-            $scale = [$width, $height, $whcut];
-        }
+        $whcut = Request::input('whcut');
+        $whcut = match (strval($whcut)) {
+            '1' => 'cover',
+            '0' => 'contain',
+            'cover',
+            'contain' => $whcut,
+            default => 'percentage',
+        };
+        $scale = [$width ?: 2160, $height ?: 4160, $whcut];
         $path = "uploads/user/picture/" . User::userid() . "/" . date("Ym") . "/";
         $image64 = trim(Request::input('image64'));
         $fileName = trim(Request::input('filename'));
@@ -824,7 +968,8 @@ class SystemController extends AbstractController
                 "image64" => $image64,
                 "path" => $path,
                 "fileName" => $fileName,
-                "scale" => $scale
+                "scale" => $scale,
+                "quality" => 85
             ]);
         } else {
             $data = Base::upload([
@@ -832,7 +977,8 @@ class SystemController extends AbstractController
                 "type" => 'image',
                 "path" => $path,
                 "fileName" => $fileName,
-                "scale" => $scale
+                "scale" => $scale,
+                "quality" => 100
             ]);
         }
         if (Base::isError($data)) {
@@ -843,7 +989,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/imgview          18. 浏览图片空间
+     * @api {get} api/system/get/imgview          19. 浏览图片空间
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -911,7 +1057,7 @@ class SystemController extends AbstractController
                 ];
                 //
                 $extension = pathinfo($dirPath . $filename, PATHINFO_EXTENSION);
-                if (in_array($extension, array('gif', 'jpg', 'jpeg', 'webp', 'png', 'bmp'))) {
+                if (in_array($extension, ['png', 'jpg', 'jpeg', 'gif', 'webp', 'bmp'])) {
                     if ($extension = Base::getThumbExt($dirPath . $filename)) {
                         $array['thumb'] .= "_thumb.{$extension}";
                     } else {
@@ -940,7 +1086,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/fileupload          19. 上传文件
+     * @api {post} api/system/fileupload          20. 上传文件
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -968,6 +1114,7 @@ class SystemController extends AbstractController
                 "image64" => $image64,
                 "path" => $path,
                 "fileName" => $fileName,
+                "quality" => 85
             ]);
         } else {
             $data = Base::upload([
@@ -975,6 +1122,7 @@ class SystemController extends AbstractController
                 "type" => 'file',
                 "path" => $path,
                 "fileName" => $fileName,
+                "quality" => 100
             ]);
         }
         //
@@ -982,36 +1130,50 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/updatelog          20. 获取更新日志
+     * @api {get} api/system/get/updatelog          21. 获取更新日志
      *
      * @apiDescription 获取更新日志
      * @apiVersion 1.0.0
      * @apiGroup system
      * @apiName get__updatelog
      *
+     * @apiParam {Number} [take]        获取数量：10-100（留空默认：50）
+     *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
      * @apiSuccess {Object} data    返回数据
      */
     public function get__updatelog()
     {
+        $take = min(100, max(10, intval(Request::input('take', 50))));
         $logPath = base_path('CHANGELOG.md');
-        $logContent = "";
         $logVersion = "";
+        $logContent = "";
+        $logResults = [];
         if (file_exists($logPath)) {
-            $logContent = file_get_contents($logPath);
-            preg_match("/## \[(.*?)\]/", $logContent, $matchs);
-            if ($matchs) {
-                $logVersion = $matchs[1] === "Unreleased" ? $matchs[1] : "v{$matchs[1]}";
+            $content = file_get_contents($logPath);
+            $sections = preg_split("/## \[(.*?)\]/", $content, -1, PREG_SPLIT_DELIM_CAPTURE);
+            for ($i = 1; $i < count($sections) && count($logResults) < $take; $i += 2) {
+                $logResults[] = [
+                    'title' => $sections[$i],
+                    'content' => $sections[$i + 1]
+                ];
             }
         }
+        if ($logResults) {
+            $logVersion = $logResults[0]['title'];
+            $logContent = implode("\n", array_map(function($item) {
+                return "## [{$item['title']}]" . $item['content'];
+            }, $logResults));
+        }
         return Base::retSuccess('success', [
-            'updateLog' => $logContent ?: false,
+            'logVersion' => $logVersion,
+            'updateLog' => $logContent,
         ]);
     }
 
     /**
-     * @api {get} api/system/email/check          21. 邮件发送测试（限管理员）
+     * @api {get} api/system/email/check          22. 邮件发送测试（限管理员）
      *
      * @apiDescription 测试配置邮箱是否能发送邮件
      * @apiVersion 1.0.0
@@ -1035,10 +1197,10 @@ class SystemController extends AbstractController
                 Factory::mailer()
                     ->setDsn("smtp://{$all['account']}:{$all['password']}@{$all['smtp_server']}:{$all['port']}?verify_peer=0")
                     ->setMessage(EmailMessage::create()
-                        ->from(env('APP_NAME', 'Task') . " <{$all['account']}>")
+                        ->from(Base::settingFind('system', 'system_alias', 'Task') . " <{$all['account']}>")
                         ->to($to)
                         ->subject('Mail sending test')
-                        ->html('<p>收到此电子邮件意味着您的邮箱配置正确。</p><p>Receiving this email means that your mailbox is configured correctly.</p>'))
+                        ->html('<p>' . Doo::translate('收到此电子邮件意味着您的邮箱配置正确。') . '</p>'))
                     ->send();
             }, function () {
                 throw new \Exception("收件人地址错误或已被忽略");
@@ -1047,7 +1209,7 @@ class SystemController extends AbstractController
         } catch (\Throwable $e) {
             // 一般是请求超时
             if (str_contains($e->getMessage(), "Timed Out")) {
-                return Base::retError("language.TimedOut");
+                return Base::retError("邮件发送超时，请检查邮箱配置是否正确");
             } elseif ($e->getCode() === 550) {
                 return Base::retError('邮件内容被拒绝，请检查邮箱是否开启接收功能');
             } else {
@@ -1057,7 +1219,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/checkin/export          22. 导出签到数据（限管理员）
+     * @api {get} api/system/checkin/export          23. 导出签到数据（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -1090,13 +1252,13 @@ class SystemController extends AbstractController
         if (count($userid) > 100) {
             return Base::retError('导出成员限制最多100个');
         }
-        if (!(is_array($date) && Base::isDate($date[0]) && Base::isDate($date[1]))) {
+        if (!(is_array($date) && Timer::isDate($date[0]) && Timer::isDate($date[1]))) {
             return Base::retError('日期选择错误');
         }
         if (Carbon::parse($date[1])->timestamp - Carbon::parse($date[0])->timestamp > 35 * 86400) {
             return Base::retError('日期范围限制最大35天');
         }
-        if (!(is_array($time) && Base::isTime($time[0]) && Base::isTime($time[1]))) {
+        if (!(is_array($time) && Timer::isTime($time[0]) && Timer::isTime($time[1]))) {
             return Base::retError('时间选择错误');
         }
         //
@@ -1104,14 +1266,14 @@ class SystemController extends AbstractController
         $secondEnd = strtotime("2000-01-01 {$time[1]}") - strtotime("2000-01-01 00:00:00");
         //
         $headings = [];
-        $headings[] = '签到人';
-        $headings[] = '签到日期';
-        $headings[] = '班次时间';
-        $headings[] = '首次签到时间';
-        $headings[] = '首次签到结果';
-        $headings[] = '最后签到时间';
-        $headings[] = '最后签到结果';
-        $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('参数数据');
         //
         $sheets = [];
         $startD = Carbon::parse($date[0])->startOfDay();
@@ -1138,28 +1300,28 @@ class SystemController extends AbstractController
                 $lastRecord = $sameCollect?->whereBetween("datetime", $lastBetween)->last();
                 $firstTimestamp = $firstRecord['timestamp'] ?: 0;
                 $lastTimestamp = $lastRecord['timestamp'] ?: 0;
-                if (Base::time() < $startT + $secondStart) {
+                if (Timer::time() < $startT + $secondStart) {
                     $firstResult = "-";
                 } else {
-                    $firstResult = "正常";
+                    $firstResult = Doo::translate("正常");
                     if (empty($firstTimestamp)) {
-                        $firstResult = "缺卡";
+                        $firstResult = Doo::translate("缺卡");
                         $styles["E{$index}"] = ["font" => ["color" => ["rgb" => "ff0000"]]];
                     } elseif ($firstTimestamp > $startT + $secondStart) {
-                        $firstResult = "迟到";
+                        $firstResult = Doo::translate("迟到");
                         $styles["E{$index}"] = ["font" => ["color" => ["rgb" => "436FF6"]]];
                     }
                 }
-                if (Base::time() < $startT + $secondEnd) {
+                if (Timer::time() < $startT + $secondEnd) {
                     $lastResult = "-";
                     $lastTimestamp = 0;
                 } else {
-                    $lastResult = "正常";
+                    $lastResult = Doo::translate("正常");
                     if (empty($lastTimestamp) || $lastTimestamp === $firstTimestamp) {
-                        $lastResult = "缺卡";
+                        $lastResult = Doo::translate("缺卡");
                         $styles["G{$index}"] = ["font" => ["color" => ["rgb" => "ff0000"]]];
                     } elseif ($lastTimestamp < $startT + $secondEnd) {
-                        $lastResult = "早退";
+                        $lastResult = Doo::translate("早退");
                         $styles["G{$index}"] = ["font" => ["color" => ["rgb" => "436FF6"]]];
                     }
                 }
@@ -1189,17 +1351,19 @@ class SystemController extends AbstractController
         //
         $fileName = $users[0]->nickname;
         if (count($users) > 1) {
-            $fileName .= "等" . count($userid) . "位成员";
+            $fileName .= "等" . count($userid) . "位成员的签到记录";
+        } else {
+            $fileName .= '的签到记录';
         }
-        $fileName .= '签到记录_' . Base::time() . '.xls';
-        $filePath = "temp/checkin/export/" . date("Ym", Base::time());
+        $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, '.xls') . ".zip";
+        $zipFile = "app/" . $filePath . "/" . Base::rightDelete($fileName, '.xlsx') . ".zip";
         $zipPath = storage_path($zipFile);
         if (file_exists($zipPath)) {
             Base::deleteDirAndFile($zipPath, true);
@@ -1224,7 +1388,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/checkin/down          23. 下载导出的签到数据
+     * @api {get} api/system/checkin/down          24. 下载导出的签到数据
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -1250,14 +1414,20 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/version          24. 获取版本号
+     * @api {get} api/system/version          25. 获取版本号
      *
      * @apiVersion 1.0.0
      * @apiGroup system
      * @apiName version
      *
-     * @apiSuccess {String} version
-     * @apiSuccess {String} publish
+     * @apiSuccessExample {json} Success-Response:
+    {
+        "version": "0.0.1",
+        "publish": {
+            "provider": "generic",
+            "url": ""
+        }
+    }
      */
     public function version()
     {
@@ -1279,4 +1449,73 @@ class SystemController extends AbstractController
         }
         return $array;
     }
+
+    /**
+     * @api {get} api/system/prefetch          26. 预加载的资源
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName prefetch
+     *
+     * @apiSuccessExample {array} Success-Response:
+    [
+        "https://......",
+        "https://......",
+        "......",
+    ]
+     */
+    public function prefetch()
+    {
+        $userAgent = strtolower(Request::server('HTTP_USER_AGENT'));
+        $isMain = str_contains($userAgent, 'maintaskwindow');
+        $isApp = str_contains($userAgent, 'kuaifan_eeui');
+        $version = Base::getVersion();
+        $array = [];
+
+        if ($isMain || $isApp) {
+            $path = 'js/build/';
+            $list = Base::recursiveFiles(public_path($path), false);
+            foreach ($list as $item) {
+                if (is_file($item) && filesize($item) > 50 * 1024) { // 50KB
+                    $array[] = $path . basename($item);
+                }
+            }
+        }
+
+        if ($isMain) {
+            $file = base_path('.prefetch');
+            if (file_exists($file)) {
+                $content = file_get_contents($file);
+                $items = explode("\n", $content);
+                $array = array_merge($array, $items);
+            }
+            // 添加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 ($officePath) {
+                $array = array_map(function($item) use ($officePath) {
+                    if (str_starts_with($item, 'office/{path}/')) {
+                        return preg_replace("/office\/{path}\//", '/office/' . $officePath . '/', $item);
+                    }
+                    return $item;
+                }, $array);
+            } else {
+                $array = array_filter($array, function($item) {
+                    return !str_starts_with($item, 'office/{path}/');
+                });
+            }
+        }
+
+        return array_map(function($item) use ($version) {
+            $url = trim($item);
+            $url = str_replace('{version}', $version, $url);
+            return url($url);
+        }, array_values(array_filter($array)));
+    }
 }

app/Http/Controllers/Api/TestController.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+/**
+ * 测试
+ */
+class TestController extends AbstractController
+{
+
+}

app/Http/Controllers/Api/UsersController.php

@@ -11,6 +11,7 @@ use App\Module\Doo;
 use App\Models\File;
 use App\Models\User;
 use App\Module\Base;
+use App\Module\Timer;
 use App\Ldap\LdapUser;
 use App\Models\Meeting;
 use App\Models\Project;
@@ -20,13 +21,16 @@ use App\Models\UmengAlias;
 use App\Models\UserDelete;
 use App\Models\UserTransfer;
 use App\Models\AbstractModel;
+use App\Models\UserCheckinFace;
 use App\Models\UserCheckinMac;
 use App\Models\UserDepartment;
 use App\Models\WebSocketDialog;
 use App\Models\UserCheckinRecord;
 use App\Models\WebSocketDialogMsg;
+use Illuminate\Support\Facades\DB;
 use App\Models\UserEmailVerification;
 use App\Module\AgoraIO\AgoraTokenGenerator;
+use Swoole\Coroutine;
 
 /**
  * @apiDefine users
@@ -38,7 +42,6 @@ class UsersController extends AbstractController
     /**
      * @api {get} api/users/login          01. 登录、注册
      *
-     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup users
      * @apiName login
@@ -127,7 +130,7 @@ class UsersController extends AbstractController
                 return $retError('帐号或密码错误');
             }
             //
-            if (in_array('disable', $user->identity)) {
+            if ($user->isDisable()) {
                 return $retError('帐号已停用...');
             }
             Cache::forget("code::" . $email);
@@ -328,8 +331,7 @@ class UsersController extends AbstractController
         $data = $user->toArray();
         $data['nickname_original'] = $user->getRawOriginal('nickname');
         $data['department_name'] = $user->getDepartmentName();
-        // 适用默认部门下第1级负责人才能添加部门OKR
-        $data['department_owner'] = UserDepartment::where('parent_id',0)->where('owner_userid', $user->userid())->exists();
+        $data['department_owner'] = UserDepartment::where('parent_id',0)->where('owner_userid', $user->userid)->exists(); // 适用默认部门下第1级负责人才能添加部门OKR
         return Base::retSuccess('success', $data);
     }
 
@@ -345,6 +347,7 @@ class UsersController extends AbstractController
      * @apiParam {String} [tel]                 电话
      * @apiParam {String} [nickname]            昵称
      * @apiParam {String} [profession]          职位/职称
+     * @apiParam {String} [lang]                语言（比如：zh/en）
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -407,6 +410,15 @@ class UsersController extends AbstractController
                 $upLdap['employeeType'] = $profession;
             }
         }
+        // 语言
+        if (Arr::exists($data, 'lang')) {
+            $lang = trim(Request::input('lang'));
+            if (!Doo::checkLanguage($lang)) {
+                return Base::retError('语言错误');
+            } else {
+                $user->lang = $lang;
+            }
+        }
         //
         $user->save();
         User::generateToken($user);
@@ -570,9 +582,9 @@ class UsersController extends AbstractController
         $list->transform(function (User $userInfo) use ($user, $state) {
             $tags = [];
             $dep = $userInfo->getDepartmentName();
-            $dep = array_filter(explode(",", $dep), function($item) {
+            $dep = array_values(array_filter(explode(",", $dep), function($item) {
                 return preg_match("/\(M\)$/", $item);
-            });
+            }));
             if ($dep) {
                 $tags[] = preg_replace("/\(M\)$/", "", trim($dep[0])) . Doo::translate("负责人");
             }
@@ -581,7 +593,7 @@ class UsersController extends AbstractController
                     $tags[] = Doo::translate("系统管理员");
                 }
                 if ($userInfo->isTemp()) {
-                    $tags[] = Doo::translate("临时帐号");
+                    $tags[] = User::tempAccountAlias(); // 临时帐号
                 }
                 if ($userInfo->userid > 3 && Carbon::parse($userInfo->created_at)->isAfter(Carbon::now()->subDays(30))) {
                     $tags[] = Doo::translate("新帐号");
@@ -614,7 +626,7 @@ class UsersController extends AbstractController
     public function basic()
     {
         $sharekey = Request::header('sharekey');
-        if(empty($sharekey) || !Meeting::getShareInfo($sharekey)){
+        if (empty($sharekey) || !Meeting::getShareInfo($sharekey)) {
             User::auth();
         }
         //
@@ -668,9 +680,13 @@ class UsersController extends AbstractController
      *   - all:     全部
      *   - 其他值:   非机器人（默认）
      * - keys.department        部门ID（0表示默认部门，不赋值获取所有部门）
-     * - keys.checkin_mac       签到mac地址（get_checkin_mac=1时有效）
+     * - keys.checkin_face      人脸图片（get_checkin_data=1时有效）
+     * - yes:     仅有人脸图片
+     * - no:      无人脸图片
+     * - all:     全部
+     * - keys.checkin_mac       签到mac地址（get_checkin_data=1时有效）
      *
-     * @apiParam {Number} [get_checkin_mac]     获取签到mac地址
+     * @apiParam {Number} [get_checkin_data]     获取签到mac地址
      * - 0: 不获取（默认）
      * - 1: 获取
      * @apiParam {Number} [page]                当前页，默认:1
@@ -687,7 +703,7 @@ class UsersController extends AbstractController
         $builder = User::select(['*', 'nickname as nickname_original']);
         //
         $keys = Request::input('keys');
-        $getCheckinMac = intval(Request::input('get_checkin_mac')) === 1;
+        $getCheckinData = intval(Request::input('get_checkin_data')) === 1;
         if (is_array($keys)) {
             if ($keys['key']) {
                 if (str_contains($keys['key'], "@")) {
@@ -722,6 +738,7 @@ class UsersController extends AbstractController
                 }
             }
             if ($keys['disable'] === 'yes') {
+                $builder->orderByDesc('disable_at');
                 $builder->whereNotNull('disable_at');
             } elseif ($keys['disable'] !== 'all') {
                 $builder->whereNull('disable_at');
@@ -754,10 +771,17 @@ class UsersController extends AbstractController
                     $builder->orderBy("is_principal","desc");
                 }
             }
-            if ($getCheckinMac && isset($keys['checkin_mac'])) {
-                $builder->whereIn('userid', function ($query) use ($keys) {
-                    $query->select('userid')->from('user_checkin_macs')->where("mac", "like", "%{$keys['checkin_mac']}%");
-                });
+            if ($getCheckinData) {
+                if (isset($keys['checkin_face'])) {
+                    $builder->whereIn('userid', function ($query) use ($keys) {
+                        $query->select('userid')->from('user_checkin_faces')->whereNotNull("faceimg");
+                    });
+                }
+                if (isset($keys['checkin_mac'])) {
+                    $builder->whereIn('userid', function ($query) use ($keys) {
+                        $query->select('userid')->from('user_checkin_macs')->where("mac", "like", "%{$keys['checkin_mac']}%");
+                    });
+                }
             }
         } else {
             $builder->whereNull('disable_at');
@@ -765,11 +789,11 @@ class UsersController extends AbstractController
         }
         $list = $builder->orderByDesc('userid')->paginate(Base::getPaginate(50, 20));
         //
-        if ($getCheckinMac) {
-            $list->transform(function (User $user) use ($getCheckinMac) {
-                if($getCheckinMac){
-                    $user->checkin_macs = UserCheckinMac::select(['id', 'mac', 'remark'])->whereUserid($user->userid)->orderBy('id')->get();
-                }
+        if ($getCheckinData) {
+            $list->transform(function (User $user) {
+                $checkinFace = UserCheckinFace::select(['faceimg'])->whereUserid($user->userid)->first();
+                $user->checkin_face = $checkinFace ? Base::fillUrl($checkinFace->faceimg) : '';
+                $user->checkin_macs = UserCheckinMac::select(['id', 'mac', 'remark'])->whereUserid($user->userid)->orderBy('id')->get();
                 return $user;
             });
         }
@@ -792,6 +816,7 @@ class UsersController extends AbstractController
      * - settemp              设为临时帐号
      * - cleartemp            取消临时身份（取消临时帐号）
      * - checkin_macs         修改自动签到mac地址（需要参数 checkin_macs）
+     * - checkin_face         修改签到人脸图片（需要参数 checkin_face）
      * - department           修改部门（需要参数 department）
      * - setdisable           设为离职（需要参数 disable_time、transfer_userid）
      * - cleardisable         取消离职
@@ -802,6 +827,7 @@ class UsersController extends AbstractController
      * @apiParam {String} [nickname]            昵称
      * @apiParam {String} [profession]          职位
      * @apiParam {String} [checkin_macs]        自动签到mac地址
+     * @apiParam {String} [checkin_face]        人脸图片地址
      * @apiParam {String} [department]          部门
      * @apiParam {String} [disable_time]        离职时间
      * @apiParam {String} [transfer_userid]     离职交接人
@@ -825,25 +851,30 @@ class UsersController extends AbstractController
         }
         $userInfo->checkSystem(1);
         //
+        $msg = '修改成功';
         $upArray = [];
         $upLdap = [];
         $transferUser = null;
         switch ($type) {
             case 'setadmin':
+                $msg = '设置成功';
                 $upArray['identity'] = array_diff($userInfo->identity, ['admin']);
                 $upArray['identity'][] = 'admin';
                 break;
 
             case 'clearadmin':
+                $msg = '取消成功';
                 $upArray['identity'] = array_diff($userInfo->identity, ['admin']);
                 break;
 
             case 'settemp':
+                $msg = '设置成功';
                 $upArray['identity'] = array_diff($userInfo->identity, ['temp']);
                 $upArray['identity'][] = 'temp';
                 break;
 
             case 'cleartemp':
+                $msg = '取消成功';
                 $upArray['identity'] = array_diff($userInfo->identity, ['temp']);
                 break;
 
@@ -861,6 +892,11 @@ class UsersController extends AbstractController
                 }
                 return UserCheckinMac::saveMac($userInfo->userid, $array);
 
+            case 'checkin_face':
+                $faceimg = $data['checkin_face'] ? $data['checkin_face'] : '';
+
+                return UserCheckinFace::saveFace($userInfo->userid, $userInfo->nickname, $faceimg, "管理员上传");
+
             case 'department':
                 if (!is_array($data['department'])) {
                     $data['department'] = [];
@@ -877,6 +913,7 @@ class UsersController extends AbstractController
                 break;
 
             case 'setdisable':
+                $msg = '操作成功';
                 if ($userInfo->userid === $user->userid) {
                     return Base::retError('不能操作自己离职');
                 }
@@ -891,17 +928,19 @@ class UsersController extends AbstractController
                 if ($transferUser->userid === $userInfo->userid) {
                     return Base::retError('不能移交给自己');
                 }
-                if (in_array('disable', $transferUser->identity)) {
+                if ($transferUser->isDisable()) {
                     return Base::retError('交接人已离职，请选择另一个交接人');
                 }
                 break;
 
             case 'cleardisable':
+                $msg = '操作成功';
                 $upArray['identity'] = array_diff($userInfo->identity, ['disable']);
                 $upArray['disable_at'] = null;
                 break;
 
             case 'delete':
+                $msg = '删除成功';
                 if ($userInfo->userid === $user->userid) {
                     return Base::retError('不能删除自己');
                 }
@@ -1003,7 +1042,10 @@ class UsersController extends AbstractController
                         'new_userid' => $transferUser->userid,
                     ]);
                     $userTransfer->save();
-                    $userTransfer->start();
+                    go(function () use ($userTransfer) {
+                        Coroutine::sleep(0.1);
+                        $userTransfer->start();
+                    });
                 } elseif ($type === 'cleardisable') {
                     // 取消离职重新加入全员群组
                     if (Base::settingFind('system', 'all_group_autoin', 'yes') === 'yes') {
@@ -1014,7 +1056,7 @@ class UsersController extends AbstractController
             });
         }
         //
-        return Base::retSuccess('修改成功', $userInfo);
+        return Base::retSuccess($msg, $userInfo);
     }
 
     /**
@@ -1049,7 +1091,7 @@ class UsersController extends AbstractController
             return Base::retError('链接已经使用过', ['code' => 2]);
 
         $oldTime = Carbon::parse($res->created_at)->timestamp;
-        $time = Base::Time();
+        $time = Timer::Time();
 
         // 30分钟失效
         if (abs($time - $oldTime) > 1800) {
@@ -1073,6 +1115,9 @@ class UsersController extends AbstractController
      * @apiGroup users
      * @apiName umeng__alias
      *
+     * @apiParam {String} action
+     * - update: 更新（默认）
+     * - remove: 删除
      * @apiParam {String} alias           别名
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
@@ -1088,6 +1133,13 @@ class UsersController extends AbstractController
             'alias.between:2,20' => '别名的长度在2-20个字符',
         ]);
         //
+        if ($data['action'] === 'remove') {
+            if ($data['alias']) {
+                UmengAlias::whereAlias($data['alias'])->delete();
+            }
+            return Base::retSuccess('删除成功');
+        }
+        //
         if (!in_array(Base::platform(), ['ios', 'android'])) {
             return Base::retError('设备类型错误');
         }
@@ -1100,10 +1152,17 @@ class UsersController extends AbstractController
         ];
         $row = UmengAlias::where($inArray);
         if ($row->exists()) {
-            $row->update(['updated_at' => Carbon::now()]);
+            $row->update([
+                'ua' => $data['userAgent'],
+                'device' => $data['deviceModel'],
+                'updated_at' => Carbon::now()
+            ]);
             return Base::retSuccess('别名已存在');
         }
-        $row = UmengAlias::createInstance($inArray);
+        $row = UmengAlias::createInstance(array_merge($inArray, [
+            'ua' => $data['userAgent'],
+            'device' => $data['deviceModel'],
+        ]));
         if ($row->save()) {
             return Base::retSuccess('添加成功');
         } else {
@@ -1126,6 +1185,7 @@ class UsersController extends AbstractController
      * @apiParam {String} [name]                    会话ID
      * @apiParam {String} [sharekey]                分享的key
      * @apiParam {String} [username]                用户名称
+     * @apiParam {String} [userimg]                 用户头像
      * @apiParam {Array} [userids]                  邀请成员
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
@@ -1135,17 +1195,18 @@ class UsersController extends AbstractController
     public function meeting__open()
     {
         $type = trim(Request::input('type'));
-        $meetingid = trim(Request::input('meetingid'));
+        $meetingid = str_replace(' ', '', trim(Request::input('meetingid')));
         $name = trim(Request::input('name'));
         $userids = Request::input('userids');
         $sharekey = trim(Request::input('sharekey'));
         $username = trim(Request::input('username'));
+        $userimg = trim(Request::input('userimg')) ?: Base::fillUrl('avatar/' . $username . '.png');
         $user = null;
-        if(!empty($sharekey) && $type === 'join'){
-            if(!Meeting::getShareInfo($sharekey)){
+        if (!empty($sharekey) && $type === 'join') {
+            if (!Meeting::getShareInfo($sharekey)) {
                 return Base::retError('分享链接已过期');
             }
-        }else{
+        } else {
             $user = User::auth();
         }
         $isCreate = false;
@@ -1155,9 +1216,14 @@ class UsersController extends AbstractController
             if (empty($meeting)) {
                 return Base::retError('频道ID不存在');
             }
+            if ($meeting->end_at) {
+                return Base::retError('会议已结束');
+            }
+            $meeting->updated_at = Carbon::now();
+            $meeting->save();
         } elseif ($type === 'create') {
             $meetingid = strtoupper(Base::generatePassword(11, 1));
-            $name = $name ?: "{$user?->nickname} 发起的会议";
+            $name = $name ?: Doo::translate("{$user?->nickname} 发起的会议");
             $channel = "DooTask:" . substr(md5($meetingid . env("APP_KEY")), 16);
             $meeting = Meeting::createInstance([
                 'meetingid' => $meetingid,
@@ -1179,9 +1245,9 @@ class UsersController extends AbstractController
         if (empty($meetingSetting['appid']) || empty($meetingSetting['app_certificate'])) {
             return Base::retError('会议功能配置错误，请联系管理员');
         }
-        $uid = intval(str_pad(Base::generatePassword(4,1), 9, 8, STR_PAD_LEFT));
-        if($user){
-            $uid = intval(str_pad(Base::generatePassword(5,1), 6, 9, STR_PAD_LEFT).$user->userid);
+        $uid = intval(str_pad(Base::generatePassword(4, 1), 9, 8, STR_PAD_LEFT));
+        if ($user) {
+            $uid = intval(str_pad(Base::generatePassword(5, 1), 6, 9, STR_PAD_LEFT) . $user->userid);
         }
         try {
             $service = new AgoraTokenGenerator($meetingSetting['appid'], $meetingSetting['app_certificate'], $meeting->channel, $uid);
@@ -1212,7 +1278,7 @@ class UsersController extends AbstractController
         //
         $data['appid'] = $meetingSetting['appid'];
         $data['uid'] = $uid;
-        $data['userimg'] = $sharekey ? Base::fillUrl('avatar/'.$username.'.png') : $user?->userimg;
+        $data['userimg'] = $sharekey ? $userimg : $user?->userimg;
         $data['nickname'] = $sharekey ? $username : $user?->nickname;
         $data['token'] = $token;
         $data['msgs'] = $msgs;
@@ -1241,7 +1307,7 @@ class UsersController extends AbstractController
     {
         $meetingid = trim(Request::input('meetingid'));
         $sharekey = trim(Request::input('sharekey'));
-        if(empty($sharekey) || !Meeting::getShareInfo($sharekey)){
+        if (empty($sharekey) || !Meeting::getShareInfo($sharekey)) {
             User::auth();
         }
         $meeting = Meeting::whereMeetingid($meetingid)->first();
@@ -1617,8 +1683,14 @@ class UsersController extends AbstractController
         $user = User::auth();
         //
         $list = UserCheckinMac::whereUserid($user->userid)->orderBy('id')->get();
+        $userface = UserCheckinFace::whereUserid($user->userid)->first();
+
+        $data = [
+            'list' => $list,
+            'faceimg' => $userface ? Base::fillUrl($userface->faceimg) : ''
+        ];
         //
-        return Base::retSuccess('success', $list);
+        return Base::retSuccess('success', $data);
     }
 
     /**
@@ -1629,7 +1701,11 @@ class UsersController extends AbstractController
      * @apiGroup users
      * @apiName checkin__save
      *
-     * @apiParam {Array} list   优先级数据，格式：[{mac,remark}]
+     * @apiParam {String} type      类型
+     * - face: 人脸识别设置
+     * - mac: MAC设置
+     * @apiParam {String} faceimg   人脸图片地址
+     * @apiParam {Array} list       优先级数据，格式：[{mac,remark}]
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -1643,30 +1719,53 @@ class UsersController extends AbstractController
         if ($setting['open'] !== 'open') {
             return Base::retError('此功能未开启，请联系管理员开启');
         }
-        if ($setting['edit'] !== 'open') {
-            return Base::retError('未开放修改权限，请联系管理员');
-        }
         //
+        $type = Request::input('type');
         $list = Request::input('list');
-        $array = [];
-        if (empty($list) || !is_array($list)) {
-            return Base::retError('参数错误');
-        }
-        foreach ($list AS $item) {
-            $item = Base::newTrim($item);
-            if (Base::isMac($item['mac'])) {
-                $mac = strtoupper($item['mac']);
-                $array[$mac] = [
-                    'mac' => $mac,
-                    'remark' => substr($item['remark'], 0, 50),
-                ];
-            }
-        }
-        if (count($array) > 3) {
-            return Base::retError('最多只能添加3个MAC地址');
+        $faceimg = Request::input('faceimg');
+        //
+        $data = [
+            'list' => $list,
+            'faceimg' =>  $faceimg
+        ];
+        switch ($type) {
+            case 'face':
+                if ($setting['face_upload'] !== 'open') {
+                    return Base::retError('未开放修改权限，请联系管理员');
+                }
+                UserCheckinFace::saveFace($user->userid, $user->nickname(), $faceimg, "用户上传");
+                break;
+
+            case 'mac':
+                if ($setting['edit'] !== 'open') {
+                    return Base::retError('未开放修改权限，请联系管理员');
+                }
+                $array = [];
+                if (empty($list) || !is_array($list)) {
+                    return Base::retError('参数错误');
+                }
+                foreach ($list as $item) {
+                    $item = Base::newTrim($item);
+                    if (Base::isMac($item['mac'])) {
+                        $mac = strtoupper($item['mac']);
+                        $array[$mac] = [
+                            'mac' => $mac,
+                            'remark' => substr($item['remark'], 0, 50),
+                        ];
+                    }
+                }
+                if (count($array) > 3) {
+                    return Base::retError('最多只能添加3个MAC地址');
+                }
+                $saveMacRes = UserCheckinMac::saveMac($user->userid, $array);
+                $data['list'] = $saveMacRes['data'];
+                break;
+
+            default:
+                return Base::retError('参数错误');
         }
         //
-        return UserCheckinMac::saveMac($user->userid, $array);
+        return Base::retSuccess('修改成功', $data);
     }
 
     /**
@@ -1962,7 +2061,7 @@ class UsersController extends AbstractController
                 }
             }
         } else {
-            if($type == 'file'){
+            if ($type == 'file') {
                 $lists[] = [
                     'type' => 'children',
                     'url' => Base::fillUrl("api/users/share/list") . "?pid=0",
@@ -2002,4 +2101,173 @@ class UsersController extends AbstractController
         // 返回
         return Base::retSuccess('success', $lists);
     }
+
+    /**
+     * @api {get} api/users/annual/report          34. 年度报告
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup users
+     * @apiName annual__report
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function annual__report()
+    {
+        $user = User::auth();
+        //
+        $year = '2023';
+        $time = '2300-01-01 00:00:01';
+        $prefix = \DB::getTablePrefix();
+        $hireTimestamp = strtotime($user->created_at);
+        DB::statement("SET SQL_MODE=''");
+
+        // 我的任务
+        $taskDb = DB::table('project_tasks as t')
+            ->join('project_task_users as tu', 't.id', '=', 'tu.task_id')
+            ->where('tu.owner', 1)
+            ->whereYear('t.created_at', $year)
+            ->where('tu.userid', $user->userid);
+
+        // 我的任务 - 时长（分钟）
+        $durationTaskDb = $taskDb->clone()
+            ->selectRaw("
+                    {$prefix}t.id,
+                    {$prefix}t.flow_item_name,
+                    {$prefix}t.name as task_name,
+                    {$prefix}p.name as project_name,
+                    {$prefix}c.name as project_column_name,
+                    {$prefix}t.start_at,
+                    {$prefix}t.end_at,
+                    {$prefix}t.complete_at,
+                    {$prefix}t.created_at,
+                    ifnull(TIMESTAMPDIFF(MINUTE, {$prefix}t.start_at, {$prefix}t.complete_at), 0) as duration
+                ")
+            ->leftJoin('projects as p', 'p.id', '=', 't.project_id')
+            ->leftJoin('project_columns as c', 'c.id', '=', 't.column_id')
+            ->whereNotNull('t.start_at')
+            ->whereNotNull('t.complete_at');
+
+        // 最多聊天用户
+        $longestChat = DB::table('web_socket_dialogs as d')
+            ->selectRaw("
+                    {$prefix}d.id,
+                    {$prefix}d.name as dialog_name,
+                    {$prefix}d.type as dialog_type,
+                    {$prefix}d.group_type as dialog_group_type,
+                    {$prefix}m.chat_num,
+                    {$prefix}u.userid,
+                    {$prefix}u.email as user_email,
+                    {$prefix}u.nickname as user_nickname,
+                    ifnull({$prefix}d.avatar, {$prefix}u.userimg) as avatar
+                ")
+            ->leftJoinSub(function ($query) use ($user, $year) {
+                $query->select('web_socket_dialog_msgs.dialog_id', DB::raw('count(*) as chat_num'))
+                    ->from('web_socket_dialog_msgs')
+                    ->where('web_socket_dialog_msgs.userid', $user->userid)
+                    ->whereYear('web_socket_dialog_msgs.created_at', $year)
+                    ->groupBy('web_socket_dialog_msgs.dialog_id');
+            }, 'm', 'm.dialog_id', '=', 'd.id')
+            ->leftJoin('web_socket_dialog_users as du', function ($query) use ($user) {
+                $query->on('d.id', '=', 'du.dialog_id');
+                $query->where('du.userid', '!=', $user->userid);
+                $query->where('d.type', 'user');
+            })
+            ->leftJoin('users as u', 'du.userid', '=', 'u.userid')
+            ->where('d.type', '!=', 'user')
+            ->orWhere('u.bot', 0)
+            ->orderByDesc('m.chat_num')
+            ->first();
+        if (!empty($longestChat)) {
+            if ($longestChat->avatar) {
+                $longestChat->avatar = url($longestChat->avatar);
+            } else if ($longestChat->dialog_type == 'user') {
+                $longestChat->avatar = User::getAvatar($longestChat->userid, $longestChat->avatar, $longestChat->user_email, $longestChat->user_nickname);
+            } else {
+                $longestChat->avatar = match ($longestChat->dialog_group_type) {
+                    'department' => url("images/avatar/default_group_department.png"),
+                    'project' => url("images/avatar/default_group_project.png"),
+                    'task' => url("images/avatar/default_group_task.png"),
+                    default => url("images/avatar/default_group_people.png"),
+                };
+            }
+        }
+
+        // 最晚在线时间
+        $timezone = config('app.timezone');
+        $latestOnline = UserCheckinRecord::whereUserid($user->userid)
+            ->whereYear(DB::raw('from_unixtime(report_time)'), $year)
+            ->orderByRaw("TIME_FORMAT(DATE_ADD(CONVERT_TZ(from_unixtime(report_time), 'UTC', '$timezone'), INTERVAL 18 HOUR), '%H%i%s') desc")
+            ->first();
+
+        //
+        $data = [
+            // 本人信息
+            'user' => [
+                'userid' => $user->userid,
+                'email' => $user->email,
+                'nickname' => $user->nickname,
+                'avatar' => User::getAvatar($user->userid, $user->userimg, $user->email, $user->nickname)
+            ],
+            // 入职时间（年月日）
+            'hire_date' => date("Y-m-d", $hireTimestamp),
+            // 在职时间（天为单位）
+            'tenure_days' => floor((strtotime(date('Y-m-d')) - $hireTimestamp) / (24 * 60 * 60)),
+            // 最晚在线时间
+            'latest_online_time' => date("Y-m-d H:i:s", $latestOnline->report_time),
+            // 跟谁聊天最多（发消息的次数。可以是群、私聊、机器人除外）
+            'longest_chat_user' => $longestChat,
+            // 跟所有ai机器人聊天的次数
+            'chat_al_num' => DB::table('web_socket_dialog_msgs as m')
+                ->join('web_socket_dialogs as d', 'd.id', '=', 'm.dialog_id')
+                ->join('web_socket_dialog_users as du', 'd.id', '=', 'du.dialog_id')
+                ->join('users as u', 'du.userid', '=', 'u.userid')
+                ->where('u.email', 'like', "%ai-%")
+                ->where('u.bot', 1)
+                ->where('m.userid', $user->userid)
+                ->whereYear('m.created_at', $year)
+                ->count(),
+            // 文件创建数量
+            'file_created_num' => File::whereCreatedId($user->userid)->whereYear('created_at', $year)->count(),
+            // 参与过的项目
+            'projects' => DB::table('projects as p')
+                ->select('p.id', 'p.name')
+                ->join('project_users as pu', 'p.id', '=', 'pu.project_id')
+                ->join('project_task_users as ptu', 'p.id', '=', 'ptu.project_id')
+                ->where(function($query) use ($user,$year) {
+                    $query->where('pu.userid', $user->userid);
+                    $query->whereYear('pu.created_at', $year);
+                })
+                ->orWhere(function($query) use ($user,$year) {
+                    $query->where('ptu.userid', $user->userid);
+                    $query->whereYear('ptu.created_at', $year);
+                })
+                ->groupBy('p.id')
+                ->take(100)
+                ->get(),
+            // 任务统计
+            'tasks' => [
+                // 总数量
+                'total' => $taskDb->count(),
+                // 完成数量
+                'completed' => $taskDb->clone()->whereNotNUll('t.complete_at')->count(),
+                // 超时数量
+                'overtime' => $taskDb->clone()->whereRaw("ifnull({$prefix}t.complete_at,'$time') > ifnull({$prefix}t.end_at,'$time')")->count(),
+                // 做得最久的任务
+                'longest_task' => $durationTaskDb->clone()->orderByDesc('duration')->first(),
+                // 做得最快的任务
+                'fastest_task' => $durationTaskDb->clone()->orderBy('duration')->first(),
+                // 每个月完成多少个任务
+                'month_completed_task' => $taskDb->clone()
+                    ->selectRaw("MONTH({$prefix}t.complete_at) AS month, COUNT({$prefix}t.id) AS num")
+                    ->whereNotNUll('t.complete_at')
+                    ->whereYear('t.complete_at', $year)
+                    ->groupBy('month')
+                    ->get()
+            ]
+        ];
+        //
+        return Base::retSuccess('success', $data);
+    }
 }

app/Http/Controllers/IndexController.php

@@ -8,20 +8,25 @@ 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\Tasks\LoopTask;
 use App\Module\Extranet;
-use App\Tasks\AppPushTask;
 use App\Module\RandomColor;
+use App\Tasks\LoopTask;
+use App\Tasks\AppPushTask;
 use App\Tasks\JokeSoupTask;
 use App\Tasks\DeleteTmpTask;
 use App\Tasks\EmailNoticeTask;
 use App\Tasks\AutoArchivedTask;
 use App\Tasks\DeleteBotMsgTask;
 use App\Tasks\CheckinRemindTask;
-use Hhxsv5\LaravelS\Swoole\Task\Task;
+use App\Tasks\CloseMeetingRoomTask;
 use App\Tasks\UnclaimedTaskRemindTask;
-use LasseRafn\InitialAvatarGenerator\InitialAvatar;
+use Hhxsv5\LaravelS\Swoole\Task\Task;
+use Laravolt\Avatar\Avatar;
+use Swoole\Coroutine;
 
 
 /**
@@ -37,9 +42,8 @@ class IndexController extends InvokeController
         if ($action) {
             $app .= "__" . $action;
         }
-        if ($app === 'manifest.txt') {
-            $app = 'manifest';
-            $child = 'txt';
+        if ($app == 'default') {
+            return '';
         }
         if (!method_exists($this, $app)) {
             $app = method_exists($this, $method) ? $method : 'main';
@@ -65,52 +69,11 @@ class IndexController extends InvokeController
             $script = asset_main($array['resources/assets/js/app.js']['file']);
         }
         return response()->view('main', [
+            'system_alias' => Base::settingFind('system', 'system_alias', 'WebPage'),
             'version' => Base::getVersion(),
             'style' => $style,
             'script' => $script,
-        ])->header('Link', "<" . url('manifest.txt') . ">; rel=\"prefetch\"");
-    }
-
-    /**
-     * Manifest
-     * @param $child
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response|string
-     */
-    public function manifest($child = '')
-    {
-        if (empty($child)) {
-            $murl = url('manifest.txt');
-            return response($murl)->header('Link', "<{$murl}>; rel=\"prefetch\"");
-        }
-        $array = [
-            "office/web-apps/apps/api/documents/api.js?hash=" . Base::getVersion(),
-            "office/7.5.1-23/web-apps/vendor/requirejs/require.js",
-            "office/7.5.1-23/web-apps/apps/api/documents/api.js",
-            "office/7.5.1-23/sdkjs/common/AllFonts.js",
-            "office/7.5.1-23/web-apps/vendor/xregexp/xregexp-all-min.js",
-            "office/7.5.1-23/web-apps/vendor/sockjs/sockjs.min.js",
-            "office/7.5.1-23/web-apps/vendor/jszip/jszip.min.js",
-            "office/7.5.1-23/web-apps/vendor/jszip-utils/jszip-utils.min.js",
-            "office/7.5.1-23/sdkjs/common/libfont/wasm/fonts.js",
-            "office/7.5.1-23/sdkjs/common/Charts/ChartStyles.js",
-            "office/7.5.1-23/sdkjs/slide/themes//themes.js",
-
-            "office/7.5.1-23/web-apps/apps/presentationeditor/main/app.js",
-            "office/7.5.1-23/sdkjs/slide/sdk-all-min.js",
-            "office/7.5.1-23/sdkjs/slide/sdk-all.js",
-
-            "office/7.5.1-23/web-apps/apps/documenteditor/main/app.js",
-            "office/7.5.1-23/sdkjs/word/sdk-all-min.js",
-            "office/7.5.1-23/sdkjs/word/sdk-all.js",
-
-            "office/7.5.1-23/web-apps/apps/spreadsheeteditor/main/app.js",
-            "office/7.5.1-23/sdkjs/cell/sdk-all-min.js",
-            "office/7.5.1-23/sdkjs/cell/sdk-all.js",
-        ];
-        foreach ($array as &$item) {
-            $item = url($item);
-        }
-        return implode(PHP_EOL, $array);
+        ]);
     }
 
     /**
@@ -124,7 +87,7 @@ class IndexController extends InvokeController
 
     /**
      * 头像
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response|\Symfony\Component\HttpFoundation\BinaryFileResponse
      */
     public function avatar()
     {
@@ -132,34 +95,120 @@ class IndexController extends InvokeController
         if ($segment && preg_match('/.*?\.png$/i', $segment)) {
             $name = substr($segment, 0, -4);
         } else {
-            $name = Request::input('name', 'H');
+            $name = Request::input('name', 'D');
         }
         $size = Request::input('size', 128);
         $color = Request::input('color');
         $background = Request::input('background');
+        // 移除各种括号及其内容
+        $pattern = '/[(（\[【{［<＜『「](.*?)[)）\]】}］>＞』」]/u';
+        $name = preg_replace($pattern, '', $name) ?: preg_replace($pattern, '$1', $name);
+        // 移除常见标识词（不区分大小写）
+        $filterWords = [
+            // 测试相关
+            '测试', '测试号', '测试账号', '内测', '体验', '试用', 'test', 'testing', 'beta',
+            // 账号相关
+            '账号', '帐号', '账户', '帐户', 'account', 'acc', 'id', 'uid',
+            // 临时标识
+            '临时', '暂用', '备用', '主号', '副号', '小号', '大号', 'temp', 'temporary', 'backup',
+            // 系统相关
+            '系统', '管理员', 'admin', 'administrator', 'system', 'sys', 'root',
+            // 用户相关
+            '用户', 'user', '会员', 'member', 'vip', 'svip', 'mvip', 'premium',
+            // 官方相关
+            '官方', '正式', '认证', 'official', 'verified', 'auth',
+            // 客服相关
+            '客服', '售后', '服务', 'service', 'support', 'helper', 'assistant',
+            // 游戏相关
+            'game', 'gaming', 'player', 'gamer',
+            // 社交媒体相关
+            'ins', 'instagram', 'fb', 'facebook', 'tiktok', 'tweet', 'weibo', 'wechat',
+            // 常见后缀
+            'official', 'real', 'fake', 'copy', 'channel', 'studio', 'team', 'group',
+            // 职业相关
+            'dev', 'developer', 'designer', 'artist', 'writer', 'editor',
+            // 其他
+            'bot', 'robot', 'auto', 'anonymous', 'guest', 'default', 'new', 'old'
+        ];
+        $filterWords = array_map(function ($word) {
+            return preg_quote($word, '/');
+        }, $filterWords);
+        $name = preg_replace('/' . implode('|', $filterWords) . '/iu', '', $name) ?: $name;
+        // 移除分隔符和特殊字符
+        $filterSymbols = [
+            // 常见分隔符
+            '-', '_', '=', '+', '/', '\\', '|',
+            '~', '@', '#', '$', '%', '^', '&', '*',
+            // 空格类字符
+            ' ', '　', "\t", "\n", "\r",
+            // 标点符号（中英文）
+            '。', '，', '、', '；', '：', '？', '！',
+            '．', '…', '‥', '′', '″', '℃',
+            '.', ',', ';', ':', '?', '!',
+            // 引号类（修正版）
+            '"', "'", '‘', '’', '“', '”', '`',
+            // 特殊符号
+            '★', '☆', '○', '●', '◎', '◇', '◆',
+            '□', '■', '△', '▲', '▽', '▼',
+            '♀', '♂', '♪', '♫', '♯', '♭', '♬',
+            '→', '←', '↑', '↓', '↖', '↗', '↙', '↘',
+            '√', '×', '÷', '±', '∵', '∴',
+            '♠', '♥', '♣', '♦',
+            // emoji 表情符号范围
+            '\x{1F300}-\x{1F9FF}',
+            '\x{2600}-\x{26FF}',
+            '\x{2700}-\x{27BF}',
+            '\x{1F900}-\x{1F9FF}',
+            '\x{1F600}-\x{1F64F}'
+        ];
+        $filterSymbols = array_map(function ($symbol) {
+            return preg_quote($symbol, '/');
+        }, $filterSymbols);
+        $name = preg_replace('/[' . implode('', $filterSymbols) . ']/u', '', $name) ?: $name;
         //
         if (preg_match('/^[\x{4e00}-\x{9fa5}]+$/u', $name)) {
             $name = mb_substr($name, mb_strlen($name) - 2);
         }
+        if (empty($name)) {
+            $name = 'D';
+        }
         if (empty($color)) {
             $color = '#ffffff';
             $cacheKey = "avatarBackgroundColor::" . md5($name);
-            $background = Cache::rememberForever($cacheKey, function() {
+            $background = Cache::rememberForever($cacheKey, function () {
                 return RandomColor::one(['luminosity' => 'dark']);
             });
         }
         //
-        $avatar = new InitialAvatar();
-        $content = $avatar->name($name)
-            ->size($size)
-            ->color($color)
-            ->background($background)
-            ->fontSize(0.35)
-            ->autoFont()
-            ->generate()
-            ->stream('png', 100);
+        $path = public_path('uploads/tmp/avatar/' . substr(md5($name), 0, 2));
+        $file = Base::joinPath($path, md5($name) . '.png');
+        if (file_exists($file)) {
+            return response()->file($file, [
+                'Pragma' => 'public',
+                'Cache-Control' => 'max-age=1814400',
+                'Content-type' => 'image/png',
+                'Expires' => gmdate('D, d M Y H:i:s \G\M\T', time() + 1814400),
+            ]);
+        }
+        Base::makeDir($path);
         //
-        return response($content)
+        $avatar = new Avatar([
+            'shape' => 'square',
+            'width' => $size,
+            'height' => $size,
+            'chars' => 2,
+            'fontSize' => $size / 2.9,
+            'uppercase' => true,
+            'fonts' => [resource_path('assets/statics/fonts/Source_Han_Sans_SC_Regular.otf')],
+            'foregrounds' => [$color],
+            'backgrounds' => [$background],
+            'border' => [
+                'size' => 0,
+                'color' => 'foreground',
+                'radius' => 0,
+            ],
+        ]);
+        return response($avatar->create($name)->save($file))
             ->header('Pragma', 'public')
             ->header('Cache-Control', 'max-age=1814400')
             ->header('Content-type', 'image/png')
@@ -196,7 +245,7 @@ class IndexController extends InvokeController
         Task::deliver(new DeleteTmpTask('task_worker', 12));
         Task::deliver(new DeleteTmpTask('tmp'));
         Task::deliver(new DeleteTmpTask('file'));
-        Task::deliver(new DeleteTmpTask('file_pack'));
+        Task::deliver(new DeleteTmpTask('tmp_file', 24));
         // 删除机器人消息
         Task::deliver(new DeleteBotMsgTask());
         // 周期任务
@@ -207,6 +256,8 @@ class IndexController extends InvokeController
         Task::deliver(new JokeSoupTask());
         // 未领取任务通知
         Task::deliver(new UnclaimedTaskRemindTask());
+        // 关闭会议室
+        Task::deliver(new CloseMeetingRoomTask());
 
         return "success";
     }
@@ -222,80 +273,130 @@ class IndexController extends InvokeController
         if (strtolower($name) === 'latest') {
             $name = $latestVersion;
         }
-        // 上传
+
+        // 上传（header 中包含 publish-version）
         if (preg_match("/^\d+\.\d+\.\d+$/", $publishVersion)) {
+            // 判断密钥
             $publishKey = Request::header('publish-key');
             if ($publishKey !== env('APP_KEY')) {
                 return Base::retError("key error");
             }
-            if (version_compare($publishVersion, $latestVersion) > -1) {    // 限制上传版本必须 ≥ 当前版本
-                $publishPath = "uploads/desktop/{$publishVersion}/";
-                $res = Base::upload([
-                    "file" => Request::file('file'),
-                    "type" => 'desktop',
-                    "path" => $publishPath,
-                    "fileName" => true
-                ]);
-                if (Base::isSuccess($res)) {
-                    file_put_contents($latestFile, $publishVersion);
+            // 判断版本
+            $action = Request::get('action');
+            $draftPath = "uploads/desktop-draft/{$publishVersion}/";
+            if ($action === 'release') {
+                // 将草稿版本发布为正式版本
+                $draftPath = public_path($draftPath);
+                $releasePath = public_path("uploads/desktop/{$publishVersion}/");
+                if (!file_exists($draftPath)) {
+                    return Base::retError("draft version not exists");
                 }
-                return $res;
+                if (file_exists($releasePath)) {
+                    Base::deleteDirAndFile($releasePath);
+                }
+                Base::copyDirectory($draftPath, $releasePath);
+                file_put_contents($latestFile, $publishVersion);
+                // 删除旧版本
+                Base::deleteDirAndFile(public_path("uploads/desktop-draft"));
+                $dirs = Base::recursiveDirs(public_path("uploads/desktop"), false);
+                sort($dirs);
+                $num = 0;
+                foreach ($dirs as $dir) {
+                    if (!preg_match("/\/\d+\.\d+\.\d+$/", $dir)) {
+                        continue;
+                    }
+                    $num++;
+                    if ($num < 5) {
+                        continue;   // 保留最新的5个版本
+                    }
+                    if (filemtime($dir) > time() - 3600 * 24 * 30) {
+                        continue;   // 保留最近30天的版本
+                    }
+                    Base::deleteDirAndFile($dir);
+                }
+                return Base::retSuccess('success');
             }
+            // 上传草稿版本
+            return Base::upload([
+                "file" => Request::file('file'),
+                "type" => 'publish',
+                "path" => $draftPath,
+                "fileName" => true,
+                "quality" => 100
+            ]);
         }
-        // 列表
-        if (preg_match("/^\d+\.\d+\.\d+$/", $name)) {
-            $path = "uploads/desktop/{$name}";
-            $dirPath = public_path($path);
-            $lists = Base::readDir($dirPath);
+
+        // 列表（访问路径 desktop/publish/{version}）
+        if (preg_match("/^v*(\d+\.\d+\.\d+)$/", $name, $match)) {
+            $paths = [
+                "uploads/desktop/{$match[1]}/",
+                "uploads/desktop/v{$match[1]}/",
+                "uploads/desktop-draft/{$match[1]}/",
+                "uploads/desktop-draft/v{$match[1]}/",
+            ];
+            $avaiPath = null;
+            foreach ($paths as $path) {
+                $dirPath = public_path($path);
+                $isDraft = str_contains($path, 'draft');
+                if (is_dir($dirPath)) {
+                    $avaiPath = $path;
+                    break;
+                }
+            }
+            if (empty($avaiPath)) {
+                abort(404);
+            }
+            $lists = Base::recursiveFiles($dirPath, false);
             $files = [];
             foreach ($lists as $file) {
-                if (str_ends_with($file, '.yml') || str_ends_with($file, '.yaml')) {
+                if (preg_match('/\.(zip|yml|yaml|blockmap)$/i', $file) || str_ends_with($file, '-win.exe')) {
                     continue;
                 }
-                $fileName = Base::leftDelete($file, $dirPath);
+                $fileName = basename($file, $dirPath);
+                $fileSize = filesize($file);
                 $files[] = [
-                    'name' => substr($fileName, 1),
+                    'name' => $fileName,
                     'time' => date("Y-m-d H:i:s", filemtime($file)),
-                    'size' => Base::readableBytes(filesize($file)),
-                    'url' => Base::fillUrl($path . $fileName),
+                    'size' => $fileSize > 0 ? Base::readableBytes($fileSize) : 0,
+                    'url' => Base::fillUrl(Base::joinPath($avaiPath, $fileName)),
+                ];
+            }
+            $otherVersion = [];
+            $dirs = Base::recursiveDirs(public_path("uploads/desktop"), false);
+            foreach ($dirs as $dir) {
+                if (!preg_match("/\/\d+\.\d+\.\d+$/", $dir)) {
+                    continue;
+                }
+                $version = basename($dir);
+                if ($version === $match[1]) {
+                    continue;
+                }
+                $otherVersion[] = [
+                    'version' => $version,
+                    'url' => Base::fillUrl("desktop/publish/{$version}"),
                 ];
             }
             //
-            $path = "uploads/android";
-            $dirPath = public_path($path);
-            $lists = Base::readDir($dirPath);
-            $apkFile = null;
-            foreach ($lists as $file) {
-                if (!str_ends_with($file, '.apk')) {
-                    continue;
-                }
-                if ($apkFile && strtotime($apkFile['time']) > filemtime($file)) {
-                    continue;
-                }
-                $fileName = Base::leftDelete($file, $dirPath);
-                $apkFile = [
-                    'name' => substr($fileName, 1),
-                    'time' => date("Y-m-d H:i:s", filemtime($file)),
-                    'size' => Base::readableBytes(filesize($file)),
-                    'url' => Base::fillUrl($path . $fileName),
-                ];
-            }
-            if ($apkFile) {
-                $files = array_merge([$apkFile], $files);
-            }
-            return view('desktop', ['version' => $name, 'files' => $files]);
+            return view('desktop', [
+                'system_alias' => Base::settingFind('system', 'system_alias', 'WebPage'),
+                'version' => $match[1],
+                'files' => $files,
+                'is_draft' => $isDraft,
+                'latest_version' => $latestVersion,
+                'other_version' => array_reverse($otherVersion),
+            ]);
         }
-        // 下载
-        if ($name && file_exists($latestFile)) {
-            $publishVersion = file_get_contents($latestFile);
-            if (preg_match("/^\d+\.\d+\.\d+$/", $publishVersion)) {
-                $filePath = public_path("uploads/desktop/{$publishVersion}/{$name}");
-                if (file_exists($filePath)) {
-                    return Response::download($filePath);
-                }
+
+        // 下载（Latest 版本内的文件，访问路径 desktop/publish/{fileName}）
+        if ($name) {
+            $filePath = public_path("uploads/desktop/{$latestVersion}/{$name}");
+            if (file_exists($filePath)) {
+                return Response::download($filePath);
             }
         }
-        return abort(404);
+
+        // 404
+        abort(404);
     }
 
     /**
@@ -322,128 +423,119 @@ class IndexController extends InvokeController
         $path = Arr::get($data, 'path');
         $file = public_path($path);
         // 防止 ../ 穿越获取到系统文件
-        if (strpos(realpath($file), public_path()) !== 0) {
-            return abort(404);
+        if (!str_starts_with(realpath($file), public_path())) {
+            abort(404);
         }
         //
-        if (file_exists($file)) {
-            parse_str($data['query'], $query);
-            $name = Arr::get($query, 'name');
-            $ext = strtolower(Arr::get($query, 'ext'));
-            $userAgent = strtolower(Request::server('HTTP_USER_AGENT'));
-            if ($ext === 'pdf'
-                && (str_contains($userAgent, 'electron') || str_contains($userAgent, 'chrome'))) {
+        if (!file_exists($file)) {
+            abort(404);
+        }
+        //
+        parse_str($data['query'], $query);
+        $name = Arr::get($query, 'name');
+        $ext = strtolower(Arr::get($query, 'ext'));
+        $userAgent = strtolower(Request::server('HTTP_USER_AGENT'));
+        if ($ext === 'pdf') {
+            // 文件超过 10m 不支持在线预览，提示下载
+            if (filesize($file) > 10 * 1024 * 1024) {
+                return view('download', [
+                    'system_alias' => Base::settingFind('system', 'system_alias', 'WebPage'),
+                    'name' => $name,
+                    'size' => Base::readableBytes(filesize($file)),
+                    'url' => Base::fillUrl($path),
+                    'button' => Doo::translate('点击下载'),
+                ]);
+            }
+            // 浏览器类型
+            $browser = 'none';
+            if (str_contains($userAgent, 'chrome') || str_contains($userAgent, 'android_kuaifan_eeui')) {
+                $browser = str_contains($userAgent, 'android_kuaifan_eeui') ? 'android-mobile' : 'chrome-desktop';
+            } elseif (str_contains($userAgent, 'safari') || str_contains($userAgent, 'ios_kuaifan_eeui')) {
+                $browser = str_contains($userAgent, 'ios_kuaifan_eeui') ? 'safari-mobile' : 'safari-desktop';
+            }
+            // electron 直接在线预览查看
+            if (str_contains($userAgent, 'electron') || str_contains($browser, 'desktop')) {
                 return Response::download($file, $name, [
                     'Content-Type' => 'application/pdf'
                 ], 'inline');
             }
-            //
-            if (in_array($ext, File::localExt)) {
-                $url = Base::fillUrl($path);
-            } else {
-                $url = 'http://' . env('APP_IPPR') . '.3/' . $path;
+            // EEUI App 直接在线预览查看
+            if (Base::isEEUIApp() && Base::judgeClientVersion("0.34.47")) {
+                if ($browser === 'safari-mobile') {
+                    $redirectUrl = Base::fillUrl($path);
+                    return <<<EOF
+                        <script>
+                            window.top.postMessage({
+                                action: "eeuiAppSendMessage",
+                                data: [
+                                    {
+                                        action: 'setPageData',
+                                        data: {
+                                            showProgress: true,
+                                            titleFixed: true,
+                                            urlFixed: true,
+                                        }
+                                    },
+                                    {
+                                        action: 'createTarget',
+                                        url: "{$redirectUrl}",
+                                    }
+                                ]
+                            }, "*")
+                        </script>
+                        EOF;
+                }
             }
-            if ($ext !== 'pdf') {
-                $url = Base::urlAddparameter($url, [
-                    'fullfilename' => $name . '.' . $ext
-                ]);
-            }
-            $toUrl = Base::fillUrl("fileview/onlinePreview?url=" . urlencode(base64_encode($url)));
-            return Redirect::to($toUrl, 301);
         }
-        return abort(404);
-    }
-
-    /**
-     * 设置语言和皮肤
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
-     */
-    public function setting__theme_language()
-    {
-        return view('setting', [
-            'theme' => Request::input('theme'),
-            'language' => Request::input('language')
+        //
+        if (in_array($ext, File::localExt)) {
+            $url = Base::fillUrl($path);
+        } else {
+            $url = 'http://' . env('APP_IPPR') . '.3/' . $path;
+        }
+        $url = Base::urlAddparameter($url, [
+            'fullfilename' => Base::rightDelete($name, '.' . $ext) . '_' . filemtime($file) . '.' . $ext
         ]);
+        $redirectUrl = Base::fillUrl("fileview/onlinePreview?url=" . urlencode(base64_encode($url)));
+        return Redirect::to($redirectUrl, 301);
     }
 
     /**
-     * 提取所有中文
-     * @return array|string
+     * 修复操作离职后续操作(todo 临时，后期删除)
+     * @return array
      */
-    public function allcn()
+    public function migration__userdialog()
     {
-        if (!Base::is_internal_ip(Base::getIp())) {
-            // 限制内网访问
-            return "Forbidden Access";
+        if (Request::header('app-key') !== env('APP_KEY')) {
+            return Base::retError("key error");
         }
-        $list = Base::readDir(resource_path());
-        $array = [];
-        foreach ($list as $item) {
-            $content = file_get_contents($item);
-            preg_match_all("/\\\$L\((.*?)\)/", $content, $matchs);
-            if ($matchs) {
-                foreach ($matchs[1] as $text) {
-                    $array[trim(trim($text, '"'), "'")] = trim(trim($text, '"'), "'");
-                }
-            }
-        }
-        return array_values($array);
-    }
-
-    /**
-     * 提取所有中文
-     * @return array|string
-     */
-    public function allcn__php()
-    {
-        if (!Base::is_internal_ip(Base::getIp())) {
-            // 限制内网访问
-            return "Forbidden Access";
-        }
-        $list = Base::readDir(app_path());
-        $array = [];
-        foreach ($list as $item) {
-            $content = file_get_contents($item);
-            preg_match_all("/(retSuccess|retError|ApiException)\((.*?)[,|)]/", $content, $matchs);
-            if ($matchs) {
-                foreach ($matchs[2] as $text) {
-                    $array[trim(trim($text, '"'), "'")] = trim(trim($text, '"'), "'");
-                }
-            }
-        }
-        return array_values($array);
-    }
-
-    /**
-     * 提取所有中文
-     * @return array|string
-     */
-    public function allcn__all()
-    {
-        if (!Base::is_internal_ip(Base::getIp())) {
-            // 限制内网访问
-            return "Forbidden Access";
-        }
-        $list = array_merge(Base::readDir(app_path()), Base::readDir(resource_path()));
-        $array = [];
-        foreach ($list as $item) {
-            if (Base::rightExists($item, ".php") || Base::rightExists($item, ".vue") || Base::rightExists($item, ".js")) {
-                $content = file_get_contents($item);
-                preg_match_all("/(['\"])(.*?)[\u{4e00}-\u{9fa5}\u{FE30}-\u{FFA0}]+([\s\S]((?!\n).)*)\\1/u", $content, $matchs);
-                if ($matchs) {
-                    foreach ($matchs[0] as $text) {
-                        $tmp = preg_replace("/\/\/(.*?)$/", "", $text);
-                        $tmp = preg_replace("/\/\/(.*?)\n/", "", $tmp);
-                        $tmp = str_replace("：", "", $tmp);
-                        if (!preg_match("/[\u{4e00}-\u{9fa5}\u{FE30}-\u{FFA0}]/u", $tmp)){
-                            continue;  // 没有中文
-                        }
-                        $val = trim(trim($text, '"'), "'");
-                        $array[md5($val)] = $val;
+        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 implode("\n", array_values($array));
+            });
+        });
+        return Base::retSuccess('success');
+    }
+
+    /**
+     * 保存配置 (todo 已废弃)
+     * @return string
+     */
+    public function storage__synch()
+    {
+        return '<!-- Deprecated -->';
     }
 }

app/Http/Controllers/InvokeController.php

@@ -2,10 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\User;
 use App\Module\Base;
-use App\Tasks\IhttpTask;
-use Hhxsv5\LaravelS\Swoole\Task\Task;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
@@ -32,24 +29,7 @@ class InvokeController extends BaseController
             $msg = "404 not found (" . str_replace("__", "/", $app) . ").";
             return Base::ajaxError($msg);
         }
-        // 使用websocket请求
-        $apiWebsocket = Request::header('Api-Websocket');
-        if ($apiWebsocket) {
-            $userid = User::userid();
-            if ($userid > 0) {
-                $url = 'http://127.0.0.1:' . env('LARAVELS_LISTEN_PORT') . Request::getRequestUri();
-                $task = new IhttpTask($url, Request::post(), [
-                    'Content-Type' => Request::header('Content-Type'),
-                    'language' => Request::header('language'),
-                    'token' => Request::header('token'),
-                ]);
-                $task->setApiWebsocket($apiWebsocket);
-                $task->setApiUserid($userid);
-                Task::deliver($task);
-                return Base::retSuccess('wait');
-            }
-        }
-        // 正常请求
+        //
         $res = $this->__before($method, $action);
         if ($res === true || Base::isSuccess($res)) {
             return $this->$app();

app/Http/Middleware/WebApi.php

@@ -5,6 +5,7 @@ namespace App\Http\Middleware;
 @error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
 
 use App\Module\Doo;
+use App\Services\RequestContext;
 use Closure;
 
 class WebApi
@@ -18,11 +19,15 @@ class WebApi
      */
     public function handle($request, Closure $next)
     {
-        global $_A;
-        $_A = [];
+        // 为每个请求生成唯一ID
+        $request->requestId = RequestContext::generateRequestId();
+        RequestContext::set('start_time', microtime(true));
+        RequestContext::set('header_language', $request->header('language'));
 
+        // 加载Doo类
         Doo::load();
 
+        // 解密请求内容
         $encrypt = Doo::pgpParseStr($request->header('encrypt'));
         if ($request->isMethod('post')) {
             $version = $request->header('version');
@@ -47,6 +52,7 @@ class WebApi
             $request->setTrustedProxies([$request->getClientIp()], $request::HEADER_X_FORWARDED_PROTO);
         }
 
+        // 执行下一个中间件
         $response = $next($request);
 
         // 加密返回内容
@@ -57,6 +63,16 @@ class WebApi
             }
         }
 
+        // 返回响应
         return $response;
     }
+
+    /**
+     * @return void
+     */
+    public function terminate()
+    {
+        // 请求结束后清理上下文
+        RequestContext::clear();
+    }
 }

app/Ldap/LdapUser.php

@@ -146,7 +146,7 @@ class LdapUser extends Model
                 $path = "uploads/user/ldap/";
                 $file = "{$path}{$user->userid}.jpeg";
                 Base::makeDir(public_path($path));
-                if (Base::saveContentImage(public_path($file), $userimg)) {
+                if (Base::saveContentImage(public_path($file), $userimg, 90)) {
                     $user->userimg = $file;
                 }
             }

app/Models/AbstractModel.php

@@ -34,6 +34,26 @@ class AbstractModel extends Model
     const ID = 'id';
 
     protected $dates = [
+        'top_at',
+        'last_at',
+
+        'start_at',
+        'end_at',
+
+        'archived_at',
+        'complete_at',
+        'loop_at',
+
+        'receive_at',
+
+        'line_at',
+        'disable_at',
+
+        'clear_at',
+
+        'read_at',
+        'done_at',
+
         'created_at',
         'updated_at',
         'deleted_at',

app/Models/ApproveProcMsg.php

@@ -11,9 +11,15 @@ namespace App\Models;
  * @property int|null $msg_id 消息ID
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg whereMsgId($value)

app/Models/Complaint.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Models;
+
+
+/**
+ * App\Models\Complaint
+ *
+ * @property int $id
+ * @property int|null $dialog_id 对话ID
+ * @property int|null $userid 举报人id
+ * @property int|null $type 举报类型
+ * @property string|null $reason 举报原因
+ * @property string|null $imgs 举报图片
+ * @property int|null $status 状态 0待处理、1已处理、2已删除
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|Complaint newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Complaint newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Complaint query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|Complaint whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Complaint whereDialogId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Complaint whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Complaint whereImgs($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Complaint whereReason($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Complaint whereStatus($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Complaint whereType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Complaint whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Complaint whereUserid($value)
+ * @mixin \Eloquent
+ */
+class Complaint extends AbstractModel
+{
+
+}

app/Models/Deleted.php

@@ -12,9 +12,15 @@ use Carbon\Carbon;
  * @property int|null $did 删除的数据ID
  * @property int|null $userid 关系会员ID
  * @property \Illuminate\Support\Carbon|null $created_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|Deleted newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Deleted newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Deleted query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|Deleted whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Deleted whereDid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Deleted whereId($value)

app/Models/File.php

@@ -28,10 +28,16 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|File newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|File newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|File onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|File query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|File whereCid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereCreatedId($value)
@@ -190,9 +196,10 @@ class File extends AbstractModel
      * @param user $user
      * @param int $pid
      * @param string $webkitRelativePath
+     * @param bool $overwrite
      * @return array
      */
-    public function contentUpload($user, int $pid, $webkitRelativePath)
+    public function contentUpload($user, int $pid, $webkitRelativePath, $overwrite = false)
     {
         $userid = $user->userid;
         if ($pid > 0) {
@@ -238,14 +245,13 @@ class File extends AbstractModel
             }
         }
         //
-        $setting = Base::setting('system');
-        $path = 'uploads/tmp/' . date("Ym") . '/';
+        $path = 'uploads/tmp/file/' . date("Ym") . '/';
         $data = Base::upload([
             "file" => Request::file('files'),
             "type" => 'more',
             "autoThumb" => false,
             "path" => $path,
-            "size" => ($setting['file_upload_limit'] ?: 0) * 1024
+            "quality" => 100
         ]);
         if (Base::isError($data)) {
             throw new ApiException($data['msg']);
@@ -283,17 +289,25 @@ class File extends AbstractModel
         if ($data['ext'] == 'markdown') {
             $data['ext'] = 'md';
         }
-        $file = File::createInstance([
+        $file = null;
+        $params = [
             'pid' => $pid,
             'name' => Base::rightDelete($data['name'], '.' . $data['ext']),
             'type' => $type,
             'ext' => $data['ext'],
             'userid' => $userid,
             'created_id' => $user->userid,
-        ]);
-        $file->handleDuplicateName();
+        ];
+        if ($overwrite) {
+            $file = self::wherePid($params['pid'])->whereExt($params['ext'])->whereName($params['name'])->first();
+        }
+        if (!$file) {
+            $overwrite = false;
+            $file = File::createInstance($params);
+            $file->handleDuplicateName();
+        }
         // 开始创建
-        return AbstractModel::transaction(function () use ($addItem, $webkitRelativePath, $type, $user, $data, $file) {
+        return AbstractModel::transaction(function () use ($overwrite, $addItem, $webkitRelativePath, $type, $user, $data, $file) {
             $file->size = $data['size'] * 1024;
             $file->saveBeforePP();
             //
@@ -321,11 +335,12 @@ class File extends AbstractModel
             $tmpRow->pushMsg('add', $tmpRow);
             //
             $data = File::handleImageUrl($tmpRow->toArray());
-            $data['full_name'] = $webkitRelativePath ?: $data['name'];
+            $data['full_name'] = $webkitRelativePath ?: ($data['name'] . '.' . $data['ext']);
+            $data['overwrite'] = $overwrite ? 1 : 0;
             //
             $addItem[] = $data;
 
-            return ['data'=>$data,'addItem'=>$addItem];
+            return ['data' => $data, 'addItem' => $addItem];
         });
     }
 
@@ -926,7 +941,7 @@ class File extends AbstractModel
      */
     public static function filePushMsg($action, $data = null, $userid = null)
     {
-        $userid = User::auth()->userid();
+        $userid = User::userid();
         if (empty($userid)) {
             return;
         }

app/Models/FileContent.php

@@ -4,6 +4,7 @@ namespace App\Models;
 
 
 use App\Module\Base;
+use App\Module\Timer;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
@@ -18,10 +19,16 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent whereContent($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent whereDeletedAt($value)
@@ -70,7 +77,7 @@ class FileContent extends AbstractModel
             'name' => $name,
             'ext' => $fileExt
         ]));
-        return Base::fillUrl("online/preview/{$name}?key={$key}");
+        return Base::fillUrl("online/preview/{$name}?key={$key}&version=" . Base::getVersion() . "&__=" . Timer::msecTime());
     }
 
     /**
@@ -100,7 +107,7 @@ class FileContent extends AbstractModel
      * @param File $file
      * @param $content
      * @param $download
-     * @return array|\Symfony\Component\HttpFoundation\StreamedResponse
+     * @return array|\Symfony\Component\HttpFoundation\BinaryFileResponse
      */
     public static function formatContent($file, $content, $download = false)
     {
@@ -112,7 +119,7 @@ class FileContent extends AbstractModel
             } else {
                 $filePath = public_path($content['url']);
             }
-            return Base::streamDownload($filePath, $name);
+            return Base::BinaryFileResponse($filePath, $name);
         }
         if (empty($content)) {
             $content = match ($file->type) {
@@ -141,7 +148,7 @@ class FileContent extends AbstractModel
             if ($download) {
                 $filePath = public_path($path);
                 if (isset($filePath)) {
-                    return Base::streamDownload($filePath, $name);
+                    return Base::BinaryFileResponse($filePath, $name);
                 } else {
                     abort(403, "This file not support download.");
                 }

app/Models/FileLink.php

@@ -8,16 +8,22 @@ use App\Module\Base;
  * App\Models\FileLink
  *
  * @property int $id
- * @property int|null $file_id 项目ID
+ * @property int|null $file_id 文件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\File|null $file
+ * @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|FileLink newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereCode($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereFileId($value)

app/Models/FileUser.php

@@ -12,9 +12,15 @@ namespace App\Models;
  * @property int|null $permission 权限：0只读，1读写
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereFileId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereId($value)

app/Models/Meeting.php

@@ -16,11 +16,17 @@ use Illuminate\Support\Carbon;
  * @property int|null $userid 创建人
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
- * @property string|null $end_at
+ * @property Carbon|null $end_at
  * @property Carbon|null $deleted_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|Meeting newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Meeting newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Meeting query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereChannel($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereDeletedAt($value)
@@ -44,12 +50,12 @@ class Meeting extends AbstractModel
     public function getShareLink()
     {
         $code = base64_encode("{$this->meetingid}" . Base::generatePassword());
-        Cache::put(self::CACHE_KEY.'_'.$code, [
+        Cache::put(self::CACHE_KEY . '_' . $code, [
             'id' => $this->id,
             'meetingid' => $this->meetingid,
             'channel' => $this->channel,
         ], Carbon::now()->addHours(self::CACHE_EXPIRED_TIME));
-        return Base::fillUrl("meeting/{$this->meetingid}/".$code);
+        return Base::fillUrl("meeting/{$this->meetingid}/" . $code);
     }
 
     /**
@@ -58,19 +64,19 @@ class Meeting extends AbstractModel
      */
     public static function getShareInfo($code)
     {
-        if(Cache::has(self::CACHE_KEY.'_'.$code)){
-            return Cache::get(self::CACHE_KEY.'_'.$code);
+        if (Cache::has(self::CACHE_KEY . '_' . $code)) {
+            return Cache::get(self::CACHE_KEY . '_' . $code);
         }
         return null;
     }
 
     /**
      * 保存访客信息
-     * @return mixed
+     * @return void
      */
     public static function setTouristInfo($data)
     {
-        Cache::put(Meeting::CACHE_KEY.'_'.$data['uid'], [
+        Cache::put(Meeting::CACHE_KEY . '_' . $data['uid'], [
             'uid' => $data['uid'],
             'userimg' => $data['userimg'],
             'nickname' => $data['nickname'],
@@ -83,8 +89,8 @@ class Meeting extends AbstractModel
      */
     public static function getTouristInfo($touristId)
     {
-        if(Cache::has(Meeting::CACHE_KEY.'_'.$touristId)){
-            return Cache::get(Meeting::CACHE_KEY.'_'.$touristId);
+        if (Cache::has(Meeting::CACHE_KEY . '_' . $touristId)) {
+            return Cache::get(Meeting::CACHE_KEY . '_' . $touristId);
         }
         return null;
     }

app/Models/MeetingMsg.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\MeetingMsg
+ *
+ * @property int $id
+ * @property string|null $meetingid 会议ID
+ * @property int|null $dialog_id 对话ID
+ * @property int|null $msg_id 消息ID
+ * @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|MeetingMsg newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|MeetingMsg newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|MeetingMsg query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|MeetingMsg whereDialogId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MeetingMsg whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MeetingMsg whereMeetingid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MeetingMsg whereMsgId($value)
+ * @mixin \Eloquent
+ */
+class MeetingMsg extends AbstractModel
+{
+    function __construct(array $attributes = [])
+    {
+        parent::__construct($attributes);
+        $this->timestamps = false;
+    }
+}

app/Models/Project.php

@@ -22,7 +22,7 @@ use Request;
  * @property int|null $personal 是否个人项目
  * @property string|null $user_simple 成员总数|1,2,3
  * @property int|null $dialog_id 聊天会话ID
- * @property string|null $archived_at 归档时间
+ * @property \Illuminate\Support\Carbon|null $archived_at 归档时间
  * @property int|null $archived_userid 归档会员
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
@@ -36,10 +36,16 @@ use Request;
  * @property-read int|null $project_user_count
  * @method static \Illuminate\Database\Eloquent\Builder|Project allData($userid = null)
  * @method static \Illuminate\Database\Eloquent\Builder|Project authData($userid = null, $owner = null)
+ * @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|Project newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Project newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Project onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|Project query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|Project whereArchivedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Project whereArchivedUserid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Project whereCreatedAt($value)
@@ -319,44 +325,65 @@ class Project extends AbstractModel
     /**
      * 推送消息
      * @param string $action
-     * @param array|self $data      发送内容，默认为[id=>项目ID]
+     * @param array|self $data      推送内容
      * @param array $userid         指定会员，默认为项目所有成员
      */
     public function pushMsg($action, $data = null, $userid = null)
     {
-        if ($data === null) {
-            $data = ['id' => $this->id];
-        } elseif ($data instanceof self) {
+        // 处理数据
+        if ($data instanceof self) {
             $data = $data->toArray();
         }
-        //
-        $array = [$userid, []];
+
+        $data = is_array($data) ? $data : [];
+        $data['id'] = $this->id;
+        $data['name'] = $this->name;
+        $data['desc'] = $this->desc;
+
+        // 处理接收用户
+        $recipients = [$userid, []];
         if ($userid === null) {
-            $array[0] = $this->relationUserids();
+            $recipients[0] = $this->relationUserids();
         } elseif (!is_array($userid)) {
-            $array[0] = [$userid];
+            $recipients[0] = [$userid];
         }
-        //
+
+        // 移除不需要的字段
+        unset($data['top_at']);
+
+        // 处理所有者权限
         if (isset($data['owner'])) {
-            $owners = ProjectUser::whereProjectId($data['id'])->whereOwner(1)->pluck('userid')->toArray();
-            $array = [array_intersect($array[0], $owners), array_diff($array[0], $owners)];
+            $owners = ProjectUser::whereProjectId($data['id'])
+                ->whereOwner(1)
+                ->pluck('userid')
+                ->toArray();
+            $recipients = [
+                array_intersect($recipients[0], $owners),
+                array_diff($recipients[0], $owners)
+            ];
         }
-        //
-        foreach ($array as $index => $item) {
+
+        // 发送推送
+        foreach ($recipients as $index => $userids) {
+            if (empty($userids)) {
+                continue;
+            }
+
             if ($index > 0) {
                 $data['owner'] = 0;
             }
+
             $params = [
                 'ignoreFd' => Request::header('fd'),
-                'userid' => array_values($item),
+                'userid' => array_values($userids),
                 'msg' => [
                     'type' => 'project',
                     'action' => $action,
                     'data' => $data,
                 ]
             ];
-            $task = new PushTask($params, false);
-            Task::deliver($task);
+
+            Task::deliver(new PushTask($params, false));
         }
     }
 

app/Models/ProjectColumn.php

@@ -22,10 +22,16 @@ use Request;
  * @property-read \App\Models\Project|null $project
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ProjectTask> $projectTask
  * @property-read int|null $project_task_count
+ * @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|ProjectColumn newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn whereColor($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn whereDeletedAt($value)

app/Models/ProjectFlow.php

@@ -2,8 +2,6 @@
 
 namespace App\Models;
 
-use App\Module\Base;
-
 /**
  * App\Models\ProjectFlow
  *
@@ -14,9 +12,15 @@ use App\Module\Base;
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ProjectFlowItem> $projectFlowItem
  * @property-read int|null $project_flow_item_count
+ * @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|ProjectFlow newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereName($value)

app/Models/ProjectFlowItem.php

@@ -13,7 +13,7 @@ use App\Module\Base;
  * @property string|null $name 名称
  * @property string|null $status 状态
  * @property array $turns 可流转
- * @property array $userids 自动负责人ID
+ * @property array $userids 状态负责人ID
  * @property string|null $usertype 流转模式
  * @property int|null $userlimit 限制负责人
  * @property int|null $columnid 对应的项目列表
@@ -21,9 +21,15 @@ use App\Module\Base;
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\ProjectFlow|null $projectFlow
+ * @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|ProjectFlowItem newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereColumnid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereFlowId($value)

app/Models/ProjectInvite.php

@@ -13,9 +13,15 @@ namespace App\Models;
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read bool $already
  * @property-read \App\Models\Project|null $project
+ * @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|ProjectInvite newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite whereCode($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite whereId($value)

app/Models/ProjectLog.php

@@ -10,7 +10,8 @@ use App\Module\Base;
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $column_id 列表ID
- * @property int|null $task_id 项目ID
+ * @property int|null $task_id 任务ID
+ * @property int|null $task_only 仅任务日志：0否，1是
  * @property int|null $userid 会员ID
  * @property string|null $detail 详细信息
  * @property array $record 记录数据
@@ -18,9 +19,15 @@ use App\Module\Base;
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\ProjectTask|null $projectTask
  * @property-read \App\Models\User|null $user
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereColumnId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereDetail($value)
@@ -28,12 +35,16 @@ use App\Module\Base;
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereProjectId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereRecord($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereTaskId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereTaskOnly($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereUserid($value)
  * @mixin \Eloquent
  */
 class ProjectLog extends AbstractModel
 {
+    protected $hidden = [
+        'task_only',
+    ];
 
     /**
      * @param $value

app/Models/ProjectPermission.php

@@ -4,18 +4,25 @@ namespace App\Models;
 
 use App\Exceptions\ApiException;
 use App\Module\Base;
+use App\Module\Doo;
 
 /**
  * App\Models\ProjectPermission
  *
  * @property int $id
  * @property int|null $project_id 项目ID
- * @property string $permissions 权限
+ * @property array $permissions 权限
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectPermission newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectPermission newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectPermission query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectPermission whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectPermission whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectPermission wherePermissions($value)
@@ -32,6 +39,7 @@ class ProjectPermission extends AbstractModel
     const TASK_LIST_SORT = 'task_list_sort';           // 列表排序
     const TASK_ADD = 'task_add';                       // 任务添加
     const TASK_UPDATE = 'task_update';                 // 任务更新
+    const TASK_TIME = 'task_time';                     // 任务时间
     const TASK_STATUS = 'task_status';                 // 任务状态
     const TASK_REMOVE = 'task_remove';                 // 任务删除
     const TASK_ARCHIVED = 'task_archived';             // 任务归档
@@ -63,7 +71,7 @@ class ProjectPermission extends AbstractModel
     /**
      * 权限
      * @param $value
-     * @return string
+     * @return array
      */
     public function getPermissionsAttribute($value)
     {
@@ -104,7 +112,8 @@ class ProjectPermission extends AbstractModel
             self::TASK_LIST_REMOVE => [self::PERMISSIONS['project_leader']],
             self::TASK_LIST_SORT => $projectTaskList,
             self::TASK_ADD => $projectTaskList,
-            self::TASK_UPDATE => [self::PERMISSIONS['project_leader'], self::PERMISSIONS['task_leader'], self::PERMISSIONS['task_assist']],
+            self::TASK_UPDATE => $taskUpdate = [self::PERMISSIONS['project_leader'], self::PERMISSIONS['task_leader'], self::PERMISSIONS['task_assist']],
+            self::TASK_TIME => $taskUpdate,
             self::TASK_STATUS => $taskStatus = [self::PERMISSIONS['project_leader'], self::PERMISSIONS['task_leader']],
             self::TASK_REMOVE => $taskStatus,
             self::TASK_ARCHIVED => $taskStatus,
@@ -147,13 +156,14 @@ class ProjectPermission extends AbstractModel
         $userid = User::userid();
         $permissions = self::getPermission($project->id, $action);
         switch ($action) {
-                // 任务添加，任务更新, 任务状态, 任务删除, 任务完成, 任务归档, 任务移动
+            // 任务添加，任务更新, 任务状态, 任务删除, 任务完成, 任务归档, 任务移动
             case self::TASK_LIST_ADD:
             case self::TASK_LIST_UPDATE:
             case self::TASK_LIST_REMOVE:
             case self::TASK_LIST_SORT:
             case self::TASK_ADD:
             case self::TASK_UPDATE:
+            case self::TASK_TIME:
             case self::TASK_STATUS:
             case self::TASK_REMOVE:
             case self::TASK_ARCHIVED:
@@ -189,7 +199,7 @@ class ProjectPermission extends AbstractModel
                     $desc = [];
                     rsort($permissions);
                     foreach ($permissions as $permission) {
-                        $desc[] = self::PERMISSIONS_DESC[$permission];
+                        $desc[] = Doo::translate(self::PERMISSIONS_DESC[$permission]);
                     }
                     $desc = array_reverse($desc);
                     throw new ApiException(sprintf("仅限%s操作", implode('、', $desc)));

app/Models/ProjectTask.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Module\Timer;
 use DB;
 use Arr;
 use Request;
@@ -9,8 +10,8 @@ use Carbon\Carbon;
 use App\Module\Base;
 use App\Tasks\PushTask;
 use App\Exceptions\ApiException;
+use App\Observers\ProjectTaskObserver;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
-use App\Models\ProjectTaskVisibilityUser;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
@@ -26,12 +27,12 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string|null $name 标题
  * @property string|null $color 颜色
  * @property string|null $desc 描述
- * @property string|null $start_at 计划开始时间
- * @property string|null $end_at 计划结束时间
- * @property string|null $archived_at 归档时间
+ * @property \Illuminate\Support\Carbon|null $start_at 计划开始时间
+ * @property \Illuminate\Support\Carbon|null $end_at 计划结束时间
+ * @property \Illuminate\Support\Carbon|null $archived_at 归档时间
  * @property int|null $archived_userid 归档会员
  * @property int|null $archived_follow 跟随项目归档（项目取消归档时任务也取消归档）
- * @property string|null $complete_at 完成时间
+ * @property \Illuminate\Support\Carbon|null $complete_at 完成时间
  * @property int|null $userid 创建人
  * @property int|null $visibility 任务可见性：1-项目人员 2-任务人员 3-指定成员
  * @property int|null $p_level 优先级
@@ -39,7 +40,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string|null $p_color 优先级颜色
  * @property int|null $sort 排序(ASC)
  * @property string|null $loop 重复周期
- * @property string|null $loop_at 下一次重复时间
+ * @property \Illuminate\Support\Carbon|null $loop_at 下一次重复时间
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
@@ -63,10 +64,16 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask allData($userid = null)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask authData($userid = null, $owner = null)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask betweenTime($start, $end, $type = 'taskTime')
+ * @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|ProjectTask newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask whereArchivedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask whereArchivedFollow($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask whereArchivedUserid($value)
@@ -329,13 +336,7 @@ class ProjectTask extends AbstractModel
         $query->where(function ($q1) use ($start, $end, $type) {
             switch ($type) {
                 case 'createdTime':
-                    $q1->where(function ($q2) use ($start) {
-                        $q2->where('project_tasks.created_at', '>=', $start);
-                    })->orWhere(function ($q2) use ($end) {
-                        $q2->where('project_tasks.created_at', '<=', $end);
-                    })->orWhere(function ($q2) use ($start, $end) {
-                        $q2->where('project_tasks.created_at', '>', $start)->where('project_tasks.created_at', '<', $end);
-                    });
+                    $q1->where('project_tasks.created_at', '>=', $start)->where('project_tasks.created_at', '<=', $end);
                     break;
 
                 default:
@@ -352,6 +353,25 @@ class ProjectTask extends AbstractModel
         return $query;
     }
 
+    /**
+     * 生成描述
+     * @param $content
+     * @return string
+     */
+    public static function generateDesc($content)
+    {
+        $content = preg_replace_callback('/<ul class="tox-checklist">(.+?)<\/ul>/is', function ($matches) {
+            return preg_replace_callback('/<li([^>]*)>(.+?)<\/li>/is', function ($m) {
+                if (str_contains($m[1], 'tox-checklist--checked')) {
+                    return "<li{$m[1]}>[√]{$m[2]} </li>";
+                } else {
+                    return "<li{$m[1]}>[ ]{$m[2]} </li>";
+                }
+            }, $matches[0]);
+        }, $content);
+        return Base::cutStr(strip_tags($content), 100);
+    }
+
     /**
      * 添加任务
      * @param $data
@@ -374,7 +394,7 @@ class ProjectTask extends AbstractModel
         $p_color    = $data['p_color'];
         $top        = intval($data['top']);
         $userid     = User::userid();
-        $visibility = isset($data['visibility_appoint']) ? $data['visibility_appoint'] : $data['visibility'];
+        $visibility = $data['visibility_appoint'] ?? $data['visibility'];
         $visibility_userids = $data['visibility_appointor'] ?: [];
         //
         if (ProjectTask::whereProjectId($project_id)
@@ -407,7 +427,7 @@ class ProjectTask extends AbstractModel
             'visibility' => $visibility ?: 1
         ]);
         if ($content) {
-            $task->desc = Base::getHtml($content, 100);
+            $task->desc = self::generateDesc($content);
         }
         // 标题
         if (empty($name)) {
@@ -419,7 +439,7 @@ class ProjectTask extends AbstractModel
         // 时间
         if ($times) {
             list($start, $end) = is_string($times) ? explode(",", $times) : (is_array($times) ? $times : []);
-            if (Base::isDate($start) && Base::isDate($end) && $start != $end) {
+            if (Timer::isDate($start) && Timer::isDate($end) && $start != $end) {
                 $task->start_at = Carbon::parse($start);
                 $task->end_at = Carbon::parse($end);
             }
@@ -508,6 +528,8 @@ class ProjectTask extends AbstractModel
                 ProjectTaskContent::createInstance([
                     'project_id' => $task->project_id,
                     'task_id' => $task->id,
+                    'userid' => $task->userid,
+                    'desc' => $task->desc,
                     'content' => [
                         'url' => ProjectTaskContent::saveContent($task->id, $content)
                     ],
@@ -516,7 +538,7 @@ class ProjectTask extends AbstractModel
             if ($task->parent_id == 0 && $subtasks && is_array($subtasks)) {
                 foreach ($subtasks as $subtask) {
                     list($start, $end) = is_string($subtask['times']) ? explode(",", $subtask['times']) : (is_array($subtask['times']) ? $subtask['times'] : []);
-                    if (Base::isDate($start) && Base::isDate($end) && $start != $end) {
+                    if (Timer::isDate($start) && Timer::isDate($end) && $start != $end) {
                         if (Carbon::parse($start)->lt($task->start_at)) {
                             throw new ApiException('子任务开始时间不能小于主任务开始时间');
                         }
@@ -642,7 +664,7 @@ class ProjectTask extends AbstractModel
                 if ($mainTask?->complete_at) {
                     throw new ApiException('主任务已完成，无法修改子任务状态');
                 }
-                if (Base::isDate($data['complete_at'])) {
+                if (Timer::isDate($data['complete_at'])) {
                     // 标记已完成
                     if ($this->complete_at) {
                         throw new ApiException('任务已完成');
@@ -719,13 +741,14 @@ class ProjectTask extends AbstractModel
                     }
                 }
                 $updateMarking['is_update_project'] = true;
+                $this->updated_at = Carbon::now();
                 $this->syncDialogUser();
             }
             // 可见性
             if (Arr::exists($data, 'visibility') || Arr::exists($data, 'visibility_appointor')) {
                 if (Arr::exists($data, 'visibility')) {
-                    ProjectTask::whereId($data['task_id'])->update(['visibility' => $data["visibility"]]);
-                    ProjectTask::whereParentId($data['task_id'])->update(['visibility' => $data["visibility"]]);
+                    $this->visibility = $data["visibility"];
+                    ProjectTask::whereParentId($data['task_id'])->change(['visibility' => $data["visibility"]]);
                 }
                 ProjectTaskVisibilityUser::whereTaskId($data['task_id'])->delete();
                 if (Arr::exists($data, 'visibility_appointor')) {
@@ -738,28 +761,32 @@ class ProjectTask extends AbstractModel
                             ])->save();
                         }
                     }
+                    if (!Arr::exists($data, 'visibility')) {
+                        ProjectTaskObserver::visibilityUpdate($this);
+                    }
                 }
             }
             // 计划时间（原则：子任务时间在主任务时间内）
             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()) : '';
+                $clearSubTaskTime = false;
                 $this->start_at = null;
                 $this->end_at = null;
                 $times = $data['times'];
                 list($start, $end, $desc) = is_string($times) ? explode(",", $times) : (is_array($times) ? $times : []);
-                if (Base::isDate($start) && Base::isDate($end) && $start != $end) {
+                if (Timer::isDate($start) && Timer::isDate($end) && $start != $end) {
                     $start_at = Carbon::parse($start);
                     $end_at = Carbon::parse($end);
                     if ($this->parent_id > 0) {
                         // 判断同步主任务时间（子任务时间 超出 主任务）
                         if ($mainTask) {
                             $isUp = false;
-                            if ($start_at->lt(Carbon::parse($mainTask->start_at))) {
+                            if (empty($mainTask->start_at) || $start_at->lt(Carbon::parse($mainTask->start_at))) {
                                 $mainTask->start_at = $start_at;
                                 $isUp = true;
                             }
-                            if ($end_at->gt(Carbon::parse($mainTask->end_at))) {
+                            if (empty($mainTask->end_at) || $end_at->gt(Carbon::parse($mainTask->end_at))) {
                                 $mainTask->end_at = $end_at;
                                 $isUp = true;
                             }
@@ -777,6 +804,7 @@ class ProjectTask extends AbstractModel
                         // 清空子任务时间（子任务时间等于主任务时间）
                         $this->start_at = $mainTask->start_at;
                         $this->end_at = $mainTask->end_at;
+                        $clearSubTaskTime = true;
                     }
                 }
                 if ($this->parent_id == 0) {
@@ -807,7 +835,7 @@ class ProjectTask extends AbstractModel
                         }
                     });
                 }
-                $newStringAt = $this->start_at ? ($this->start_at->toDateTimeString() . '~' . $this->end_at->toDateTimeString()) : '';
+                $newStringAt = $this->start_at && !$clearSubTaskTime ? ($this->start_at->toDateTimeString() . '~' . $this->end_at->toDateTimeString()) : '';
                 $newDesc = $desc ? "（备注：{$desc}）" : "";
                 $this->addLog("修改{任务}时间" . $newDesc, [
                     'change' => [$oldStringAt, $newStringAt]
@@ -871,6 +899,7 @@ class ProjectTask extends AbstractModel
                             $row->delete();
                         }
                     }
+                    $this->updated_at = Carbon::now();
                     $this->syncDialogUser();
                 }
                 // 背景色
@@ -894,15 +923,25 @@ class ProjectTask extends AbstractModel
                 }
                 // 内容
                 if (Arr::exists($data, 'content')) {
+                    $logRecord = [];
+                    $logContent = ProjectTaskContent::whereTaskId($this->id)->orderByDesc('id')->first();
+                    if ($logContent) {
+                        $logRecord['link'] = [
+                            'title' => '查看历史',
+                            'url' => 'single/task/content/' . $this->id . '?history_id=' . $logContent->id,
+                        ];
+                    }
+                    $this->desc = self::generateDesc($data['content']);
                     ProjectTaskContent::createInstance([
                         'project_id' => $this->project_id,
                         'task_id' => $this->id,
+                        'userid' => User::userid(),
+                        'desc' => $this->desc,
                         'content' => [
                             'url' => ProjectTaskContent::saveContent($this->id, $data['content'])
                         ],
                     ])->save();
-                    $this->desc = Base::getHtml($data['content'], 100);
-                    $this->addLog("修改{任务}详细描述");
+                    $this->addLog("修改{任务}详细描述", $logRecord);
                     $updateMarking['is_update_content'] = true;
                 }
                 // 优先级
@@ -927,8 +966,6 @@ class ProjectTask extends AbstractModel
                 }
             }
             $this->save();
-            if ($this->start_at instanceof \DateTimeInterface) $this->start_at = $this->start_at->format('Y-m-d H:i:s');
-            if ($this->end_at instanceof \DateTimeInterface) $this->end_at = $this->end_at->format('Y-m-d H:i:s');
         });
         return true;
     }
@@ -1244,7 +1281,9 @@ class ProjectTask extends AbstractModel
                 // 标记已完成
                 if ($this->parent_id == 0) {
                     if (self::whereParentId($this->id)->whereCompleteAt(null)->exists()) {
-                        throw new ApiException('子任务未完成');
+                        throw new ApiException('子任务未完成', [
+                            'task_id' => $this->id
+                        ], -4004);
                     }
                 }
                 if (!$this->hasOwner()) {
@@ -1379,7 +1418,7 @@ class ProjectTask extends AbstractModel
      * @param int $userid
      * @return ProjectLog
      */
-    public function addLog($detail, $record = [], $userid = 0)
+    public function addLog($detail, $record = [], $userid = 0, $taskOnly = 0)
     {
         $detail = str_replace("{任务}", $this->parent_id ? "子任务" : "任务", $detail);
         $array = [
@@ -1390,11 +1429,18 @@ class ProjectTask extends AbstractModel
             'detail' => $detail,
         ];
         if ($this->parent_id) {
-            $record['subtitle'] = $this->name;
+            $record['subtask'] = [
+                'id' => $this->id,
+                'parent_id' => $this->parent_id,
+                'name' => $this->name,
+            ];
         }
         if ($record) {
             $array['record'] = $record;
         }
+        if ($taskOnly) {
+            $array['task_only'] = $taskOnly;
+        }
         $log = ProjectLog::createInstance($array);
         $log->save();
         return $log;
@@ -1430,53 +1476,62 @@ class ProjectTask extends AbstractModel
         }
         //
         $array = [];
-        if (empty($data['parent_id'])) {
-            if (Arr::exists($data, 'owner') || Arr::exists($data, 'assist')) {
-                $taskUser = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($data['id'])->get();
-                // 负责人
-                $owners = $taskUser->where('owner', 1)->pluck('userid')->toArray();
-                $owners = array_intersect($userids, $owners);
-                if ($owners) {
-                    $array[] = [
-                        'userid' => array_values($owners),
-                        'data' => array_merge($data, [
-                            'owner' => 1,
-                            'assist' => 1,
-                        ])
-                    ];
-                }
-                // 协助人
-                $assists = $taskUser->where('owner', 0)->pluck('userid')->toArray();
-                $assists = array_intersect($userids, $assists);
-                if ($assists) {
-                    $array[] = [
-                        'userid' => array_values($assists),
-                        'data' => array_merge($data, [
-                            'owner' => 0,
-                            'assist' => 1,
-                        ])
-                    ];
-                }
-                // 项目成员（其他人）
-                if ($data['visibility'] == 1) {
-                    // 全部可见
+        if (Arr::exists($data, 'owner') || Arr::exists($data, 'assist')) {
+            $taskUser = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($data['id'])->get();
+            // 负责人
+            $owners = $taskUser->where('owner', 1)->pluck('userid')->toArray();
+            $owners = array_intersect($userids, $owners);
+            if ($owners) {
+                $array[] = [
+                    'userid' => array_values($owners),
+                    'data' => array_merge($data, [
+                        'owner' => 1,
+                        'assist' => 1,
+                    ])
+                ];
+            }
+            // 协助人
+            $assists = $taskUser->where('owner', 0)->pluck('userid')->toArray();
+            $assists = array_intersect($userids, $assists);
+            if ($assists) {
+                $array[] = [
+                    'userid' => array_values($assists),
+                    'data' => array_merge($data, [
+                        'owner' => 0,
+                        'assist' => 1,
+                    ])
+                ];
+            }
+            // 其他人
+            switch ($data['visibility']) {
+                case 1:
+                    // 项目人员，除了负责人、协助人项目其他人
                     $userids = array_diff($userids, $owners, $assists);
-                } else {
-                    // 指定可见
-                    $userids = $taskUser->pluck('userid')->toArray();
-                }
-                $data = array_merge($data, [
-                    'owner' => 0,
-                    'assist' => 0,
-                ]);
+                    break;
+                case 2:
+                    // 任务人员，除了负责人、协助人
+                    $userids = [];
+                    break;
+                case 3:
+                    // 指定成员
+                    $specifys = ProjectTaskVisibilityUser::select(['userid'])->whereTaskId($data['id'])->pluck('userid')->toArray();
+                    $userids = array_diff($specifys, $owners, $assists);
+                    break;
+                default:
+                    $userids = [];
+                    break;
+            }
+            if ($userids) {
+                $array[] = [
+                    'userid' => array_values($userids),
+                    'data' => array_merge($data, [
+                        'owner' => 0,
+                        'assist' => 0,
+                    ])
+                ];
             }
         }
         //
-        $array[] = [
-            'userid' => array_values($userids),
-            'data' => $data
-        ];
-        //
         foreach ($array as $item) {
             $params = [
                 'ignoreFd' => Request::header('fd'),
@@ -1563,14 +1618,18 @@ class ProjectTask extends AbstractModel
             'dialog_id' => $this->dialog_id,
         ];
         //
+        $projectOwnerids = ProjectUser::whereProjectId($this->project_id)->whereOwner(1)->pluck('userid')->toArray();  // 项目负责人
+        //
         $array = [];
         if (empty($userids)) {
             // 默认 项目成员 与 项目负责人，任务负责人、协助人的差集
             $projectUserids = ProjectUser::whereProjectId($this->project_id)->pluck('userid')->toArray();  // 项目成员
-            $projectOwner = ProjectUser::whereProjectId($this->project_id)->whereOwner(1)->pluck('userid')->toArray();  // 项目负责人
             $taskOwnerAndAssists = ProjectTaskUser::select(['userid', 'owner'])->whereIn('owner', [0, 1])->whereTaskId($this->id)->pluck('userid')->toArray();
             $subUserids = ProjectTaskUser::whereTaskPid($this->id)->pluck('userid')->toArray();
-            $userids = array_diff($projectUserids, $projectOwner, $taskOwnerAndAssists, $subUserids);
+            $userids = array_diff($projectUserids, $projectOwnerids, $taskOwnerAndAssists, $subUserids);
+        } else {
+            // 保证项目负责人都能看到
+            $userids = array_diff($userids, $projectOwnerids);
         }
         //
         $array[] = [
@@ -1627,21 +1686,13 @@ class ProjectTask extends AbstractModel
         if (empty($receivers)) {
             return;
         }
-
+        //
+        $userid = User::userid();
+        //
         $botUser = User::botGetOrCreate('task-alert');
         if (empty($botUser)) {
             return;
         }
-
-        $dataId = $this->parent_id ?: $this->id;
-        $taskHtml = "<span class=\"mention task\" data-id=\"{$dataId}\">#{$this->name}</span>";
-        $text = match ($type) {
-            1 => "您的任务 {$taskHtml} 即将超时。",
-            2 => "您的任务 {$taskHtml} 已经超时。",
-            3 => "您的任务 {$taskHtml} 时间已修改。",
-            default => "您有一个新任务 {$taskHtml}。",
-        };
-
         /** @var User $user */
         foreach ($receivers as $receiver) {
             $data = [
@@ -1652,67 +1703,101 @@ class ProjectTask extends AbstractModel
             if (in_array($type, [1, 2]) && ProjectTaskPushLog::where($data)->exists()) {
                 continue;
             }
+            if ($owners[$receiver->userid]) {
+                $title = match ($type) {
+                    1 => "您负责的任务即将超时",
+                    2 => "您负责的任务已经超时",
+                    3 => "您负责的任务时间已修改",
+                    default => "您有一个新任务",
+                };
+            } else {
+                $title = match ($type) {
+                    1 => "您协助的任务即将超时",
+                    2 => "您协助的任务已经超时",
+                    3 => "您协助的任务时间已修改",
+                    default => "您有一个新协助任务",
+                };
+            }
             //
-            $replace = $owners[$receiver->userid] ? "您负责的任务" : "您协助的任务";
             $dialog = WebSocketDialog::checkUserDialog($botUser, $receiver->userid);
             if ($dialog) {
                 ProjectTaskPushLog::createInstance($data)->save();
-                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', [
-                    'text' => str_replace("您的任务", $replace, $text) . $suffix
-                ], $botUser->userid);
+                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                    'type' => 'task_list',
+                    'title' => $title . $suffix,
+                    'list' => [
+                        [
+                            'id' => $this->parent_id ?: $this->id,
+                            'name' => $this->name,
+                        ]
+                    ],
+                ], in_array($type, [0, 3]) ? $userid : $botUser->userid);
             }
         }
     }
 
     /**
      * 移动任务
-     * @param int $project_id
-     * @param int $column_id
+     * @param int $projectId
+     * @param int $columnId
      * @param int $flowItemId
      * @param array $owner
      * @param array $assist
+     * @param string $completeAt
      * @return bool
      */
-    public function moveTask(int $projectId, int $columnId,int $flowItemId = 0,array $owner = [], array $assist = [])
+    public function moveTask(int $projectId, int $columnId,int $flowItemId = 0,array $owner = [], array $assist = [], string $completeAt='')
     {
-        AbstractModel::transaction(function () use($projectId, $columnId, $flowItemId, $owner, $assist) {
+        AbstractModel::transaction(function () use ($projectId, $columnId, $flowItemId, $owner, $assist, $completeAt) {
             $newTaskUser =  array_merge($owner, $assist);
             //
             $this->project_id = $projectId;
             $this->column_id = $columnId;
-            $this->flow_item_id = $flowItemId;
             // 任务内容
-            if($this->content){
+            if ($this->content) {
                 $this->content->project_id = $projectId;
                 $this->content->save();
             }
             // 任务文件
-            foreach ($this->taskFile as $taskFile){
+            foreach ($this->taskFile as $taskFile) {
                 $taskFile->project_id = $projectId;
                 $taskFile->save();
             }
             // 任务标签
-            foreach ($this->taskTag as $taskTag){
+            foreach ($this->taskTag as $taskTag) {
                 $taskTag->project_id = $projectId;
                 $taskTag->save();
             }
             // 任务用户
-            $this->updateTask(['owner' => $owner]);
-            $this->updateTask(['assist' => $assist]);
-            foreach ($this->taskUser as $taskUser){
-                if( in_array($taskUser->id, $newTaskUser) ){
+            $this->updateTask([
+                'owner' => $owner,
+                'assist' => $assist
+            ]);
+            foreach ($this->taskUser as $taskUser) {
+                if (in_array($taskUser->id, $newTaskUser)) {
                     $taskUser->project_id = $projectId;
                     $taskUser->save();
                 }
             }
             //
-            if($flowItemId){
+            if ($flowItemId) {
                 $flowItem = projectFlowItem::whereProjectId($projectId)->whereId($flowItemId)->first();
+                $this->flow_item_id = $flowItemId;
                 $this->flow_item_name = $flowItem->status . "|" . $flowItem->name;
-            }else{
+                if ($flowItem->status == 'end') {
+                    $this->completeTask(Carbon::now(), $flowItem->name);
+                } else {
+                    $this->completeTask(null);
+                }
+            } else {
+                $this->flow_item_id = 0;
                 $this->flow_item_name = '';
             }
             //
+            if ($completeAt) {
+                $this->complete_at = $completeAt;
+            }
+            //
             $this->save();
             //
             $this->addLog("移动{任务}");

app/Models/ProjectTaskContent.php

@@ -11,24 +11,33 @@ use App\Exceptions\ApiException;
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $task_id 任务ID
+ * @property int|null $userid 用户ID
+ * @property string|null $desc 内容描述
  * @property string|null $content 内容
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereContent($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereDesc($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereProjectId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereTaskId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereUserid($value)
  * @mixin \Eloquent
  */
 class ProjectTaskContent extends AbstractModel
 {
     protected $hidden = [
-        'created_at',
         'updated_at',
     ];
 
@@ -44,8 +53,8 @@ class ProjectTaskContent extends AbstractModel
             $array = $this->toArray();
             $array['content'] = file_get_contents($filePath) ?: '';
             if ($array['content']) {
-                $replace = Base::fillUrl('uploads/task');
-                $array['content'] = str_replace('{{RemoteURL}}uploads/task', $replace, $array['content']);
+                $replace = Base::fillUrl('uploads');
+                $array['content'] = str_replace('{{RemoteURL}}uploads', $replace, $array['content']);
             }
             return $array;
         }
@@ -65,18 +74,24 @@ class ProjectTaskContent extends AbstractModel
         $oldContent = $content;
         $path = 'uploads/task/content/' . date("Ym") . '/' . $task_id . '/';
         //
-        preg_match_all("/<img\s+src=\"data:image\/(png|jpg|jpeg|webp);base64,(.*?)\"/s", $content, $matchs);
+        preg_match_all('/<img[^>]*?src=\\\\?["\']data:image\/(png|jpg|jpeg|webp);base64,(.*?)\\\\?["\']/s', $content, $matchs);
         foreach ($matchs[2] as $key => $text) {
             $tmpPath = $path . 'attached/';
             Base::makeDir(public_path($tmpPath));
             $tmpPath .= md5($text) . "." . $matchs[1][$key];
-            if (Base::saveContentImage(public_path($tmpPath), base64_decode($text))) {
+            if (Base::saveContentImage(public_path($tmpPath), base64_decode($text), 90)) {
                 $paramet = getimagesize(public_path($tmpPath));
                 $content = str_replace($matchs[0][$key], '<img src="{{RemoteURL}}' . $tmpPath . '" original-width="' . $paramet[0] . '" original-height="' . $paramet[1] . '"', $content);
             }
         }
-        $pattern = '/<img(.*?)src=("|\')https*:\/\/(.*?)\/(uploads\/task\/content\/(.*?))\2/is';
-        $content = preg_replace($pattern, '<img$1src=$2{{RemoteURL}}$4$2', $content);
+        preg_match_all('/(<img[^>]*?src=\\\\?["\'])(https?:\/\/[^\/]+\/)(uploads\/[^\s"\'>]+)(\\\\?["\'][^>]*?>)/i', $content, $matches);
+        foreach ($matches[0] as $key => $fullMatch) {
+            $filePath = public_path($matches[3][$key]);
+            if (file_exists($filePath)) {
+                $replacement = $matches[1][$key] . '{{RemoteURL}}' . $matches[3][$key] . $matches[4][$key];
+                $content = str_replace($fullMatch, $replacement, $content);
+            }
+        }
         //
         $filePath = $path . md5($content);
         $publicPath = public_path($filePath);

app/Models/ProjectTaskFile.php

@@ -22,9 +22,15 @@ use Cache;
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read int $height
  * @property-read int $width
+ * @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|ProjectTaskFile newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFile newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFile query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFile whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFile whereDownload($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFile whereExt($value)

app/Models/ProjectTaskFlowChange.php

@@ -14,9 +14,15 @@ namespace App\Models;
  * @property string|null $after_flow_item_name （变化后）工作流状态名称
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereAfterFlowItemId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereAfterFlowItemName($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereBeforeFlowItemId($value)

app/Models/ProjectTaskPushLog.php

@@ -17,10 +17,16 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereId($value)

app/Models/ProjectTaskTag.php

@@ -12,9 +12,15 @@ namespace App\Models;
  * @property string|null $color 颜色
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTag newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTag newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTag query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTag whereColor($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTag whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTag whereId($value)

app/Models/ProjectTaskUser.php

@@ -14,9 +14,15 @@ namespace App\Models;
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\ProjectTask|null $projectTask
+ * @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|ProjectTaskUser newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser whereOwner($value)
@@ -46,7 +52,7 @@ class ProjectTaskUser extends AbstractModel
      */
     public static function transfer($originalUserid, $newUserid)
     {
-        self::whereUserid($originalUserid)->chunk(100, function ($list) use ($originalUserid, $newUserid) {
+        self::whereUserid($originalUserid)->chunkById(100, function ($list) use ($originalUserid, $newUserid) {
             $tastIds = [];
             /** @var self $item */
             foreach ($list as $item) {
@@ -62,7 +68,7 @@ class ProjectTaskUser extends AbstractModel
                     $item->save();
                 }
                 if ($item->projectTask) {
-                    $item->projectTask->addLog("移交{任务}身份", ['userid' => [$originalUserid, ' => ', $newUserid]]);
+                    $item->projectTask->addLog("移交{任务}身份", ['userid' => [$originalUserid, ' => ', $newUserid]], 0, 1);
                     if (!in_array($item->task_pid, $tastIds)) {
                         $tastIds[] = $item->task_pid;
                         $item->projectTask->syncDialogUser();

app/Models/ProjectTaskVisibilityUser.php

@@ -12,9 +12,15 @@ namespace App\Models;
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\ProjectTask|null $projectTask
+ * @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|ProjectTaskVisibilityUser newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser whereProjectId($value)

app/Models/ProjectUser.php

@@ -9,13 +9,19 @@ namespace App\Models;
  * @property int|null $project_id 项目ID
  * @property int|null $userid 成员ID
  * @property int|null $owner 是否负责人
- * @property string|null $top_at 置顶时间
+ * @property \Illuminate\Support\Carbon|null $top_at 置顶时间
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\Project|null $project
+ * @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|ProjectUser newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereOwner($value)

app/Models/Report.php

@@ -29,9 +29,15 @@ use JetBrains\PhpStorm\Pure;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $receivesUser
  * @property-read int|null $receives_user_count
  * @property-read \App\Models\User|null $sendUser
+ * @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 Builder|Report newModelQuery()
  * @method static Builder|Report newQuery()
  * @method static Builder|Report query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static Builder|Report whereContent($value)
  * @method static Builder|Report whereCreatedAt($value)
  * @method static Builder|Report whereId($value)
@@ -68,7 +74,7 @@ class Report extends AbstractModel
     public function receivesUser(): BelongsToMany
     {
         return $this->belongsToMany(User::class, ReportReceive::class, "rid", "userid")
-            ->withPivot("receive_time", "read");
+            ->withPivot("receive_at", "read");
     }
 
     public function sendUser()
@@ -76,15 +82,6 @@ class Report extends AbstractModel
         return $this->hasOne(User::class, "userid", "userid");
     }
 
-    public function getTypeAttribute($value): string
-    {
-        return match ($value) {
-            Report::WEEKLY => "周报",
-            Report::DAILY => "日报",
-            default => "",
-        };
-    }
-
     public function getContentAttribute($value): string
     {
         return htmlspecialchars_decode($value);

app/Models/ReportReceive.php

@@ -10,15 +10,21 @@ use Illuminate\Database\Eloquent\Model;
  *
  * @property int $id
  * @property int $rid
- * @property string|null $receive_time 接收时间
+ * @property \Illuminate\Support\Carbon|null $receive_at 接收时间
  * @property int $userid 接收人
  * @property int $read 是否已读
+ * @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|ReportReceive newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereRead($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereReceiveTime($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereReceiveAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereRid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereUserid($value)
  * @mixin \Eloquent
@@ -32,7 +38,7 @@ class ReportReceive extends AbstractModel
 
     protected $fillable = [
         "rid",
-        "receive_time",
+        "receive_at",
         "userid",
         "read",
     ];

app/Models/Setting.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Module\Base;
+use App\Module\Timer;
 
 /**
  * App\Models\Setting
@@ -13,9 +14,15 @@ use App\Module\Base;
  * @property string|null $setting
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|Setting newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Setting newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Setting query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|Setting whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Setting whereDesc($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Setting whereId($value)
@@ -26,6 +33,32 @@ use App\Module\Base;
  */
 class Setting extends AbstractModel
 {
+    /**
+     * 格式化设置参数
+     * @param $value
+     * @return array|mixed
+     */
+    public function getSettingAttribute($value)
+    {
+        if (is_array($value)) {
+            return $value;
+        }
+        $value = Base::json2array($value);
+        switch ($this->name) {
+            case 'system':
+                $value['system_alias'] = $value['system_alias'] ?: env('APP_NAME');
+                if (!is_array($value['task_default_time']) || count($value['task_default_time']) != 2 || !Timer::isTime($value['task_default_time'][0]) || !Timer::isTime($value['task_default_time'][1])) {
+                    $value['task_default_time'] = ['09:00', '18:00'];
+                }
+                break;
+            case 'fileSetting':
+                $value['permission_pack_type'] = $value['permission_pack_type'] ?: 'all';
+                $value['permission_pack_userids'] = is_array($value['permission_pack_userids']) ? $value['permission_pack_userids'] : [];
+                break;
+        }
+        return $value;
+    }
+
     /**
      * 验证邮箱地址（过滤忽略地址）
      * @param $array

app/Models/TaskWorker.php

@@ -10,15 +10,21 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property int $id
  * @property string|null $args
  * @property string|null $error
- * @property string|null $start_at 开始时间
- * @property string|null $end_at 结束时间
+ * @property \Illuminate\Support\Carbon|null $start_at 开始时间
+ * @property \Illuminate\Support\Carbon|null $end_at 结束时间
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereArgs($value)
  * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereDeletedAt($value)

app/Models/Tmp.php

@@ -11,9 +11,15 @@ namespace App\Models;
  * @property string|null $content
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|Tmp newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Tmp newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Tmp query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|Tmp whereContent($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Tmp whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Tmp whereId($value)

app/Models/UmengAlias.php

@@ -14,15 +14,25 @@ use Hedeqiang\UMeng\IOS;
  * @property int|null $userid 会员ID
  * @property string|null $alias 别名
  * @property string|null $platform 平台类型
+ * @property string|null $device 设备类型
+ * @property string|null $ua userAgent
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @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 whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias wherePlatform($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUa($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUserid($value)
  * @mixin \Eloquent
@@ -31,6 +41,16 @@ class UmengAlias extends AbstractModel
 {
     protected $table = 'umeng_alias';
 
+    /**
+     * 推送内容处理
+     * @param $string
+     * @return string
+     */
+    private static function specialCharacters($string)
+    {
+        return str_replace(["\r\n", "\r", "\n"], '', $string);
+    }
+
     /**
      * 获取推送配置
      * @return array|false
@@ -73,9 +93,9 @@ class UmengAlias extends AbstractModel
             return false;
         }
         //
-        $title = $array['title'] ?: '';                                         // 标题
-        $subtitle = $array['subtitle'] ?: '';                                   // 副标题（iOS）
-        $body = $array['body'] ?: '';                                           // 通知内容
+        $title = self::specialCharacters($array['title'] ?: '');        // 标题
+        $subtitle = self::specialCharacters($array['subtitle'] ?: '');  // 副标题（iOS）
+        $body = self::specialCharacters($array['body'] ?: '');          // 通知内容
         $description = $array['description'] ?: 'no description';               // 描述
         $extra = is_array($array['extra']) ? $array['extra'] : [];              // 额外参数
         $seconds = intval($array['seconds']) ?: 86400;                          // 有效时间（单位：秒）
@@ -132,7 +152,13 @@ class UmengAlias extends AbstractModel
                     '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,
+                    ],
                 ]);
 
             default:

app/Models/User.php

@@ -6,6 +6,8 @@ namespace App\Models;
 use App\Exceptions\ApiException;
 use App\Module\Base;
 use App\Module\Doo;
+use App\Module\Table\OnlineData;
+use App\Services\RequestContext;
 use Cache;
 use Carbon\Carbon;
 
@@ -13,34 +15,41 @@ use Carbon\Carbon;
  * App\Models\User
  *
  * @property int $userid
- * @property array $identity 身份
- * @property array $department 所属部门
+ * @property array $identity
+ * @property array $department
  * @property string|null $az A-Z
  * @property string|null $pinyin 拼音（主要用于搜索）
- * @property string|null $email 邮箱
+ * @property string|null $email
  * @property string|null $tel 联系电话
- * @property string $nickname 昵称
- * @property string|null $profession 职位/职称
- * @property string $userimg 头像
+ * @property string $nickname
+ * @property string|null $profession
+ * @property string $userimg
  * @property string|null $encrypt
  * @property string|null $password 登录密码
  * @property int|null $changepass 登录需要修改密码
  * @property int|null $login_num 累计登录次数
  * @property string|null $last_ip 最后登录IP
- * @property string|null $last_at 最后登录时间
+ * @property \Illuminate\Support\Carbon|null $last_at 最后登录时间
  * @property string|null $line_ip 最后在线IP（接口）
- * @property string|null $line_at 最后在线时间（接口）
+ * @property \Illuminate\Support\Carbon|null $line_at 最后在线时间（接口）
  * @property int|null $task_dialog_id 最后打开的任务会话ID
  * @property string|null $created_ip 注册IP
- * @property string|null $disable_at 禁用时间（离职时间）
+ * @property \Illuminate\Support\Carbon|null $disable_at
  * @property int|null $email_verity 邮箱是否已验证
  * @property int|null $bot 是否机器人
+ * @property string|null $lang 语言首选项
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
  * @method static \Database\Factories\UserFactory factory(...$parameters)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|User newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|User newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|User query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|User whereAz($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereBot($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereChangepass($value)
@@ -52,6 +61,7 @@ use Carbon\Carbon;
  * @method static \Illuminate\Database\Eloquent\Builder|User whereEmailVerity($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereEncrypt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereIdentity($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereLang($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereLastAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereLastIp($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereLineAt($value)
@@ -89,7 +99,13 @@ class User extends AbstractModel
      */
     public function getNicknameAttribute($value)
     {
-        return $value ?: Base::cardFormat($this->email);
+        if ($value) {
+            if (UserBot::isSystemBot($this->email)) {
+                return Doo::translate($value);
+            }
+            return $value;
+        }
+        return Base::formatName($this->email);
     }
 
     /**
@@ -144,7 +160,7 @@ class User extends AbstractModel
         });
         $array = [];
         foreach ($list as $item) {
-            $array[] = $item['name'] . ($item['owner_userid'] === $this->userid ? '(M)' : '');
+            $array[] = $item['name'] . ($item['owner_userid'] === $this->userid ? ' (M)' : '');
         }
         return implode(', ', $array);
     }
@@ -179,7 +195,7 @@ class User extends AbstractModel
      */
     public function getOnlineStatus()
     {
-        $online = $this->bot || Cache::get("User::online:" . $this->userid) === "on";
+        $online = $this->bot || OnlineData::live($this->userid) > 0;
         if ($online) {
             return true;
         }
@@ -290,6 +306,26 @@ class User extends AbstractModel
         });
     }
 
+    /**
+     * 检查发送聊天内容前必须设置昵称、电话
+     * @return void
+     */
+    public function checkChatInformation()
+    {
+        if ($this->bot) {
+            return;
+        }
+        $chatInformation = Base::settingFind('system', 'chat_information');
+        if ($chatInformation == 'required') {
+            if (empty($this->getRawOriginal('nickname'))) {
+                throw new ApiException('请设置昵称', [], -2);
+            }
+            if (empty($this->getRawOriginal('tel'))) {
+                throw new ApiException('请设置联系电话', [], -3);
+            }
+        }
+    }
+
     /** ***************************************************************************************** */
     /** ***************************************************************************************** */
     /** ***************************************************************************************** */
@@ -385,7 +421,7 @@ class User extends AbstractModel
                 throw new ApiException('请登录后继续...', [], -1);
             }
         }
-        if (in_array('disable', $user->identity)) {
+        if ($user->isDisable()) {
             throw new ApiException('帐号已停用...', [], -1);
         }
         if ($identity) {
@@ -400,9 +436,8 @@ class User extends AbstractModel
      */
     private static function authInfo()
     {
-        global $_A;
-        if (isset($_A["__static_auth"])) {
-            return $_A["__static_auth"];
+        if (RequestContext::has('auth')) {
+            return RequestContext::get('auth');
         }
         if (Doo::userId() > 0
             && !Doo::userExpired()
@@ -414,13 +449,19 @@ class User extends AbstractModel
             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 $_A["__static_auth"] = $user;
+            return RequestContext::save('auth', $user);
         }
-        return $_A["__static_auth"] = false;
+        return RequestContext::save('auth', false);
     }
 
     /**
@@ -454,22 +495,21 @@ class User extends AbstractModel
      * @param int $userid 会员ID
      * @return self
      */
-    public static function userid2basic($userid)
+    public static function userid2basic($userid, $addField = [])
     {
-        global $_A;
         if (empty($userid)) {
             return null;
         }
         $userid = intval($userid);
-        if (isset($_A["__static_userid2basic_" . $userid])) {
-            return $_A["__static_userid2basic_" . $userid];
+        if (RequestContext::has("userid2basic_" . $userid)) {
+            return RequestContext::get("userid2basic_" . $userid);
         }
-        $userInfo = self::whereUserid($userid)->select(User::$basicField)->first();
+        $userInfo = self::whereUserid($userid)->select(array_merge(User::$basicField, $addField))->first();
         if ($userInfo) {
             $userInfo->online = $userInfo->getOnlineStatus();
             $userInfo->department_name = $userInfo->getDepartmentName();
         }
-        return $_A["__static_userid2basic_" . $userid] = ($userInfo ?: []);
+        return RequestContext::save("userid2basic_" . $userid, $userInfo ?: []);
     }
 
 
@@ -507,6 +547,16 @@ class User extends AbstractModel
         }
     }
 
+    /**
+     * 临时帐号别名
+     * @return mixed|string
+     */
+    public static function tempAccountAlias()
+    {
+        $alias = Base::settingFind('system', 'temp_account_alias');
+        return $alias ?: Doo::translate("临时帐号");
+    }
+
     /**
      * 获取头像
      * @param $userid
@@ -539,6 +589,10 @@ class User extends AbstractModel
                 return url("images/avatar/default_openai.png");
             case 'ai-claude@bot.system':
                 return url("images/avatar/default_claude.png");
+            case 'ai-gemini@bot.system':
+                return url("images/avatar/default_gemini.png");
+            case 'ai-zhipu@bot.system':
+                return url("images/avatar/default_zhipu.png");
             case 'bot-manager@bot.system':
                 return url("images/avatar/default_bot.png");
             case 'meeting-alert@bot.system':
@@ -611,7 +665,9 @@ class User extends AbstractModel
                 ])->save();
             }
             //
-            $update['nickname'] = UserBot::systemBotName($email);
+            if (empty($update['nickname'])) {
+                $update['nickname'] = UserBot::systemBotName($email);
+            }
         }
         if ($update) {
             $botUser->updateInstance($update);

app/Models/UserBot.php

@@ -5,6 +5,8 @@ namespace App\Models;
 use App\Module\Base;
 use App\Module\Doo;
 use App\Module\Extranet;
+use App\Module\Timer;
+use App\Tasks\JokeSoupTask;
 use Cache;
 use Carbon\Carbon;
 
@@ -15,14 +17,20 @@ use Carbon\Carbon;
  * @property int|null $userid 所属人ID
  * @property int|null $bot_id 机器人ID
  * @property int|null $clear_day 消息自动清理天数
- * @property string|null $clear_at 下一次清理时间
+ * @property \Illuminate\Support\Carbon|null $clear_at 下一次清理时间
  * @property string|null $webhook_url 消息webhook地址
  * @property int|null $webhook_num 消息webhook请求次数
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|UserBot newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserBot newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserBot query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereBotId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereClearAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereClearDay($value)
@@ -37,6 +45,16 @@ use Carbon\Carbon;
 class UserBot extends AbstractModel
 {
 
+    /**
+     * 判断是否系统机器人
+     * @param $email
+     * @return bool
+     */
+    public static function isSystemBot($email)
+    {
+        return str_ends_with($email, '@bot.system') && self::systemBotName($email);
+    }
+
     /**
      * 系统机器人名称
      * @param $name string 邮箱 或 邮箱前缀
@@ -47,7 +65,7 @@ class UserBot extends AbstractModel
         if (str_contains($name, "@")) {
             $name = explode("@", $name)[0];
         }
-        return match ($name) {
+        $name = match ($name) {
             'system-msg' => '系统消息',
             'task-alert' => '任务提醒',
             'check-in' => '签到打卡',
@@ -57,11 +75,14 @@ class UserBot extends AbstractModel
             'ai-claude' => 'Claude',
             'ai-wenxin' => '文心一言',
             'ai-qianwen' => '通义千问',
+            'ai-gemini' => 'Gemini',
+            'ai-zhipu' => '智谱清言',
             'bot-manager' => '机器人管理',
             'meeting-alert' => '会议通知',
             'okr-alert' => 'OKR提醒',
             default => '',  // 不是系统机器人时返回空（也可以拿来判断是否是系统机器人）
         };
+        return Doo::translate($name);
     }
 
     /**
@@ -71,77 +92,118 @@ class UserBot extends AbstractModel
      */
     public static function quickMsgs($email)
     {
-        return match ($email) {
-            'check-in@bot.system' => [
-                [
-                    'key' => 'checkin',
-                    'label' => Doo::translate('我要打卡')
-                ], [
-                    'key' => 'it',
-                    'label' => Doo::translate('IT资讯')
-                ], [
-                    'key' => '36ke',
-                    'label' => Doo::translate('36氪')
-                ], [
-                    'key' => '60s',
-                    'label' => Doo::translate('60s读世界')
-                ], [
-                    'key' => 'joke',
-                    'label' => Doo::translate('开心笑话')
-                ], [
-                    'key' => 'soup',
-                    'label' => Doo::translate('心灵鸡汤')
-                ]
-            ],
-            'anon-msg@bot.system' => [
-                [
-                    'key' => 'help',
-                    'label' => Doo::translate('使用说明')
-                ], [
-                    'key' => 'privacy',
-                    'label' => Doo::translate('隐私说明')
-                ],
-            ],
-            'bot-manager@bot.system' => [
-                [
-                    'key' => '/help',
-                    'label' => Doo::translate('帮助指令')
-                ], [
-                    'key' => '/api',
-                    'label' => Doo::translate('Api接口文档')
-                ], [
-                    'key' => '/list',
-                    'label' => Doo::translate('我的机器人')
-                ],
-            ],
-            'ai-openai@bot.system',
-            'ai-claude@bot.system',
-            'ai-wenxin@bot.system',
-            'ai-qianwen@bot.system' => [
-                [
-                    'key' => '%3A.clear',
-                    'label' => Doo::translate('清空上下文')
-                ]
-            ],
-            default => [],
-        };
+        switch ($email) {
+            case 'check-in@bot.system':
+                $menu = [
+                    /*[
+                        'key' => 'it',
+                        'label' => Doo::translate('IT资讯')
+                    ], [
+                        'key' => '36ke',
+                        'label' => Doo::translate('36氪')
+                    ], [
+                        'key' => '60s',
+                        'label' => Doo::translate('60s读世界')
+                    ], [
+                        'key' => 'joke',
+                        'label' => Doo::translate('开心笑话')
+                    ], [
+                        'key' => 'soup',
+                        'label' => Doo::translate('心灵鸡汤')
+                    ]*/
+                ];
+                $setting = Base::setting('checkinSetting');
+                if ($setting['open'] !== 'open') {
+                    return $menu;
+                }
+                if (in_array('locat', $setting['modes']) && Base::isEEUIApp()) {
+                    $menu[] = [
+                        'key' => 'locat-checkin',
+                        'label' => Doo::translate('定位签到'),
+                        'config' => [
+                            'key' => $setting['locat_bd_lbs_key'],
+                            'lng' => $setting['locat_bd_lbs_point']['lng'],
+                            'lat' => $setting['locat_bd_lbs_point']['lat'],
+                            'radius' => $setting['locat_bd_lbs_point']['radius'],
+                        ]
+                    ];
+                }
+                if (in_array('manual', $setting['modes'])) {
+                    $menu[] = [
+                        'key' => 'manual-checkin',
+                        'label' => Doo::translate('手动签到')
+                    ];
+                }
+                return $menu;
 
+            case 'anon-msg@bot.system':
+                return [
+                    [
+                        'key' => 'help',
+                        'label' => Doo::translate('使用说明')
+                    ], [
+                        'key' => 'privacy',
+                        'label' => Doo::translate('隐私说明')
+                    ],
+                ];
+
+            case 'meeting-alert@bot.system':
+                if (!Base::judgeClientVersion('0.39.89')) {
+                    return [];
+                }
+                return [
+                    [
+                        'key' => 'meeting-create',
+                        'label' => Doo::translate('新会议')
+                    ],
+                    [
+                        'key' => 'meeting-join',
+                        'label' => Doo::translate('加入会议')
+                    ],
+                ];
+
+            case 'bot-manager@bot.system':
+                return [
+                    [
+                        'key' => '/help',
+                        'label' => Doo::translate('帮助指令')
+                    ], [
+                        'key' => '/api',
+                        'label' => Doo::translate('API接口文档')
+                    ], [
+                        'key' => '/list',
+                        'label' => Doo::translate('我的机器人')
+                    ],
+                ];
+
+            default:
+                if (preg_match('/^ai-(.*?)@bot.system$/', $email)) {
+                    return [
+                        [
+                            'key' => '%3A.clear',
+                            'label' => Doo::translate('清空上下文')
+                        ]
+                    ];
+                }
+                return [];
+        }
     }
 
     /**
      * 签到机器人
      * @param $command
      * @param $userid
+     * @param $extra
      * @return string
      */
-    public static function checkinBotQuickMsg($command, $userid)
+    public static function checkinBotQuickMsg($command, $userid, $extra = [])
     {
         if (Cache::get("UserBot::checkinBotQuickMsg:{$userid}") === "yes") {
             return "操作频繁！";
         }
         Cache::put("UserBot::checkinBotQuickMsg:{$userid}", "yes", Carbon::now()->addSecond());
         //
-        if ($command === 'checkin') {
+        if ($command === 'manual-checkin') {
             $setting = Base::setting('checkinSetting');
             if ($setting['open'] !== 'open') {
                 return '暂未开启签到功能。';
@@ -149,9 +211,25 @@ class UserBot extends AbstractModel
             if (!in_array('manual', $setting['modes'])) {
                 return '暂未开放手动签到。';
             }
-            if ($error = UserBot::checkinBotCheckin($userid, Base::time(), true)) {
-                return $error;
+            UserBot::checkinBotCheckin('manual-' . $userid, Timer::time(), true);
+            return null;
+        } elseif ($command === 'locat-checkin') {
+            $setting = Base::setting('checkinSetting');
+            if ($setting['open'] !== 'open') {
+                return '暂未开启签到功能。';
             }
+            if (!in_array('locat', $setting['modes'])) {
+                return '暂未开放定位签到。';
+            }
+            if (empty($extra)) {
+                return '当前客户端版本低（所需版本≥v0.39.75）。';
+            }
+            if ($extra['type'] === 'bd') {
+                // todo 判断距离
+            } else {
+                return '错误的定位签到。';
+            }
+            UserBot::checkinBotCheckin('locat-' . $userid, Timer::time(), true);
             return null;
         } else {
             return Extranet::checkinBotQuickMsg($command);
@@ -160,10 +238,11 @@ class UserBot extends AbstractModel
 
     /**
      * 签到机器人签到
-     * @param $mac
+     * @param mixed $mac
+     * - 多个使用,分隔
+     * - 支持：mac地址、(manual|locat|face|checkin)-userid
      * @param $time
      * @param bool $alreadyTip  签到过是否提示
-     * @return string|null 返回string表示错误信息，返回null表示签到成功
      */
     public static function checkinBotCheckin($mac, $time, $alreadyTip = false)
     {
@@ -179,18 +258,20 @@ class UserBot extends AbstractModel
         $timeEnd = strtotime("{$nowDate} {$times[1]}");
         $timeAdvance = max($timeStart - $advance, strtotime($nowDate));
         $timeDelay = min($timeEnd + $delay, strtotime("{$nowDate} 23:59:59"));
-        if (Base::time() < $timeAdvance || $timeDelay < Base::time()) {
-            return "不在有效时间内，有效时间为：" . date("H:i", $timeAdvance) . "-" . date("H:i", $timeDelay);
+        $errorTime = false;
+        if (Timer::time() < $timeAdvance || $timeDelay < Timer::time()) {
+            $errorTime = "不在有效时间内，有效时间为：" . date("H:i", $timeAdvance) . "-" . date("H:i", $timeDelay);
         }
         //
         $macs = explode(",", $mac);
         $checkins = [];
+        $array = [];
         foreach ($macs as $mac) {
             $mac = strtoupper($mac);
-            $array = [];
             if (Base::isMac($mac)) {
+                // 路由器签到
                 if ($UserCheckinMac = UserCheckinMac::whereMac($mac)->first()) {
-                    $array = [
+                    $array[] = [
                         'userid' => $UserCheckinMac->userid,
                         'mac' => $UserCheckinMac->mac,
                         'date' => $nowDate,
@@ -200,23 +281,34 @@ class UserBot extends AbstractModel
                         'remark' => $UserCheckinMac->remark,
                     ];
                 }
-            } elseif (Base::isNumber($mac)) {
+            } elseif (preg_match('/^(manual|locat|face|checkin)-(\d+)$/i', $mac, $match)) {
+                // 机器签到、手动签到、定位签到
+                $type = str_replace('checkin', 'face', strtolower($match[1]));
+                $mac = intval($match[2]);
+                $remark = match ($type) {
+                    'manual' => $setting['manual_remark'] ?: 'Manual',
+                    'locat' => $setting['locat_remark'] ?: 'Location',
+                    'face' => $setting['face_remark'] ?: 'Machine',
+                    default => '',
+                };
                 if ($UserInfo = User::whereUserid($mac)->whereBot(0)->first()) {
-                    $array = [
+                    $array[] = [
                         'userid' => $UserInfo->userid,
                         'mac' => '00:00:00:00:00:00',
                         'date' => $nowDate,
                     ];
                     $checkins[] = [
                         'userid' => $UserInfo->userid,
-                        'remark' => '手动签到',
+                        'remark' => $remark,
                     ];
                 }
             }
-            if ($array) {
-                $record = UserCheckinRecord::where($array)->first();
+        }
+        if (!$errorTime) {
+            foreach ($array as $item) {
+                $record = UserCheckinRecord::where($item)->first();
                 if (empty($record)) {
-                    $record = UserCheckinRecord::createInstance($array);
+                    $record = UserCheckinRecord::createInstance($item);
                 }
                 $record->times = Base::array2json(array_merge($record->times, [$nowTime]));
                 $record->report_time = $time;
@@ -225,68 +317,102 @@ class UserBot extends AbstractModel
         }
         //
         if ($checkins && $botUser = User::botGetOrCreate('check-in')) {
-            $getJokeSoup = function($type) {
+            $getJokeSoup = function($type, $userid) {
                 $pre = $type == "up" ? "每日开心：" : "心灵鸡汤：";
-                $key = $type == "up" ? "JokeSoupTask:jokes" : "JokeSoupTask:soups";
-                $array = Base::json2array(Cache::get($key));
+                $key = $type == "up" ? "jokes" : "soups";
+                $array = Base::json2array(Cache::get(JokeSoupTask::keyName($key)));
                 if ($array) {
                     $item = $array[array_rand($array)];
                     if ($item) {
-                        return $pre . $item;
+                        Doo::setLanguage($userid);
+                        return Doo::translate($pre . $item);
                     }
                 }
                 return null;
             };
-            $sendMsg = function($type, $checkin) use ($alreadyTip, $getJokeSoup, $botUser, $nowDate) {
+            $sendMsg = function($type, $checkin) use ($errorTime, $alreadyTip, $getJokeSoup, $botUser, $nowDate) {
+                $dialog = WebSocketDialog::checkUserDialog($botUser, $checkin['userid']);
+                if (!$dialog) {
+                    return;
+                }
+                // 判断错误
+                if ($errorTime) {
+                    if ($alreadyTip) {
+                        $text = $errorTime;
+                        $text .= $checkin['remark'] ? " ({$checkin['remark']})": "";
+                        WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                            'type' => 'content',
+                            'content' => $text,
+                        ], $botUser->userid, false, false, true);
+                    }
+                    return;
+                }
+                // 判断已打卡
                 $cacheKey = "Checkin::sendMsg-{$nowDate}-{$type}:" . $checkin['userid'];
-                $typeDesc = $type == "up" ? "上班" : "下班";
+                $typeContent = $type == "up" ? "上班" : "下班";
                 if (Cache::get($cacheKey) === "yes") {
-                    if ($alreadyTip && $dialog = WebSocketDialog::checkUserDialog($botUser, $checkin['userid'])) {
-                        $text = "<p>今日已{$typeDesc}打卡，无需重复打卡。</p>";
-                        WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, $type != "up");
+                    if ($alreadyTip) {
+                        $text = "今日已{$typeContent}打卡，无需重复打卡。";
+                        $text .= $checkin['remark'] ? " ({$checkin['remark']})": "";
+                        WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                            'type' => 'content',
+                            'content' => $text,
+                        ], $botUser->userid, false, false, true);
                     }
                     return;
                 }
                 Cache::put($cacheKey, "yes", Carbon::now()->addDay());
-                //
-                if ($dialog = WebSocketDialog::checkUserDialog($botUser, $checkin['userid'])) {
-                    $hi = date("H:i");
-                    $remark = $checkin['remark'] ? " ({$checkin['remark']})": "";
-                    $text = "<p>{$typeDesc}打卡成功，打卡时间: {$hi}{$remark}</p>";
-                    $suff = $getJokeSoup($type);
-                    if ($suff) {
-                        $text = "{$text}<p>----------</p><p>{$suff}</p>";
-                    }
-                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, $type != "up");
-                }
+                // 打卡成功
+                $hi = date("H:i");
+                $remark = $checkin['remark'] ? " ({$checkin['remark']})": "";
+                $subcontent = $getJokeSoup($type, $checkin['userid']);
+                $title = "{$typeContent}打卡成功，打卡时间: {$hi}{$remark}";
+                WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                    'type' => 'content',
+                    'title' => $title,
+                    'content' => [
+                        [
+                            'content' => $title
+                        ], [
+                            'content' => $subcontent,
+                            'language' => false,
+                            'style' => 'padding-top:4px;opacity:0.6',
+                        ]
+                    ],
+                ], $botUser->userid, false, false, $type != "up");
             };
-            if ($timeAdvance <= Base::time() && Base::time() < $timeEnd) {
+            if ($timeAdvance <= Timer::time() && Timer::time() < $timeEnd) {
                 // 上班打卡通知（从最早打卡时间 到 下班打卡时间）
                 foreach ($checkins as $checkin) {
                     $sendMsg('up', $checkin);
                 }
             }
-            if ($timeEnd <= Base::time() && Base::time() <= $timeDelay) {
+            if ($timeEnd <= Timer::time() && Timer::time() <= $timeDelay) {
                 // 下班打卡通知（下班打卡时间 到 最晚打卡时间）
                 foreach ($checkins as $checkin) {
                     $sendMsg('down', $checkin);
                 }
             }
         }
-        return null;
     }
 
     /**
      * 隐私机器人
      * @param $command
-     * @return string
+     * @return array
      */
     public static function anonBotQuickMsg($command)
     {
         return match ($command) {
-            "help" => "使用说明：打开你想要发匿名消息的个人对话，点击输入框右边的 ⊕ 号，选择 <u>匿名消息</u> 即可输入你想要发送的匿名消息内容。",
-            "privacy" => "匿名消息将通过 <u>匿名消息（机器人）</u> 发送给对方，不会记录你的身份信息。",
-            default => '',
+            "help" => [
+                "title" => "匿名消息使用说明",
+                "content" => "使用说明：打开你想要发匿名消息的个人对话，点击输入框右边的 ⊕ 号，选择「匿名消息」即可输入你想要发送的匿名消息内容。"
+            ],
+            "privacy" => [
+                "title" => "匿名消息隐私说明",
+                "content" => "匿名消息将通过「匿名消息（机器人）」发送给对方，不会记录你的身份信息。"
+            ],
+            default => [],
         };
     }
 }

app/Models/UserCheckinFace.php

@@ -0,0 +1,109 @@
+<?php
+
+namespace App\Models;
+
+use App\Exceptions\ApiException;
+use App\Module\Base;
+use App\Module\Ihttp;
+
+/**
+ * App\Models\UserCheckinFace
+ *
+ * @property int $id
+ * @property int|null $userid 会员id
+ * @property string|null $faceimg 人脸图片
+ * @property int|null $status 状态
+ * @property string|null $remark 备注
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinFace newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinFace newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinFace query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinFace whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinFace whereFaceimg($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinFace whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinFace whereRemark($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinFace whereStatus($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinFace whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinFace whereUserid($value)
+ * @mixin \Eloquent
+ */
+class UserCheckinFace extends AbstractModel
+{
+
+    public static function saveFace($userid, $nickname, $faceimg, $remark='')
+    {
+        // 取上传图片的URL
+        $faceimg = Base::unFillUrl($faceimg);
+        $record = "";
+        if ($faceimg != '') {
+            $faceFile = public_path($faceimg);
+            $record = base64_encode(file_get_contents($faceFile));
+        }
+
+        $url = 'http://' . env('APP_IPPR') . '.14' . ":7788/user";
+        $data = [
+            'name' => $nickname,
+            'enrollid' => $userid,
+            'admin' => 0,
+            'backupnum' => 50,
+        ];
+        if ($record != '') {
+            $data['record'] = $record;
+        }
+
+        $res = Ihttp::ihttp_post($url, json_encode($data), 15);
+        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) {
+            $checkinFace = self::query()->whereUserid($userid)->first();
+            if ($checkinFace) {
+                self::updateData(['id' => $checkinFace->id], [
+                    'faceimg' => $faceimg,
+                    'status' => 1,
+                    'remark' => $remark
+                ]);
+            } else {
+                $checkinFace = new UserCheckinFace();
+                $checkinFace->faceimg = $faceimg;
+                $checkinFace->userid = $userid;
+                $checkinFace->remark = $remark;
+                $checkinFace->save();
+            }
+            if ($faceimg == '') {
+                $res = UserCheckinFace::deleteDeviceUser($userid);
+                if ($res) {
+                    return $res;
+                }
+            }
+            return Base::retSuccess('设置成功');
+        });
+    }
+
+    public static function deleteDeviceUser($userid) {
+        $url = 'http://' . env('APP_IPPR') . '.14' . ":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){
+                throw new ApiException($data->msg);
+                // return Base::retError($data->msg);
+            }
+        }
+    }
+}

app/Models/UserCheckinMac.php

@@ -15,9 +15,15 @@ use App\Module\Base;
  * @property string|null $remark 备注
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinMac newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinMac newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinMac query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinMac whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinMac whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinMac whereMac($value)

app/Models/UserCheckinRecord.php

@@ -16,9 +16,15 @@ use App\Module\Base;
  * @property int|null $report_time 上报的时间戳
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord whereDate($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord whereId($value)

app/Models/UserDelete.php

@@ -16,9 +16,15 @@ use App\Module\Base;
  * @property string $cache 会员资料缓存
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|UserDelete newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserDelete newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserDelete query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereCache($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereEmail($value)
@@ -42,7 +48,7 @@ class UserDelete extends AbstractModel
             $value = Base::json2array($value);
             // 昵称
             if (!$value['nickname']) {
-                $value['nickname'] = Base::cardFormat($value['email']);
+                $value['nickname'] = Base::formatName($value['email']);
             }
             // 头像
             $value['userimg'] = User::getAvatar($value['userid'], $value['userimg'], $value['email'], $value['nickname']);
@@ -65,7 +71,7 @@ class UserDelete extends AbstractModel
         }
         $cache = $row->cache;
         $cache = array_intersect_key($cache, array_flip(array_merge(User::$basicField, ['department_name'])));
-        $cache['delete_at'] = $row->created_at->format($row->dateFormat ?: 'Y-m-d H:i:s');
+        $cache['delete_at'] = $row->created_at->toDateTimeString();
         return $cache;
     }
 }

app/Models/UserDepartment.php

@@ -14,9 +14,15 @@ use App\Exceptions\ApiException;
  * @property int|null $owner_userid 部门负责人
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereDialogId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereId($value)

app/Models/UserEmailVerification.php

@@ -4,6 +4,8 @@ namespace App\Models;
 
 use App\Exceptions\ApiException;
 use App\Module\Base;
+use App\Module\Doo;
+use App\Module\Timer;
 use Carbon\Carbon;
 use Guanguans\Notify\Factory;
 use Guanguans\Notify\Messages\EmailMessage;
@@ -19,9 +21,15 @@ use Guanguans\Notify\Messages\EmailMessage;
  * @property int|null $type 邮件类型：1-邮箱认证，2-修改邮箱
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereCode($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereEmail($value)
@@ -58,36 +66,48 @@ class UserEmailVerification extends AbstractModel
         ]);
         $row->save();
         $setting = Base::setting('emailSetting');
+        $alias = Base::settingFind('system', 'system_alias', 'Task');
         try {
             if (!Base::isEmail($email)) {
                 throw new \Exception("User email '{$email}' address error");
             }
             switch ($type) {
                 case 2:
-                    $subject = env('APP_NAME') . "修改邮箱验证";
-                    $content = "<p>{$user->nickname} 您好，您正在修改 " . env('APP_NAME') . " 的邮箱，验证码如下。请在30分钟内输入验证码</p><p style='color: #0000DD;'><u>$code</u></p><p>如果不是本人操作，您的帐号可能存在风险，请及时修改密码!</p>";
+                    $subject = Doo::translate($alias . "修改邮箱验证");
+                    $content = sprintf("<p>%s</p><p style='color: #0000DD;'><u>%s</u></p><p>%s</p>",
+                        Doo::translate($user->nickname . " 您好，您正在修改 " . $alias . " 的邮箱，验证码如下。请在30分钟内输入验证码"),
+                        $code,
+                        Doo::translate("如果不是本人操作，您的帐号可能存在风险，请及时修改密码！")
+                    );
                     break;
                 case 3:
-                    $subject = env('APP_NAME') . "注销帐号验证";
-                    $content = "<p>{$user->nickname} 您好，您正在注销 " . env('APP_NAME') . " 的帐号，验证码如下。请在30分钟内输入验证码</p><p style='color: #0000DD;'><u>$code</u></p><p>如果不是本人操作，您的帐号可能存在风险，请及时修改密码!</p>";
+                    $subject = Doo::translate($alias . "注销帐号验证");
+                    $content = sprintf("<p>%s</p><p style='color: #0000DD;'><u>%s</u></p><p>%s</p>",
+                        Doo::translate($user->nickname . " 您好，您正在注销 " . $alias . " 的帐号，验证码如下。请在30分钟内输入验证码"),
+                        $code,
+                        Doo::translate("如果不是本人操作，您的帐号可能存在风险，请及时修改密码！")
+                    );
                     break;
                 default:
                     $url = Base::fillUrl('single/valid/email') . '?code=' . $row->code;
-                    $subject = env('APP_NAME') . "绑定邮箱验证";
-                    $content = "<p>{$user->nickname} 您好，您正在绑定 " . env('APP_NAME') . " 的邮箱，请于30分钟之内点击以下链接完成验证 :</p><p style='display: flex; justify-content: center;'><a href='{$url}' target='_blank'>{$url}</a></p>";
+                    $subject = Doo::translate($alias . "绑定邮箱验证");
+                    $content = sprintf("<p>%s</p><p style='display: flex; justify-content: center;'>%s</p>",
+                        Doo::translate($user->nickname . " 您好，您正在绑定 " . $alias . " 的邮箱，请于30分钟之内点击以下链接完成验证:"),
+                        "<a href='{$url}' target='_blank'>{$url}</a>"
+                    );
                     break;
             }
             Factory::mailer()
                 ->setDsn("smtp://{$setting['account']}:{$setting['password']}@{$setting['smtp_server']}:{$setting['port']}?verify_peer=0")
                 ->setMessage(EmailMessage::create()
-                    ->from(env('APP_NAME', 'Task') . " <{$setting['account']}>")
+                    ->from($alias . " <{$setting['account']}>")
                     ->to($email)
                     ->subject($subject)
                     ->html($content))
                 ->send();
         } catch (\Throwable $e) {
             if (str_contains($e->getMessage(), "Timed Out")) {
-                throw new ApiException("language.TimedOut");
+                throw new ApiException("邮件发送超时，请检查邮箱配置是否正确");
             } elseif ($e->getCode() === 550) {
                 throw new ApiException('邮件内容被拒绝，请检查邮箱是否开启接收功能');
             } else {
@@ -116,7 +136,7 @@ class UserEmailVerification extends AbstractModel
         }
 
         $oldTime = Carbon::parse($emailVerify->created_at)->timestamp;
-        $time = Base::Time();
+        $time = Timer::Time();
 
         // 30分钟失效
         if (abs($time - $oldTime) > 1800) {

app/Models/UserTransfer.php

@@ -16,9 +16,15 @@ use Guanguans\Notify\Messages\EmailMessage;
  * @property int|null $new_userid 交接人
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer whereNewUserid($value)
@@ -44,28 +50,58 @@ class UserTransfer extends AbstractModel
         // 移交文件
         File::transfer($this->original_userid, $this->new_userid);
         // 离职移出群组
-        WebSocketDialog::select(['web_socket_dialogs.*'])
-            ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
-            ->where('web_socket_dialogs.type', 'group')
-            ->where('u.userid', $this->original_userid)
-            ->orderByDesc('web_socket_dialogs.id')
-            ->chunk(100, function($list) {
-                /** @var WebSocketDialog $dialog */
-                foreach ($list as $dialog) {
-                    // 离职员工退出群
-                    $dialog->exitGroup($this->original_userid, 'remove', false, false);
-                    if ($dialog->owner_id === $this->original_userid) {
-                        // 如果是群主则把交接人设为群主
-                        $dialog->owner_id = $this->new_userid;
-                        if ($dialog->save()) {
-                            $dialog->joinGroup($this->new_userid, 0);
-                            $dialog->pushMsg("groupUpdate", [
-                                'id' => $dialog->id,
-                                'owner_id' => $dialog->owner_id,
-                            ]);
-                        }
+        $this->exitDialog();
+    }
+
+    /**
+     * 退出群组
+     * @return void
+     */
+    public function exitDialog()
+    {
+        $lastId = 0;
+        $limit = 100;
+        while (true) {
+            $query = WebSocketDialog::select(['web_socket_dialogs.*'])
+                ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
+                ->where('web_socket_dialogs.type', 'group')
+                ->where('web_socket_dialogs.group_type', '!=', 'okr')
+                ->where('u.userid', $this->original_userid)
+                ->orderBy('web_socket_dialogs.id')
+                ->limit($limit);
+            if ($lastId) {
+                $query->where('web_socket_dialogs.id', '>', $lastId);
+            }
+            $list = $query->get();
+
+            // 没有数据了就退出
+            if ($list->isEmpty()) {
+                break;
+            }
+
+            // 记录最后一条记录的ID
+            $lastId = $list->last()->id;
+
+            // 离职员工退出群
+            foreach ($list as $dialog) {
+                $dialog->exitGroup($this->original_userid, 'remove', false, false);
+                if ($dialog->owner_id === $this->original_userid) {
+                    // 如果是群主则把交接人设为群主
+                    $dialog->owner_id = $this->new_userid;
+                    if ($dialog->save()) {
+                        $dialog->joinGroup($this->new_userid, 0);
+                        $dialog->pushMsg("groupUpdate", [
+                            'id' => $dialog->id,
+                            'owner_id' => $dialog->owner_id,
+                        ]);
                     }
                 }
-            });
+            }
+
+            // 如果返回的数据少于限制数，说明已经是最后一批
+            if ($list->count() < $limit) {
+                break;
+            }
+        }
     }
 }

app/Models/WebSocket.php

@@ -13,9 +13,15 @@ namespace App\Models;
  * @property int|null $userid
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocket newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocket newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocket query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocket whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocket whereFd($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocket whereId($value)

app/Models/WebSocketDialog.php

@@ -9,6 +9,7 @@ use App\Tasks\PushTask;
 use Cache;
 use Carbon\Carbon;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\DB;
 
@@ -20,29 +21,35 @@ use Illuminate\Support\Facades\DB;
  * @property string|null $group_type 聊天室类型
  * @property string|null $name 对话名称
  * @property string $avatar 头像（群）
- * @property string|null $last_at 最后消息时间
  * @property int|null $owner_id 群主用户ID
  * @property int|null $link_id 关联id
+ * @property int|null $top_userid 置顶的用户ID
  * @property int|null $top_msg_id 置顶的消息ID
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\WebSocketDialogUser> $dialogUser
  * @property-read int|null $dialog_user_count
+ * @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|WebSocketDialog newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereAvatar($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereGroupType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereLastAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereLinkId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereName($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereOwnerId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereTopMsgId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereTopUserid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog withTrashed()
@@ -71,6 +78,23 @@ class WebSocketDialog extends AbstractModel
         return $this->hasMany(WebSocketDialogUser::class, 'dialog_id', 'id');
     }
 
+    /**
+     * 获取对话成员（连表查）
+     * @param $addField
+     * @return User|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
+     */
+    public function dialogUserBuilder($addField = [])
+    {
+        $columns = array_map(function ($column) {
+            return "users." . $column;
+        }, array_merge(User::$basicField, $addField));
+        $columns[] = "du.*";
+        return User::select($columns)
+            ->join('web_socket_dialog_users as du', 'users.userid', '=', 'du.userid')
+            ->where('du.dialog_id', $this->id)
+            ->whereNull('users.disable_at');
+    }
+
 
     /**
      * 获取对话列表
@@ -81,18 +105,20 @@ class WebSocketDialog extends AbstractModel
      */
     public static function getDialogList($userid, $updated = "", $deleted = "")
     {
-        $builder = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread', 'u.silence', 'u.color', 'u.updated_at as user_at'])
-            ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
-            ->where('u.userid', $userid);
+        $builder = 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)
+            ->whereNull('d.deleted_at');
         if ($updated) {
             $builder->where('u.updated_at', '>', $updated);
         }
         $list = $builder
             ->orderByDesc('u.top_at')
-            ->orderByDesc('web_socket_dialogs.last_at')
+            ->orderByDesc('u.last_at')
             ->paginate(Base::getPaginate(100, 50));
-        $list->transform(function (WebSocketDialog $item) use ($userid) {
-            return $item->formatData($userid);
+        $list->transform(function ($item) use ($userid) {
+            return self::synthesizeData($item, $userid);
         });
         //
         $data = $list->toArray();
@@ -103,185 +129,272 @@ class WebSocketDialog extends AbstractModel
     }
 
     /**
-     * 获取未读对话列表
+     * 列表外的未读对话 和 列表外的待办对话
      * @param $userid
-     * @param $beforeAt
-     * @param $take
+     * @param $unreadAt
+     * @param $todoAt
      * @return WebSocketDialog[]
      */
-    public static function getDialogUnread($userid, $beforeAt, $take = 20)
+    public static function getDialogBeyond($userid, $unreadAt, $todoAt)
     {
         DB::statement("SET SQL_MODE=''");
-        $list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread', 'u.silence', 'u.color', 'u.updated_at as user_at'])
-            ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
-            ->join('web_socket_dialog_msg_reads as r', 'web_socket_dialogs.id', '=', 'r.dialog_id')
-            ->where('r.userid', $userid)
-            ->where('r.silence', 0)
-            ->where('r.read_at')
-            ->where('web_socket_dialogs.last_at', '>', $beforeAt)
-            ->groupBy('web_socket_dialogs.id')
-            ->take(min(100, $take))
-            ->get();
-        $list->transform(function (WebSocketDialog $item) use ($userid) {
-            return $item->formatData($userid);
-        });
-        //
-        return $list;
+        $ids = [];
+        $array = [];
+        if ($unreadAt) {
+            // 未读对话
+            $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')
+                ->join('web_socket_dialog_msg_reads as r', 'd.id', '=', 'r.dialog_id')
+                ->where('u.userid', $userid)
+                ->where('u.last_at', '<', $unreadAt)
+                ->whereNull('d.deleted_at')
+                ->where('r.userid', $userid)
+                ->where('r.read_at')
+                ->groupBy('u.dialog_id')
+                ->take(20)
+                ->get();
+            $list->transform(function ($item) use ($userid, &$ids, &$array) {
+                if (!in_array($item->id, $ids)) {
+                    $ids[] = $item->id;
+                    $array[] = self::synthesizeData($item, $userid);
+                }
+            });
+            // 标记未读会话
+            $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', $userid)
+                ->where('u.mark_unread', 1)
+                ->where('u.last_at', '<', $unreadAt)
+                ->whereNull('d.deleted_at')
+                ->take(20)
+                ->get();
+            $list->transform(function ($item) use ($userid, &$ids, &$array) {
+                if (!in_array($item->id, $ids)) {
+                    $ids[] = $item->id;
+                    $array[] = self::synthesizeData($item, $userid);
+                }
+            });
+        }
+        if ($todoAt) {
+            // 待办会话
+            $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')
+                ->join('web_socket_dialog_msg_todos as t', 'd.id', '=', 't.dialog_id')
+                ->where('u.userid', $userid)
+                ->where('u.last_at', '<', $todoAt)
+                ->whereNull('d.deleted_at')
+                ->where('t.userid', $userid)
+                ->where('t.done_at')
+                ->groupBy('u.dialog_id')
+                ->take(20)
+                ->get();
+            $list->transform(function ($item) use ($userid, &$ids, &$array) {
+                if (!in_array($item->id, $ids)) {
+                    $ids[] = $item->id;
+                    $array[] = self::synthesizeData($item, $userid);
+                }
+            });
+        }
+        return $array;
     }
 
-
     /**
-     * 格式化对话
+     * 综合数据
+     * @param $data
      * @param int $userid   会员ID
-     * @param bool $hasData
-     * @return $this
+     * @param bool $hasData 已存在的消息类型
+     * @return array
      */
-    public function formatData($userid, $hasData = false)
+    public static function synthesizeData($data, $userid, $hasData = false)
     {
-        $dialogUserFun = function ($key, $default = null) use ($userid) {
-            $data = Cache::remember("Dialog::formatData-{$this->id}-{$userid}", now()->addSeconds(10), function () use ($userid) {
-                return WebSocketDialogUser::whereDialogId($this->id)->whereUserid($userid)->first()?->toArray();
-            });
-            return $data[$key] ?? $default;
-        };
-        //
-        $time = Carbon::parse($this->user_at ?? $dialogUserFun('updated_at'));
-        $this->top_at = $this->top_at ?? $dialogUserFun('top_at');
-        $this->user_at = $time->toDateTimeString('millisecond');
-        $this->user_ms = $time->valueOf();
-        //
-        if (isset($this->search_msg_id)) {
-            // 最后消息 (搜索预览消息)
-            $this->last_msg = WebSocketDialogMsg::whereDialogId($this->id)->find($this->search_msg_id);
-            $this->last_at = $this->last_msg?->created_at;
-        } else {
-            // 未读信息
-            $this->generateUnread($userid, $hasData);
-            // 未读标记
-            $this->mark_unread = $this->mark_unread ?? $dialogUserFun('mark_unread');
-            // 是否免打扰
-            $this->silence = $this->silence ?? $dialogUserFun('silence');
-            // 对话人数
-            $this->people = WebSocketDialogUser::whereDialogId($this->id)->count();
-            // 有待办
-            $this->todo_num = WebSocketDialogMsgTodo::whereDialogId($this->id)->whereUserid($userid)->whereDoneAt(null)->count();
-            // 最后消息
-            $this->last_msg = WebSocketDialogMsg::whereDialogId($this->id)->orderByDesc('id')->first();
+        // 判断数据
+        if (is_numeric($data)) {
+            $data = WebSocketDialog::find($data)?->toArray();
+        } elseif ($data instanceof Model) {
+            $data = $data->toArray();
+        } elseif (is_object($data)) {
+            $data = (array)$data;
         }
+        if (!is_array($data) || !isset($data['id'])) {
+            return $data;
+        }
+
+        // 会话必要字段
+        $fields = [
+            'id', 'type', 'group_type', 'name', 'avatar', 'owner_id', 'link_id', 'top_userid', 'top_msg_id', 'created_at', 'updated_at', 'deleted_at',
+        ];
+        if (!empty(array_diff($fields, array_keys($data)))) {
+            // 补全数据
+            foreach ($fields as $field) {
+                $data[$field] = $data[$field] ?? null;
+            }
+        }
+        $data['avatar'] = Base::fillUrl($data['avatar']);
+
+        // 会员必要字段
+        $fields = [
+            'top_at', 'last_at', 'mark_unread', 'silence', 'hide', 'color', 'user_at',
+        ];
+        if (!empty(array_diff($fields, array_keys($data)))) {
+            // 补全数据（查询数据库）
+            $array = WebSocketDialogUser::whereDialogId($data['id'])->whereUserid($userid)->first()?->toArray();
+            foreach ($fields as $field) {
+                if ($field === 'user_at') {
+                    $data[$field] = $data[$field] ?? $array['updated_at'] ?? null;
+                } else {
+                    $data[$field] = $data[$field] ?? $array[$field] ?? null;
+                }
+            }
+        }
+        // 会员数据处理
+        if (isset($data['user_at']) && !isset($data['user_ms'])) {
+            $time = Carbon::parse($data['user_at']);
+            $data['user_at'] = $time->toDateTimeString('millisecond');
+            $data['user_ms'] = $time->valueOf();
+        }
+
+        // 信息数据
+        if (isset($data['search_msg_id'])) {
+            // 最后消息 (搜索预览消息)
+            $data['last_msg'] = $data['last_msg'] ?? WebSocketDialogMsg::whereDialogId($data['id'])->find($data['search_msg_id'])?->toArray();
+            $data['last_at'] = $data['last_msg'] ? Carbon::parse($data['last_msg']['created_at'])->toDateTimeString() : null;
+        } else {
+            // 未读消息
+            $data = array_merge($data, self::generateUnread($data['id'], $userid));
+            // 对话人数
+            $data['people'] = $data['people'] ?? WebSocketDialogUser::whereDialogId($data['id'])->count();
+            // 有待办
+            $data['todo_num'] = $data['todo_num'] ?? WebSocketDialogMsgTodo::whereDialogId($data['id'])->whereUserid($userid)->whereDoneAt(null)->count();
+            // 最后消息
+            $data['last_msg'] = $data['last_msg'] ?? WebSocketDialogMsg::whereDialogId($data['id'])->orderByDesc('id')->first()?->toArray();
+        }
+        $data['last_msg'] = self::lastMsgFormat($data['last_msg']);
+
         // 对方信息
-        $this->pinyin = Base::cn2pinyin($this->name);
-        $this->quick_msgs = [];
-        $this->dialog_user = null;
-        $this->group_info = null;
-        $this->bot = 0;
-        switch ($this->type) {
+        $data['pinyin'] = Base::cn2pinyin($data['name']);
+        $data['quick_msgs'] = [];
+        $data['dialog_user'] = null;
+        $data['group_info'] = null;
+        $data['bot'] = 0;
+        switch ($data['type']) {
             case "user":
-                $dialog_user = WebSocketDialogUser::whereDialogId($this->id)->where('userid', '!=', $userid)->first();
+                $dialog_user = WebSocketDialogUser::whereDialogId($data['id'])->where('userid', '!=', $userid)->first();
                 if ($dialog_user->userid === 0) {
                     $dialog_user->userid = $userid;
                 }
                 $basic = User::userid2basic($dialog_user->userid);
                 if ($basic) {
-                    $this->name = $basic->nickname;
-                    $this->email = $basic->email;
-                    $this->userimg = $basic->userimg;
-                    $this->bot = $basic->getBotOwner();
-                    $this->quick_msgs = UserBot::quickMsgs($basic->email);
+                    $data['name'] = $basic->nickname;
+                    $data['email'] = $basic->email;
+                    $data['userimg'] = $basic->userimg;
+                    $data['bot'] = $basic->getBotOwner();
+                    $data['quick_msgs'] = UserBot::quickMsgs($basic->email);
                 } else {
-                    $this->name = 'non-existent';
-                    $this->dialog_delete = 1;
+                    $data['name'] = 'non-existent';
+                    $data['dialog_delete'] = 1;
                 }
-                $this->dialog_user = $dialog_user;
+                $data['dialog_user'] = $dialog_user;
+                $data['dialog_mute'] = Base::settingFind('system', 'user_private_chat_mute');
                 break;
             case "group":
-                switch ($this->group_type) {
+                switch ($data['group_type']) {
+                    case 'user':
+                        $data['dialog_mute'] = Base::settingFind('system', 'user_group_chat_mute');
+                        break;
                     case 'project':
-                        $this->group_info = Project::withTrashed()->select(['id', 'name', 'archived_at', 'deleted_at'])->whereDialogId($this->id)->first()?->cancelAppend()->cancelHidden();
-                        if ($this->group_info) {
-                            $this->name = $this->group_info->name;
+                        $data['group_info'] = Project::withTrashed()->select(['id', 'name', 'archived_at', 'deleted_at'])->whereDialogId($data['id'])->first()?->cancelAppend()->cancelHidden()->toArray();
+                        if ($data['group_info']) {
+                            $data['name'] = $data['group_info']['name'];
                         } else {
-                            $this->name = '[Delete]';
-                            $this->dialog_delete = 1;
+                            $data['name'] = '[Delete]';
+                            $data['dialog_delete'] = 1;
                         }
                         break;
                     case 'task':
-                        $this->group_info = ProjectTask::withTrashed()->select(['id', 'name', 'complete_at', 'archived_at', 'deleted_at'])->whereDialogId($this->id)->first()?->cancelAppend()->cancelHidden();
-                        if ($this->group_info) {
-                            $this->name = $this->group_info->name;
+                        $data['group_info'] = ProjectTask::withTrashed()->select(['id', 'name', 'complete_at', 'archived_at', 'deleted_at'])->whereDialogId($data['id'])->first()?->cancelAppend()->cancelHidden()->toArray();
+                        if ($data['group_info']) {
+                            $data['name'] = $data['group_info']['name'];
                         } else {
-                            $this->name = '[Delete]';
-                            $this->dialog_delete = 1;
+                            $data['name'] = '[Delete]';
+                            $data['dialog_delete'] = 1;
                         }
                         break;
                     case 'all':
-                        $this->name = Doo::translate('全体成员');
-                        $this->all_group_mute = Base::settingFind('system', 'all_group_mute');
+                        $data['name'] = Doo::translate('全体成员');
+                        $data['dialog_mute'] = Base::settingFind('system', 'all_group_mute');
                         break;
                 }
                 break;
         }
+
+        // 已存在的消息类型
         if ($hasData === true) {
-            $msgBuilder = WebSocketDialogMsg::whereDialogId($this->id);
-            $this->has_tag = $msgBuilder->clone()->where('tag', '>', 0)->exists();
-            $this->has_todo = $msgBuilder->clone()->where('todo', '>', 0)->exists();
-            $this->has_image = $msgBuilder->clone()->whereMtype('image')->exists();
-            $this->has_file = $msgBuilder->clone()->whereMtype('file')->exists();
-            $this->has_link = $msgBuilder->clone()->whereLink(1)->exists();
-            Cache::forever("Dialog::tag:" . $this->id, Base::array2json([
-                'has_tag' => $this->has_tag,
-                'has_todo' => $this->has_todo,
-                'has_image' => $this->has_image,
-                'has_file' => $this->has_file,
-                'has_link' => $this->has_link,
+            $msgBuilder = WebSocketDialogMsg::whereDialogId($data['id']);
+            $data['has_tag'] = $msgBuilder->clone()->where('tag', '>', 0)->exists();
+            $data['has_todo'] = $msgBuilder->clone()->where('todo', '>', 0)->exists();
+            $data['has_image'] = $msgBuilder->clone()->whereMtype('image')->exists();
+            $data['has_file'] = $msgBuilder->clone()->whereMtype('file')->exists();
+            $data['has_link'] = $msgBuilder->clone()->whereLink(1)->exists();
+            Cache::forever("Dialog::tag:" . $data['id'], Base::array2json([
+                'has_tag' => $data['has_tag'],
+                'has_todo' => $data['has_todo'],
+                'has_image' => $data['has_image'],
+                'has_file' => $data['has_file'],
+                'has_link' => $data['has_link'],
             ]));
         } else {
-            $tagData = Base::json2array(Cache::get("Dialog::tag:" . $this->id));
+            $tagData = Base::json2array(Cache::get("Dialog::tag:" . $data['id']));
             if ($tagData) {
-                $this->has_tag = !!$tagData['has_tag'];
-                $this->has_todo = !!$tagData['has_todo'];
-                $this->has_image = !!$tagData['has_image'];
-                $this->has_file = !!$tagData['has_file'];
-                $this->has_link = !!$tagData['has_link'];
+                $data['has_tag'] = !!$tagData['has_tag'];
+                $data['has_todo'] = !!$tagData['has_todo'];
+                $data['has_image'] = !!$tagData['has_image'];
+                $data['has_file'] = !!$tagData['has_file'];
+                $data['has_link'] = !!$tagData['has_link'];
             }
         }
-        return $this;
+        return $data;
     }
 
     /**
-     * 生成未读数据
-     * @param $userid
-     * @param $positionData
-     * @return $this
+     * 格式化最后消息
+     * @param array $lastMsg
+     * @return array
      */
-    public function generateUnread($userid, $positionData = false)
+    public static function lastMsgFormat($lastMsg)
     {
-        $builder = WebSocketDialogMsgRead::whereDialogId($this->id)->whereUserid($userid)->whereReadAt(null);
-        $this->unread = $builder->count();
-        $this->mention = $this->unread > 0 ? $builder->clone()->whereMention(1)->count() : 0;
-        if ($positionData) {
-            $array = [];
-            // @我的消息
-            if ($this->mention > 0) {
-                $list = $builder->clone()->whereMention(1)->orderByDesc('msg_id')->take(20)->get();
-                foreach ($list as $item) {
-                    $array[] = [
-                        'msg_id' => $item->msg_id,
-                        'label' => Doo::translate('@我的消息'),
-                    ];
-                }
-            }
-            // 最早一条未读消息
-            if ($this->unread > 0
-                && $first_id = intval($builder->clone()->orderBy('msg_id')->value('msg_id'))) {
-                $array[] = [
-                    'msg_id' => $first_id,
-                    'label' => '{UNREAD}'
-                ];
-            }
-            //
-            $this->position_msgs = $array;
+        if ($lastMsg && $lastMsg['type'] != 'preview') {
+            $msgData = $lastMsg;
+            $msgData['emoji'] = Base::array_only_recursive($msgData['emoji'], ['symbol']);
+            $msgData['msg'] = ['preview' => WebSocketDialogMsg::previewMsg($msgData)];
+            $msgData['type'] = 'preview';
+            $lastMsg = array_intersect_key($msgData, array_flip(['id', 'type', 'msg', 'userid', 'percentage', 'emoji', 'created_at']));
         }
-        return $this;
+        return $lastMsg;
+    }
+
+    /**
+     * 获取未读数据
+     * @param $dialogId
+     * @param $userid
+     * @return array
+     */
+    public static function generateUnread($dialogId, $userid)
+    {
+        $data = [];
+        // 未读消息
+        $builder = WebSocketDialogMsgRead::whereDialogId($dialogId)->whereUserid($userid)->whereReadAt(null);
+        // 总未读消息
+        $data['unread'] = $builder->clone()->count();
+        // 最早一条未读消息
+        $data['unread_one'] = $data['unread'] > 0 ? intval($builder->clone()->orderBy('msg_id')->value('msg_id')) : 0;
+        // @我的消息
+        $data['mention'] = $data['unread'] > 0 ? $builder->clone()->whereMention(1)->count() : 0;
+        // @我的消息（id集合）
+        $data['mention_ids'] = $data['mention'] > 0 ? $builder->clone()->whereMention(1)->orderByDesc('msg_id')->take(20)->pluck('msg_id')->toArray() : [];
+        return $data;
     }
 
     /**
@@ -435,17 +548,37 @@ class WebSocketDialog extends AbstractModel
      */
     public function checkMute($userid)
     {
-        if ($this->group_type === 'all') {
-            $allGroupMute = Base::settingFind('system', 'all_group_mute');
-            switch ($allGroupMute) {
-                case 'all':
-                    throw new ApiException('当前会话全员禁言');
-                case 'user':
-                    if (!User::find($userid)?->isAdmin()) {
-                        throw new ApiException('当前会话禁言');
+        $muteMsgTip = null;
+        $systemConfig = Base::setting('system');
+        switch ($this->type) {
+            case 'user':
+                if ($systemConfig['user_private_chat_mute'] === 'close') {
+                    $muteMsgTip = '个人会话禁言';
+                }
+                break;
+
+            case 'group':
+                if ($this->group_type === 'user') {
+                    if ($systemConfig['user_group_chat_mute'] === 'close') {
+                        $muteMsgTip = '个人群组禁言';
                     }
+                } elseif ($this->group_type === 'all') {
+                    if ($systemConfig['all_group_mute'] === 'close') {
+                        $muteMsgTip = '当前会话全员禁言';
+                    }
+                }
+                break;
+        }
+        if ($muteMsgTip === null) {
+            return;
+        }
+        if ($userid) {
+            $user = User::find($userid);
+            if ($user?->bot || $user?->isAdmin()) { // 机器人或管理员不受禁言
+                return;
             }
         }
+        throw new ApiException($muteMsgTip);
     }
 
     /**
@@ -503,20 +636,6 @@ class WebSocketDialog extends AbstractModel
         Task::deliver($task);
     }
 
-    /**
-     * 更新对话最后消息时间
-     * @return WebSocketDialogMsg|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Model|\Illuminate\Database\Query\Builder|object|null
-     */
-    public function updateMsgLastAt()
-    {
-        $lastMsg = WebSocketDialogMsg::whereDialogId($this->id)->orderByDesc('id')->first();
-        if ($lastMsg) {
-            $this->last_at = $lastMsg->created_at;
-            $this->save();
-        }
-        return $lastMsg;
-    }
-
     /**
      * 获取对话（同时检验对话身份）
      * @param $dialog_id
@@ -573,7 +692,6 @@ class WebSocketDialog extends AbstractModel
                 'name' => $name ?: '',
                 'group_type' => $group_type,
                 'owner_id' => $owner_id,
-                'last_at' => in_array($group_type, ['user', 'department', 'all']) ? Carbon::now() : null,
             ]);
             $dialog->save();
             foreach (is_array($userid) ? $userid : [$userid] as $value) {
@@ -581,7 +699,8 @@ class WebSocketDialog extends AbstractModel
                     WebSocketDialogUser::createInstance([
                         'dialog_id' => $dialog->id,
                         'userid' => $value,
-                        'important' => !in_array($group_type, ['user', 'all'])
+                        'important' => !in_array($group_type, ['user', 'all']),
+                        'last_at' => in_array($group_type, ['user', 'department', 'all']) ? Carbon::now() : null,
                     ])->save();
                 }
             }
@@ -593,27 +712,22 @@ class WebSocketDialog extends AbstractModel
      * 获取会员对话（没有自动创建）
      * @param User $user    发起会话的会员
      * @param int $receiver  另一个会员ID
-     * @return self|null
+     * @return WebSocketDialog|null
      */
     public static function checkUserDialog($user, $receiver)
     {
         if ($user->userid == $receiver) {
             $receiver = 0;
         }
-        $dialogUser = self::select(['web_socket_dialogs.*'])
-            ->join('web_socket_dialog_users as u1', 'web_socket_dialogs.id', '=', 'u1.dialog_id')
-            ->join('web_socket_dialog_users as u2', 'web_socket_dialogs.id', '=', 'u2.dialog_id')
-            ->where('u1.userid', $user->userid)
-            ->where('u2.userid', $receiver)
-            ->where('web_socket_dialogs.type', 'user')
-            ->first();
+        $dialogUser = self::getUserDialog($user->userid, $receiver, 0, $cacheKey);
         if ($dialogUser) {
             return $dialogUser;
         }
         if ($receiver > 0 && $user->isTemp() && !User::whereUserid($receiver)->whereBot(1)->exists() ) {
             throw new ApiException('无法发起会话，请联系管理员。');
         }
-        return AbstractModel::transaction(function () use ($receiver, $user) {
+        return AbstractModel::transaction(function () use ($cacheKey, $receiver, $user) {
+            Cache::forget($cacheKey);
             $dialog = self::createInstance([
                 'type' => 'user',
             ]);
@@ -630,12 +744,47 @@ class WebSocketDialog extends AbstractModel
         });
     }
 
+    /**
+     * 获取用户对话（支持缓存）
+     * @param $userid1
+     * @param $userid2
+     * @param $ttl
+     * @param null $cacheKey
+     * @return \Illuminate\Database\Eloquent\Builder|WebSocketDialog|null
+     */
+    public static function getUserDialog($userid1, $userid2, $ttl, &$cacheKey = null)
+    {
+        $userids = [$userid1, $userid2];
+        sort($userids);
+        $cacheKey = "Dialog::user:" . implode('-', $userids);
+        if (empty($ttl)) {
+            return WebSocketDialog::query()
+                ->whereType('user')
+                ->whereExists(function ($query) use ($userids) {
+                    $query->select(DB::raw(1))
+                        ->from('web_socket_dialog_users')
+                        ->whereColumn('web_socket_dialog_users.dialog_id', 'web_socket_dialogs.id')
+                        ->where('web_socket_dialog_users.userid', $userids[0]);
+                })
+                ->whereExists(function ($query) use ($userids) {
+                    $query->select(DB::raw(1))
+                        ->from('web_socket_dialog_users')
+                        ->whereColumn('web_socket_dialog_users.dialog_id', 'web_socket_dialogs.id')
+                        ->where('web_socket_dialog_users.userid', $userids[1]);
+                })
+                ->first();
+        }
+        return Cache::remember($cacheKey, $ttl, function() use ($userids) {
+            return self::getUserDialog($userids[0], $userids[1], 0);
+        });
+    }
+
     /**
      * 发送消息文件
      *
      * @param User $user 发起会话的会员
      * @param array $dialogIds 对话id
-     * @param file $files 文件对象
+     * @param file|mixed $files 文件对象
      * @param string $image64 base64文件
      * @param string $fileName 文件名称
      * @param int $replyId 恢复id
@@ -646,6 +795,7 @@ class WebSocketDialog extends AbstractModel
     {
         $filePath = '';
         $result = [];
+        $data = [];
         foreach ($dialogIds as $dialog_id) {
             $dialog = WebSocketDialog::checkDialog($dialog_id);
             //
@@ -656,18 +806,19 @@ class WebSocketDialog extends AbstractModel
                     "image64" => $image64,
                     "path" => $path,
                     "fileName" => $fileName,
+                    "quality" => 85
                 ]);
             } else if ($filePath) {
                 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,
-                    "size" => ($setting['file_upload_limit'] ?: 0) * 1024
+                    "quality" => 100,
+                    "convertVideo" => true
                 ]);
             }
             //

app/Models/WebSocketDialogMsg.php

@@ -4,6 +4,7 @@ namespace App\Models;
 
 use Carbon\Carbon;
 use App\Module\Base;
+use App\Module\Doo;
 use App\Module\Image;
 use App\Tasks\PushTask;
 use App\Exceptions\ApiException;
@@ -33,18 +34,21 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property int|null $reply_id 回复ID
  * @property int|null $forward_id 转发ID
  * @property int|null $forward_num 被转发多少次
- * @property int|null $forward_show 是否显示转发的来源
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property-read \App\Models\WebSocketDialogMsg|null $forward_data
  * @property-read int|mixed $percentage
- * @property-read \App\Models\WebSocketDialogMsg|null $reply_data
  * @property-read \App\Models\WebSocketDialog|null $webSocketDialog
+ * @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|WebSocketDialogMsg newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereDialogId($value)
@@ -52,7 +56,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereEmoji($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereForwardId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereForwardNum($value)
- * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereForwardShow($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereKey($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereLink($value)
@@ -78,8 +81,6 @@ class WebSocketDialogMsg extends AbstractModel
 
     protected $appends = [
         'percentage',
-        'reply_data',
-        'forward_data',
     ];
 
     protected $hidden = [
@@ -107,36 +108,6 @@ class WebSocketDialogMsg extends AbstractModel
         return $this->appendattrs['percentage'];
     }
 
-    /**
-     * 回复消息详情
-     * @return WebSocketDialogMsg|null
-     */
-    public function getReplyDataAttribute()
-    {
-        if (!isset($this->appendattrs['reply_data'])) {
-            $this->appendattrs['reply_data'] = null;
-            if ($this->reply_id > 0) {
-                $this->appendattrs['reply_data'] = self::find($this->reply_id, ['id', 'userid', 'type', 'msg'])?->cancelAppend() ?: null;
-            }
-        }
-        return $this->appendattrs['reply_data'];
-    }
-
-    /**
-     * 转发消息详情
-     * @return WebSocketDialogMsg|null
-     */
-    public function getForwardDataAttribute()
-    {
-        if (!isset($this->appendattrs['forward_data'])) {
-            $this->appendattrs['forward_data'] = null;
-            if ($this->forward_id > 0) {
-                $this->appendattrs['forward_data'] = self::find($this->forward_id, ['id', 'userid', 'type', 'msg'])?->cancelAppend() ?: null;
-            }
-        }
-        return $this->appendattrs['forward_data'];
-    }
-
     /**
      * 消息格式化
      * @param $value
@@ -147,13 +118,9 @@ class WebSocketDialogMsg extends AbstractModel
         if (is_array($value)) {
             return $value;
         }
-        $value = Base::json2array($value);
-        if ($this->type === 'file') {
-            $value['type'] = in_array($value['ext'], ['jpg', 'jpeg', 'webp', 'png', 'gif']) ? 'img' : 'file';
-            $value['path'] = Base::fillUrl($value['path']);
-            $value['thumb'] = Base::fillUrl($value['thumb'] ?: Base::extIcon($value['ext']));
-        } else if ($this->type === 'record') {
-            $value['path'] = Base::fillUrl($value['path']);
+        $value = $this->formatDataMsg($this->type, $value);
+        if (isset($value['reply_data'])) {
+            $value['reply_data']['msg'] = $this->formatDataMsg($value['reply_data']['type'], $value['reply_data']['msg']);
         }
         return $value;
     }
@@ -171,6 +138,48 @@ class WebSocketDialogMsg extends AbstractModel
         return Base::json2array($value);
     }
 
+    /**
+     * 处理消息数据
+     * @param $type
+     * @param $msg
+     * @return mixed
+     */
+    private function formatDataMsg($type, $msg)
+    {
+        if (!is_array($msg)) {
+            $msg = Base::json2array($msg);
+        }
+        switch ($type) {
+            case 'file':
+                $msg['type'] = in_array($msg['ext'], ['jpg', 'jpeg', 'webp', 'png', 'gif']) ? 'img' : 'file';
+                $msg['path'] = Base::fillUrl($msg['path']);
+                $msg['thumb'] = Base::fillUrl($msg['thumb'] ?: Base::extIcon($msg['ext']));
+                break;
+
+            case 'record':
+                $msg['path'] = Base::fillUrl($msg['path']);
+                $textUserid = is_array($msg['text_userid']) ? $msg['text_userid'] : [];
+                if (isset($msg['text_userid'])) {
+                    unset($msg['text_userid']);
+                }
+                if ($msg['text'] && !in_array(Doo::userId(), $textUserid)) {
+                    $msg['text'] = "";
+                }
+                break;
+
+            case 'location':
+                $msg['thumb'] = Base::fillUrl($msg['thumb'] ?: "images/other/location.jpg");
+                break;
+
+            case 'template':
+                if ($msg['data']['thumb']) {
+                    $msg['data']['thumb']['url'] = Base::fillUrl($msg['data']['thumb']['url']);
+                }
+                break;
+        }
+        return $msg;
+    }
+
     /**
      * 获取占比
      * @param bool|int $increment 是否新增阅读数
@@ -333,41 +342,54 @@ class WebSocketDialogMsg extends AbstractModel
         if (in_array($this->type, ['tag', 'todo', 'notice'])) {
             return Base::retError('此消息不支持设待办');
         }
-        if ($this->todo && $this->todo != $sender) {
-            return Base::retError('仅支持设此待办人员【' . User::userid2nickname($this->todo) . '】取消');
-        }
-        $before = $this->todo;
-        $this->todo = $before ? 0 : $sender;
+        $current = WebSocketDialogMsgTodo::whereMsgId($this->id)->pluck('userid')->toArray();
+        $cancel = array_diff($current, $userids);
+        $setup = array_diff($userids, $current);
+        //
+        $this->todo = $setup || count($current) > count($cancel) ? $sender : 0;
         $this->save();
-        $resData = [
+        $upData = [
             'id' => $this->id,
             'todo' => $this->todo,
+            'dialog_id' => $this->dialog_id,
         ];
+        $dialog = WebSocketDialog::find($this->dialog_id);
+        $dialog->pushMsg('update', $upData);
         //
-        $data = [
-            'update' => $resData
+        $retData = [
+            'add' => [],
+            'update' => $upData
         ];
-        $res = self::sendMsg(null, $this->dialog_id, 'todo', [
-            'action' => $this->todo ? 'add' : 'remove',
-            'data' => [
-                'id' => $this->id,
-                'type' => $this->type,
-                'msg' => $this->quoteTextMsg(),
-                'userids' => implode(",", $userids),
-            ]
-        ], $sender);
-        if (Base::isSuccess($res)) {
-            $data['add'] = $res['data'];
-            $dialog = WebSocketDialog::find($this->dialog_id);
-            $dialog->pushMsg('update', array_merge($resData, ['dialog_id' => $this->dialog_id]));
-            //
-            if ($this->todo) {
+        if ($cancel) {
+            $res = self::sendMsg(null, $this->dialog_id, 'todo', [
+                'action' => 'remove',
+                'data' => [
+                    'id' => $this->id,
+                    'type' => $this->type,
+                    'msg' => $this->quoteTextMsg(),
+                    'userids' => implode(",", $cancel),
+                ]
+            ], $sender);
+            if (Base::isSuccess($res)) {
+                $retData['add'][] = $res['data'];
+                WebSocketDialogMsgTodo::whereMsgId($this->id)->whereIn('userid', $cancel)->delete();
+            }
+        }
+        if ($setup) {
+            $res = self::sendMsg(null, $this->dialog_id, 'todo', [
+                'action' => 'add',
+                'data' => [
+                    'id' => $this->id,
+                    'type' => $this->type,
+                    'msg' => $this->quoteTextMsg(),
+                    'userids' => implode(",", $setup),
+                ]
+            ], $sender);
+            if (Base::isSuccess($res)) {
+                $retData['add'][] = $res['data'];
                 $useridList = $dialog->dialogUser->pluck('userid')->toArray();
-                foreach ($useridList as $userid) {
-                    if ($userids && !in_array($userid, $userids)) {
-                        continue;
-                    }
-                    if (empty($userid)) {
+                foreach ($setup as $userid) {
+                    if (!in_array($userid, $useridList)) {
                         continue;
                     }
                     WebSocketDialogMsgTodo::createInstance([
@@ -376,30 +398,40 @@ class WebSocketDialogMsg extends AbstractModel
                         'userid' => $userid,
                     ])->saveOrIgnore();
                 }
-            } else {
-                WebSocketDialogMsgTodo::whereMsgId($this->id)->delete();
             }
-        } else {
-            $this->todo = $before;
-            $this->save();
         }
         //
-        return Base::retSuccess($this->todo ? '设置成功' : '取消成功', $data);
+        return Base::retSuccess($this->todo ? '设置成功' : '取消成功', $retData);
     }
 
     /**
      * 转发消息
      * @param array|int $dialogids
      * @param array|int $userids
-     * @param User $user    发送的会员
-     * @param int $showSource    是否显示原发送者信息
-     * @param string $leaveMessage    转发留言
+     * @param User $user                发送的会员
+     * @param int $showSource           是否显示原发送者信息
+     * @param string $leaveMessage      转发留言
      * @return mixed
      */
     public function forwardMsg($dialogids, $userids, $user, $showSource = 1, $leaveMessage = '')
     {
-        return AbstractModel::transaction(function() use ($dialogids, $user, $userids, $showSource, $leaveMessage) {
-            $originalMsg = Base::json2array($this->getRawOriginal('msg'));
+        return AbstractModel::transaction(function () use ($dialogids, $user, $userids, $showSource, $leaveMessage) {
+            $msgData = Base::json2array($this->getRawOriginal('msg'));
+            $forwardData = is_array($msgData['forward_data']) ? $msgData['forward_data'] : [];
+            $forwardId = $forwardData['id'] ?: $this->id;
+            $forwardUserid = $forwardData['userid'] ?: $this->userid;
+            if ($forwardData['show'] === 0) {
+                // 如果上一条消息不显示原发送者信息，则转发的消息原始数据为当前消息
+                $forwardId = $this->id;
+                $forwardUserid = $this->userid;
+            }
+            $msgData['forward_data'] = [
+                'id' => $forwardId,                 // 转发的消息ID（原始）
+                'userid' => $forwardUserid,         // 转发的消息会员ID（原始）
+                'parent_id' => $this->id,           // 转发的消息ID
+                'parent_userid' => $this->userid,   // 转发的消息会员ID
+                'show' => $showSource,              // 是否显示原发送者信息
+            ];
             $msgs = [];
             $already = [];
             if ($dialogids) {
@@ -407,13 +439,16 @@ class WebSocketDialogMsg extends AbstractModel
                     $dialogids = [$dialogids];
                 }
                 foreach ($dialogids as $dialogid) {
-                    $res = self::sendMsg('forward-'.( $showSource ? 1 : 0).'-'.($this->forward_id ?: $this->id), $dialogid, $this->type, $originalMsg, $user->userid);
+                    $res = self::sendMsg('forward-' . $forwardId, $dialogid, $this->type, $msgData, $user->userid);
                     if (Base::isSuccess($res)) {
                         $msgs[] = $res['data'];
                         $already[] = $dialogid;
                     }
                     if ($leaveMessage) {
-                        self::sendMsg(null, $dialogid, 'text', ['text' => $leaveMessage], $user->userid);
+                        $res = self::sendMsg(null, $dialogid, 'text', ['text' => $leaveMessage], $user->userid);
+                        if (Base::isSuccess($res)) {
+                            $msgs[] = $res['data'];
+                        }
                     }
                 }
             }
@@ -427,16 +462,22 @@ class WebSocketDialogMsg extends AbstractModel
                     }
                     $dialog = WebSocketDialog::checkUserDialog($user, $userid);
                     if ($dialog && !in_array($dialog->id, $already)) {
-                        $res = self::sendMsg('forward-'.( $showSource ? 1 : 0).'-'.($this->forward_id  ?: $this->id), $dialog->id, $this->type, $originalMsg, $user->userid);
+                        $res = self::sendMsg('forward-' . $forwardId, $dialog->id, $this->type, $msgData, $user->userid);
                         if (Base::isSuccess($res)) {
                             $msgs[] = $res['data'];
                         }
                         if ($leaveMessage) {
-                            self::sendMsg(null, $dialog->id, 'text', ['text' => $leaveMessage], $user->userid);
+                            $res = self::sendMsg(null, $dialog->id, 'text', ['text' => $leaveMessage], $user->userid);
+                            if (Base::isSuccess($res)) {
+                                $msgs[] = $res['data'];
+                            }
                         }
                     }
                 }
             }
+            if (count($msgs) > 0) {
+                $this->increment('forward_num', count($msgs));
+            }
             return Base::retSuccess('转发成功', [
                 'msgs' => $msgs
             ]);
@@ -458,9 +499,8 @@ class WebSocketDialogMsg extends AbstractModel
             WebSocketDialogMsgTodo::whereIn('msg_id', $ids)->delete();
             self::whereIn('id', $ids)->delete();
             //
-            $dialogDatas = WebSocketDialog::whereIn('id', $dialogIds)->get();
-            foreach ($dialogDatas as $dialogData) {
-                $dialogData->updateMsgLastAt();
+            foreach ($dialogIds as $dialogId) {
+                WebSocketDialogUser::updateMsgLastAt($dialogId);
             }
             foreach ($replyIds as $id) {
                 self::whereId($id)->update(['reply_num' => self::whereReplyId($id)->count()]);
@@ -501,7 +541,7 @@ class WebSocketDialogMsg extends AbstractModel
                         'data' => [
                             'id' => $this->id,
                             'dialog_id' => $this->dialog_id,
-                            'last_msg' => $dialogData->updateMsgLastAt(),
+                            'last_msg' => WebSocketDialogUser::updateMsgLastAt($this->dialog_id),
                             'update_read' => $deleteRead ? 1 : 0
                         ],
                     ]
@@ -514,97 +554,195 @@ class WebSocketDialogMsg extends AbstractModel
 
     /**
      * 预览消息
-     * @param bool $preserveHtml    保留html格式
-     * @param null|array $data
+     * @param WebSocketDialogMsg|array $data    消息数据
+     * @param bool $preserveHtml                保留html格式
      * @return string
      */
-    public function previewMsg($preserveHtml = false, $data = null)
+    public static function previewMsg($data, $preserveHtml = false)
     {
-        if ($data === null) {
+        if ($data instanceof WebSocketDialogMsg) {
             $data = [
-                'type' => $this->type,
-                'msg' => $this->msg,
+                'type' => $data->type,
+                'msg' => $data->msg,
             ];
         }
+        if (!is_array($data)) {
+            return '';
+        }
+
         switch ($data['type']) {
             case 'text':
-            case 'word-chain':
+                return self::previewTextMsg($data['msg'], $preserveHtml);
+
             case 'vote':
-                return $this->previewTextMsg($data['msg']['text'], $preserveHtml);
+                $action = Doo::translate("投票");
+                return "[{$action}] " . self::previewTextMsg($data['msg'], $preserveHtml);
+
+            case 'word-chain':
+                $action = Doo::translate("接龙");
+                return "[{$action}] " . self::previewTextMsg($data['msg'], $preserveHtml);
+
             case 'record':
-                return "[语音]";
+                $action = Doo::translate("语音");
+                return "[{$action}]";
+
+            case 'location':
+                $action = Doo::translate("位置");
+                return "[{$action}] " . Base::cutStr($data['msg']['title'], 50);
+
             case 'meeting':
-                return "[会议] ${$data['msg']['name']}";
+                $action = Doo::translate("会议");
+                return "[{$action}] " . Base::cutStr($data['msg']['name'], 50);
+
             case 'file':
-                if ($data['msg']['type'] == 'img') {
-                    return "[图片]";
-                }
-                return "[文件] {$data['msg']['name']}";
+                return self::previewFileMsg($data['msg']);
+
             case 'tag':
-                $action = $data['msg']['action'] === 'remove' ? '取消标注' : '标注';
-                return "[{$action}] {$this->previewMsg(false, $data['msg']['data'])}";
+                $action = Doo::translate($data['msg']['action'] === 'remove' ? '取消标注' : '标注');
+                return "[{$action}] " . self::previewMsg($data['msg']['data']);
+
             case 'top':
-                $action = $data['msg']['action'] === 'remove' ? '取消置顶' : '置顶';
-                return "[{$action}] {$this->previewMsg(false, $data['msg']['data'])}";
+                $action = Doo::translate($data['msg']['action'] === 'remove' ? '取消置顶' : '置顶');
+                return "[{$action}] " . self::previewMsg($data['msg']['data']);
+
             case 'todo':
-                $action = $data['msg']['action'] === 'remove' ? '取消待办' : ($data['msg']['action'] === 'done' ? '完成' : '设待办');
-                return "[{$action}] {$this->previewMsg(false, $data['msg']['data'])}";
+                $action = Doo::translate($data['msg']['action'] === 'remove' ? '取消待办' : ($data['msg']['action'] === 'done' ? '完成' : '设待办'));
+                return "[{$action}] " . self::previewMsg($data['msg']['data']);
+
             case 'notice':
-                return $data['msg']['notice'];
+                return Base::cutStr(Doo::translate($data['msg']['notice']), 50);
+
+            case 'template':
+                return self::previewTemplateMsg($data['msg']);
+
+            case 'preview':
+                return $data['msg']['preview'];
+
             default:
-                return "[未知的消息]";
+                $action = Doo::translate("未知的消息");
+                return "[{$action}]";
         }
     }
 
-    /**
-     * 生成关键词
-     * @return string
-     */
-    public function generateMsgKey()
-    {
-        return match ($this->type) {
-            'text' => str_replace(" ", " ", strip_tags($this->msg['text'])),
-            'meeting', 'file' => $this->msg['name'],
-            default => '',
-        };
-    }
-
-    /**
-     * 返回引用消息（如果是文本消息则截取）
-     * @param int $strlen
-     * @return array|mixed
-     */
-    public function quoteTextMsg($strlen = 30)
-    {
-        $msg = $this->msg;
-        if ($this->type === 'text') {
-            $msg['text'] = $this->previewTextMsg($msg['text']);
-            if (mb_strlen($msg['text']) > $strlen) {
-                $msg['text'] = mb_substr($msg['text'], 0, $strlen - 3) . "...";
-            }
-        }
-        return $msg;
-    }
-
     /**
      * 返回文本预览消息
-     * @param $text
+     * @param array $msgData
      * @param bool $preserveHtml    保留html格式
      * @return string|string[]|null
      */
-    private function previewTextMsg($text, $preserveHtml = false)
+    private static function previewTextMsg($msgData, $preserveHtml = false)
     {
+        $text = $msgData['text'] ?? '';
         if (!$text) return '';
+        if ($msgData['type'] === 'md') {
+            $text = Base::markdown2html($text);
+        }
         $text = preg_replace("/<img\s+class=\"emoticon\"[^>]*?alt=\"(\S+)\"[^>]*?>/", "[$1]", $text);
-        $text = preg_replace("/<img\s+class=\"emoticon\"[^>]*?>/", "[动画表情]", $text);
-        $text = preg_replace("/<img\s+class=\"browse\"[^>]*?>/", "[图片]", $text);
+        $text = preg_replace("/<img\s+class=\"emoticon\"[^>]*?>/", "[" . Doo::translate('动画表情') . "]", $text);
+        $text = preg_replace("/<img\s+class=\"browse\"[^>]*?>/", "[" . Doo::translate('图片') . "]", $text);
         if (!$preserveHtml) {
+            $text = str_replace("</p><p>", "</p> <p>", $text);
             $text = strip_tags($text);
-            $text = str_replace(["&nbsp;", "&amp;", "&lt;", "&gt;"], [" ", "&", "<", ">"], $text);
+            $text = str_replace(["&nbsp;", "&quot;", "&amp;", "&lt;", "&gt;"], [" ", '"', "&", "<", ">"], $text);
+            $text = preg_replace("/\s+/", " ", $text);
+            $text = Base::cutStr($text, 50);
         }
         return $text;
     }
 
+    /**
+     * 预览文件消息
+     * @param $msg
+     * @return string
+     */
+    private static function previewFileMsg($msg)
+    {
+        if ($msg['type'] == 'img') {
+            $action = Doo::translate("图片");
+            return "[{$action}]";
+        } elseif ($msg['ext'] == 'mp4') {
+            $action = Doo::translate("视频");
+            return "[{$action}]";
+        }
+        $action = Doo::translate("文件");
+        return "[{$action}] " . Base::cutStr($msg['name'], 50);
+    }
+
+    /**
+     * 预览模板消息
+     * @param $msg
+     * @return string
+     */
+    private static function previewTemplateMsg($msg)
+    {
+        if (!empty($msg['title_raw'])) {
+            return $msg['title_raw'];
+        }
+        if ($msg['type'] === 'task_list' && count($msg['list']) === 1) {
+            return Doo::translate($msg['title']) . ": " . Base::cutStr($msg['list'][0]['name'], 50);
+        }
+        if (!empty($msg['title'])) {
+            return Doo::translate($msg['title']);
+        }
+        if ($msg['type'] === 'content' && is_string($msg['content']) && $msg['content'] !== '') {
+            return Base::cutStr(Doo::translate($msg['content']), 50);
+        }
+        return Doo::translate('未知的消息');
+    }
+
+    /**
+     * 生成关键词并保存
+     * @param string $key
+     * @return void
+     */
+    public function generateKeyAndSave($key = ''): void
+    {
+        if (empty($key)) {
+            $key = '';
+            switch ($this->type) {
+                case 'text':
+                    if (!preg_match("/<span[^>]*?data-quick-key=([\"'])([^\"']+?)\\1[^>]*?>/is", $this->msg['text'])) {
+                        $key = strip_tags($this->msg['text']);
+                    }
+                    break;
+
+                case 'vote':
+                case 'word-chain':
+                    $key = strip_tags($this->msg['text']);
+                    break;
+
+                case 'file':
+                    $key = $this->msg['name'];
+                    $key = preg_replace("/^(image|\d+)\.(png|jpg|jpeg|webp|gif)$/i", "", $key);
+                    $key = preg_replace("/^LongText-(.*?)/i", "", $key);
+                    break;
+
+                case 'meeting':
+                    $key = $this->msg['name'];
+                    break;
+            }
+        }
+        $key = str_replace(["&quot;", "&amp;", "&lt;", "&gt;"], "", $key);
+        $key = str_replace(["\r", "\n", "\t", "&nbsp;"], " ", $key);
+        $key = preg_replace("/^\/[A-Za-z]+/", " ", $key);
+        $key = preg_replace("/\s+/", " ", $key);
+        $this->key = trim($key);
+        $this->save();
+    }
+
+    /**
+     * 返回引用消息（如果是文本只取预览）
+     * @return array|mixed
+     */
+    public function quoteTextMsg()
+    {
+        $msg = $this->msg;
+        if ($this->type === 'text') {
+            $msg['text'] = self::previewTextMsg($msg);
+        }
+        return $msg;
+    }
+
     /**
      * 处理文本消息内容，用于发送前
      * @param $text
@@ -622,9 +760,9 @@ class WebSocketDialogMsg extends AbstractModel
             $imagePath = "uploads/chat/" . date("Ym") . "/" . $dialog_id . "/";
             Base::makeDir(public_path($imagePath));
             $imagePath .= md5s($base64) . "." . $matchs[1][$key];
-            if (Base::saveContentImage(public_path($imagePath), base64_decode($base64))) {
+            if (Base::saveContentImage(public_path($imagePath), base64_decode($base64), 90)) {
                 $imageSize = getimagesize(public_path($imagePath));
-                if ($extension = Image::thumbImage(public_path($imagePath), public_path($imagePath) . "_thumb.{*}", 320, 0)) {
+                if ($extension = Image::thumbImage(public_path($imagePath), public_path($imagePath) . "_thumb.{*}", 320, 0, 80)) {
                     $imagePath .= "_thumb.{$extension}";
                 }
                 $text = str_replace($matchs[0][$key], "[:IMAGE:browse:{$imageSize[0]}:{$imageSize[1]}:{$imagePath}::]", $text);
@@ -698,7 +836,7 @@ class WebSocketDialogMsg extends AbstractModel
             }
             if (file_exists(public_path($imagePath))) {
                 $imageSize = getimagesize(public_path($imagePath));
-                if ($extension = Image::thumbImage(public_path($imagePath), public_path($imagePath) . "_thumb.{*}", 320, 0)) {
+                if ($extension = Image::thumbImage(public_path($imagePath), public_path($imagePath) . "_thumb.{*}", 320, 0, 80)) {
                     $imagePath .= "_thumb.{$extension}";
                 }
                 $text = str_replace($matchs[0][$key], "[:IMAGE:browse:{$imageSize[0]}:{$imageSize[1]}:{$imagePath}::]", $text);
@@ -706,9 +844,9 @@ class WebSocketDialogMsg extends AbstractModel
                 $image = file_get_contents($str);
                 if (empty($image)) {
                     $text = str_replace($matchs[0][$key], "[:IMAGE:browse:90:90:images/other/imgerr.jpg::]", $text);
-                } else if (Base::saveContentImage(public_path($imagePath), $image)) {
+                } else if (Base::saveContentImage(public_path($imagePath), $image, 90)) {
                     $imageSize = getimagesize(public_path($imagePath));
-                    if ($extension = Image::thumbImage(public_path($imagePath), public_path($imagePath) . "_thumb.{*}", 320, 0)) {
+                    if ($extension = Image::thumbImage(public_path($imagePath), public_path($imagePath) . "_thumb.{*}", 320, 0, 80)) {
                         $imagePath .= "_thumb.{$extension}";
                     }
                     $text = str_replace($matchs[0][$key], "[:IMAGE:browse:{$imageSize[0]}:{$imageSize[1]}:{$imagePath}::]", $text);
@@ -742,7 +880,7 @@ class WebSocketDialogMsg extends AbstractModel
             $text = str_replace($matchs[0][$key], "[:{$matchChar[1]}:{$keyId}:{$matchValye[1]}:]", $text);
         }
         // 处理快捷消息
-        preg_match_all("/<span[^>]*?data-quick-key=([\"'])(.*?)\\1[^>]*?>(.*?)<\/span>/is", $text, $matchs);
+        preg_match_all("/<span[^>]*?data-quick-key=([\"'])([^\"']+?)\\1[^>]*?>(.*?)<\/span>/is", $text, $matchs);
         foreach ($matchs[0] as $key => $str) {
             $quickKey = $matchs[2][$key];
             $quickLabel = $matchs[3][$key];
@@ -752,8 +890,17 @@ class WebSocketDialogMsg extends AbstractModel
                 $text = str_replace($str, "[:QUICK:{$quickKey}:{$quickLabel}:]", $text);
             }
         }
+        // 处理 li 标签
+        preg_match_all("/<li[^>]*?>/i", $text, $matchs);
+        foreach ($matchs[0] as $str) {
+            if (preg_match("/data-list=['\"](bullet|ordered|checked|unchecked)['\"]/i", $str, $match)) {
+                $text = str_replace($str, '<li data-list="' . $match[1] . '">', $text);
+            } else {
+                $text = str_replace($str, '<li>', $text);
+            }
+        }
         // 处理链接标签
-        preg_match_all("/<a[^>]*?href=([\"'])(.*?)\\1[^>]*?>(.*?)<\/a>/is", $text, $matchs);
+        preg_match_all("/<a[^>]*?href=([\"'])([^\"']+?)\\1[^>]*?>(.*?)<\/a>/is", $text, $matchs);
         foreach ($matchs[0] as $key => $str) {
             $herf = $matchs[2][$key];
             $title = $matchs[3][$key] ?: $herf;
@@ -771,7 +918,7 @@ class WebSocketDialogMsg extends AbstractModel
             $text = str_replace($str, "[:LINK:{$herf}:{$title}:]", $text);
         }
         // 文件分享链接
-        preg_match_all("/(https*:\/\/)((\w|=|\?|\.|\/|&|-|:|\+|%|;|#|@|,|!)+)/i", $text, $matchs);
+        preg_match_all("/(https?:\/\/)((\w|=|\?|\.|\/|&|-|:|\+|%|;|#|@|,|!)+)/i", $text, $matchs);
         if ($matchs) {
             foreach ($matchs[0] as $str) {
                 preg_match("/\/single\/file\/(.*?)$/i", $str, $match);
@@ -786,7 +933,20 @@ class WebSocketDialogMsg extends AbstractModel
         }
         // 过滤标签
         $text = strip_tags($text, '<blockquote> <strong> <pre> <ol> <ul> <li> <em> <p> <s> <u> <a>');
-        $text = preg_replace("/\<(blockquote|strong|pre|ol|ul|li|em|p|s|u).*?\>/is", "<$1>", $text);    // 不用去除a标签，上面已经处理过了
+        $text = preg_replace_callback("/\<(blockquote|strong|pre|ol|ul|em|p|s|u)(.*?)\>/is", function (array $match) {    // 不用去除 li 和 a 标签，上面已经处理过了
+            preg_match("/<[^>]*?style=([\"'])(.*?)\\1[^>]*?>/is", $match[0], $matchs);
+            $attach = '';
+            if ($matchs) {
+                $styleArray = explode(';', $matchs[2]);
+                $validStyles = array_filter($styleArray, function ($styleItem) {
+                    return preg_match('/\s*(?:color|font-size|background-color|font-weight|font-family|text-decoration|font-style)\s*:/i', $styleItem); // 只保留指定样式
+                });
+                if ($validStyles) {
+                    $attach = ' style="' . implode(';', $validStyles) . '"';
+                }
+            }
+            return "<{$match[1]}{$attach}>";
+        }, $text);
         $text = preg_replace_callback("/\[:LINK:(.*?):(.*?):\]/i", function (array $match) {
             return "<a href=\"" . base64_decode($match[1]) . "\" target=\"_blank\">" . base64_decode($match[2]) . "</a>";
         }, $text);
@@ -805,6 +965,7 @@ class WebSocketDialogMsg extends AbstractModel
     /**
      * 发送消息、修改消息
      * @param string $action            动作
+     * - null：发送消息
      * - reply-98：回复消息ID=98
      * - update-99：更新消息ID=99（标记修改）
      * - change-99：更新消息ID=99（不标记修改）
@@ -817,14 +978,15 @@ class WebSocketDialogMsg extends AbstractModel
      * @param bool $push_retry          推送-失败后重试1次（有时候在事务里执行，数据还没生成时会出现找不到消息的情况）
      * @param bool|null $push_silence   推送-静默
      * - type = [text|file|record|meeting]  默认为：false
+     * @param string|null $search_key   搜索关键词（用于搜索，留空则自动生成）
      * @return array
      */
-    public static function sendMsg($action, $dialog_id, $type, $msg, $sender = null, $push_self = false, $push_retry = false, $push_silence = null)
+    public static function sendMsg($action, $dialog_id, $type, $msg, $sender = null, $push_self = false, $push_retry = false, $push_silence = null, $search_key = null)
     {
         $link = 0;
         $mtype = $type;
         if ($type === 'text') {
-            if (str_contains($msg['text'], '<a ') || preg_match("/https*:\/\//", $msg['text'])) {
+            if (str_contains($msg['text'], '<a ') || preg_match("/https?:\/\//", $msg['text'])) {
                 $link = 1;
             }
             if (str_contains($msg['text'], '<img ')) {
@@ -841,15 +1003,36 @@ class WebSocketDialogMsg extends AbstractModel
             if (in_array($msg['ext'], ['jpg', 'jpeg', 'webp', 'png', 'gif'])) {
                 $mtype = 'image';
             }
+        } elseif ($type === 'location') {
+            if (preg_match('/^https?:\/\//', $msg['thumb'])) {
+                $thumb = file_get_contents($msg['thumb']);
+                if (empty($thumb)) {
+                    throw new ApiException('获取地图快照失败');
+                }
+                $fileUrl = "uploads/chat/" . date("Ym") . "/" . $dialog_id . "/" . md5s($msg['thumb']) . ".jpg";
+                $filePath = public_path($fileUrl);
+                Base::makeDir(dirname($filePath));
+                if (!Base::saveContentImage($filePath, $thumb, 90)) {
+                    throw new ApiException('保存地图快照失败');
+                }
+                $imageSize = getimagesize($filePath);
+                if ($imageSize[0] < 20 || $imageSize[1] < 20) {
+                    throw new ApiException('地图快照尺寸太小');
+                }
+                $msg['thumb_original'] = $msg['thumb'];
+                $msg['thumb'] = $fileUrl;
+                $msg['width'] = $imageSize[0];
+                $msg['height'] = $imageSize[1];
+            }
         }
         if ($push_silence === null) {
             $push_silence = !in_array($type, ["text", "file", "record", "meeting"]);
         }
         //
-        $update_id = preg_match("/^update-(\d+)$/", $action, $match) ? $match[1] : 0;
-        $change_id = preg_match("/^change-(\d+)$/", $action, $match) ? $match[1] : 0;
-        $reply_id = preg_match("/^reply-(\d+)$/", $action, $match) ? $match[1] : 0;
-        $forward_id = preg_match("/^forward-(\d+)-(\d+)$/", $action, $match) ? $match[2] : 0;
+        $update_id = intval(preg_match("/^update-(\d+)$/", $action, $match) ? $match[1] : 0);
+        $change_id = intval(preg_match("/^change-(\d+)$/", $action, $match) ? $match[1] : 0);
+        $reply_id = intval(preg_match("/^reply-(\d+)$/", $action, $match) ? $match[1] : 0);
+        $forward_id = intval(preg_match("/^forward-(\d+)$/", $action, $match) ? $match[1] : 0);
         $sender = $sender === null ? User::userid() : $sender;
         //
         $dialog = WebSocketDialog::find($dialog_id);
@@ -871,22 +1054,35 @@ class WebSocketDialogMsg extends AbstractModel
             if (empty($dialogMsg)) {
                 throw new ApiException('消息不存在');
             }
-            if ($dialogMsg->type !== 'text' && $dialogMsg->type !== 'vote') {
-                throw new ApiException('此消息不支持此操作');
-            }
-            if ($dialogMsg->userid != $sender && $dialogMsg->type !== 'vote') {
-                throw new ApiException('仅支持修改自己的消息');
+            $oldMsg = Base::json2array($dialogMsg->getRawOriginal('msg'));
+            if ($dialogMsg->type === 'vote') {
+                if ($dialogMsg->userid != $sender) {
+                    $msg = [
+                        'votes' => $msg['votes'],
+                    ];
+                }
+            } else {
+                if (!in_array($dialogMsg->type, ['text', 'template'])) {
+                    throw new ApiException('此消息不支持此操作');
+                }
+                if ($dialogMsg->userid != $sender) {
+                    throw new ApiException('仅支持修改自己的消息');
+                }
             }
             //
             $updateData = [
                 'mtype' => $mtype,
                 'link' => $link,
-                'msg' => $msg,
+                'msg' => array_merge($oldMsg, $msg),
                 'modify' => $modify,
             ];
             $dialogMsg->updateInstance($updateData);
-            $dialogMsg->key = $dialogMsg->generateMsgKey();
-            $dialogMsg->save();
+            $dialogMsg->generateKeyAndSave($search_key);
+            //
+            WebSocketDialogUser::whereDialogId($dialog->id)->whereUserid($sender)->whereHide(1)->change([
+                'hide' => 0,    // 修改消息时，显示会话（仅自己）
+                'updated_at' => Carbon::now()->toDateTimeString('millisecond'),
+            ]);
             //
             $dialogMsg->msgJoinGroup($dialog);
             //
@@ -897,34 +1093,52 @@ class WebSocketDialogMsg extends AbstractModel
             return Base::retSuccess('修改成功', $dialogMsg);
         } else {
             // 发送
-            if ($reply_id && !self::whereId($reply_id)->increment('reply_num')) {
-                throw new ApiException('回复的消息不存在');
-            }
-            // 转发
-            if ($forward_id && !self::whereId($forward_id)->increment('forward_num')) {
-                throw new ApiException('转发的消息不存在');
+            if ($reply_id) {
+                // 回复
+                $replyRow = self::whereId($reply_id)->whereDialogId($dialog_id)->first();
+                if (empty($replyRow)) {
+                    throw new ApiException('回复的消息不存在');
+                }
+                $replyMsg = Base::json2array($replyRow->getRawOriginal('msg'));
+                unset($replyMsg['reply_data']);
+                $msg['reply_data'] = [
+                    'id' => $replyRow->id,
+                    'userid' => $replyRow->userid,
+                    'type' => $replyRow->type,
+                    'msg' => $replyMsg,
+                ];
+                $replyRow->increment('reply_num');
             }
             //
             $dialogMsg = self::createInstance([
                 'dialog_id' => $dialog_id,
                 'dialog_type' => $dialog->type,
                 'reply_id' => $reply_id,
+                'forward_id' => $forward_id,
                 'userid' => $sender,
                 'type' => $type,
                 'mtype' => $mtype,
                 'link' => $link,
                 'msg' => $msg,
                 'read' => 0,
-                'forward_id' => $forward_id,
-                'forward_show' => $forward_id ? $match[1] : 1,
             ]);
-            AbstractModel::transaction(function () use ($dialog, $dialogMsg) {
-                $dialog->last_at = Carbon::now();
-                $dialog->save();
+            AbstractModel::transaction(function () use ($search_key, $dialogMsg) {
                 $dialogMsg->send = 1;
-                $dialogMsg->key = $dialogMsg->generateMsgKey();
-                $dialogMsg->save();
-                WebSocketDialogUser::whereDialogId($dialog->id)->change(['updated_at' => Carbon::now()->toDateTimeString('millisecond')]);
+                $dialogMsg->generateKeyAndSave($search_key);
+                //
+                if ($dialogMsg->type === 'meeting') {
+                    MeetingMsg::createInstance([
+                        'meetingid' => $dialogMsg->msg['meetingid'],
+                        'dialog_id' => $dialogMsg->dialog_id,
+                        'msg_id' => $dialogMsg->id,
+                    ])->save();
+                }
+                //
+                WebSocketDialogUser::whereDialogId($dialogMsg->dialog_id)->change([
+                    'hide' => 0,    // 有新消息时，显示会话（会话内所有会员）
+                    'last_at' => Carbon::now(),
+                    'updated_at' => Carbon::now()->toDateTimeString('millisecond'),
+                ]);
             });
             //
             $task = new WebSocketDialogMsgTask($dialogMsg->id);

app/Models/WebSocketDialogMsgRead.php

@@ -15,13 +15,21 @@ use Carbon\Carbon;
  * @property int|null $silence 是否免打扰：0否，1是
  * @property int|null $email 是否发了邮件
  * @property int|null $after 在阅读之后才添加的记录
- * @property string|null $read_at 阅读时间
+ * @property int|null $dot 红点标记
+ * @property \Illuminate\Support\Carbon|null $read_at 阅读时间
  * @property-read \App\Models\WebSocketDialogMsg|null $webSocketDialogMsg
+ * @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|WebSocketDialogMsgRead newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereAfter($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereDialogId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereDot($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereEmail($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereMention($value)

app/Models/WebSocketDialogMsgTodo.php

@@ -9,11 +9,17 @@ namespace App\Models;
  * @property int|null $dialog_id 对话ID
  * @property int|null $msg_id 消息ID
  * @property int|null $userid 接收会员ID
- * @property string|null $done_at 完成时间
+ * @property \Illuminate\Support\Carbon|null $done_at 完成时间
  * @property-read array|mixed $msg_data
+ * @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|WebSocketDialogMsgTodo newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTodo newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTodo query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTodo whereDialogId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTodo whereDoneAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTodo whereId($value)

app/Models/WebSocketDialogMsgTranslate.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\WebSocketDialogMsgTranslate
+ *
+ * @property int $id
+ * @property int|null $dialog_id 对话ID
+ * @property int|null $msg_id 消息ID
+ * @property string|null $language 语言
+ * @property string|null $content 翻译内容
+ * @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|WebSocketDialogMsgTranslate newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTranslate newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTranslate query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTranslate whereContent($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTranslate whereDialogId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTranslate whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTranslate whereLanguage($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTranslate whereMsgId($value)
+ * @mixin \Eloquent
+ */
+class WebSocketDialogMsgTranslate extends AbstractModel
+{
+    function __construct(array $attributes = [])
+    {
+        parent::__construct($attributes);
+        $this->timestamps = false;
+    }
+}

app/Models/WebSocketDialogUser.php

@@ -10,24 +10,34 @@ use Carbon\Carbon;
  * @property int $id
  * @property int|null $dialog_id 对话ID
  * @property int|null $userid 会员ID
- * @property string|null $top_at 置顶时间
+ * @property \Illuminate\Support\Carbon|null $top_at 置顶时间
+ * @property \Illuminate\Support\Carbon|null $last_at 最后消息时间
  * @property int|null $mark_unread 是否标记为未读：0否，1是
  * @property int|null $silence 是否免打扰：0否，1是
+ * @property int|null $hide 不显示会话：0否，1是
  * @property int|null $inviter 邀请人
- * @property int|null $important 是否不可移出（项目、任务人员）
+ * @property int|null $important 是否不可移出（项目、任务、部门人员）
  * @property string|null $color 颜色
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\WebSocketDialog|null $webSocketDialog
+ * @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|WebSocketDialogUser newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereColor($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereDialogId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereHide($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereImportant($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereInviter($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereLastAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereMarkUnread($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereSilence($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereTopAt($value)
@@ -37,7 +47,7 @@ use Carbon\Carbon;
  */
 class WebSocketDialogUser extends AbstractModel
 {
-    protected $dateFormat = 'Y-m-d H:i:s.v';
+    protected $dateFormat = 'Y-m-d H:i:s.u';
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
@@ -46,4 +56,17 @@ class WebSocketDialogUser extends AbstractModel
     {
         return $this->hasOne(WebSocketDialog::class, 'id', 'dialog_id');
     }
+
+    /**
+     * 更新对话最后消息时间
+     * @return WebSocketDialogMsg|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Model|\Illuminate\Database\Query\Builder|object|null
+     */
+    public static function updateMsgLastAt($dialogId)
+    {
+        $lastMsg = WebSocketDialogMsg::whereDialogId($dialogId)->orderByDesc('id')->first();
+        if ($lastMsg) {
+            WebSocketDialogUser::whereDialogId($dialogId)->change(['last_at' => $lastMsg->created_at]);
+        }
+        return $lastMsg;
+    }
 }

app/Models/WebSocketTmpMsg.php

@@ -12,9 +12,15 @@ namespace App\Models;
  * @property int|null $create_id 所属会员ID
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketTmpMsg newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketTmpMsg newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketTmpMsg query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketTmpMsg whereCreateId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketTmpMsg whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketTmpMsg whereId($value)

app/Module/Doo.php

@@ -11,7 +11,7 @@ use FFI;
 class Doo
 {
     private static $doo;
-    private static $passphrase = "LYHevk5n";
+    private static $userLanguage = "";
 
     /**
      * char转为字符串
@@ -228,6 +228,14 @@ class Doo
         if (Base::isError($data)) {
             throw new ApiException($data['msg'] ?: '注册失败');
         }
+        if (\DB::transactionLevel() > 0) {
+            try {
+                \DB::commit();
+                \DB::beginTransaction();
+            } catch (\Throwable) {
+                // do nothing
+            }
+        }
         $user = User::whereEmail($email)->first();
         if (empty($user)) {
             throw new ApiException('注册失败');
@@ -261,12 +269,58 @@ class Doo
     /**
      * 翻译
      * @param $text
-     * @param string $type
+     * @param string $lang
      * @return string
      */
-    public static function translate($text, string $type = ""): string
+    public static function translate($text, string $lang = ""): string
     {
-        return self::string(self::doo()->translate($text, $type));
+        return self::string(self::doo()->translate($text, $lang ?: self::$userLanguage));
+    }
+
+    /**
+     * 设置语言
+     * @param string|integer $lang 语言 或 会员ID
+     * @return void
+     */
+    public static function setLanguage($lang) {
+        if (Base::isNumber($lang)) {
+            $lang = User::find(intval($lang))?->lang ?: "";
+        }
+        self::$userLanguage = $lang;
+    }
+
+    /**
+     * 获取语言列表 或 语言名称
+     * @param string|false $lang
+     * @return string|string[]
+     */
+    public static function getLanguages($lang = false)
+    {
+        $array = [
+            "zh" => "简体中文",
+            "zh-CHT" => "繁体中文",
+            "en" => "英语",
+            "ko" => "韩语",
+            "ja" => "日语",
+            "de" => "德语",
+            "fr" => "法语",
+            "id" => "印度尼西亚语",
+            "ru" => "俄语",
+        ];
+        if ($lang !== false) {
+            return $array[$lang] ?? "";
+        }
+        return $array;
+    }
+
+    /**
+     * 检查语言是否存在
+     * @param $lang
+     * @return bool
+     */
+    public static function checkLanguage($lang): bool
+    {
+        return array_key_exists($lang, self::getLanguages());
     }
 
     /**

app/Module/Extranet.php

@@ -12,6 +12,102 @@ use Illuminate\Support\Facades\Config;
  */
 class Extranet
 {
+    /**
+     * 通过 openAI 语音转文字
+     * @param string $filePath
+     * @return array
+     */
+    public static function openAItranscriptions($filePath)
+    {
+        if (!file_exists($filePath)) {
+            return Base::retError("语音文件不存在");
+        }
+        $systemSetting = Base::setting('system');
+        $aibotSetting = Base::setting('aibotSetting');
+        if ($systemSetting['voice2text'] !== 'open' || empty($aibotSetting['openai_key'])) {
+            return Base::retError("语音转文字功能未开启");
+        }
+        //
+        $extra = [
+            'Content-Type' => 'multipart/form-data',
+            'Authorization' => 'Bearer ' . $aibotSetting['openai_key'],
+        ];
+        if ($aibotSetting['openai_agency']) {
+            $extra['CURLOPT_PROXY'] = $aibotSetting['openai_agency'];
+            if (str_contains($aibotSetting['openai_agency'], 'socks')) {
+                $extra['CURLOPT_PROXYTYPE'] = CURLPROXY_SOCKS5;
+            } else {
+                $extra['CURLOPT_PROXYTYPE'] = CURLPROXY_HTTP;
+            }
+        }
+        $res = Ihttp::ihttp_request('https://api.openai.com/v1/audio/transcriptions', [
+            'file' => new \CURLFile($filePath),
+            'model' => 'whisper-1'
+        ], $extra, 15);
+        if (Base::isError($res)) {
+            return Base::retError("语音转文字失败", $res);
+        }
+        $resData = Base::json2array($res['data']);
+        if (empty($resData['text'])) {
+            return Base::retError("语音转文字失败", $resData);
+        }
+        //
+        return Base::retSuccess("success", $resData['text']);
+    }
+
+    /**
+     * 通过 openAI 翻译
+     * @param $text
+     * @param $targetLanguage
+     * @return array
+     */
+    public static function openAItranslations($text, $targetLanguage)
+    {
+        $systemSetting = Base::setting('system');
+        $aibotSetting = Base::setting('aibotSetting');
+        if ($systemSetting['translation'] !== 'open' || empty($aibotSetting['openai_key'])) {
+            return Base::retError("翻译功能未开启");
+        }
+        $extra = [
+            'Content-Type' => 'application/json',
+            'Authorization' => 'Bearer ' . $aibotSetting['openai_key'],
+        ];
+        if ($aibotSetting['openai_agency']) {
+            $extra['CURLOPT_PROXY'] = $aibotSetting['openai_agency'];
+            if (str_contains($aibotSetting['openai_agency'], 'socks')) {
+                $extra['CURLOPT_PROXYTYPE'] = CURLPROXY_SOCKS5;
+            } else {
+                $extra['CURLOPT_PROXYTYPE'] = CURLPROXY_HTTP;
+            }
+        }
+        $res = Ihttp::ihttp_request('https://api.openai.com/v1/chat/completions', json_encode([
+            "model" => "gpt-3.5-turbo",
+            "messages" => [
+                [
+                    "role" => "system",
+                    "content" => "你是一个专业的翻译器，翻译的结果尽量符合“项目任务管理系统”的使用，并且翻译的结果不用额外添加换行尽量保持原格式，将提供的文本翻译成“{$targetLanguage}”语言。"
+                ],
+                [
+                    "role" => "user",
+                    "content" => $text
+                ]
+            ]
+        ]), $extra, 15);
+        if (Base::isError($res)) {
+            return Base::retError("翻译失败", $res);
+        }
+        $resData = Base::json2array($res['data']);
+        if (empty($resData['choices'])) {
+            return Base::retError("翻译失败", $resData);
+        }
+        $result = $resData['choices'][0]['message']['content'];
+        $result = preg_replace('/^\"|\"$/', '', $result);
+        if (empty($result)) {
+            return Base::retError("翻译失败", $result);
+        }
+        return Base::retSuccess("success", $result);
+    }
+
     /**
      * 获取IP地址经纬度
      * @param string $ip
@@ -174,19 +270,16 @@ class Extranet
 
     /**
      * 随机笑话接口
-     * @return array
+     * @return string
      */
-    public static function randJoke(): array
+    public static function randJoke(): string
     {
-        $jokeKey = env("JUKE_KEY_JOKE");
-        if ($jokeKey) {
-            $data = self::curl("http://v.juhe.cn/joke/randJoke.php?key=" . $jokeKey);
-            $data = Base::json2array($data);
-            if ($data['reason'] === 'success') {
-                return $data['result'];
-            }
+        $data = self::curl("https://hmajax.itheima.net/api/randjoke");
+        $data = Base::json2array($data);
+        if ($data['message'] === '获取成功' && $text = trim($data['data'])) {
+            return $text;
         }
-        return [];
+        return "";
     }
 
     /**
@@ -195,13 +288,10 @@ class Extranet
      */
     public static function soups(): string
     {
-        $soupKey = env("JUKE_KEY_SOUP");
-        if ($soupKey) {
-            $data = self::curl("https://apis.juhe.cn/fapig/soup/query?key=" . $soupKey);
-            $data = Base::json2array($data);
-            if ($data['reason'] === 'success' && $text = trim($data['result']['text'])) {
-                return $text;
-            }
+        $data = self::curl("https://hmajax.itheima.net/api/ambition");
+        $data = Base::json2array($data);
+        if ($data['message'] === '获取成功' && $text = trim($data['data'])) {
+            return $text;
         }
         return "";
     }
@@ -289,22 +379,74 @@ class Extranet
                     $text = "心灵鸡汤：{$data}";
                 }
                 break;
+
+            default:
+                $text = "";
+                break;
         }
         return $text;
     }
 
+    /**
+     * 获取搜狗表情包
+     * @param $keyword
+     * @return array
+     */
+    public static function sticker($keyword)
+    {
+        $data = self::curl("https://pic.sogou.com/napi/wap/searchlist", 1800, 15, [], [
+            'CURLOPT_CUSTOMREQUEST' => 'POST',
+            'CURLOPT_POSTFIELDS' => json_encode([
+                "initQuery" => $keyword . " 表情",
+                "queryFrom" => "wap",
+                "ie" => "utf8",
+                "keyword" => $keyword . " 表情",
+                // "mode" => 20,
+                "showMode" => 0,
+                "start" => 1,
+                "reqType" => "client",
+                "reqFrom" => "wap_result",
+                "prevIsRedis" => "n",
+                "pagetype" => 0,
+                "amsParams" => []
+            ]),
+            'CURLOPT_HTTPHEADER' => [
+                'Content-Type: application/json',
+                'Referer: https://pic.sogou.com/'
+            ]
+        ]);
+        $data = Base::json2array($data);
+        if ($data['status'] === 0 && $data['data']['picResult']['items']) {
+            $data = $data['data']['picResult']['items'];
+            $data = array_filter($data, function ($item) {
+                return intval($item['thumbHeight']) > 10 && intval($item['thumbWidth']) > 10;
+            });
+            return array_map(function ($item) {
+                return [
+                    'name' => $item['title'],
+                    'src' => $item['thumbUrl'],
+                    'height' => $item['thumbHeight'],
+                    'width' => $item['thumbWidth'],
+                ];
+            }, $data);
+        }
+        return [];
+    }
+
     /**
      * @param $url
      * @param int $cacheSecond 缓存时间（秒），如果结果为空则缓存有效30秒
      * @param int $timeout
+     * @param array $post
+     * @param array $extra
      * @return string
      */
-    private static function curl($url, int $cacheSecond = 0, int $timeout = 15): string
+    private static function curl($url, int $cacheSecond = 0, int $timeout = 15, array $post = [], array $extra = []): string
     {
         if ($cacheSecond > 0) {
-            $key = "curlCache::" . md5($url);
-            $content = Cache::remember($key, Carbon::now()->addSeconds($cacheSecond), function () use ($cacheSecond, $key, $timeout, $url) {
-                $result = Ihttp::ihttp_request($url, [], [], $timeout);
+            $key = "curlCache::" . md5($url) . "::" . md5(json_encode($post)) . "::" . md5(json_encode($extra));
+            $content = Cache::remember($key, Carbon::now()->addSeconds($cacheSecond), function () use ($extra, $post, $cacheSecond, $key, $timeout, $url) {
+                $result = Ihttp::ihttp_request($url, $post, $extra, $timeout);
                 $content = Base::isSuccess($result) ? trim($result['data']) : '';
                 if (empty($content) && $cacheSecond > 30) {
                     Cache::put($key, "", Carbon::now()->addSeconds(30));
@@ -312,7 +454,7 @@ class Extranet
                 return $content;
             });
         } else {
-            $result = Ihttp::ihttp_request($url, [], [], $timeout);
+            $result = Ihttp::ihttp_request($url, $post, $extra, $timeout);
             $content = Base::isSuccess($result) ? trim($result['data']) : '';
         }
         //

app/Module/Ihttp.php

@@ -35,8 +35,12 @@ class Ihttp
             if($post) {
                 if (is_array($post)) {
                     $filepost = false;
-                    foreach ($post as $name => $value) {
-                        if (is_string($value) && substr($value, 0, 1) == '@') {
+                    foreach ($post as $value) {
+                        if (is_string($value) && str_starts_with($value, '@')) {
+                            $filepost = true;
+                            break;
+                        }
+                        if ($value instanceof \CURLFile) {
                             $filepost = true;
                             break;
                         }

app/Module/Image.php

@@ -24,6 +24,15 @@ class Image
     public function __construct($imagePath) {
         $this->path = $imagePath;
         $this->image = new Imagick($this->path);
+        $this->updateSize();
+    }
+
+    /**
+     * 更新图片尺寸
+     * @return void
+     * @throws \ImagickException
+     */
+    private function updateSize() {
         $geo = $this->image->getImageGeometry();
         $this->height = $geo['height'];
         $this->width = $geo['width'];
@@ -47,6 +56,36 @@ class Image
         return $this->height;
     }
 
+    /**
+     * 按比例裁剪
+     * @param float $ratio
+     * @return $this
+     * @throws \ImagickException
+     */
+    public function ratioCrop(float $ratio = 0): static
+    {
+        if ($ratio === 0) {
+            return $this;
+        }
+        if ($ratio  < 1) {
+            $ratio = 1 / $ratio;
+        }
+        $width = $this->width;
+        $height = $this->height;
+        if ($width > $height * $ratio) {
+            $newWidth = $height * $ratio;
+            $newHeight = $height;
+        } elseif ($height > $width * $ratio) {
+            $newWidth = $width;
+            $newHeight = $width * $ratio;
+        } else {
+            return $this;
+        }
+        $this->image->cropImage($newWidth, $newHeight, ($width - $newWidth) / 2, ($height - $newHeight) / 2);
+        $this->updateSize();
+        return $this;
+    }
+
     /**
      * 创建缩略图
      * @param int $width
@@ -97,6 +136,7 @@ class Image
         } else {
             $this->image->thumbnailImage($width, $height);
         }
+        $this->updateSize();
         return $this;
     }
 
@@ -161,6 +201,15 @@ class Image
         $this->image->destroy();
     }
 
+    /**
+     * 销毁对象
+     * @return void
+     */
+    public function destroy()
+    {
+        $this->image->destroy();
+    }
+
     /** ******************************************************************************/
     /** ******************************************************************************/
     /** ******************************************************************************/
@@ -171,10 +220,11 @@ class Image
      * @param string $savePath  保存路径
      * @param int $width        宽度
      * @param int $height       高度
+     * @param int $quality      压缩质量（0-100）, 0 为不压缩
      * @param string $mode      模式（percentage|cover|contain）
      * @return string|null      成功返回图片后缀，失败返回 false
      */
-    public static function thumbImage(string $imagePath, string $savePath, int $width, int $height, string $mode = 'percentage'): ?string
+    public static function thumbImage(string $imagePath, string $savePath, int $width, int $height, int $quality = 0, string $mode = 'percentage'): ?string
     {
         if (!file_exists($imagePath)) {
             return null;
@@ -187,6 +237,13 @@ class Image
             $image = new Image($imagePath);
             $image->thumb($width, $height, $mode);
             $image->saveTo($savePath);
+            if ($quality > 0) {
+                Image::compressImage($savePath, $quality);
+            }
+            if ($savePath != $imagePath && filesize($savePath) >= filesize($imagePath)) {
+                unlink($savePath);
+                symlink(basename($imagePath), $savePath);
+            }
             return $extension;
         } catch (\ImagickException) {
             return null;
@@ -194,33 +251,34 @@ class Image
     }
 
     /**
-     * 压缩图片
-     * @param string $imagePath     图片路径
-     * @param string|null $savePath 保存路径（默认覆盖原图）
-     * @param int $quality          压缩质量（0-100）
-     * @param float $minSize        最小尺寸（单位：KB）
+     * 压缩图片（如果压缩后的图片比原图还大那就直接使用原图）
+     * @param array|string $path        图片路径（如果是数组，第1个元素为原图路径，第2个元素为保存路径）
+     * @param int $quality              压缩质量（0-100）
+     * @param float $minSize            最小尺寸，小于这个尺寸不压缩（单位：KB）
      * @return bool
      */
-    public static function compressImage(string $imagePath, string $savePath = null, int $quality = 100, float $minSize = 10): bool
+    public static function compressImage(array|string $path, int $quality = 100, float $minSize = 5): bool
     {
         if (Base::settingFind("system", "image_compress") === 'close') {
             return false;
         }
+        if (is_array($path)) {
+            $imagePath = $path[0];
+            $savePath = $path[1] ?? $imagePath;
+        } else {
+            $imagePath = $path;
+            $savePath = $path;
+        }
         if (!file_exists($imagePath)) {
             return false;
         }
+        $quality = min(max($quality, 1), 100);
         $imageSize = filesize($imagePath);
         if ($minSize > 0 && $imageSize < $minSize * 1024) {
             return false;
         }
-        if (empty($savePath)) {
-            $savePath = $imagePath;
-        }
         $tmpPath = $imagePath . '.compress.tmp';
-        try {
-            $image = new Image($imagePath);
-            $image->compress($quality);
-            $image->saveTo($tmpPath);
+        if (self::compressAuto($imagePath, $tmpPath, $quality)) {
             if (filesize($tmpPath) >= $imageSize) {
                 copy($imagePath, $savePath);
                 unlink($tmpPath);
@@ -228,8 +286,89 @@ class Image
                 rename($tmpPath, $savePath);
             }
             return true;
+        }
+        return false;
+    }
+
+    /**
+     * 自动压缩图片（仅限于compressImage方法使用）
+     * @param string $imagePath
+     * @param string $savePath
+     * @param int $quality
+     * @return bool
+     */
+    private static function compressAuto(string $imagePath, string $savePath, int $quality = 100): bool
+    {
+        if (strtolower(pathinfo($imagePath, PATHINFO_EXTENSION)) === 'png') {
+            $minQuality = $quality - 20;
+            $compressedContent = shell_exec("pngquant --quality={$minQuality}-{$quality} --strip - < " . $imagePath);
+            if ($compressedContent) {
+                file_put_contents($savePath, $compressedContent);
+                return true;
+            }
+        }
+        try {
+            $image = new Image($imagePath);
+            $image->compress($quality);
+            $image->saveTo($savePath);
+            return true;
         } catch (\ImagickException) {
             return false;
         }
     }
+
+    /** ******************************************************************************/
+    /** ******************************************************************************/
+    /** ******************************************************************************/
+
+    // ImageMagick 策略限制配置
+    private static $limits = [
+        'width' => 16384,    // 16KP
+        'height' => 16384,   // 16KP
+        'area' => 128000000, // 128MP (128 * 1000000 pixels)
+        'memory' => 256,     // 256MiB
+    ];
+
+    /**
+     * 验证上传的图片
+     * @param $file
+     * @return array
+     */
+    public static function validateImage($file)
+    {
+        try {
+            // 获取图片信息
+            $imageInfo = getimagesize($file);
+            if ($imageInfo === false) {
+                return Base::retError('无法获取图片信息');
+            }
+
+            $width = $imageInfo[0];
+            $height = $imageInfo[1];
+            $area = $width * $height;
+
+            // 检查尺寸限制
+            if ($width > self::$limits['width']) {
+                return Base::retError(sprintf('图片宽度(%dpx)超过限制(%dpx)', $width, self::$limits['width']));
+            }
+
+            if ($height > self::$limits['height']) {
+                return Base::retError(sprintf('图片高度(%dpx)超过限制(%dpx)', $height, self::$limits['height']));
+            }
+
+            if ($area > self::$limits['area']) {
+                return Base::retError(sprintf('图片总像素(%dpx)超过限制(%dpx)', $area, self::$limits['area']));
+            }
+
+            // 估算内存使用（每个像素约4字节）
+            $estimatedMemory = ($area * 4) / (1024 * 1024); // 转换为 MB
+            if ($estimatedMemory > self::$limits['memory']) {
+                return Base::retError(sprintf('预计内存使用(%dMB)超过限制(%dMB)', $estimatedMemory, self::$limits['memory']));
+            }
+
+            return Base::retSuccess('success');
+        } catch (\Exception $e) {
+            return Base::retError('验证过程发生错误：' . $e->getMessage());
+        }
+    }
 }

app/Module/Table/AbstractData.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Module\Table;
+
+use ReflectionClass;
+use Swoole\Table;
+
+abstract class AbstractData
+{
+    /** @var self */
+    protected static $instance = null;
+
+    /** @var Table */
+    protected $table;
+
+    protected function getTableName(): string
+    {
+        $className = (new ReflectionClass(static::class))->getShortName();
+        return lcfirst($className) . 'Table';
+    }
+
+    private function __clone() {}
+    private function __wakeup() {}
+
+    protected function __construct()
+    {
+        $this->table = app('swoole')->{$this->getTableName()};
+    }
+
+    public function getTable()
+    {
+        return $this->table;
+    }
+
+    public static function instance()
+    {
+        if (static::$instance === null) {
+            static::$instance = new static();
+        }
+        return static::$instance;
+    }
+
+    public static function set($key, $value)
+    {
+        return self::instance()->table->set($key, ['value' => $value]);
+    }
+
+    public static function get($key, $default = null)
+    {
+        $data = self::instance()->table->get($key);
+        return $data ? $data['value'] : $default;
+    }
+
+    public static function del($key)
+    {
+        return self::instance()->table->del($key);
+    }
+
+    public static function exist($key)
+    {
+        return self::instance()->table->exist($key);
+    }
+
+    public static function setMultiple(array $items)
+    {
+        foreach ($items as $key => $value) {
+            self::set($key, $value);
+        }
+    }
+
+    public static function clear()
+    {
+        foreach (self::instance()->table as $key => $row) {
+            self::del($key);
+        }
+    }
+
+    public static function getAll()
+    {
+        $result = [];
+        foreach (self::instance()->table as $key => $row) {
+            $result[$key] = $row['value'];
+        }
+        return $result;
+    }
+}

app/Module/Table/GlobalData.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Module\Table;
+
+class GlobalData extends AbstractData
+{
+}

app/Module/Table/OnlineData.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Module\Table;
+
+use App\Models\User;
+use App\Tasks\LineTask;
+use App\Tasks\PushTask;
+use Carbon\Carbon;
+use Hhxsv5\LaravelS\Swoole\Task\Task;
+
+class OnlineData extends AbstractData
+{
+    /**
+     * 上线
+     * @param $userid
+     * @return float|int|mixed
+     */
+    public static function online($userid)
+    {
+        $key = "online::" . $userid;
+        $value = self::instance()->getTable()->incr($key, 'value');
+        if ($value === 1) {
+            // 通知上线
+            Task::deliver(new LineTask($userid, true));
+            // 推送离线时收到的消息
+            Task::deliver(new PushTask("RETRY::" . $userid));
+        }
+        return $value;
+    }
+
+    /**
+     * 离线
+     * @param $userid
+     * @return float|int|mixed
+     */
+    public static function offline($userid)
+    {
+        $key = "online::" . $userid;
+        $value = self::instance()->getTable()->decr($key, 'value');
+        if ($value === 0) {
+            // 更新最后在线时间
+            User::whereUserid($userid)->update([
+                'line_at' => Carbon::now()
+            ]);
+            // 通知下线
+            Task::deliver(new LineTask($userid, false));
+            // 清除在线状态
+            self::instance()->getTable()->del($key);
+        }
+        return $value;
+    }
+
+    /**
+     * 获取在线状态
+     * @param $userid
+     * @return int
+     */
+    public static function live($userid)
+    {
+        $key = "online::" . $userid;
+        return intval(self::instance()->getTable()->get($key));
+    }
+}

app/Module/TimeRange.php

@@ -15,22 +15,60 @@ class TimeRange
     public function __construct($data)
     {
         if (is_array($data)) {
-            $range = explode("-", str_replace([",", "|"], "-", $data['timerange']));
-            if ($data['updated_at'] || $data['at_after']) {
-                $range[0] = $data['updated_at'] ?: $data['at_after'];
-            }
-            if ($data['deleted_at']) {
-                $range[1] = $data['deleted_at'];
+            $keys = array_keys($data);
+            if (count($keys) === 2 && $keys[0] === 0 && $keys[1] === 1) {
+                $range = $data;
+            } else {
+                $range = $this->format($data['timerange']);
+                if ($data['updated_at'] || $data['at_after']) {
+                    $range[0] = $data['updated_at'] ?: $data['at_after'];
+                }
+                if ($data['deleted_at']) {
+                    $range[1] = $data['deleted_at'];
+                }
             }
         } else {
-            $range = explode("-", str_replace([",", "|"], "-", $data));
+            $range = $this->format($data);
         }
         //
-        $updated = Base::isNumber($range[0]) ? intval($range[0]) : trim($range[0]);
-        $deleted = Base::isNumber($range[1]) ? intval($range[1]) : trim($range[1]);
-        //
-        $this->updated = $updated ? Carbon::parse($updated) : null;
-        $this->deleted = $deleted ? Carbon::parse($deleted) : null;
+        $this->updated = $range[0] ? Base::newCarbon($range[0]) : null;
+        $this->deleted = $range[1] ? Base::newCarbon($range[1]) : null;
+    }
+
+    /**
+     * @return Carbon|null
+     */
+    public function firstTime(): ?Carbon
+    {
+        return $this->updated;
+    }
+
+    /**
+     * @return Carbon|null
+     */
+    public function lastTime(): ?Carbon
+    {
+        return $this->deleted;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isExist(): bool
+    {
+        return $this->updated && $this->deleted;
+    }
+
+    /**
+     * @param $timerange
+     * - 格式1：2021-01-01 00:00:00,2021-01-01 23:59:59
+     * - 格式2：1612051200-1612137599
+     * @return array
+     */
+    private function format($timerange)
+    {
+        $search = str_contains($timerange, ":") ? ["|"] : ["|", "-"];
+        return Base::newTrim(explode(",", str_replace($search, ",", $timerange)));
     }
 
     /**

app/Module/Timer.php

@@ -0,0 +1,380 @@
+<?php
+
+namespace App\Module;
+
+use App\Services\RequestContext;
+use Carbon\Carbon;
+
+class Timer
+{
+    /**
+     * 获取时间戳
+     * @return int
+     */
+    public static function time()
+    {
+        return intval(RequestContext::get("start_time", time()));
+    }
+
+    /**
+     * 获取毫秒时间戳
+     * @return float
+     */
+    public static function msecTime()
+    {
+        list($msec, $sec) = explode(' ', microtime());
+        $time = explode(".", $sec . ($msec * 1000));
+        return $time[0];
+    }
+
+    /**
+     * 时间差(不够1个小时算一个小时)
+     * @param int $s 开始时间戳
+     * @param int $e 结束时间戳
+     * @return string
+     */
+    public static function timeDiff($s, $e)
+    {
+        $time = $e - $s;
+        $days = 0;
+        if ($time >= 86400) { // 如果大于1天
+            $days = (int)($time / 86400);
+            $time = $time % 86400; // 计算天后剩余的毫秒数
+        }
+        $hours = 0;
+        if ($time >= 3600) { // 如果大于1小时
+            $hours = (int)($time / 3600);
+            $time = $time % 3600; // 计算小时后剩余的毫秒数
+        }
+        $minutes = ceil($time / 60); // 剩下的毫秒数都算作分
+        $daysStr = $days > 0 ? $days . '天' : '';
+        $hoursStr = ($hours > 0 || ($days > 0 && $minutes > 0)) ? $hours . '时' : '';
+        $minuteStr = ($minutes > 0) ? $minutes . '分' : '';
+        return $daysStr . $hoursStr . $minuteStr;
+    }
+
+    /**
+     * 时间秒数格式化
+     * @param int $time 时间秒数
+     * @return string
+     */
+    public static function timeFormat($time)
+    {
+        $days = 0;
+        if ($time >= 86400) { // 如果大于1天
+            $days = (int)($time / 86400);
+            $time = $time % 86400; // 计算天后剩余的毫秒数
+        }
+        $hours = 0;
+        if ($time >= 3600) { // 如果大于1小时
+            $hours = (int)($time / 3600);
+            $time = $time % 3600; // 计算小时后剩余的毫秒数
+        }
+        $minutes = ceil($time / 60); // 剩下的毫秒数都算作分
+        $daysStr = $days > 0 ? $days . '天' : '';
+        $hoursStr = ($hours > 0 || ($days > 0 && $minutes > 0)) ? $hours . '时' : '';
+        $minuteStr = ($minutes > 0) ? $minutes . '分' : '';
+        return $daysStr . $hoursStr . $minuteStr;
+    }
+
+    /**
+     * 检测日期格式
+     * @param string $str 需要检测的字符串
+     * @return bool
+     */
+    public static function isDate($str)
+    {
+        $strArr = explode('-', $str);
+        if (empty($strArr) || count($strArr) != 3) {
+            return false;
+        } else {
+            list($year, $month, $day) = $strArr;
+            if (checkdate(intval($month), intval($day), intval($year))) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * 检测时间格式
+     * @param string $str 需要检测的字符串
+     * @return bool
+     */
+    public static function isTime($str)
+    {
+        $strArr = explode(':', $str);
+        $count = count($strArr);
+        if ($count < 2 || $count > 3) {
+            return false;
+        }
+        $hour = $strArr[0];
+        if ($hour < 0 || $hour > 23) {
+            return false;
+        }
+        $minute = $strArr[1];
+        if ($minute < 0 || $minute > 59) {
+            return false;
+        }
+        if ($count == 3) {
+            $second = $strArr[2];
+            if ($second < 0 || $second > 59) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 检测 日期格式 或 时间格式
+     * @param string $str 需要检测的字符串
+     * @return bool
+     */
+    public static function isDateOrTime($str)
+    {
+        return self::isDate($str) || self::isTime($str);
+    }
+
+    /**
+     * 时间转毫秒时间戳
+     * @param $time
+     * @return float|int
+     */
+    public static function strtotimeM($time)
+    {
+        if (str_contains($time, '.')) {
+            list($t, $m) = explode(".", $time);
+            if (is_string($t)) {
+                $t = strtotime($t);
+            }
+            $time = $t . str_pad($m, 3, "0", STR_PAD_LEFT);
+        }
+        if (is_numeric($time)) {
+            return (int) str_pad($time, 13, "0");
+        } else {
+            return strtotime($time) * 1000;
+        }
+    }
+
+    /**
+     * 时间格式化
+     * @param $date
+     * @return false|string
+     */
+    public static function forumDate($date)
+    {
+        $dur = time() - $date;
+        if ($date > Carbon::now()->startOf('day')->timestamp) {
+            //今天
+            if ($dur < 60) {
+                return max($dur, 1) . '秒前';
+            } elseif ($dur < 3600) {
+                return floor($dur / 60) . '分钟前';
+            } elseif ($dur < 86400) {
+                return floor($dur / 3600) . '小时前';
+            } else {
+                return date("H:i", $date);
+            }
+        } elseif ($date > Carbon::now()->subDays()->startOf('day')->timestamp) {
+            //昨天
+            return '昨天';
+        } elseif ($date > Carbon::now()->subDays(2)->startOf('day')->timestamp) {
+            //前天
+            return '前天';
+        } elseif ($dur > 86400) {
+            //x天前
+            return floor($dur / 86400) . '天前';
+        }
+        return date("Y-m-d", $date);
+    }
+
+    /**
+     * 获取(时间戳转)今天是星期几，只返回（几）
+     * @param string|number $unixTime
+     * @return string
+     */
+    public static function getWeek($unixTime = '')
+    {
+        $unixTime = is_numeric($unixTime) ? $unixTime : time();
+        $weekarray = ['日', '一', '二', '三', '四', '五', '六'];
+        return $weekarray[date('w', $unixTime)];
+    }
+
+    /**
+     * 获取(时间戳转)现在时间段：深夜、凌晨、早晨、上午.....
+     * @param string|number $unixTime
+     * @return string
+     */
+    public static function getDayeSegment($unixTime = '')
+    {
+        $unixTime = is_numeric($unixTime) ? $unixTime : time();
+        $H = date('H', $unixTime);
+        if ($H >= 19) {
+            return '晚上';
+        } elseif ($H >= 18) {
+            return '傍晚';
+        } elseif ($H >= 13) {
+            return '下午';
+        } elseif ($H >= 12) {
+            return '中午';
+        } elseif ($H >= 8) {
+            return '上午';
+        } elseif ($H >= 5) {
+            return '早晨';
+        } elseif ($H >= 1) {
+            return '凌晨';
+        } elseif ($H >= 0) {
+            return '深夜';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * 秒 （转） 年、天、时、分、秒
+     * @param $time
+     * @return array|bool
+     */
+    public static function sec2time($time)
+    {
+        if (is_numeric($time)) {
+            $value = array(
+                "years" => 0, "days" => 0, "hours" => 0,
+                "minutes" => 0, "seconds" => 0,
+            );
+            if ($time >= 86400) {
+                $value["days"] = floor($time / 86400);
+                $time = ($time % 86400);
+            }
+            if ($time >= 3600) {
+                $value["hours"] = floor($time / 3600);
+                $time = ($time % 3600);
+            }
+            if ($time >= 60) {
+                $value["minutes"] = floor($time / 60);
+                $time = ($time % 60);
+            }
+            $value["seconds"] = floor($time);
+            return (array)$value;
+        } else {
+            return (bool)FALSE;
+        }
+    }
+
+    /**
+     * 年、天、时、分、秒 （转） 秒
+     * @param $value
+     * @return int
+     */
+    public static function time2sec($value)
+    {
+        $time = intval($value["seconds"]);
+        $time += intval($value["minutes"] * 60);
+        $time += intval($value["hours"] * 3600);
+        $time += intval($value["days"] * 86400);
+        $time += intval($value["years"] * 31536000);
+        return $time;
+    }
+
+    /**
+     * 阿拉伯数字转化为中文
+     * @param $num
+     * @return string
+     */
+    public static function chinaNum($num)
+    {
+        $china = array('零', '一', '二', '三', '四', '五', '六', '七', '八', '九');
+        $arr = str_split($num);
+        $txt = '';
+        for ($i = 0; $i < count($arr); $i++) {
+            $txt .= $china[$arr[$i]];
+        }
+        return $txt;
+    }
+
+    /**
+     * 阿拉伯数字转化为中文（用于星期，七改成日）
+     * @param $num
+     * @return string
+     */
+    public static function chinaNumZ($num)
+    {
+        return str_replace("七", "日", Timer::chinaNum($num));
+    }
+
+    /**
+     * 时间是否在时间范围内
+     * @param array $timeRanges 如：['08:00', '12:00'] 或 [['08:00', '12:00'], ['14:00', '18:00']]
+     * @param string|null $currentTime
+     * @return bool
+     */
+    public static function isTimeInRanges(array $timeRanges, ?string $currentTime = null): bool
+    {
+        // 如果没有传入当前时间，使用当前时间
+        $currentTime = $currentTime ?? date('H:i');
+
+        // 转换当前时间为分钟数，便于比较
+        $currentMinutes = self::timeToMinutes($currentTime);
+        if ($currentMinutes === false) {
+            return false;
+        }
+
+        // 将单个时间范围转换为数组格式
+        if (isset($timeRanges[0]) && !is_array($timeRanges[0])) {
+            $timeRanges = [$timeRanges];
+        }
+
+        // 过滤并检查有效的时间范围
+        foreach ($timeRanges as $range) {
+            if (!self::isValidTimeRange($range)) {
+                continue;
+            }
+
+            $startMinutes = self::timeToMinutes($range[0]);
+            $endMinutes = self::timeToMinutes($range[1]);
+
+            if ($startMinutes === false || $endMinutes === false) {
+                continue;
+            }
+
+            if ($startMinutes <= $currentMinutes && $currentMinutes <= $endMinutes) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 辅助函数：检查时间范围是否有效
+     * @param $range
+     * @return bool
+     */
+    private static function isValidTimeRange($range): bool
+    {
+        return is_array($range)
+            && count($range) === 2
+            && is_string($range[0])
+            && is_string($range[1])
+            && !empty($range[0])
+            && !empty($range[1])
+            && preg_match('/^([01]?[0-9]|2[0-3]):[0-5][0-9]$/', $range[0])
+            && preg_match('/^([01]?[0-9]|2[0-3]):[0-5][0-9]$/', $range[1]);
+    }
+
+    /**
+     * 辅助函数：将时间转换为分钟数
+     * @param string $time
+     * @return false|float|int
+     */
+    private static function timeToMinutes(string $time)
+    {
+        if (!preg_match('/^([01]?[0-9]|2[0-3]):([0-5][0-9])$/', $time, $matches)) {
+            return false;
+        }
+
+        return intval($matches[1]) * 60 + intval($matches[2]);
+    }
+
+}

app/Observers/ProjectTaskObserver.php

@@ -4,6 +4,8 @@ namespace App\Observers;
 
 use App\Models\Deleted;
 use App\Models\ProjectTask;
+use App\Models\ProjectTaskUser;
+use App\Models\ProjectTaskVisibilityUser;
 use App\Models\ProjectUser;
 
 class ProjectTaskObserver
@@ -27,11 +29,14 @@ class ProjectTaskObserver
      */
     public function updated(ProjectTask $projectTask)
     {
+        if ($projectTask->isDirty('visibility')) {
+            self::visibilityUpdate($projectTask);
+        }
         if ($projectTask->isDirty('archived_at')) {
             if ($projectTask->archived_at) {
-                Deleted::record('projectTask', $projectTask->id, $this->userids($projectTask));
+                Deleted::record('projectTask', $projectTask->id, self::userids($projectTask));
             } else {
-                Deleted::forget('projectTask', $projectTask->id, $this->userids($projectTask));
+                Deleted::forget('projectTask', $projectTask->id, self::userids($projectTask));
             }
         }
     }
@@ -44,7 +49,7 @@ class ProjectTaskObserver
      */
     public function deleted(ProjectTask $projectTask)
     {
-        Deleted::record('projectTask', $projectTask->id, $this->userids($projectTask));
+        Deleted::record('projectTask', $projectTask->id, self::userids($projectTask));
     }
 
     /**
@@ -55,7 +60,7 @@ class ProjectTaskObserver
      */
     public function restored(ProjectTask $projectTask)
     {
-        Deleted::forget('projectTask', $projectTask->id, $this->userids($projectTask));
+        Deleted::forget('projectTask', $projectTask->id, self::userids($projectTask));
     }
 
     /**
@@ -71,10 +76,50 @@ class ProjectTaskObserver
 
     /**
      * @param ProjectTask $projectTask
+     * @param string[]|string $dataType
      * @return array
      */
-    private function userids(ProjectTask $projectTask)
+    public static function userids(ProjectTask $projectTask, array|string $dataType = 'project')
     {
-        return ProjectUser::whereProjectId($projectTask->project_id)->pluck('userid')->toArray();
+        if (!is_array($dataType)) {
+            $dataType = [$dataType];
+        }
+        if (in_array('project', $dataType)) {
+            return ProjectUser::whereProjectId($projectTask->project_id)->pluck('userid')->toArray();
+        }
+        if (in_array('projectOwnerUser', $dataType)) {
+            return ProjectUser::whereProjectId($projectTask->project_id)->where('owner', 1)->pluck('userid')->toArray();
+        }
+        $array = [];
+        if (in_array('task', $dataType)) {
+            $array = array_merge($array, ProjectTaskUser::whereTaskId($projectTask->id)->pluck('userid')->toArray());
+        }
+        if (in_array('visibility', $dataType)) {
+            $array = array_merge($array, ProjectTaskVisibilityUser::whereTaskId($projectTask->id)->pluck('userid')->toArray());
+        }
+        return array_values(array_filter(array_unique($array)));
+    }
+
+    /**
+     * 可见性更新
+     * @param ProjectTask $projectTask
+     */
+    public static function visibilityUpdate(ProjectTask $projectTask)
+    {
+        $projectUserids = self::userids($projectTask);
+        switch ($projectTask->visibility) {
+            case 1:
+                Deleted::forget('projectTask', $projectTask->id, $projectUserids);
+                break;
+            case 2:
+            case 3:
+                $dataType = $projectTask->visibility == 2 ? ['task'] : ['task', 'visibility'];
+                $forgetUserids = self::userids($projectTask, $dataType);
+                $projectOwnerUserIds = self::userids($projectTask, 'projectOwnerUser');
+                $recordUserids = array_diff($projectUserids, $forgetUserids, $projectOwnerUserIds);
+                Deleted::record('projectTask', $projectTask->id, $recordUserids);
+                Deleted::forget('projectTask', $projectTask->id, $forgetUserids);
+                break;
+        }
     }
 }

app/Observers/WebSocketDialogObserver.php

@@ -49,7 +49,8 @@ class WebSocketDialogObserver
      */
     public function restored(WebSocketDialog $webSocketDialog)
     {
-        Deleted::forget('dialog', $webSocketDialog->id, $this->userids($webSocketDialog));
+        $userids = $this->userids($webSocketDialog);
+        Deleted::forget('dialog', $webSocketDialog->id, $userids);
     }
 
     /**

app/Observers/WebSocketDialogUserObserver.php

@@ -4,6 +4,7 @@ namespace App\Observers;
 
 use App\Models\Deleted;
 use App\Models\WebSocketDialogUser;
+use Carbon\Carbon;
 
 class WebSocketDialogUserObserver
 {
@@ -15,6 +16,18 @@ class WebSocketDialogUserObserver
      */
     public function created(WebSocketDialogUser $webSocketDialogUser)
     {
+        if (!$webSocketDialogUser->last_at) {
+            if (in_array($webSocketDialogUser->webSocketDialog?->group_type, ['user', 'department', 'all'])) {
+                $webSocketDialogUser->last_at = Carbon::now();
+                $webSocketDialogUser->save();
+            } else {
+                $item = WebSocketDialogUser::whereDialogId($webSocketDialogUser->dialog_id)->orderByDesc('last_at')->first();
+                if ($item?->last_at) {
+                    $webSocketDialogUser->last_at = $item->last_at;
+                    $webSocketDialogUser->save();
+                }
+            }
+        }
         Deleted::forget('dialog', $webSocketDialogUser->dialog_id, $webSocketDialogUser->userid);
     }
 

app/Services/RequestContext.php

@@ -0,0 +1,142 @@
+<?php
+
+namespace App\Services;
+
+use Illuminate\Http\Request;
+
+class RequestContext
+{
+    /** @var array<string, array<string, mixed>> */
+    private static array $context = [];
+
+    private const REQUEST_ID_PREFIX = 'req_';
+
+    /**
+     * 生成请求唯一ID
+     */
+    public static function generateRequestId(): string
+    {
+        return self::REQUEST_ID_PREFIX . uniqid() . mt_rand(10000, 99999);
+    }
+
+    /**
+     * 获取当前请求ID
+     */
+    private static function getCurrentRequestId(): ?string
+    {
+        /** @var Request $request */
+        $request = request();
+        return $request?->requestId;
+    }
+
+    /**
+     * 设置请求上下文
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param string|null $requestId
+     * @return void
+     */
+    public static function set(string $key, mixed $value, ?string $requestId = null): void
+    {
+        $requestId = $requestId ?? self::getCurrentRequestId();
+        if ($requestId === null) {
+            return;
+        }
+
+        self::$context[$requestId] ??= [];
+        self::$context[$requestId][$key] = $value;
+    }
+
+    // 与 set 方法的区别是，save 方法会返回传入的 value 值
+    public static function save(string $key, mixed $value, ?string $requestId = null): mixed
+    {
+        self::set($key, $value, $requestId);
+        return $value;
+    }
+
+    /**
+     * 获取请求上下文
+     *
+     * @param string $key
+     * @param mixed $default
+     * @param string|null $requestId
+     * @return mixed
+     */
+    public static function get(string $key, mixed $default = null, ?string $requestId = null): mixed
+    {
+        $requestId = $requestId ?? self::getCurrentRequestId();
+        if ($requestId === null) {
+            return $default;
+        }
+
+        return self::$context[$requestId][$key] ?? $default;
+    }
+
+    /**
+     * 判断请求上下文是否存在
+     *
+     * @param string $key
+     * @param string|null $requestId
+     * @return bool
+     */
+    public static function has(string $key, ?string $requestId = null): bool
+    {
+        $requestId = $requestId ?? self::getCurrentRequestId();
+        if ($requestId === null) {
+            return false;
+        }
+
+        return isset(self::$context[$requestId][$key]);
+    }
+
+    /**
+     * 清理请求上下文
+     *
+     * @param string|null $requestId
+     * @return void
+     */
+    public static function clear(?string $requestId = null): void
+    {
+        $requestId = $requestId ?? self::getCurrentRequestId();
+        if ($requestId === null) {
+            return;
+        }
+
+        unset(self::$context[$requestId]);
+    }
+
+    /**
+     * 获取当前请求的所有上下文数据
+     *
+     * @param string|null $requestId
+     * @return array<string, mixed>
+     */
+    public static function getAll(?string $requestId = null): array
+    {
+        $requestId = $requestId ?? self::getCurrentRequestId();
+        if ($requestId === null) {
+            return [];
+        }
+
+        return self::$context[$requestId] ?? [];
+    }
+
+    /**
+     * 批量设置上下文数据
+     *
+     * @param array<string, mixed> $data
+     * @param string|null $requestId
+     * @return void
+     */
+    public static function setMultiple(array $data, ?string $requestId = null): void
+    {
+        $requestId = $requestId ?? self::getCurrentRequestId();
+        if ($requestId === null) {
+            return;
+        }
+
+        self::$context[$requestId] ??= [];
+        self::$context[$requestId] = array_merge(self::$context[$requestId], $data);
+    }
+}

app/Services/WebSocketService.php

@@ -6,10 +6,9 @@ namespace App\Services;
 
 use App\Models\User;
 use App\Models\WebSocket;
-use App\Models\WebSocketDialogMsg;
 use App\Module\Base;
 use App\Module\Doo;
-use App\Tasks\LineTask;
+use App\Module\Table\OnlineData;
 use App\Tasks\PushTask;
 use Cache;
 use Carbon\Carbon;
@@ -25,7 +24,6 @@ use Swoole\WebSocket\Server;
 class WebSocketService implements WebSocketHandlerInterface
 {
     /**
-     * 声明没有参数的构造函数
      * WebSocketService constructor.
      */
     public function __construct()
@@ -37,14 +35,14 @@ class WebSocketService implements WebSocketHandlerInterface
      * 连接建立时触发
      * @param Server $server
      * @param Request $request
+     * @return void
      */
     public function onOpen(Server $server, Request $request)
     {
         $fd = $request->fd;
         $get = Base::newTrim($request->get);
-        $action = $get['action'];
         Cache::forget("User::encrypt:" . $fd);
-        switch ($action) {
+        switch ($get['action']) {
             /**
              * 网页访问
              */
@@ -52,22 +50,21 @@ class WebSocketService implements WebSocketHandlerInterface
                 {
                     Doo::load($get['token'], $get['language']);
                     //
-                    if (Doo::userId() > 0
-                        && !Doo::userExpired()
-                        && $user = User::whereUserid(Doo::userId())->whereEmail(Doo::userEmail())->whereEncrypt(Doo::userEncrypt())->first()) {
-                        // 保存用户
-                        $this->saveUser($fd, $user->userid);
-                        // 发送open事件
+                    $count = 0;
+                    $userid = Doo::userId();
+                    if ($userid > 0 && !Doo::userExpired()) {
+                        $count = User::whereUserid($userid)->whereEmail(Doo::userEmail())->whereEncrypt(Doo::userEncrypt())->count();
+                    }
+                    if ($count) {
+                        // 用户正常
                         $server->push($fd, Base::array2json([
                             'type' => 'open',
                             'data' => [
                                 'fd' => $fd,
+                                'ud' => $userid,
                             ],
                         ]));
-                        // 通知上线
-                        Task::deliver(new LineTask($user->userid, true));
-                        // 推送离线时收到的消息
-                        Task::deliver(new PushTask("RETRY::" . $user->userid));
+                        $this->userOn($fd, $userid);
                     } else {
                         // 用户不存在
                         $server->push($fd, Base::array2json([
@@ -77,7 +74,6 @@ class WebSocketService implements WebSocketHandlerInterface
                             ],
                         ]));
                         $server->close($fd);
-                        $this->deleteUser($fd);
                     }
                 }
                 break;
@@ -91,39 +87,23 @@ class WebSocketService implements WebSocketHandlerInterface
      * 收到消息时触发
      * @param Server $server
      * @param Frame $frame
+     * @return void
      */
     public function onMessage(Server $server, Frame $frame)
     {
         $msg = Base::json2array($frame->data);
-        $type = $msg['type'];       // 消息类型
-        $msgId = $msg['msgId'];     // 消息ID（用于回调）
-        $data = $msg['data'];       // 消息详情
-        //
+        $type = $msg['type'];                       // 消息类型
+        $data = $msg['data'];                       // 消息详情
+        $msgId = $msg['msgId'] ?? $msg['msg_id'];   // 消息ID（用于回调）
+
+        // 处理消息
         $reData = [];
         switch ($type) {
-            /**
-             * 收到回执
-             */
+            // 收到回执
             case 'receipt':
                 return;
 
-            /**
-             * 已阅消息
-             */
-            case 'readMsg':
-                $ids = is_array($data['id']) ? $data['id'] : [$data['id']];
-                $userid = $this->getUserid($frame->fd);
-                WebSocketDialogMsg::whereIn('id', $ids)->chunkById(20, function($list) use ($userid) {
-                    /** @var WebSocketDialogMsg $item */
-                    foreach ($list as $item) {
-                        $item->readSuccess($userid);
-                    }
-                });
-                return;
-
-            /**
-             * 访问状态
-             */
+            // 访问状态
             case 'path':
                 $row = WebSocket::whereFd($frame->fd)->first();
                 if ($row) {
@@ -140,9 +120,7 @@ class WebSocketService implements WebSocketHandlerInterface
                 }
                 return;
 
-            /**
-             * 加密参数
-             */
+            // 加密参数
             case 'encrypt':
                 if ($data['type'] === 'pgp') {
                     $data['key'] = Doo::pgpPublicFormat($data['key']);
@@ -150,7 +128,8 @@ class WebSocketService implements WebSocketHandlerInterface
                 Cache::put("User::encrypt:" . $frame->fd, Base::array2json($data), Carbon::now()->addDay());
                 return;
         }
-        //
+
+        // 返回消息
         if ($msgId) {
             PushTask::push([
                 'fd' => $frame->fd,
@@ -168,15 +147,11 @@ class WebSocketService implements WebSocketHandlerInterface
      * @param Server $server
      * @param $fd
      * @param $reactorId
-     * @throws \Exception
+     * @return void
      */
     public function onClose(Server $server, $fd, $reactorId)
     {
-        $userid = $this->getUserid($fd);
-        if($userid){
-            Task::deliver(new LineTask($userid, false));  // 通知离线
-            $this->deleteUser($fd);
-        }
+        $this->userOff($fd);
     }
 
     /** ****************************************************************************** */
@@ -184,65 +159,49 @@ class WebSocketService implements WebSocketHandlerInterface
     /** ****************************************************************************** */
 
     /**
-     * 保存用户
+     * 用户上线
      * @param $fd
      * @param $userid
+     * @return void
      */
-    private function saveUser($fd, $userid)
+    private function userOn($fd, $userid)
     {
-        Cache::put("User::fd:" . $fd, "on", Carbon::now()->addDay());
-        Cache::put("User::online:" . $userid, "on", Carbon::now()->addDay());
-        //
         WebSocket::updateInsert([
             'key' => md5($fd . '@' . $userid)
         ], [
             'fd' => $fd,
             'userid' => $userid,
         ]);
+        OnlineData::online($userid);
     }
 
     /**
-     * 清除用户
+     * 用户下线
      * @param $fd
+     * @return void
      */
-    private function deleteUser($fd)
+    private function userOff($fd)
     {
-        Cache::forget("User::fd:" . $fd);
-        //
-        $array = [];
-        WebSocket::whereFd($fd)->chunk(10, function($list) use (&$array) {
+        $paths = [];
+        WebSocket::whereFd($fd)->chunk(10, function($list) use (&$paths) {
             /** @var WebSocket $item */
             foreach ($list as $item) {
                 $item->delete();
                 if ($item->userid) {
-                    // 离线时更新会员最后在线时间
-                    User::whereUserid($item->userid)->update([
-                        'line_at' => Carbon::now()
-                    ]);
-                    Cache::forget("User::online:" . $item->userid);
+                    OnlineData::offline($item->userid);
                 }
                 if ($item->path && str_starts_with($item->path, "/single/file/")) {
-                    $array[$item->path] = $item->path;
+                    $paths[$item->path] = $item->path;
                 }
             }
         });
-        foreach ($array as $path) {
+        foreach ($paths as $path) {
             $this->pushPath($path);
         }
     }
 
     /**
-     * 根据fd获取会员ID
-     * @param $fd
-     * @return int
-     */
-    private function getUserid($fd)
-    {
-        return intval(WebSocket::whereFd($fd)->value('userid'));
-    }
-
-    /**
-     * 发送给相同访问状态的会员
+     * 通知相同访问路径的用户
      * @param $path
      */
     private function pushPath($path)

app/Tasks/AutoArchivedTask.php

@@ -3,7 +3,6 @@ namespace App\Tasks;
 
 @error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
 
-use App\Models\AbstractModel;
 use App\Models\ProjectTask;
 use App\Module\Base;
 use Carbon\Carbon;

app/Tasks/BotReceiveMsgTask.php

@@ -10,6 +10,7 @@ use App\Module\Base;
 use App\Module\Doo;
 use App\Module\Ihttp;
 use Carbon\Carbon;
+use DB;
 
 @error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
 
@@ -62,6 +63,22 @@ class BotReceiveMsgTask extends AbstractTask
      */
     private function botManagerReceive(WebSocketDialogMsg $msg, User $botUser)
     {
+        // 位置消息
+        if ($msg->type === 'location') {
+            // 签到机器人
+            if ($botUser->email === 'check-in@bot.system') {
+                $content = UserBot::checkinBotQuickMsg('locat-checkin', $msg->userid, $msg->msg);
+                if ($content) {
+                    WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'template', [
+                        'type' => 'content',
+                        'content' => $content,
+                    ], $botUser->userid, false, false, true);    // todo 未能在任务end事件来发送任务
+                }
+            }
+            return;
+        }
+
+        // 文本消息
         if ($msg->type !== 'text') {
             return;
         }
@@ -69,7 +86,7 @@ class BotReceiveMsgTask extends AbstractTask
         if ($this->mention) {
             $original = preg_replace("/<span class=\"mention user\" data-id=\"(\d+)\">(.*?)<\/span>/", "", $original);
         }
-        if (preg_match("/<span[^>]*?data-quick-key=([\"'])(.*?)\\1[^>]*?>(.*?)<\/span>/is", $original, $match)) {
+        if (preg_match("/<span[^>]*?data-quick-key=([\"'])([^\"']+?)\\1[^>]*?>(.*?)<\/span>/is", $original, $match)) {
             $command = $match[2];
             if (str_starts_with($command, '%3A.')) {
                 $command = ":" . substr($command, 4);
@@ -93,16 +110,23 @@ class BotReceiveMsgTask extends AbstractTask
         }
         // 签到机器人
         if ($botUser->email === 'check-in@bot.system') {
-            $text = UserBot::checkinBotQuickMsg($command, $msg->userid);
-            if ($text) {
-                WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'text', ['text' => $text], $botUser->userid, false, false, true);    // todo 未能在任务end事件来发送任务
+            $content = UserBot::checkinBotQuickMsg($command, $msg->userid);
+            if ($content) {
+                WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'template', [
+                    'type' => 'content',
+                    'content' => $content,
+                ], $botUser->userid, false, false, true);    // todo 未能在任务end事件来发送任务
             }
         }
         // 隐私机器人
         if ($botUser->email === 'anon-msg@bot.system') {
-            $text = UserBot::anonBotQuickMsg($command);
-            if ($text) {
-                WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'text', ['text' => $text], $botUser->userid, false, false, true);    // todo 未能在任务end事件来发送任务
+            $array = UserBot::anonBotQuickMsg($command);
+            if ($array) {
+                WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'template', [
+                    'type' => 'content',
+                    'title' => $array['title'],
+                    'content' => $array['content'],
+                ], $botUser->userid, false, false, true);    // todo 未能在任务end事件来发送任务
             }
         }
         // 管理机器人
@@ -112,15 +136,17 @@ class BotReceiveMsgTask extends AbstractTask
             } elseif (UserBot::whereBotId($botUser->userid)->whereUserid($msg->userid)->exists()) {
                 $isManager = false;
             } else {
-                $text = "非常抱歉，我不是你的机器人，无法完成你的指令。";
-                WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'text', ['text' => $text], $botUser->userid, false, false, true);    // todo 未能在任务end事件来发送任务
+                WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'template', [
+                    'type' => 'content',
+                    'content' => "非常抱歉，我不是你的机器人，无法完成你的指令。",
+                ], $botUser->userid, false, false, true);    // todo 未能在任务end事件来发送任务
                 return;
             }
             //
             $array = Base::newTrim(explode(" ", "{$command}    "));
             $type = $array[0];
             $data = [];
-            $notice = "";
+            $content = "";
             if (!$isManager && in_array($type, ['/list', '/newbot'])) {
                 return; // 这些操作仅支持【机器人管理】机器人
             }
@@ -143,20 +169,19 @@ class BotReceiveMsgTask extends AbstractTask
                         ->orderByDesc('id')
                         ->get();
                     if ($data->isEmpty()) {
-                        $type = "notice";
-                        $notice = "您没有创建机器人。";
+                        $content = "您没有创建机器人。";
                     }
                     break;
 
                 /**
                  * 详情
                  */
+                case '/hello':
                 case '/info':
                     $botId = $isManager ? $array[1] : $botUser->userid;
                     $data = $this->botManagerOne($botId, $msg->userid);
                     if (!$data) {
-                        $type = "notice";
-                        $notice = "机器人不存在。";
+                        $content = "机器人不存在。";
                     }
                     break;
 
@@ -169,27 +194,27 @@ class BotReceiveMsgTask extends AbstractTask
                             ->where('users.bot', 1)
                             ->where('user_bots.userid', $msg->userid)
                             ->count() >= 50) {
-                        $type = "notice";
-                        $notice = "超过最大创建数量。";
+                        $content = "超过最大创建数量。";
                         break;
                     }
                     if (strlen($array[1]) < 2 || strlen($array[1]) > 20) {
-                        $type = "notice";
-                        $notice = "机器人名称由2-20个字符组成。";
+                        $content = "机器人名称由2-20个字符组成。";
                         break;
                     }
                     $data = User::botGetOrCreate("user-" . Base::generatePassword(), [
                         'nickname' => $array[1]
                     ], $msg->userid);
                     if (empty($data)) {
-                        $type = "notice";
-                        $notice = "创建失败。";
+                        $content = "创建失败。";
                         break;
                     }
                     $dialog = WebSocketDialog::checkUserDialog($data, $msg->userid);
                     if ($dialog) {
-                        $text = "<p>您好，我是机器人：{$data->nickname}，我的机器人ID是：{$data->userid}，</p><p>你可以发送 <u><b>/help</b></u> 查看我支持什么命令。</p>";
-                        WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => $text], $data->userid);   // todo 未能在任务end事件来发送任务
+                        WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                            'type' => '/hello',
+                            'title' => '创建成功。',
+                            'data' => $data,
+                        ], $data->userid);    // todo 未能在任务end事件来发送任务
                     }
                     break;
 
@@ -200,8 +225,7 @@ class BotReceiveMsgTask extends AbstractTask
                     $botId = $isManager ? $array[1] : $botUser->userid;
                     $nameString = $isManager ? $array[2] : $array[1];
                     if (strlen($nameString) < 2 || strlen($nameString) > 20) {
-                        $type = "notice";
-                        $notice = "机器人名称由2-20个字符组成。";
+                        $content = "机器人名称由2-20个字符组成。";
                         break;
                     }
                     $data = $this->botManagerOne($botId, $msg->userid);
@@ -211,8 +235,7 @@ class BotReceiveMsgTask extends AbstractTask
                         $data->pinyin = Base::cn2pinyin($nameString);
                         $data->save();
                     } else {
-                        $type = "notice";
-                        $notice = "机器人不存在。";
+                        $content = "机器人不存在。";
                     }
                     break;
 
@@ -226,8 +249,7 @@ class BotReceiveMsgTask extends AbstractTask
                     if ($data) {
                         $data->deleteUser('delete bot');
                     } else {
-                        $type = "notice";
-                        $notice = "机器人不存在。";
+                        $content = "机器人不存在。";
                     }
                     break;
 
@@ -240,8 +262,7 @@ class BotReceiveMsgTask extends AbstractTask
                     if ($data) {
                         User::generateToken($data);
                     } else {
-                        $type = "notice";
-                        $notice = "机器人不存在。";
+                        $content = "机器人不存在。";
                     }
                     break;
 
@@ -256,8 +277,7 @@ class BotReceiveMsgTask extends AbstractTask
                         $data->password = Doo::md5s(Base::generatePassword(32), $data->encrypt);
                         $data->save();
                     } else {
-                        $type = "notice";
-                        $notice = "机器人不存在。";
+                        $content = "机器人不存在。";
                     }
                     break;
 
@@ -278,8 +298,7 @@ class BotReceiveMsgTask extends AbstractTask
                         $data->clear_day = $userBot->clear_day;
                         $data->clear_at = $userBot->clear_at;   // 这两个参数只是作为输出，所以不保存
                     } else {
-                        $type = "notice";
-                        $notice = "机器人不存在。";
+                        $content = "机器人不存在。";
                     }
                     break;
 
@@ -291,8 +310,7 @@ class BotReceiveMsgTask extends AbstractTask
                     $webhookUrl = $isManager ? $array[2] : $array[1];
                     $data = $this->botManagerOne($botId, $msg->userid);
                     if (strlen($webhookUrl) > 255) {
-                        $type = "notice";
-                        $notice = "webhook地址最长仅支持255个字符。";
+                        $content = "webhook地址最长仅支持255个字符。";
                     } elseif ($data) {
                         $userBot = UserBot::whereBotId($botId)->whereUserid($msg->userid)->first();
                         if ($userBot) {
@@ -303,8 +321,7 @@ class BotReceiveMsgTask extends AbstractTask
                         $data->webhook_url = $userBot->webhook_url ?: '-';
                         $data->webhook_num = $userBot->webhook_num;   // 这两个参数只是作为输出，所以不保存
                     } else {
-                        $type = "notice";
-                        $notice = "机器人不存在。";
+                        $content = "机器人不存在。";
                     }
                     break;
 
@@ -316,43 +333,65 @@ class BotReceiveMsgTask extends AbstractTask
                     $nameKey = $isManager ? $array[2] : $array[1];
                     $data = $this->botManagerOne($botId, $msg->userid);
                     if ($data) {
-                        $list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread', 'u.silence', 'u.color', 'u.updated_at as user_at'])
-                            ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
-                            ->where('web_socket_dialogs.name', 'LIKE', "%{$nameKey}%")
+                        $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', $data->userid)
+                            ->where('d.name', 'LIKE', "%{$nameKey}%")
+                            ->whereNull('d.deleted_at')
                             ->orderByDesc('u.top_at')
-                            ->orderByDesc('web_socket_dialogs.last_at')
+                            ->orderByDesc('u.last_at')
                             ->take(20)
-                            ->get();
-                        if ($list->isEmpty()) {
-                            $type = "notice";
-                            $notice = "没有搜索到相关会话。";
+                            ->get()
+                            ->map(function($item) use ($data) {
+                                return WebSocketDialog::synthesizeData($item, $data->userid);
+                            })
+                            ->all();
+                        if (empty($list)) {
+                            $content = "没有搜索到相关会话。";
                         } else {
-                            $list->transform(function (WebSocketDialog $item) use ($data) {
-                                return $item->formatData($data->userid);
-                            });
                             $data->list = $list;   // 这个参数只是作为输出，所以不保存
                         }
                     } else {
-                        $type = "notice";
-                        $notice = "机器人不存在。";
+                        $content = "机器人不存在。";
                     }
                     break;
             }
             //
-            $text = view('push.bot', [
-                'type' => $type,
-                'data' => $data,
-                'notice' => $notice,
-                'manager' => $isManager,
-                'version' => Base::getVersion()
-            ])->render();
-            if (!$isManager) {
-                $text = preg_replace("/\s*\{机器人ID\}/", "", $text);
+
+            if ($content) {
+                $msgData = [
+                    'type' => 'content',
+                    'content' => $content,
+                ];
+            } else {
+                $msgData = [
+                    'type' => $type,
+                    'data' => $data,
+                ];
+                $msgData['title'] = match ($type) {
+                    '/hello' => '您好',
+                    '/help' => '帮助指令',
+                    '/list' => '我的机器人',
+                    '/info' => '机器人信息',
+                    '/newbot' => '新建机器人',
+                    '/setname' => '设置名称',
+                    '/deletebot' => '删除机器人',
+                    '/token' => '机器人Token',
+                    '/revoke' => '更新Token',
+                    '/webhook' => '设置Webhook',
+                    '/clearday' => '设置保留消息时间',
+                    '/dialog' => '对话列表',
+                    '/api' => 'API接口文档',
+                    default => '不支持的指令',
+                };
+                if ($type == '/api') {
+                    $msgData['version'] = Base::getVersion();
+                } elseif ($type == '/help') {
+                    $msgData['manager'] = $isManager;
+                }
             }
-            $text = preg_replace("/^\x20+/", "", $text);
-            $text = preg_replace("/\n\x20+/", "\n", $text);
-            WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'text', ['text' => $text], $botUser->userid, false, false, true);    // todo 未能在任务end事件来发送任务
+            WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'template', $msgData, $botUser->userid, false, false, true);    // todo 未能在任务end事件来发送任务
         }
     }
 
@@ -369,7 +408,7 @@ class BotReceiveMsgTask extends AbstractTask
         $serverUrl = 'http://' . env('APP_IPPR') . '.3';
         $userBot = null;
         $extras = [];
-        $error = null;
+        $errorContent = null;
         switch ($botUser->email) {
             // ChatGPT 机器人
             case 'ai-openai@bot.system':
@@ -380,12 +419,13 @@ class BotReceiveMsgTask extends AbstractTask
                     'openai_agency' => $setting['openai_agency'],
                     'openai_model' => $setting['openai_model'],
                     'server_url' => $serverUrl,
+                    'chunk_size' => 7,
                 ];
                 if (empty($extras['openai_key'])) {
-                    $error = 'Robot disabled.';
+                    $errorContent = '机器人未启用。';
                 } elseif (in_array($this->client['platform'], ['win', 'mac', 'web'])
                     && !Base::judgeClientVersion("0.29.11", $this->client['version'])) {
-                    $error = 'The client version is low (required version ≥ v0.29.11).';
+                    $errorContent = '当前客户端版本低（所需版本≥v0.29.11）。';
                 }
                 break;
             // Claude 机器人
@@ -398,10 +438,10 @@ class BotReceiveMsgTask extends AbstractTask
                     'server_url' => $serverUrl,
                 ];
                 if (empty($extras['claude_token'])) {
-                    $error = 'Robot disabled.';
+                    $errorContent = '机器人未启用。';
                 } elseif (in_array($this->client['platform'], ['win', 'mac', 'web'])
                     && !Base::judgeClientVersion("0.29.11", $this->client['version'])) {
-                    $error = 'The client version is low (required version ≥ v0.29.11).';
+                    $errorContent = '当前客户端版本低（所需版本≥v0.29.11）。';
                 }
                 break;
             // Wenxin 机器人
@@ -415,10 +455,10 @@ class BotReceiveMsgTask extends AbstractTask
                     'server_url' => $serverUrl,
                 ];
                 if (empty($extras['wenxin_key'])) {
-                    $error = 'Robot disabled.';
+                    $errorContent = '机器人未启用。';
                 } elseif (in_array($this->client['platform'], ['win', 'mac', 'web'])
                     && !Base::judgeClientVersion("0.29.11", $this->client['version'])) {
-                    $error = 'The client version is low (required version ≥ v0.29.12).';
+                    $errorContent = '当前客户端版本低（所需版本≥v0.29.12）。';
                 }
                 break;
             // QianWen 机器人
@@ -431,10 +471,44 @@ class BotReceiveMsgTask extends AbstractTask
                     'server_url' => $serverUrl,
                 ];
                 if (empty($extras['qianwen_key'])) {
-                    $error = 'Robot disabled.';
+                    $errorContent = '机器人未启用。';
                 } elseif (in_array($this->client['platform'], ['win', 'mac', 'web'])
                     && !Base::judgeClientVersion("0.29.11", $this->client['version'])) {
-                    $error = 'The client version is low (required version ≥ v0.29.12).';
+                    $errorContent = '当前客户端版本低（所需版本≥v0.29.12）。';
+                }
+                break;
+            // Gemini 机器人
+            case 'ai-gemini@bot.system':
+                $setting = Base::setting('aibotSetting');
+                $webhookUrl = "{$serverUrl}/ai/gemini/send";
+                $extras = [
+                    'gemini_key' => $setting['gemini_key'],
+                    'gemini_model' => $setting['gemini_model'],
+                    'gemini_agency' => $setting['gemini_agency'],
+                    'gemini_timeout' => 20,
+                    'server_url' => $serverUrl,
+                ];
+                if (empty($extras['gemini_key'])) {
+                    $errorContent = '机器人未启用。';
+                } elseif (in_array($this->client['platform'], ['win', 'mac', 'web'])
+                    && !Base::judgeClientVersion("0.29.11", $this->client['version'])) {
+                    $errorContent = '当前客户端版本低（所需版本≥v0.29.12）。';
+                }
+                break;
+            // 智谱清言 机器人
+            case 'ai-zhipu@bot.system':
+                $setting = Base::setting('aibotSetting');
+                $webhookUrl = "{$serverUrl}/ai/zhipu/send";
+                $extras = [
+                    'zhipu_key' => $setting['zhipu_key'],
+                    'zhipu_model' => $setting['zhipu_model'],
+                    'server_url' => $serverUrl,
+                ];
+                if (empty($extras['zhipu_key'])) {
+                    $errorContent = '机器人未启用。';
+                } elseif (in_array($this->client['platform'], ['win', 'mac', 'web'])
+                    && !Base::judgeClientVersion("0.29.11", $this->client['version'])) {
+                    $errorContent = '当前客户端版本低（所需版本≥v0.29.12）。';
                 }
                 break;
             // 其他机器人
@@ -443,16 +517,19 @@ class BotReceiveMsgTask extends AbstractTask
                 $webhookUrl = $userBot?->webhook_url;
                 break;
         }
-        if ($error) {
-            WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'text', ['text' => $error], $botUser->userid, false, false, true); // todo 未能在任务end事件来发送任务
+        if ($errorContent) {
+            WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'template', [
+                'type' => 'content',
+                'content' => $errorContent,
+            ], $botUser->userid, false, false, true); // todo 未能在任务end事件来发送任务
             return;
         }
-        if (!preg_match("/^https*:\/\//", $webhookUrl)) {
+        if (!preg_match("/^https?:\/\//", $webhookUrl)) {
             return;
         }
         //
         try {
-            $res = Ihttp::ihttp_post($webhookUrl, [
+            $data = [
                 'text' => $command,
                 'token' => User::generateToken($botUser),
                 'dialog_id' => $dialog->id,
@@ -463,18 +540,25 @@ class BotReceiveMsgTask extends AbstractTask
                 'bot_uid' => $botUser->userid,
                 'version' => Base::getVersion(),
                 'extras' => Base::array2json($extras)
-            ], 10);
+            ];
+            $res = Ihttp::ihttp_post($webhookUrl, $data);
             if ($userBot) {
                 $userBot->webhook_num++;
                 $userBot->save();
             }
-            if($res['data'] && $data = json_decode($res['data'])){
-                if($data['code'] != 200 && $data['message']){
+            if ($res['data'] && $data = Base::json2array($res['data'])) {
+                if ($data['code'] != 200 && $data['message']) {
                     WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'text', ['text' => $res['data']['message']], $botUser->userid, false, false, true);
                 }
             }
         } catch (\Throwable $th) {
-            //throw $th;
+            info(Base::array2json([
+                'bot_userid' => $botUser->userid,
+                'dialog' => $dialog->id,
+                'msg' => $msg->id,
+                'webhook_url' => $webhookUrl,
+                'error' => $th->getMessage(),
+            ]));
         }
     }
 

app/Tasks/CheckinRemindTask.php

@@ -7,7 +7,9 @@ use App\Models\UserCheckinRecord;
 use App\Models\WebSocketDialog;
 use App\Models\WebSocketDialogMsg;
 use App\Module\Base;
+use App\Module\Doo;
 use App\Module\Extranet;
+use App\Module\Timer;
 use Cache;
 use Carbon\Carbon;
 
@@ -40,14 +42,14 @@ class CheckinRemindTask extends AbstractTask
         //
         if ($remindin > 0) {
             $timeRemindin = $timeStart - $remindin;
-            if ($timeRemindin <= Base::time() && Base::time() <= $timeStart) {
+            if ($timeRemindin <= Timer::time() && Timer::time() <= $timeStart) {
                 // 签到打卡提醒
                 $this->remind('in');
             }
         }
         if ($remindexceed > 0) {
             $timeRemindexceed = $timeStart + $remindexceed;
-            if ($timeRemindexceed <= Base::time() && Base::time() <= $timeRemindexceed + 300) {
+            if ($timeRemindexceed <= Timer::time() && Timer::time() <= $timeRemindexceed + 300) {
                 // 签到缺卡提醒
                 $this->remind('exceed');
             }
@@ -83,11 +85,28 @@ class CheckinRemindTask extends AbstractTask
                 $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid);
                 if ($dialog) {
                     if ($type === 'exceed') {
-                        $text = "<p><strong style='color:red'>缺卡提醒：</strong>上班时间到了，你还没有打卡哦~</p>";
+                        $title = '缺卡提醒';
+                        $style = 'color:#f55;';
+                        $content = '上班时间到了，你还没有打卡哦~';
                     } else {
-                        $text = "<p><strong>打卡提醒：</strong>快到上班时间了，别忘了打卡哦~</p>";
+                        $title = '打卡提醒';
+                        $style = '';
+                        $content = '快到上班时间了，别忘了打卡哦~';
                     }
-                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => $text], $botUser->userid);
+                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
+                        'type' => 'content',
+                        'title' => $title,
+                        'content' => [
+                            [
+                                'content' => $title,
+                                'style' => $style . 'font-weight:bold',
+                            ],
+                            [
+                                'content' => $content,
+                                'style' => 'padding-top:4px;opacity:0.6',
+                            ],
+                        ],
+                    ], $botUser->userid);
                 }
             }
         });

app/Tasks/CloseMeetingRoomTask.php

@@ -0,0 +1,132 @@
+<?php
+
+namespace App\Tasks;
+
+use App\Models\Meeting;
+use App\Models\WebSocketDialog;
+use App\Module\Base;
+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()
+    {
+        parent::__construct();
+    }
+
+    public function start()
+    {
+        // 10分钟执行一次
+        $time = intval(Cache::get("CloseMeetingRoomTask:Time"));
+        if (time() - $time < 600) {
+            return;
+        }
+        Cache::put("CloseMeetingRoomTask:Time", time(), Carbon::now()->addMinutes(10));
+        // 判断参数
+        $setting = Base::setting('meetingSetting');
+        if ($setting['open'] !== 'open') {
+            return;
+        }
+        if (empty($setting['appid']) ||empty($setting['api_key']) || empty($setting['api_secret'])) {
+            return;
+        }
+        $credentials = $setting['api_key'] . ":" . $setting['api_secret'];
+        $base64Credentials = base64_encode($credentials);
+        $arrHeader = [
+            "Accept: application/json",
+            "Authorization: Basic " . $base64Credentials
+        ];
+        // 获取10分钟未更新的会议
+        $meetings = Meeting::whereNull('end_at')
+            ->where('updated_at', '<', Carbon::now()->subMinutes(10))
+            ->take(100)
+            ->get();
+        $dialogIds = [];
+        /** @var Meeting $meeting */
+        foreach ($meetings as $meeting) {
+            if (!$this->isEmptyChannel($setting['appid'], $meeting->channel, $arrHeader)) {
+                $meeting->updated_at = Carbon::now();
+                $meeting->save();
+                continue;
+            }
+            $meeting->end_at = Carbon::now();
+            $meeting->save();
+            // 更新消息
+            $newMsg = $meeting->toArray();
+            $newMsg['end_at'] = $meeting->end_at->toDateTimeString();
+            WebSocketDialogMsg::select(['web_socket_dialog_msgs.*', 'm.meetingid'])
+                ->join("meeting_msgs as m", "m.msg_id", "=", "web_socket_dialog_msgs.id")
+                ->where('m.meetingid', $meeting->meetingid)
+                ->chunk(100, function ($msgs) use ($newMsg, &$dialogIds) {
+                    /** @var WebSocketDialogMsg $msg */
+                    foreach ($msgs as $msg) {
+                        $msgData = Base::json2array($msg->getRawOriginal('msg'));
+                        $msg->msg = Base::array2json(array_merge($msgData, $newMsg));
+                        $msg->save();
+                        //
+                        if (!isset($dialogIds[$msg->dialog_id])) {
+                            $dialogIds[$msg->dialog_id] = [];
+                        }
+                        $dialogIds[$msg->dialog_id][] = [
+                            'id' => $msg->id,
+                            'msg' => $msg->msg,
+                        ];
+                    }
+                });
+        }
+        // 推送更新
+        foreach ($dialogIds as $dialogId => $datas) {
+            $dialog = WebSocketDialog::find($dialogId);
+            if (empty($dialog)) {
+                continue;
+            }
+            foreach ($datas as $data) {
+                $dialog->pushMsg('update', $data);
+            }
+        }
+    }
+
+    public function end()
+    {
+    }
+
+    /**
+     * 是否空频道
+     * @param $appid
+     * @param $channel
+     * @param $arrHeader
+     * @return bool
+     */
+    private function isEmptyChannel($appid, $channel, $arrHeader)
+    {
+        $curl = curl_init();
+        curl_setopt_array($curl, [
+            CURLOPT_URL => "https://api.sd-rtn.com/dev/v1/channel/user/{$appid}/{$channel}",
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_ENCODING => "",
+            CURLOPT_MAXREDIRS => 10,
+            CURLOPT_TIMEOUT => 30,
+            CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
+            CURLOPT_CUSTOMREQUEST => "GET",
+            CURLOPT_HTTPHEADER => $arrHeader,
+        ]);
+        $response = curl_exec($curl);
+        $err = curl_error($curl);
+        curl_close($curl);
+        if ($err) {
+            return false;   // 错误
+        }
+        $data = Base::json2array($response);
+        if (!$data['success']) {
+            return false;   // 失败
+        }
+        if ($data['data']['channel_exist']) {
+            return false;   // 有人
+        }
+        return true;
+    }
+}

app/Tasks/DeleteTmpTask.php

@@ -6,8 +6,8 @@ use App\Models\File;
 use App\Models\TaskWorker;
 use App\Models\Tmp;
 use App\Models\WebSocketTmpMsg;
+use App\Module\Base;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\File as SupportFile;
 
 /**
  * 删除过期临时数据任务
@@ -99,22 +99,19 @@ class DeleteTmpTask extends AbstractTask
                 break;
 
             /**
-             * file_pack 临时压缩下载文件
+             * tmp_file 删除临时文件
              */
-            case 'file_pack':
+            case 'tmp_file':
                 {
-                    $path = public_path('tmp/file/');
-                    if (!SupportFile::exists($path)) {
+                    $day = intval(env("AUTO_EMPTY_TEMP_FILE", 30));
+                    if ($day <= 0) {
                         return;
                     }
-                    $dirIterator = new \RecursiveDirectoryIterator($path);
-                    $iterator = new \RecursiveIteratorIterator($dirIterator);
-                    foreach ($iterator as $file) {
-                        if ($file->isFile()) {
-                            $time = $file->getMTime();
-                            if ($time < time() - 3600 * 24) {
-                                unlink($file->getPathname());
-                            }
+                    $files = Base::recursiveFiles(public_path('uploads/tmp'));
+                    foreach ($files as $file) {
+                        $time = @filemtime($file);
+                        if ($time && $time < time() - 3600 * 24 * $day) {
+                            unlink($file);
                         }
                     }
                 }

app/Tasks/EmailNoticeTask.php

@@ -7,164 +7,278 @@ use App\Models\User;
 use App\Models\WebSocketDialogMsg;
 use App\Models\WebSocketDialogMsgRead;
 use App\Module\Base;
+use App\Module\Doo;
+use App\Module\Timer;
 use Carbon\Carbon;
 use Guanguans\Notify\Factory;
 use Guanguans\Notify\Messages\EmailMessage;
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
+/**
+ * 未读消息邮件通知任务
+ * 根据设置的时间范围，将未读消息通过邮件发送给用户
+ */
 class EmailNoticeTask extends AbstractTask
 {
+    /** @var array 允许发送通知的消息类型 */
+    private const ALLOWED_MSG_TYPES = ["text", "file", "record", "meeting"];
+
+    /** @var int 每批处理的数据量 */
+    private const CHUNK_SIZE = 100;
+
+    /** @var array 邮件相关设置 */
+    private array $emailSetting;
+
     public function __construct()
     {
         parent::__construct();
+        $this->emailSetting = Base::setting('emailSetting');
     }
 
     public function start()
     {
-        $setting = Base::setting('emailSetting');
-        // 消息通知
-        if ($setting['notice_msg'] === 'open') {
-            $userMinute = intval($setting['msg_unread_user_minute']);
-            $groupMinute = intval($setting['msg_unread_group_minute']);
-            \DB::statement("SET SQL_MODE=''");
-            $builder = WebSocketDialogMsg::select(['web_socket_dialog_msgs.*', 'r.id as r_id', 'r.userid as r_userid'])
-                ->join('web_socket_dialog_msg_reads as r', 'web_socket_dialog_msgs.id', '=', 'r.msg_id')
-                ->whereNull("r.read_at")
-                ->where("r.silence", 0)
-                ->where("r.email", 0);
-            if ($userMinute > -1) {
-                $builder->clone()
-                    ->where("web_socket_dialog_msgs.dialog_type", "user")
-                    ->whereIn("web_socket_dialog_msgs.type", ["text", "file", "record", "meeting"])
-                    ->whereBetween("web_socket_dialog_msgs.created_at", [
-                        Carbon::now()->subMinutes($userMinute + 10),
-                        Carbon::now()->subMinutes($userMinute)
-                    ])
-                    ->groupBy('r_userid')
-                    ->chunkById(100, function ($rows) {
-                        $this->unreadMsgEmail($rows, "user");
-                    });
-            }
-            if ($groupMinute > -1) {
-                $builder->clone()
-                    ->where("web_socket_dialog_msgs.dialog_type", "group")
-                    ->whereIn("web_socket_dialog_msgs.type", ["text", "file", "record", "meeting"])
-                    ->whereBetween("web_socket_dialog_msgs.created_at", [
-                        Carbon::now()->subMinutes($groupMinute + 10),
-                        Carbon::now()->subMinutes($groupMinute)
-                    ])
-                    ->groupBy('r_userid')
-                    ->chunkById(100, function ($rows) {
-                        $this->unreadMsgEmail($rows, "group");
-                    });
-            }
+        // 检查是否可以发送邮件
+        if (!$this->canSendEmails()) {
+            return;
         }
+
+        \DB::statement("SET SQL_MODE=''");
+
+        // 分别处理用户消息和群组消息
+        $this->processMessages('user');
+        $this->processMessages('group');
+    }
+
+    /**
+     * 检查是否可以发送邮件通知
+     * 需要开启通知功能且在指定的时间范围内
+     */
+    private function canSendEmails(): bool
+    {
+        if ($this->emailSetting['notice_msg'] !== 'open') {
+            return false;
+        }
+
+        $timeRanges = is_array($this->emailSetting['msg_unread_time_ranges'])
+            ? $this->emailSetting['msg_unread_time_ranges']
+            : [];
+
+        return Timer::isTimeInRanges($timeRanges);
+    }
+
+    /**
+     * 处理指定类型的未读消息
+     * @param string $dialogType 对话类型：user|group
+     */
+    private function processMessages(string $dialogType): void
+    {
+        // 获取未读时间限制（分钟）
+        $minute = $dialogType === 'user'
+            ? intval($this->emailSetting['msg_unread_user_minute'])
+            : intval($this->emailSetting['msg_unread_group_minute']);
+
+        if ($minute <= -1) {
+            return;
+        }
+
+        // 获取上次处理时间
+        $lastProcessKey = 'time' . ucfirst($dialogType);
+        $startTime = Base::settingFind('emailLastNotice', $lastProcessKey);
+        $startTime = $startTime ? Carbon::parse($startTime) : Carbon::today();
+
+        // 计算本次处理的结束时间（当前时间减去未读时间限制）
+        $endTime = Carbon::now()->subMinutes($minute);
+
+        // 如果开始时间晚于结束时间，则不处理
+        if ($startTime->isAfter($endTime)) {
+            return;
+        }
+
+        // 获取需要处理的用户列表
+        $query = WebSocketDialogMsgRead::select('web_socket_dialog_msg_reads.userid')
+            ->join('web_socket_dialog_msgs as m', 'm.id', '=', 'web_socket_dialog_msg_reads.msg_id')
+            ->whereNull('web_socket_dialog_msg_reads.read_at')
+            ->where('web_socket_dialog_msg_reads.silence', 0)
+            ->where('web_socket_dialog_msg_reads.email', 0)
+            ->where('m.dialog_type', $dialogType)
+            ->whereBetween('m.created_at', [$startTime, $endTime])
+            ->whereIn('m.type', self::ALLOWED_MSG_TYPES)
+            ->orderBy('web_socket_dialog_msg_reads.userid')
+            ->groupBy('web_socket_dialog_msg_reads.userid');
+
+        // 分批处理用户的未读消息
+        $query->chunk(self::CHUNK_SIZE, function($users) use ($dialogType, $startTime, $endTime) {
+            foreach ($users as $userData) {
+                $this->sendUserEmail($userData->userid, $dialogType, $startTime, $endTime);
+            }
+        });
+
+        // 更新处理时间
+        Base::setting('emailLastNotice', [
+            $lastProcessKey => $endTime->toDateTimeString()
+        ]);
+    }
+
+    /**
+     * 发送用户的未读消息邮件
+     */
+    private function sendUserEmail(int $userId, string $dialogType, Carbon $startTime, Carbon $endTime): void
+    {
+        // 验证用户
+        $user = User::whereDisableAt(null)->find($userId);
+        if (!$user || $user->bot || !is_null($user->disable_at) || !Base::isEmail($user->email)) {
+            return;
+        }
+
+        // 获取未读消息
+        $messages = $this->getUnreadMessages($userId, $dialogType, $startTime, $endTime);
+        if ($messages->isEmpty()) {
+            return;
+        }
+
+        // 设置用户语言
+        Doo::setLanguage($user->lang);
+
+        // 按对话分组并生成邮件内容
+        $messagesByDialog = $messages->groupBy('dialog_id');
+        $emailContent = $this->generateEmailContent($user, $messagesByDialog, $dialogType);
+
+        try {
+            // 发送邮件
+            $this->sendEmail($user, $emailContent);
+            // 标记消息已发送邮件
+            WebSocketDialogMsgRead::whereIn('id', $messages->pluck('r_id'))
+                ->update(['email' => 1]);
+        } catch (\Throwable $e) {
+            info("Email send failed for user {$userId}: " . $e->getMessage());
+        }
+    }
+
+    /**
+     * 获取用户的未读消息
+     */
+    private function getUnreadMessages($userId, $dialogType, Carbon $startTime, Carbon $endTime)
+    {
+        return WebSocketDialogMsg::select([
+            'web_socket_dialog_msgs.*',
+            'r.id as r_id',
+            'r.userid as r_userid'
+        ])
+            ->join('web_socket_dialog_msg_reads as r', 'web_socket_dialog_msgs.id', '=', 'r.msg_id')
+            ->where([
+                'r.userid' => $userId,
+                'r.silence' => 0,
+                'r.email' => 0,
+                'web_socket_dialog_msgs.dialog_type' => $dialogType
+            ])
+            ->whereNull('r.read_at')
+            ->whereBetween('web_socket_dialog_msgs.created_at', [$startTime, $endTime])
+            ->whereIn('web_socket_dialog_msgs.type', self::ALLOWED_MSG_TYPES)
+            ->orderBy('web_socket_dialog_msgs.created_at')
+            ->limit(self::CHUNK_SIZE)
+            ->get();
+    }
+
+    /**
+     * 生成邮件内容
+     */
+    private function generateEmailContent($user, $messagesByDialog, $dialogType)
+    {
+        $msgType = $dialogType === "group" ? "群聊" : "单聊";
+
+        // 生成邮件头部
+        $content = view('email.unread', [
+            'type' => 'head',
+            'title' => Doo::translate(sprintf('%s，您好。', $user->nickname)),
+            'desc' => Doo::translate(sprintf('您有%d条未读%s消息，请及时处理。', count($messagesByDialog), $msgType)),
+        ])->render();
+
+        $subject = null;
+        // 处理每个对话的消息
+        foreach ($messagesByDialog as $items) {
+            $dialogId = 0;
+            $dialogName = null;
+
+            foreach ($items as $item) {
+                $item->cancelAppend();
+                $item->userInfo = User::userid2basic($item->userid, ['lang']);
+                Doo::setLanguage($item->userInfo->lang);
+                $item->preview = WebSocketDialogMsg::previewMsg($item, true);
+                $item->preview = str_replace('<p>', '<p style="margin:0;padding:0">', $item->preview);
+
+                if (empty($dialogId)) {
+                    $dialogId = $item->dialog_id;
+                }
+                if ($dialogName === null) {
+                    $dialogName = $this->getDialogName($item, $dialogType);
+                }
+            }
+
+            // 生成邮件主题
+            if ($subject === null) {
+                $subject = count($messagesByDialog) > 1
+                    ? sprintf('来自%d个%s未读消息提醒', count($messagesByDialog), $msgType)
+                    : sprintf('来自%s未读消息提醒', $dialogName);
+            }
+
+            // 添加对话内容
+            $content .= view('email.unread', [
+                'type' => 'content',
+                'dialogUrl' => '',  // 不显示回复消息按钮
+                // 'dialogUrl' => config("app.url") . "/manage/messenger?dialog_id={$dialogId}",
+                'dialogName' => trim($dialogName),
+                'title' => Doo::translate(sprintf('%d条未读信息', count($items))),
+                'button' => Doo::translate('回复消息'),
+                'unread' => count($items),
+                'items' => $items,
+            ])->render();
+        }
+
+        $content = str_replace("{{RemoteURL}}", config("app.url") . "/", $content);
+
+        return [
+            'subject' => Doo::translate($subject),
+            'content' => $content
+        ];
+    }
+
+    /**
+     * 获取对话名称
+     */
+    private function getDialogName($message, $dialogType)
+    {
+        if ($dialogType === "user" && $message->userInfo) {
+            return $message->userInfo->profession
+                ? sprintf('%s (%s) ', $message->userInfo->nickname, $message->userInfo->profession)
+                : $message->userInfo->nickname;
+        }
+        return $message->webSocketDialog?->getGroupName();
+    }
+
+    /**
+     * 发送邮件
+     */
+    private function sendEmail($user, $emailData): void
+    {
+        Setting::validateAddr($user->email, function($to) use ($emailData) {
+            Factory::mailer()
+                ->setDsn(sprintf(
+                    'smtp://%s:%s@%s:%s?verify_peer=0',
+                    $this->emailSetting['account'],
+                    $this->emailSetting['password'],
+                    $this->emailSetting['smtp_server'],
+                    $this->emailSetting['port']
+                ))
+                ->setMessage(EmailMessage::create()
+                    ->from(sprintf('%s <%s>', Base::settingFind('system', 'system_alias', 'Task'), $this->emailSetting['account']))
+                    ->to($to)
+                    ->subject($emailData['subject'])
+                    ->html($emailData['content']))
+                ->send();
+        });
     }
 
     public function end()
     {
-
-    }
-
-    /**
-     * 未读消息通知
-     * @param $rows
-     * @param $dialogType
-     * @return void
-     */
-    private function unreadMsgEmail($rows, $dialogType)
-    {
-        $array = $rows->groupBy('r_userid');
-        foreach ($array as $userid => $data) {
-            $data = WebSocketDialogMsg::select(['web_socket_dialog_msgs.*', 'r.id as r_id', 'r.userid as r_userid'])
-                ->join('web_socket_dialog_msg_reads as r', 'web_socket_dialog_msgs.id', '=', 'r.msg_id')
-                ->whereNull("r.read_at")
-                ->where("r.silence", 0)
-                ->where("r.email", 0)
-                ->where("r.userid", $userid)
-                ->where("web_socket_dialog_msgs.dialog_type", $dialogType)
-                ->whereIn("web_socket_dialog_msgs.type", ["text", "file", "record", "meeting"])
-                ->take(100)
-                ->get();
-            if (empty($data)) {
-                continue;
-            }
-            $user = User::whereBot(0)->whereNull('disable_at')->find($userid);
-            if (empty($user)) {
-                continue;
-            }
-            if (!Base::isEmail($user->email)) {
-                continue;
-            }
-            $setting = Base::setting('emailSetting');
-            $msgType = $dialogType === "group" ? "群聊" : "成员";
-            $subject = null;
-            $content = view('email.unread', [
-                'type' => 'head',
-                'nickname' => $user->nickname,
-                'msgType' => $msgType,
-                'count' => count($data),
-            ])->render();
-            $lists = $data->groupBy('dialog_id');
-            /** @var WebSocketDialogMsg[] $items */
-            foreach ($lists as $items) {
-                $dialogId = 0;
-                $dialogName = null;
-                foreach ($items as $item) {
-                    $item->cancelAppend();
-                    $item->userInfo = User::userid2basic($item->userid);
-                    $item->preview = $item->previewMsg(true);
-                    $item->preview = str_replace('<p>', '<p style="margin:0;padding:0">', $item->preview);
-                    if (empty($dialogId)) {
-                        $dialogId = $item->dialog_id;
-                    }
-                    if ($dialogName === null) {
-                        if ($dialogType === "user" && $item->userInfo) {
-                            if ($item->userInfo->profession) {
-                                $dialogName = $item->userInfo->nickname . " ({$item->userInfo->profession})";
-                            } else {
-                                $dialogName = $item->userInfo->nickname;
-                            }
-                        } else {
-                            $dialogName = $item->webSocketDialog?->getGroupName();
-                        }
-                    }
-                }
-                if ($subject === null) {
-                    $count = count($lists);
-                    if ($count > 1) {
-                        $subject = "来自{$count}个{$msgType}未读消息提醒";
-                    } else {
-                        $subject = "来自{$dialogName}未读消息提醒";
-                    }
-                }
-                $content .= view('email.unread', [
-                    'type' => 'content',
-                    'dialogUrl' => config("app.url") . "/manage/messenger?dialog_id={$dialogId}",
-                    'dialogName' => $dialogName,
-                    'unread' => count($items),
-                    'items' => $items,
-                ])->render();
-                $content = str_replace("{{RemoteURL}}", config("app.url") . "/", $content);
-            }
-            try {
-                Setting::validateAddr($user->email, function($to) use ($content, $subject, $setting) {
-                    Factory::mailer()
-                        ->setDsn("smtp://{$setting['account']}:{$setting['password']}@{$setting['smtp_server']}:{$setting['port']}?verify_peer=0")
-                        ->setMessage(EmailMessage::create()
-                            ->from(env('APP_NAME', 'Task') . " <{$setting['account']}>")
-                            ->to($to)
-                            ->subject($subject)
-                            ->html($content))
-                        ->send();
-                });
-            } catch (\Throwable $e) {
-                info("unreadMsgEmail: " . $e->getMessage());
-            }
-            WebSocketDialogMsgRead::whereIn('id', $data->pluck('r_id'))->update([
-                'email' => 1
-            ]);
-        }
+        // 任务结束处理
     }
 }

app/Tasks/IhttpTask.php

@@ -1,75 +0,0 @@
-<?php
-namespace App\Tasks;
-
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
-use App\Module\Base;
-use App\Module\Ihttp;
-
-/**
- * Ihttp任务
- * Class IhttpTask
- * @package App\Tasks
- */
-class IhttpTask extends AbstractTask
-{
-    protected $url;
-    protected $post;
-    protected $extra;
-    protected $apiWebsocket;
-    protected $apiUserid;
-    protected $endPush = [];
-
-    /**
-     * IhttpTask constructor.
-     * @param $url
-     * @param array $post
-     * @param array $extra
-     */
-    public function __construct($url, $post = [], $extra = [])
-    {
-        parent::__construct(...func_get_args());
-        $this->url = $url;
-        $this->post = $post;
-        $this->extra = $extra;
-    }
-
-    /**
-     * @param mixed $apiWebsocket
-     */
-    public function setApiWebsocket($apiWebsocket): void
-    {
-        $this->apiWebsocket = $apiWebsocket;
-    }
-
-    /**
-     * @param mixed $apiUserid
-     */
-    public function setApiUserid($apiUserid): void
-    {
-        $this->apiUserid = $apiUserid;
-    }
-
-    public function start()
-    {
-        $res = Ihttp::ihttp_request($this->url, $this->post, $this->extra);
-        if ($this->apiWebsocket && $this->apiUserid) {
-            $data = Base::isSuccess($res) ? Base::json2array($res['data']) : $res;
-            $this->endPush[] = [
-                'userid' => $this->apiUserid,
-                'msg' => [
-                    'type' => 'apiWebsocket',
-                    'apiWebsocket' => $this->apiWebsocket,
-                    'apiSuccess' => Base::isSuccess($res),
-                    'data' => $data,
-                ]
-            ];
-
-        }
-    }
-
-    public function end()
-    {
-        PushTask::push($this->endPush);
-    }
-}