build

定时任务判断fix

.env.docker

@@ -1,13 +1,17 @@
-APP_NAME=Dootask
+TIMEZONE=PRC
+
+APP_NAME=DooTask
 APP_ENV=local
 APP_KEY=
-APP_DEBUG=true
+APP_DEBUG=false
 APP_SCHEME=auto
 APP_URL=http://localhost
 
 APP_ID=
 APP_IPPR=
 APP_PORT=2222
+APP_SSL_PORT=
+APP_DEV_PORT=
 
 LOG_CHANNEL=stack
 LOG_LEVEL=debug

.env.example

@@ -1,3 +1,5 @@
+TIMEZONE=PRC
+
 APP_NAME=Laravel
 APP_ENV=local
 APP_KEY=

.github/workflows/electron.yml

@@ -1,61 +0,0 @@
-name: Build
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-
-    if: startsWith(github.event.ref, 'refs/tags/v')
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Create changelog text
-        id: changelog
-        uses: loopwerk/tag-changelog@v1
-        with:
-          token: ${{ secrets.GH_PAT }}
-          exclude_types: other,chore
-
-      - name: Create release
-        uses: actions/create-release@latest
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          body: ${{ steps.changelog.outputs.changes }}
-
-  build:
-    runs-on: ${{ matrix.os }}
-    environment: build
-
-    strategy:
-      matrix:
-        os: [macos-11]
-        platform: [
-            build-mac,
-            build-mac-arm,
-            build-win
-        ]
-
-    if: startsWith(github.event.ref, 'refs/tags/v')
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Use Node.js 14.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 14.x
-
-      - name: Build
-        env:
-          GH_TOKEN: ${{ secrets.GH_PAT }}
-          EP_PRE_RELEASE: true
-        run: ./cmd electron ${{ matrix.platform }}
-

.github/workflows/publish.yml

@@ -0,0 +1,305 @@
+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
+
+  pack-vendor:
+    needs: [ check-version, create-release ]
+    if: needs.check-version.outputs.should_release == 'true'
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          extensions: mbstring, intl, gd, xml, zip, swoole
+          tools: composer:v2
+
+      - name: Install Dependencies
+        run: composer install
+
+      - name: Create Vendor Archive
+        run: tar -czf vendor.tar.gz vendor/
+
+      - name: Upload Vendor Archive
+        uses: actions/github-script@v7
+        env:
+          RELEASE_ID: ${{ needs.create-release.outputs.release_id }}
+        with:
+          script: |
+            const fs = require('fs');
+
+            const data = await fs.promises.readFile('vendor.tar.gz');
+
+            await github.rest.repos.uploadReleaseAsset({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              release_id: process.env.RELEASE_ID,
+              name: 'vendor.tar.gz',
+              data: data
+            });
+
+  build-client:
+    needs: [ check-version, create-release, pack-vendor ]
+    if: needs.check-version.outputs.should_release == 'true'
+    permissions:
+      contents: write
+    strategy:
+      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, pack-vendor, 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: |
+          pushd electron || exit
+          npm install
+          popd || exit
+          node ./electron/build.js published

.gitignore

@@ -1,10 +1,12 @@
 /node_modules
 /public/hot
 /public/tmp
+/public/summary
 /public/uploads/*
 /public/.well-known
 /public/.user.ini
 /storage/*.key
+/config/LICENSE
 /vendor
 /build
 /tmp
@@ -13,16 +15,17 @@
 .idea
 .vscode
 .vagrant
+.windsurfrules
 .phpunit.result.cache
 Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
 test.*
-composer.lock
 package-lock.json
 laravels-timer-process.pid
 .DS_Store
 vars.yaml
 laravels.conf
 laravels.pid
+README_LOCAL.md

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "resources/drawio"]
+	path = resources/drawio
+	url = https://github.com/jgraph/drawio.git
+[submodule "resources/mobile"]
+	path = resources/mobile
+	url = https://github.com/kuaifan/dootask-app.git

.gitpod.yml

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

.prefetch

@@ -0,0 +1,170 @@
+office/web-apps/apps/api/documents/api.js?hash={version}
+
+office/{path}/fonts/000
+office/{path}/fonts/001
+office/{path}/fonts/002
+office/{path}/fonts/020
+office/{path}/fonts/022
+office/{path}/fonts/023
+office/{path}/fonts/024
+office/{path}/fonts/027
+office/{path}/fonts/028
+office/{path}/fonts/029
+office/{path}/fonts/030
+office/{path}/fonts/036
+office/{path}/fonts/037
+office/{path}/fonts/038
+office/{path}/fonts/039
+office/{path}/fonts/050
+office/{path}/fonts/051
+office/{path}/fonts/052
+office/{path}/fonts/053
+office/{path}/fonts/058
+office/{path}/fonts/059
+office/{path}/fonts/060
+office/{path}/fonts/061
+office/{path}/fonts/062
+office/{path}/fonts/063
+office/{path}/fonts/064
+office/{path}/fonts/065
+office/{path}/fonts/066
+office/{path}/fonts/067
+office/{path}/fonts/068
+office/{path}/fonts/069
+office/{path}/fonts/070
+office/{path}/fonts/071
+office/{path}/fonts/072
+office/{path}/fonts/073
+office/{path}/fonts/074
+office/{path}/fonts/075
+office/{path}/fonts/076
+office/{path}/fonts/077
+office/{path}/fonts/078
+office/{path}/fonts/079
+office/{path}/fonts/080
+office/{path}/fonts/081
+office/{path}/fonts/086
+office/{path}/fonts/091
+office/{path}/fonts/092
+office/{path}/fonts/093
+office/{path}/fonts/094
+office/{path}/fonts/095
+office/{path}/fonts/096
+office/{path}/fonts/097
+office/{path}/fonts/098
+office/{path}/fonts/099
+office/{path}/fonts/100
+office/{path}/fonts/101
+office/{path}/fonts/102
+office/{path}/fonts/103
+office/{path}/fonts/131
+office/{path}/fonts/132
+office/{path}/fonts/133
+office/{path}/fonts/134
+office/{path}/fonts/135
+office/{path}/fonts/136
+office/{path}/fonts/137
+office/{path}/fonts/138
+office/{path}/fonts/139
+office/{path}/fonts/140
+office/{path}/fonts/141
+office/{path}/fonts/142
+office/{path}/fonts/143
+office/{path}/fonts/145
+office/{path}/fonts/147
+office/{path}/fonts/152
+office/{path}/fonts/154
+office/{path}/fonts/177
+office/{path}/fonts/178
+office/{path}/fonts/179
+office/{path}/fonts/180
+office/{path}/fonts/181
+office/{path}/fonts/182
+office/{path}/fonts/183
+office/{path}/fonts/184
+office/{path}/fonts/185
+office/{path}/fonts/186
+office/{path}/fonts/187
+office/{path}/fonts/188
+office/{path}/fonts/189
+office/{path}/fonts/190
+office/{path}/fonts/191
+office/{path}/fonts/192
+office/{path}/fonts/193
+office/{path}/fonts/198
+office/{path}/fonts/199
+office/{path}/fonts/200
+office/{path}/fonts/201
+office/{path}/fonts/202
+office/{path}/fonts/203
+office/{path}/fonts/204
+office/{path}/fonts/205
+office/{path}/fonts/206
+office/{path}/fonts/207
+office/{path}/fonts/208
+office/{path}/fonts/209
+office/{path}/fonts/210
+office/{path}/fonts/211
+office/{path}/fonts/212
+office/{path}/fonts/214
+office/{path}/fonts/215
+office/{path}/fonts/216
+office/{path}/fonts/217
+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

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**
@@ -11,24 +11,25 @@ Group No.: `546574618`
 
 ## Setup
 
-- `Docker` & `Docker Compose v2.0+` must be installed
-- System: `Centos/Debian/Ubuntu/macOS`
-- Hardware suggestion: 2 cores and above 2G memory
+- `Docker v20.10+` & `Docker Compose v2.0+` must be installed
+- System: `Centos/Debian/Ubuntu/macOS/Windows`
+- Hardware suggestion: 2 cores and above 4G memory
+- Special note: Windows users please use `git bash` or `cmder` to run the command
 
-### Deployment project
+### Deployment (Pro Edition)
 
 ```bash
 # 1、Clone the repository
 
 # Clone projects on github
-git clone https://github.com/kuaifan/dootask.git
+git clone -b pro --depth=1 https://github.com/kuaifan/dootask.git
 # Or you can use gitee
-git clone https://gitee.com/aipaw/dootask.git
+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
 ```
 
 ### Stop server
@@ -56,11 +58,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  
 ```
 
@@ -74,11 +78,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
@@ -86,8 +98,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、Enter directory and run command
-./cmd https
+# 2、Running commands in a project (If you unconfigure the NGINX agent, run: ./cmd https close)
+./cmd https agent
 ```
 
 ## Upgrade
@@ -95,7 +107,7 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 **Note: Please back up your data before upgrading!**
 
 ```bash
-# Method 1: enter directory and run command
+# Method 1: Running commands in a project
 ./cmd update
 
 # Or method 2: use this method if method 1 fails
@@ -104,12 +116,33 @@ git pull
 ./cmd uninstall
 ./cmd install
 ./cmd mysql recovery
-./cmd artisan migrate
+```
+
+* Please try again if the upgrade fails across a large version.
+* If 502 after the upgrade please run `./cmd restart` restart the service.
+
+## Transfer
+
+Follow these steps to complete the project migration after the new project is installed:
+
+1. Backup original database
+
+```bash
+# Run command under old project
+./cmd mysql backup
+```
+
+2. Copy `database backup file` and `public/uploads` directory to the new project.
+
+3. Restore database to new project
+```bash
+# Run command under new project
+./cmd mysql recovery
 ```
 
 ## Uninstall
 
 ```bash
-# Enter directory and run command
+# Running commands in a project
 ./cmd uninstall
 ```

README_CN.md

@@ -2,7 +2,7 @@
 
 **[English](./README.md)** | 中文文档
 
-- [截图预览](README_PREVIEW.md)
+- [截图预览](./README_PREVIEW.md)
 - [演示站点](http://www.dootask.com/)
 
 **QQ交流群**
@@ -11,24 +11,25 @@
 
 ## 安装程序
 
-- 必须安装：`Docker` 和 `Docker Compose v2.0+`
-- 支持环境：`Centos/Debian/Ubuntu/macOS`
-- 硬件建议：2核2G以上
+- 必须安装：`Docker v20.10+` 和 `Docker Compose v2.0+`
+- 支持环境：`Centos/Debian/Ubuntu/macOS/Windows`
+- 硬件建议：2核4G以上
+- 特别说明：Windows 用户请使用 `git bash` 或者 `cmder` 运行命令
 
-### 部署项目
+### 部署项目（Pro版）
 
 ```bash
 # 1、克隆项目到您的本地或服务器
 
 # 通过github克隆项目
-git clone https://github.com/kuaifan/dootask.git
+git clone -b pro --depth=1 https://github.com/kuaifan/dootask.git
 # 或者你也可以使用gitee
-git clone https://gitee.com/aipaw/dootask.git
+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
 ```
 
 ### 停止服务
@@ -56,11 +58,13 @@ cd dootask
 
 ### 开发编译
 
+- 请确保你已经安装了 `NodeJs 20+`
+
 ```bash
-# 开发模式，仅限macOS
+# 开发模式
 ./cmd dev
    
-# 编译项目，仅限macOS
+# 编译项目（这是网页端的，App/Pc/Mac客户端请查看 README_CLIENT.md）
 ./cmd prod  
 ```
 
@@ -75,11 +79,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 代理配置添加
@@ -87,8 +99,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
 ```
 
 ## 升级更新
@@ -96,7 +108,7 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 **注意：在升级之前请备份好你的数据！**
 
 ```bash
-# 方法1：进入项目所在目录，运行以下命令
+# 方法1：在项目下运行命令
 ./cmd update
 
 # （或者）方法2：如果方法1失败请使用此方法
@@ -105,12 +117,33 @@ git pull
 ./cmd uninstall
 ./cmd install
 ./cmd mysql recovery
-./cmd artisan migrate
+```
+
+* 跨越大版本升级失败时请重试执行一次。
+* 如果升级后出现502请运行 `./cmd restart` 重启服务即可。
+
+## 迁移项目
+
+在新项目安装好之后按照以下步骤完成项目迁移：
+
+1、备份原数据库
+
+```bash
+# 在旧的项目下运行命令
+./cmd mysql backup
+```
+
+2、将`数据库备份文件`及`public/uploads`目录拷贝至新项目
+
+3、还原数据库至新项目
+```bash
+# 在新的项目下运行命令
+./cmd mysql recovery
 ```
 
 ## 卸载项目
 
 ```bash
-# 进入项目所在目录，运行以下命令
+# 在项目下运行命令
 ./cmd uninstall
 ```

README_PUBLISH.md

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

app/Console/Commands/SyncDialogUserMsgToElasticsearch.php

@@ -0,0 +1,254 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\WebSocketDialogMsg;
+use App\Models\WebSocketDialogUser;
+use App\Module\ElasticSearch\ElasticSearchKeyValue;
+use App\Module\ElasticSearch\ElasticSearchUserMsg;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
+
+class SyncDialogUserMsgToElasticsearch extends Command
+{
+    /**
+     * 更新数据
+     * --f: 全量更新 (默认)
+     * --i: 增量更新（从上次更新的最后一个ID接上）
+     *
+     * 清理数据
+     * --c: 清除索引
+     */
+
+    protected $signature = 'elasticsearch:sync-dialog-user-msg {--f} {--i} {--c} {--batch=500}';
+    protected $description = '同步聊天会话用户和消息到Elasticsearch';
+    protected $es;
+
+    /**
+     * SyncDialogUserMsgToElasticsearch constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        try {
+            $this->es = new ElasticSearchUserMsg();
+        } catch (\Exception $e) {
+            $this->error('Elasticsearch连接失败: ' . $e->getMessage());
+            exit(1);
+        }
+    }
+
+    /**
+     * @return int
+     * @throws \Exception
+     */
+    public function handle()
+    {
+        $this->info('开始同步聊天数据...');
+
+        // 清除索引
+        if ($this->option('c')) {
+            $this->info('清除索引...');
+            if (!$this->es->indexExists()) {
+                $this->saveLastId(true);
+                $this->info('索引不存在');
+                return 0;
+            }
+            $result = $this->es->deleteIndex();
+            if (isset($result['error'])) {
+                $this->error('删除索引失败: ' . $result['error']);
+                return 1;
+            }
+            $this->saveLastId(true);
+            $this->info('索引删除成功');
+            return 0;
+        }
+
+        // 判断创建索引
+        if (!$this->es->indexExists()) {
+            $this->info('创建索引...');
+            $result = ElasticSearchUserMsg::generateIndex();
+            if (isset($result['error'])) {
+                $this->error('创建索引失败: ' . $result['error']);
+                return 1;
+            }
+            $this->saveLastId(true);
+            $this->info('索引创建成功');
+        }
+
+        // 同步用户-会话数据
+        $this->syncDialogUsers($this->option('batch'));
+
+        // 同步消息数据
+        $this->syncDialogMsgs($this->option('batch'));
+
+        // 完成
+        $this->info("\n同步完成");
+        return 0;
+    }
+
+    /**
+     * 保存最后一个ID
+     * @param string|true $type
+     * @param integer $lastId
+     */
+    private function saveLastId($type, $lastId = 0)
+    {
+        if ($type === true) {
+            $setting = [];
+        } else {
+            $setting = ElasticSearchKeyValue::getArray('elasticSearch:sync');
+            $setting[$type] = $lastId;
+        }
+        ElasticSearchKeyValue::save('elasticSearch:sync', $setting);
+    }
+
+    /**
+     * 获取最后一个ID
+     * @param $type
+     * @return int
+     */
+    private function getLastId($type)
+    {
+        if ($this->option('i')) {
+            $setting = ElasticSearchKeyValue::getArray('elasticSearch:sync');
+            return intval($setting[$type] ?? 0);
+        }
+        return 0;
+    }
+
+    /**
+     * 同步用户-会话数据（父文档）
+     * @param $batchSize
+     * @return void
+     */
+    private function syncDialogUsers($batchSize)
+    {
+        $this->info("\n同步用户数据...");
+        $lastId = $this->getLastId('dialog_user');
+
+        $num = 0;
+        $count = WebSocketDialogUser::where('id', '>', $lastId)->count();
+
+        do {
+            // 获取一批用户-会话关系
+            $dialogUsers = WebSocketDialogUser::where('id', '>', $lastId)
+                ->orderBy('id')
+                ->limit($batchSize)
+                ->get();
+
+            if ($dialogUsers->isEmpty()) {
+                break;
+            }
+
+            $num += count($dialogUsers);
+            $progress = round($num / $count * 100, 2);
+            $this->info("{$num}/{$count} ({$progress}%) 正在同步用户ID {$lastId} ~ {$dialogUsers->last()->id}");
+
+            // 批量索引数据
+            $params = ['body' => []];
+            foreach ($dialogUsers as $dialogUser) {
+                $params['body'][] = [
+                    'index' => [
+                        '_index' => ElasticSearchUserMsg::indexName(),
+                        '_id' => ElasticSearchUserMsg::generateUserDicId($dialogUser),
+                    ]
+                ];
+                $params['body'][] = ElasticSearchUserMsg::generateUserFormat($dialogUser);
+            }
+
+            if ($params['body']) {
+                $result = $this->es->bulk($params);
+                if (isset($result['errors']) && $result['errors']) {
+                    $this->error('批量索引用户数据部分失败');
+                    Log::error('Elasticsearch批量索引失败: ' . json_encode($result['items']));
+                }
+            }
+
+            $lastId = $dialogUsers->last()->id;
+            $this->saveLastId('dialog_user', $lastId);
+        } while (count($dialogUsers) == $batchSize);
+
+        $this->info("同步用户数据结束 - 最后ID {$lastId}");
+    }
+
+    /**
+     * 同步消息数据（子文档）
+     */
+    private function syncDialogMsgs($batchSize)
+    {
+        $this->info("\n同步消息数据...");
+        $lastId = $this->getLastId('dialog_msg');
+
+        $num = 0;
+        $count = WebSocketDialogMsg::where('id', '>', $lastId)->count();
+
+        do {
+            // 获取一批消息
+            $dialogMsgs = WebSocketDialogMsg::where('id', '>', $lastId)
+                ->orderBy('id')
+                ->limit($batchSize)
+                ->get();
+
+            if ($dialogMsgs->isEmpty()) {
+                break;
+            }
+
+            $num += count($dialogMsgs);
+            $progress = round($num / $count * 100, 2);
+            $this->info("{$num}/{$count} ({$progress}%) 正在同步消息ID {$lastId} ~ {$dialogMsgs->last()->id}");
+
+            // 获取这些消息所属的会话对应的所有用户
+            $dialogIds = $dialogMsgs->pluck('dialog_id')->unique()->toArray();
+            $userDialogMap = [];
+
+            if (!empty($dialogIds)) {
+                $dialogUsers = WebSocketDialogUser::whereIn('dialog_id', $dialogIds)->get();
+
+                foreach ($dialogUsers as $dialogUser) {
+                    $userDialogMap[$dialogUser->dialog_id][] = $dialogUser->userid;
+                }
+            }
+
+            // 批量索引消息数据
+            $params = ['body' => []];
+            foreach ($dialogMsgs as $dialogMsg) {
+                // 如果该会话没有用户，跳过
+                if (empty($userDialogMap[$dialogMsg->dialog_id])) {
+                    continue;
+                }
+
+                // 为每个用户-会话关系创建子文档
+                foreach ($userDialogMap[$dialogMsg->dialog_id] as $userid) {
+                    $params['body'][] = [
+                        'index' => [
+                            '_index' => ElasticSearchUserMsg::indexName(),
+                            '_id' => ElasticSearchUserMsg::generateMsgDicId($dialogMsg, $userid),
+                            'routing' => ElasticSearchUserMsg::generateMsgParentId($dialogMsg, $userid) // 路由到父文档
+                        ]
+                    ];
+
+                    $params['body'][] = ElasticSearchUserMsg::generateMsgFormat($dialogMsg, $userid);
+                }
+            }
+
+            if (!empty($params['body'])) {
+                // 分批处理
+                $chunks = array_chunk($params['body'], 1000);
+                foreach ($chunks as $chunk) {
+                    $chunkParams = ['body' => $chunk];
+                    $result = $this->es->bulk($chunkParams);
+                    if (isset($result['errors']) && $result['errors']) {
+                        $this->error('批量索引消息数据部分失败');
+                        Log::error('Elasticsearch批量索引失败: ' . json_encode($result['items']));
+                    }
+                }
+            }
+
+            $lastId = $dialogMsgs->last()->id;
+            $this->saveLastId('dialog_msg', $lastId);
+        } while (count($dialogMsgs) == $batchSize);
+
+        $this->info("同步消息结束 - 最后ID {$lastId}");
+    }
+}

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) {
@@ -67,9 +74,168 @@ class Handler extends ExceptionHandler
     public function report(Throwable $e)
     {
         if ($e instanceof ApiException) {
-            Log::error($e->getMessage(), ['exception' => ' at ' . $e->getFile() .':' . $e->getLine()]);
+            if ($e->getCode() !== -1) {
+                Log::error($e->getMessage(), [
+                    'code' => $e->getCode(),
+                    'data' => $e->getData(),
+                    'exception' => ' at ' . $e->getFile() . ':' . $e->getLine()
+                ]);
+            }
         } else {
             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) { }
+        }
+
+        // 容错处理
+        $patternFault = '/^(images\/.*\.(png|jpg|jpeg))\/crop\/([^\/]+)$/';
+        $matchesFault = null;
+        if (preg_match($patternFault, $path, $matchesFault)) {
+            $file = public_path($matchesFault[1]);
+            if (!file_exists($file)) {
+                $file = public_path('images/other/imgerr.jpg');
+            }
+            if (file_exists($file)) {
+                return response()->file($file);
+            }
+        }
+
+        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));
     }
 }
 
@@ -15,3 +15,10 @@ if (!function_exists('seeders_at')) {
         return date("Y-m-d H:i:s", $time);
     }
 }
+
+if (!function_exists('md5s')) {
+    function md5s($val, $len = 16)
+    {
+        return substr(md5($val), 32 - $len);
+    }
+}

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

@@ -0,0 +1,109 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Models\UserBot;
+use App\Module\Base;
+use Request;
+
+/**
+ * @apiDefine public
+ *
+ * 公开
+ */
+class PublicController extends AbstractController
+{
+    /**
+     * 签到 - 路由器（openwrt）功能安装脚本
+     *
+     * @apiParam {String}   key
+     *
+     * @return string
+     */
+    public function checkin__install()
+    {
+        $key = trim(Request::input('key'));
+        //
+        $setting = Base::setting('checkinSetting');
+        if ($setting['open'] !== 'open') {
+            return <<<EOF
+                #!/bin/sh
+                echo "function off"
+                EOF;
+        }
+        if ($key != $setting['key']) {
+            return <<<EOF
+                #!/bin/sh
+                echo "key error"
+                EOF;
+        }
+        //
+        $reportUrl = Base::fillUrl("api/public/checkin/report");
+        return <<<EOE
+            #!/bin/sh
+            echo 'installing...'
+
+            cat > /etc/init.d/dootask-checkin-report <<EOF
+            #!/bin/sh
+            mac=\\\$(awk 'NR!=1&&\\\$3=="0x2" {print \\\$4}' /proc/net/arp | tr "\\n" ",")
+            tmp='{"key":"{$setting['key']}","mac":"'\\\${mac}'","time":"'\\\$(date +%s)'"}'
+            curl -4 -X POST "{$reportUrl}" -H "Content-Type: application/json" -d \\\${tmp}
+            EOF
+
+            chmod +x /etc/init.d/dootask-checkin-report
+            crontab -l >/tmp/cronbak
+            sed -i '/\/etc\/init.d\/dootask-checkin-report/d' /tmp/cronbak
+            sed -i '/^$/d' /tmp/cronbak
+            echo "* * * * * sh /etc/init.d/dootask-checkin-report" >>/tmp/cronbak
+            crontab /tmp/cronbak
+            rm -f /tmp/cronbak
+            /etc/init.d/cron enable
+            /etc/init.d/cron restart
+
+            echo 'installed'
+            EOE;
+    }
+
+    /**
+     * {post} 签到 - 上报
+     * - 1、路由器（openwrt）签到上报
+     * - 2、考勤机签到上报
+     *
+     * @apiParam {String}   key
+     * @apiParam {String}   mac     使用逗号分割多个
+     * @apiParam {String}   time
+     *
+     * @return string
+     */
+    public function checkin__report()
+    {
+        $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';
+        }
+        $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

@@ -3,15 +3,18 @@
 namespace App\Http\Controllers\Api;
 
 use App\Exceptions\ApiException;
+use App\Models\AbstractModel;
 use App\Models\ProjectTask;
 use App\Models\Report;
+use App\Models\ReportLink;
 use App\Models\ReportReceive;
 use App\Models\User;
+use App\Models\WebSocketDialogMsg;
 use App\Module\Base;
+use App\Module\Doo;
 use App\Tasks\PushTask;
 use Carbon\Carbon;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Validation\Rule;
 use Request;
@@ -27,12 +30,15 @@ class ReportController extends AbstractController
     /**
      * @api {get} api/report/my          01. 我发送的汇报
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName my
      *
-     * @apiParam {String} [type]        汇报类型，weekly:周报，daily:日报
-     * @apiParam {Array} [created_at]   汇报时间
+     * @apiParam {Object} [keys]             搜索条件
+     * - keys.key: 关键词
+     * - keys.type: 汇报类型，weekly:周报，daily:日报
+     * - keys.created_at: 汇报时间
      * @apiParam {Number} [page]        当前页，默认:1
      * @apiParam {Number} [pagesize]    每页显示数量，默认:20，最大:50
      *
@@ -43,30 +49,45 @@ class ReportController extends AbstractController
     public function my(): array
     {
         $user = User::auth();
-        // 搜索当前用户
+        //
         $builder = Report::with(['receivesUser'])->whereUserid($user->userid);
-        $type = trim(Request::input('type'));
-        $createAt = Request::input('created_at');
-        in_array($type, [Report::WEEKLY, Report::DAILY]) && $builder->whereType($type);
-        $whereArray = [];
-        if (is_array($createAt)) {
-            if ($createAt[0] > 0) $whereArray[] = ['created_at', '>=', date('Y-m-d H:i:s', Base::dayTimeF($createAt[0]))];
-            if ($createAt[1] > 0) $whereArray[] = ['created_at', '<=', date('Y-m-d H:i:s', Base::dayTimeE($createAt[1]))];
+        $keys = Request::input('keys');
+        if (is_array($keys)) {
+            if ($keys['key']) {
+                if (str_contains($keys['key'], '@')) {
+                    $builder->whereHas('sendUser', function ($q2) use ($keys) {
+                        $q2->where("users.email", "LIKE", "%{$keys['key']}%");
+                    });
+                } else {
+                    $builder->where("title", "LIKE", "%{$keys['key']}%");
+                }
+            }
+            if (in_array($keys['type'], [Report::WEEKLY, Report::DAILY])) {
+                $builder->whereType($keys['type']);
+            }
+            if (is_array($keys['created_at'])) {
+                if ($keys['created_at'][0] > 0) $builder->where('created_at', '>=', Base::newCarbon($keys['created_at'][0])->startOfDay());
+                if ($keys['created_at'][1] > 0) $builder->where('created_at', '<=', Base::newCarbon($keys['created_at'][1])->endOfDay());
+            }
         }
-        $list = $builder->where($whereArray)->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
+        $list = $builder->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
         return Base::retSuccess('success', $list);
     }
 
     /**
      * @api {get} api/report/receive          02. 我接收的汇报
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName receive
      *
-     * @apiParam {String} [username]    会员名
-     * @apiParam {String} [type]        汇报类型，weekly:周报，daily:日报
-     * @apiParam {Array} [created_at]   汇报时间
+     * @apiParam {Object} [keys]             搜索条件
+     * - keys.key: 关键词
+     * - keys.department_id: 部门ID
+     * - keys.type: 汇报类型，weekly:周报，daily:日报
+     * - keys.status: 状态，unread:未读，read:已读
+     * - keys.created_at: 汇报时间
      * @apiParam {Number} [page]        当前页，默认:1
      * @apiParam {Number} [pagesize]    每页显示数量，默认:20，最大:50
      *
@@ -81,24 +102,41 @@ class ReportController extends AbstractController
         $builder->whereHas("receivesUser", function ($query) use ($user) {
             $query->where("report_receives.userid", $user->userid);
         });
-        $type = trim(Request::input('type'));
-        $createAt = Request::input('created_at');
-        $username = trim(Request::input('username', ''));
-        $builder->whereHas('sendUser', function ($query) use ($username) {
-            if (!empty($username)) {
-                $query->where('users.email', 'LIKE', '%' . $username . '%');
+        $keys = Request::input('keys');
+        if (is_array($keys)) {
+            if ($keys['key']) {
+                if (str_contains($keys['key'], '@')) {
+                    $builder->whereHas('sendUser', function ($q2) use ($keys) {
+                        $q2->where("users.email", "LIKE", "%{$keys['key']}%");
+                    });
+                } elseif (Base::isNumber($keys['key'])) {
+                    $builder->where("userid", intval($keys['key']));
+                } else {
+                    $builder->where("title", "LIKE", "%{$keys['key']}%");
+                }
+            }
+            if ($keys['department_id']) {
+                $builder->whereHas('sendUser', function ($query) use ($keys) {
+                    $query->where("users.department", "LIKE", "%,{$keys['department_id']},%");
+                });
+            }
+            if (in_array($keys['type'], [Report::WEEKLY, Report::DAILY])) {
+                $builder->whereType($keys['type']);
+            }
+            if (in_array($keys['status'], ['unread', 'read'])) {
+                $builder->whereHas("receivesUser", function ($query) use ($user, $keys) {
+                    $query->where("report_receives.userid", $user->userid)->where("report_receives.read", $keys['status'] === 'unread' ? 0 : 1);
+                });
+            }
+            if (is_array($keys['created_at'])) {
+                if ($keys['created_at'][0] > 0) $builder->where('created_at', '>=', Base::newCarbon($keys['created_at'][0])->startOfDay());
+                if ($keys['created_at'][1] > 0) $builder->where('created_at', '<=', Base::newCarbon($keys['created_at'][1])->endOfDay());
             }
-        });
-        in_array($type, [Report::WEEKLY, Report::DAILY]) && $builder->whereType($type);
-        $whereArray = [];
-        if (is_array($createAt)) {
-            if ($createAt[0] > 0) $whereArray[] = ['created_at', '>=', date('Y-m-d H:i:s', Base::dayTimeF($createAt[0]))];
-            if ($createAt[1] > 0) $whereArray[] = ['created_at', '<=', date('Y-m-d H:i:s', Base::dayTimeE($createAt[1]))];
         }
-        $list = $builder->where($whereArray)->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
+        $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);
@@ -107,16 +145,18 @@ class ReportController extends AbstractController
     /**
      * @api {get} api/report/store          03. 保存并发送工作汇报
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName store
      *
-     * @apiParam {Number} [id]           汇报ID
-     * @apiParam {String} [title]        汇报标题
-     * @apiParam {Array}  [type]         汇报类型，weekly:周报，daily:日报
-     * @apiParam {Number} [content]      内容
-     * @apiParam {Number} [receive]      汇报对象
-     * @apiParam {Number} [offset]       偏移量
+     * @apiParam {Number} id            汇报ID，0为新建
+     * @apiParam {String} [sign]        唯一签名，通过[api/report/template]接口返回
+     * @apiParam {String} title         汇报标题
+     * @apiParam {Array}  type          汇报类型，weekly:周报，daily:日报
+     * @apiParam {Number} content       内容
+     * @apiParam {Number} [receive]     汇报对象
+     * @apiParam {Number} offset        时间偏移量
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -124,21 +164,23 @@ class ReportController extends AbstractController
      */
     public function store(): array
     {
+        $user = User::auth();
+        //
         $input = [
-            "id" => Base::getPostValue("id", 0),
-            "title" => Base::getPostValue("title"),
-            "type" => Base::getPostValue("type"),
-            "content" => Base::getPostValue("content"),
-            "receive" => Base::getPostValue("receive"),
+            "id" => Request::input("id", 0),
+            "sign" => Request::input("sign"),
+            "title" => Request::input("title"),
+            "type" => Request::input("type"),
+            "content" => Request::input("content"),
+            "receive" => Request::input("receive"),
             // 以当前日期为基础的周期偏移量。例如选择了上一周那么就是 -1，上一天同理。
-            "offset" => Base::getPostValue("offset", 0),
+            "offset" => Request::input("offset", 0),
         ];
         $validator = Validator::make($input, [
             'id' => 'numeric',
             'title' => 'required',
             'type' => ['required', Rule::in([Report::WEEKLY, Report::DAILY])],
             'content' => 'required',
-            'receive' => 'required',
             'offset' => ['numeric', 'max:0'],
         ], [
             'id.numeric' => 'ID只能是数字',
@@ -146,14 +188,12 @@ class ReportController extends AbstractController
             'type.required' => '请选择汇报类型',
             'type.in' => '汇报类型错误',
             'content.required' => '请填写汇报内容',
-            'receive.required' => '请选择接收人',
             'offset.numeric' => '工作汇报周期格式错误，只能是数字',
             'offset.max' => '只能提交当天/本周或者之前的的工作汇报',
         ]);
         if ($validator->fails())
             return Base::retError($validator->errors()->first());
 
-        $user = User::auth();
         // 接收人
         if (is_array($input["receive"])) {
             // 删除当前登录人
@@ -165,7 +205,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,
                 ];
@@ -173,7 +213,7 @@ class ReportController extends AbstractController
         }
 
         // 在事务中运行
-        Report::transaction(function () use ($input, $user) {
+        return AbstractModel::transaction(function () use ($input, $user) {
             $id = $input["id"];
             if ($id) {
                 // 编辑
@@ -185,25 +225,24 @@ class ReportController extends AbstractController
                 ]);
             } else {
                 // 生成唯一标识
-                $sign = Report::generateSign($input["type"], $input["offset"]);
+                $sign = Base::isNumber($input["sign"]) ? $input["sign"] : Report::generateSign($input["type"], $input["offset"]);
                 // 检查唯一标识是否存在
-                if (empty($input["id"])) {
-                    if (Report::query()->whereSign($sign)->whereType($input["type"])->count() > 0)
-                        throw new ApiException("请勿重复提交工作汇报");
+                if (empty($input["id"]) && Report::query()->whereSign($sign)->whereType($input["type"])->count() > 0) {
+                    throw new ApiException("请勿重复提交工作汇报");
                 }
                 $report = Report::createInstance([
+                    "sign" => $sign,
                     "title" => $input["title"],
                     "type" => $input["type"],
-                    "content" => htmlspecialchars($input["content"]),
                     "userid" => $user->userid,
-                    "sign" => $sign,
+                    "content" => htmlspecialchars($input["content"]),
                 ]);
             }
-
             $report->save();
-            if (!empty($input["receive_content"])) {
-                // 删除关联
-                $report->Receives()->delete();
+
+            // 删除关联
+            $report->Receives()->delete();
+            if ($input["receive_content"]) {
                 // 保存接收人
                 $report->Receives()->createMany($input["receive_content"]);
             }
@@ -224,13 +263,15 @@ class ReportController extends AbstractController
                 ];
                 Task::deliver(new PushTask($params, false));
             }
+            //
+            return Base::retSuccess('保存成功', $report);
         });
-        return Base::retSuccess('保存成功');
     }
 
     /**
      * @api {get} api/report/template          04. 生成汇报模板
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName template
@@ -250,6 +291,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();
@@ -271,21 +313,31 @@ 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::query()->whereSign($sign)->whereType($type)->first();
+        $one = Report::whereSign($sign)->whereType($type)->first();
+
         // 如果已经提交了相关汇报
         if ($one && $id > 0) {
             return Base::retSuccess('success', [
-                "content" => $one->content,
-                "title" => $one->title,
                 "id" => $one->id,
+                "sign" => $one->sign,
+                "title" => $one->title,
+                "content" => $one->content,
             ]);
         }
 
+        // 表格头部
+        $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()])
@@ -297,33 +349,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>[' . Base::Lang('周' . ['日', '一', '二', '三', '四', '五', '六'][$complete_at->dayOfWeek]) . ']</span>&nbsp;') : '';
-                $completeContent .= '<li>' . $pre . $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;">[' . Base::Lang('超期') . ']</span>&nbsp;' : '';
-                $unfinishedContent .= '<li>' . $pre . $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") . "]";
@@ -331,16 +397,43 @@ class ReportController extends AbstractController
         } else {
             $title = $user->nickname . "的日报[" . $start_time->format("Y/m/d") . "]";
         }
+        $title = Doo::translate($title);
+
+        // 生成内容
+        $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) {
+            $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(),
-            "complete_task" => $complete_task,
-            "unfinished_task" => $unfinished_task,
-            "content" => '<h2>' . Base::Lang('已完成工作') . '</h2><ol>' .
-                $completeContent . '</ol><h2>' .
-                Base::Lang('未完成的工作') . '</h2><ol>' .
-                $unfinishedContent . '</ol>',
+            "sign" => $sign,
             "title" => $title,
+            "content" => implode("", $contents),
         ];
+
         if ($one) {
             $data['id'] = $one->id;
         }
@@ -350,11 +443,13 @@ class ReportController extends AbstractController
     /**
      * @api {get} api/report/detail          05. 报告详情
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName detail
      *
-     * @apiParam {Number} [id]           报告id
+     * @apiParam {Number} [id]           报告ID
+     * @apiParam {String} [code]         报告分享代码，与ID二选一，优先ID
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -362,31 +457,148 @@ class ReportController extends AbstractController
      */
     public function detail(): array
     {
-        $id = intval(trim(Request::input("id")));
-        if (empty($id))
-            return Base::retError("缺少ID参数");
-
-        $one = Report::getOne($id);
-        $one->type_val = $one->getRawOriginal("type");
-
         $user = User::auth();
-        // 标记为已读
-        if (!empty($one->receivesUser)) {
-            foreach ($one->receivesUser as $item) {
-                if ($item->userid === $user->userid && $item->pivot->read === 0) {
-                    $one->receivesUser()->updateExistingPivot($user->userid, [
-                        "read" => 1,
-                    ]);
+        //
+        $id = intval(trim(Request::input("id")));
+        $code = trim(Request::input("code"));
+        //
+        if (empty($id) && empty($code)) {
+            return Base::retError("缺少ID参数");
+        }
+        //
+        if (!empty($id)) {
+            $one = Report::getOne($id);
+            $one->type_val = $one->getRawOriginal("type");
+            // 标记为已读
+            if (!empty($one->receivesUser)) {
+                foreach ($one->receivesUser as $item) {
+                    if ($item->userid === $user->userid && $item->pivot->read === 0) {
+                        $one->receivesUser()->updateExistingPivot($user->userid, [
+                            "read" => 1,
+                        ]);
+                    }
                 }
             }
+        } else {
+            $link = ReportLink::whereCode($code)->first();
+            if (empty($link)) {
+                return Base::retError("报告不存在或已被删除");
+            }
+            $one = Report::getOne($link->rid);
+            $one->report_link = $link;
+            $link->increment("num");
         }
-
         return Base::retSuccess("success", $one);
     }
 
     /**
-     * @api {get} api/report/last_submitter          06. 获取最后一次提交的接收人
+     * @api {get} api/report/mark          06. 标记已读/未读
      *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName mark
+     *
+     * @apiParam {Number} id            报告id（组）
+     * @apiParam {Number} action        操作
+     * - read: 标记已读（默认）
+     * - unread: 标记未读
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function mark(): array
+    {
+        $user = User::auth();
+        //
+        $id = Request::input('id');
+        $action = Request::input('action');
+        //
+        if (is_array($id)) {
+            if (count(Base::arrayRetainInt($id)) > 100) {
+                return Base::retError("最多只能操作100条数据");
+            }
+            $builder = Report::whereIn("id", Base::arrayRetainInt($id));
+        } else {
+            $builder = Report::whereId(intval($id));
+        }
+        $builder ->chunkById(100, function ($list) use ($action, $user) {
+            /** @var Report $item */
+            foreach ($list as $item) {
+                $item->receivesUser()->updateExistingPivot($user->userid, [
+                    "read" => $action === 'unread' ? 0 : 1,
+                ]);
+            }
+        });
+        return Base::retSuccess("操作成功");
+    }
+
+    /**
+     * @api {get} api/report/share          07. 分享报告到消息
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName share
+     *
+     * @apiParam {Number} id                报告id（组）
+     * @apiParam {Array} dialogids          转发给的对话ID
+     * @apiParam {Array} userids            转发给的成员ID
+     * @apiParam {String} leave_message     转发留言
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function share()
+    {
+        $user = User::auth();
+        //
+        $id = Request::input('id');
+        $dialogids = Request::input('dialogids');
+        $userids = Request::input('userids');
+        $leave_message = Request::input('leave_message');
+        //
+        if (is_array($id)) {
+            if (count(Base::arrayRetainInt($id)) > 20) {
+                return Base::retError("最多只能操作20条数据");
+            }
+            $builder = Report::whereIn("id", Base::arrayRetainInt($id));
+        } else {
+            $builder = Report::whereId(intval($id));
+        }
+        $reportMsgs = [];
+        $builder ->chunkById(100, function ($list) use (&$reportMsgs, $user) {
+            /** @var Report $item */
+            foreach ($list as $item) {
+                $reportLink = ReportLink::generateLink($item->id, $user->userid);
+                $reportMsgs[] = "<a class=\"mention report\" href=\"{{RemoteURL}}single/report/detail/{$reportLink['code']}\" target=\"_blank\">%{$item->title}</a>";
+            }
+        });
+        if (empty($reportMsgs)) {
+            return Base::retError("报告不存在或已被删除");
+        }
+        $reportTag = count($reportMsgs) > 1 ? 'li' : 'p';
+        $reportMsgs = array_map(function ($item) use ($reportTag) {
+            return "<{$reportTag}>{$item}</{$reportTag}>";
+        }, $reportMsgs);
+        if ($reportTag === 'li') {
+            array_unshift($reportMsgs, "<ol>");
+            $reportMsgs[] = "</ol>";
+        }
+        if ($leave_message) {
+            $reportMsgs[] = "<p>{$leave_message}</p>";
+        }
+        $msgText = implode("", $reportMsgs);
+        //
+        return WebSocketDialogMsg::sendMsgBatch($user, $userids, $dialogids, $msgText);
+    }
+
+    /**
+     * @api {get} api/report/last_submitter          08. 获取最后一次提交的接收人
+     *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName last_submitter
@@ -402,32 +614,34 @@ class ReportController extends AbstractController
     }
 
     /**
-     * @api {get} api/report/unread          07. 获取未读
+     * @api {get} api/report/unread          09. 获取未读
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName unread
      *
-     * @apiParam {Number} [userid]          用户id
-     *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
      * @apiSuccess {Object} data    返回数据
      */
     public function unread(): array
     {
-        $userid = intval(trim(Request::input("userid")));
-        $user = empty($userid) ? User::auth() : User::find($userid);
-
-        $data = Report::whereHas("Receives", function (Builder $query) use ($user) {
-            $query->where("userid", $user->userid)->where("read", 0);
-        })->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
-        return Base::retSuccess("success", $data);
+        $user = User::auth();
+        //
+        $total = Report::select('reports.id')
+            ->join('report_receives', 'report_receives.rid', '=', 'reports.id')
+            ->where('report_receives.userid', $user->userid)
+            ->where('report_receives.read', 0)
+            ->count();
+        //
+        return Base::retSuccess("success", compact("total"));
     }
 
     /**
-     * @api {get} api/report/read          08. 标记汇报已读，可批量
+     * @api {get} api/report/read          10. 标记汇报已读，可批量
      *
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName read
@@ -447,7 +661,7 @@ class ReportController extends AbstractController
         }
 
         if (is_string($ids)) {
-            $ids = explode(",", $ids);
+            $ids = Base::explodeInt($ids);
         }
 
         $data = Report::with(["receivesUser" => function (BelongsToMany $query) use ($user) {

app/Http/Controllers/Api/TestController.php

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

app/Http/Controllers/IndexController.php

@@ -2,11 +2,32 @@
 
 namespace App\Http\Controllers;
 
-use App\Module\Base;
-use App\Tasks\AutoArchivedTask;
-use App\Tasks\DeleteTmpTask;
-use Hhxsv5\LaravelS\Swoole\Task\Task;
+use Arr;
+use Cache;
+use Request;
 use Redirect;
+use Response;
+use App\Models\File;
+use App\Models\User;
+use App\Models\UserTransfer;
+use App\Module\Doo;
+use App\Module\Base;
+use App\Module\Extranet;
+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 App\Tasks\CloseMeetingRoomTask;
+use App\Tasks\ElasticSearchSyncTask;
+use App\Tasks\UnclaimedTaskRemindTask;
+use Hhxsv5\LaravelS\Swoole\Task\Task;
+use Laravolt\Avatar\Avatar;
+use Swoole\Coroutine;
 
 
 /**
@@ -22,6 +43,9 @@ class IndexController extends InvokeController
         if ($action) {
             $app .= "__" . $action;
         }
+        if ($app == 'default') {
+            return '';
+        }
         if (!method_exists($this, $app)) {
             $app = method_exists($this, $method) ? $method : 'main';
         }
@@ -30,11 +54,166 @@ class IndexController extends InvokeController
 
     /**
      * 首页
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return \Illuminate\Http\Response
      */
     public function main()
     {
-        return view('main', ['version' => Base::getVersion()]);
+        $hotFile = public_path('hot');
+        $manifestFile = public_path('manifest.json');
+        if (file_exists($hotFile)) {
+            $array = Base::json2array(file_get_contents($hotFile));
+            $style = null;
+            $script = preg_replace("/^(\/\/(.*?))(:\d+)?\//i", "$1:" . $array['APP_DEV_PORT'] . "/", asset_main("resources/assets/js/app.js"));
+        } else {
+            $array = Base::json2array(file_get_contents($manifestFile));
+            $style = asset_main($array['resources/assets/js/app.js']['css'][0]);
+            $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,
+        ]);
+    }
+
+    /**
+     * 获取版本号
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function version()
+    {
+        return Redirect::to(Base::fillUrl('api/system/version'), 301);
+    }
+
+    /**
+     * 头像
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response|\Symfony\Component\HttpFoundation\BinaryFileResponse
+     */
+    public function avatar()
+    {
+        $segment = Request::segment(2);
+        if ($segment && preg_match('/.*?\.png$/i', $segment)) {
+            $name = substr($segment, 0, -4);
+        } else {
+            $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 () {
+                return RandomColor::one(['luminosity' => 'dark']);
+            });
+        }
+        //
+        $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);
+        //
+        $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')
+            ->header('Expires', gmdate('D, d M Y H:i:s \G\M\T', time() + 1814400));
     }
 
     /**
@@ -56,96 +235,309 @@ class IndexController extends InvokeController
             // 限制内网访问
             return "Forbidden Access";
         }
+        // 自动归档
+        Task::deliver(new AutoArchivedTask());
+        // 邮件通知
+        Task::deliver(new EmailNoticeTask());
+        // App推送
+        Task::deliver(new AppPushTask());
         // 删除过期的临时表数据
         Task::deliver(new DeleteTmpTask('wg_tmp_msgs', 1));
-        Task::deliver(new DeleteTmpTask('tmp', 24));
-        // 自动归档任务
-        Task::deliver(new AutoArchivedTask());
+        Task::deliver(new DeleteTmpTask('task_worker', 12));
+        Task::deliver(new DeleteTmpTask('tmp'));
+        Task::deliver(new DeleteTmpTask('file'));
+        Task::deliver(new DeleteTmpTask('tmp_file', 24));
+        // 删除机器人消息
+        Task::deliver(new DeleteBotMsgTask());
+        // 周期任务
+        Task::deliver(new LoopTask());
+        // 签到提醒
+        Task::deliver(new CheckinRemindTask());
+        // 获取笑话/心灵鸡汤
+        Task::deliver(new JokeSoupTask());
+        // 未领取任务通知
+        Task::deliver(new UnclaimedTaskRemindTask());
+        // 关闭会议室
+        Task::deliver(new CloseMeetingRoomTask());
+        // ElasticSearch 同步
+        Task::deliver(new ElasticSearchSyncTask());
 
         return "success";
     }
 
     /**
-     * 提取所有中文
-     * @return array|string
+     * 桌面客户端发布
      */
-    public function allcn()
+    public function desktop__publish($name = '')
     {
-        if (!Base::is_internal_ip(Base::getIp())) {
-            // 限制内网访问
-            return "Forbidden Access";
+        $publishVersion = Request::header('publish-version');
+        $latestFile = public_path("uploads/desktop/latest");
+        $latestVersion = file_exists($latestFile) ? trim(file_get_contents($latestFile)) : "0.0.1";
+        if (strtolower($name) === 'latest') {
+            $name = $latestVersion;
         }
-        $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, '"'), "'");
+
+        // 上传（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");
+            }
+            // 判断版本
+            $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");
+                }
+                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,
+            ]);
+        }
+
+        // 列表（访问路径 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 (preg_match('/\.(zip|yml|yaml|blockmap)$/i', $file) || str_ends_with($file, '-win.exe')) {
+                    continue;
+                }
+                $fileName = basename($file, $dirPath);
+                $fileSize = filesize($file);
+                $files[] = [
+                    'name' => $fileName,
+                    'time' => date("Y-m-d H:i:s", filemtime($file)),
+                    '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}"),
+                ];
+            }
+            //
+            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),
+            ]);
         }
-        return array_values($array);
+
+        // 下载（Latest 版本内的文件，访问路径 desktop/publish/{fileName}）
+        if ($name) {
+            $filePath = public_path("uploads/desktop/{$latestVersion}/{$name}");
+            if (file_exists($filePath)) {
+                return Response::download($filePath);
+            }
+        }
+
+        // 404
+        abort(404);
     }
 
     /**
-     * 提取所有中文
-     * @return array|string
+     * Drawio 图标搜索
+     * @return array|mixed
      */
-    public function allcn__php()
+    public function drawio__iconsearch()
     {
-        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);
+        $query = trim(Request::input('q'));
+        $page = trim(Request::input('p'));
+        $size = trim(Request::input('c'));
+        return Extranet::drawioIconSearch($query, $page, $size);
     }
 
     /**
-     * 提取所有中文
-     * @return array|string
+     * 预览文件
+     * @return array|mixed
      */
-    public function allcn__all()
+    public function online__preview()
     {
-        if (!Base::is_internal_ip(Base::getIp())) {
-            // 限制内网访问
-            return "Forbidden Access";
+        $key = trim(Request::input('key'));
+        //
+        $data = parse_url($key);
+        $path = Arr::get($data, 'path');
+        $file = public_path($path);
+        // 防止 ../ 穿越获取到系统文件
+        if (!str_starts_with(realpath($file), public_path())) {
+            abort(404);
         }
-        $list = array_merge(Base::readDir(app_path()), Base::readDir(resource_path()));
-        $array = [];
-        foreach ($list as $item) {
-            if (Base::rightExists($item, "language.all.js")) {
-                continue;
+        //
+        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('点击下载'),
+                ]);
             }
-            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;
+            // 浏览器类型
+            $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');
+            }
+            // 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 (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);
+    }
+
+    /**
+     * 修复操作离职后续操作(todo 临时，后期删除)
+     * @return array
+     */
+    public function migration__userdialog()
+    {
+        if (Request::header('app-key') !== env('APP_KEY')) {
+            return Base::retError("key error");
+        }
+        go(function() {
+            Coroutine::sleep(3);
+            $handled = [];
+            UserTransfer::orderBy('id')->chunkById(10, function ($transfers) use ($handled) {
+                /** @var UserTransfer $transfer */
+                foreach ($transfers as $transfer) {
+                    if (in_array($transfer->original_userid, $handled)) {
+                        continue;
+                    }
+                    $handled[] = $transfer->original_userid;
+                    //
+                    $user = User::find($transfer->original_userid);
+                    if ($user?->isDisable()) {
+                        $transfer->exitDialog();
                     }
                 }
-            }
-        }
-        return 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/VerifyCsrfToken.php

@@ -12,43 +12,10 @@ class VerifyCsrfToken extends Middleware
      * @var array
      */
     protected $except = [
-        // 上传图片
-        'api/system/imgupload/',
+        // 接口部分
+        'api/*',
 
-        // 上传文件
-        'api/system/fileupload/',
-
-        // 保存任务优先级
-        'api/system/priority/',
-
-        // 保存创建项目列表模板
-        'api/system/column/template/',
-
-        // 添加任务
-        'api/project/task/add/',
-
-        // 保存工作流
-        'api/project/flow/save/',
-
-        // 修改任务
-        'api/project/task/update/',
-
-        // 聊天发文本
-        'api/dialog/msg/sendtext/',
-
-        // 聊天发文件
-        'api/dialog/msg/sendfile/',
-
-        // 保存文件内容
-        'api/file/content/save/',
-
-        // 保存文件内容（office）
-        'api/file/content/office/',
-
-        // 保存文件内容（上传）
-        'api/file/content/upload/',
-
-        // 保存汇报
-        'api/report/store/',
+        // 发布桌面端
+        'desktop/publish/',
     ];
 }

app/Http/Middleware/WebApi.php

@@ -4,8 +4,9 @@ namespace App\Http\Middleware;
 
 @error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
 
+use App\Module\Doo;
+use App\Services\RequestContext;
 use Closure;
-use Request;
 
 class WebApi
 {
@@ -18,20 +19,60 @@ 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'));
 
-        if (Request::input('__Access-Control-Allow-Origin') || Request::header('__Access-Control-Allow-Origin')) {
-            header('Access-Control-Allow-Origin:*');
-            header('Access-Control-Allow-Methods:GET,POST,PUT,DELETE,OPTIONS');
-            header('Access-Control-Allow-Headers:Content-Type, platform, platform-channel, token, release, Access-Control-Allow-Origin');
+        // 加载Doo类
+        Doo::load();
+
+        // 解密请求内容
+        $encrypt = Doo::pgpParseStr($request->header('encrypt'));
+        if ($request->isMethod('post')) {
+            $version = $request->header('version');
+            if ($version && version_compare($version, '0.25.48', '<')) {
+                // 旧版本兼容 php://input
+                parse_str($request->getContent(), $content);
+                if ($content) {
+                    $request->merge($content);
+                }
+            } elseif ($encrypt['encrypt_type'] === 'pgp' && $content = $request->input('encrypted')) {
+                // 新版本解密提交的内容
+                $content = Doo::pgpDecryptApi($content, $encrypt['encrypt_id']);
+                if ($content) {
+                    $request->merge($content);
+                }
+            }
         }
 
+        // 强制 https
         $APP_SCHEME = env('APP_SCHEME', 'auto');
         if (in_array(strtolower($APP_SCHEME), ['https', 'on', 'ssl', '1', 'true', 'yes'], true)) {
             $request->setTrustedProxies([$request->getClientIp()], $request::HEADER_X_FORWARDED_PROTO);
         }
 
-        return $next($request);
+        // 执行下一个中间件
+        $response = $next($request);
+
+        // 加密返回内容
+        if ($encrypt['client_type'] === 'pgp' && $content = $response->getContent()) {
+            $content = Doo::pgpEncryptApi($content, $encrypt['client_key']);
+            if ($content) {
+                $response->setContent(json_encode(['encrypted' => $content]));
+            }
+        }
+
+        // 返回响应
+        return $response;
+    }
+
+    /**
+     * @return void
+     */
+    public function terminate()
+    {
+        // 请求结束后清理上下文
+        RequestContext::clear();
     }
 }

app/Ldap/LdapUser.php

@@ -0,0 +1,251 @@
+<?php
+
+namespace App\Ldap;
+
+use App\Models\User;
+use App\Module\Base;
+use LdapRecord\Configuration\ConfigurationException;
+use LdapRecord\Container;
+use LdapRecord\LdapRecordException;
+use LdapRecord\Models\Model;
+
+class LdapUser extends Model
+{
+    protected static $init = null;
+    /**
+     * The object classes of the LDAP model.
+     *
+     * @var array
+     */
+    public static $objectClasses = [
+        'inetOrgPerson',
+        'organizationalPerson',
+        'person',
+        'top',
+        'posixAccount',
+    ];
+
+    /**
+     * @return mixed|null
+     */
+    public function getPhoto()
+    {
+        return $this->jpegPhoto && is_array($this->jpegPhoto) ? $this->jpegPhoto[0] : null;
+    }
+
+    /**
+     * @return mixed|null
+     */
+    public function getDisplayName()
+    {
+        $nickname = $this->displayName ?: $this->uid;
+        return is_array($nickname) ? $nickname[0] : $nickname;
+    }
+
+    /**
+     * @return LdapUser
+     */
+    public static function static(): LdapUser
+    {
+        return new static;
+    }
+
+    /**
+     * 服务是否打开
+     * @return bool
+     */
+    public static function isOpen(): bool
+    {
+        return Base::settingFind('thirdAccessSetting', 'ldap_open') === 'open';
+    }
+
+    /**
+     * 同步本地是否打开
+     * @return bool
+     */
+    public static function isSyncLocal(): bool
+    {
+        return Base::settingFind('thirdAccessSetting', 'ldap_sync_local') === 'open';
+    }
+
+    /**
+     * 初始化配置
+     * @return bool
+     */
+    public static function initConfig()
+    {
+        if (is_bool(self::$init)) {
+            return self::$init;
+        }
+        //
+        $setting = Base::setting('thirdAccessSetting');
+        if ($setting['ldap_open'] !== 'open') {
+            return self::$init = false;
+        }
+        //
+        $connection = Container::getDefaultConnection();
+        try {
+            $connection->setConfiguration([
+                "hosts" => [$setting['ldap_host']],
+                "port" => intval($setting['ldap_port']),
+                "base_dn" => $setting['ldap_base_dn'],
+                "username" => $setting['ldap_user_dn'],
+                "password" => $setting['ldap_password'],
+            ]);
+            return self::$init = true;
+        } catch (ConfigurationException $e) {
+            info($e->getMessage());
+            return self::$init = false;
+        }
+    }
+
+    /**
+     * 获取
+     * @param $username
+     * @param $password
+     * @return Model|null
+     */
+    public static function userFirst($username, $password): ?Model
+    {
+        if (!self::initConfig()) {
+            return null;
+        }
+        try {
+            return self::static()
+                ->where([
+                    'cn' => $username,
+                    'userPassword' => $password
+                ])->first();
+        } catch (\Exception) {
+            return null;
+        }
+    }
+
+    /**
+     * 登录
+     * @param $username
+     * @param $password
+     * @param User|null $user
+     * @return User|mixed|null
+     */
+    public static function userLogin($username, $password, $user = null)
+    {
+        if (!self::initConfig()) {
+            return null;
+        }
+        $row = self::userFirst($username, $password);
+        if (!$row) {
+            return null;
+        }
+        if (empty($user)) {
+            $user = User::reg($username, $password);
+        }
+        if ($user) {
+            $userimg = $row->getPhoto();
+            if ($userimg) {
+                $path = "uploads/user/ldap/";
+                $file = "{$path}{$user->userid}.jpeg";
+                Base::makeDir(public_path($path));
+                if (Base::saveContentImage(public_path($file), $userimg)) {
+                    $user->userimg = $file;
+                }
+            }
+            $user->nickname = $row->getDisplayName();
+            $user->save();
+        }
+        return $user;
+    }
+
+    /**
+     * 同步
+     * @param User $user
+     * @param $password
+     * @return void
+     */
+    public static function userSync(User $user, $password)
+    {
+        if ($user->isLdap()) {
+            return;
+        }
+        //
+        if (!self::initConfig()) {
+            return;
+        }
+        //
+        if (self::isSyncLocal()) {
+            $row = self::userFirst($user->email, $password);
+            if ($row) {
+                return;
+            }
+            try {
+                $userimg = public_path($user->getRawOriginal('userimg'));
+                if (file_exists($userimg)) {
+                    $userimg = file_get_contents($userimg);
+                } else {
+                    $userimg = '';
+                }
+                self::static()->create([
+                    'cn' => $user->email,
+                    'gidNumber' => 0,
+                    'homeDirectory' => '/home/ldap/dootask/' . env("APP_NAME"),
+                    'sn' => $user->email,
+                    'uid' => $user->email,
+                    'uidNumber' => $user->userid,
+                    'userPassword' => $password,
+                    'displayName' => $user->nickname,
+                    'jpegPhoto' => $userimg,
+                ]);
+                $user->identity = Base::arrayImplode(array_merge(array_diff($user->identity, ['ldap']), ['ldap']));
+                $user->save();
+            } catch (LdapRecordException $e) {
+                info("[LDAP] sync fail: " . $e->getMessage());
+            }
+        }
+    }
+
+    /**
+     * 更新
+     * @param $username
+     * @param $array
+     * @return void
+     */
+    public static function userUpdate($username, $array)
+    {
+        if (empty($array)) {
+            return;
+        }
+        if (!self::initConfig()) {
+            return;
+        }
+        try {
+            $row = self::static()
+                ->where([
+                    'cn' => $username,
+                ])->first();
+            $row?->update($array);
+        } catch (\Exception $e) {
+            info("[LDAP] update fail: " . $e->getMessage());
+        }
+    }
+
+    /**
+     * 删除
+     * @param $username
+     * @return void
+     */
+    public static function userDelete($username)
+    {
+        if (!self::initConfig()) {
+            return;
+        }
+        try {
+            $row = self::static()
+                ->where([
+                    'cn' => $username,
+                ])->first();
+            $row?->delete();
+        } catch (\Exception $e) {
+            info("[LDAP] delete fail: " . $e->getMessage());
+        }
+    }
+}

app/Models/AbstractModel.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
 /**
- * App\Model\AbstractModel
+ * App\Models\AbstractModel
  *
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel newQuery()
@@ -21,7 +21,10 @@ use Illuminate\Support\Facades\DB;
  * @method static \Illuminate\Database\Eloquent\Model|object|static|null cancelHidden()
  * @method static \Illuminate\Database\Eloquent\Builder|static with($relations)
  * @method static \Illuminate\Database\Query\Builder|static select($columns = [])
+ * @method static \Illuminate\Database\Query\Builder|static whereIn($column, $values, $boolean = 'and', $not = false)
  * @method static \Illuminate\Database\Query\Builder|static whereNotIn($column, $values, $boolean = 'and')
+ * @method int change(array $array)
+ * @method int remove()
  * @mixin \Eloquent
  */
 class AbstractModel extends Model
@@ -31,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',
@@ -38,6 +61,42 @@ class AbstractModel extends Model
 
     protected $appendattrs = [];
 
+    /**
+     * 通过模型修改数据
+     * @param AbstractModel $builder
+     * @param $array
+     * @return int
+     */
+    protected function scopeChange($builder, $array)
+    {
+        $line = 0;
+        $rows = $builder->get();
+        foreach ($rows as $row) {
+            $row->updateInstance($array);
+            if ($row->save()) {
+                $line++;
+            }
+        }
+        return $line;
+    }
+
+    /**
+     * 通过模型删除数据
+     * @param AbstractModel $builder
+     * @return int
+     */
+    protected function scopeRemove($builder)
+    {
+        $line = 0;
+        $rows = $builder->get();
+        foreach ($rows as $row) {
+            if ($row->delete()) {
+                $line++;
+            }
+        }
+        return $line;
+    }
+
     /**
      * 保存数据忽略错误
      * @return bool
@@ -46,7 +105,7 @@ class AbstractModel extends Model
     {
         try {
             return $this->save();
-        } catch (\Exception $e) {
+        } catch (\Throwable) {
             return false;
         }
     }
@@ -151,22 +210,34 @@ class AbstractModel extends Model
     /**
      * 数据库更新或插入
      * @param $where
-     * @param array $update 存在时更新的内容
-     * @param array $insert 不存在时插入的内容，如果没有则插入更新内容
+     * @param array|\Closure $update 存在时更新的内容
+     * @param array|\Closure $insert 不存在时插入的内容，如果没有则插入更新内容
+     * @param bool $isInsert 是否是插入数据
      * @return AbstractModel|\Illuminate\Database\Eloquent\Builder|Model|object|static|null
      */
-    public static function updateInsert($where, $update = [], $insert = [])
+    public static function updateInsert($where, $update = [], $insert = [], &$isInsert = true)
     {
         $row = static::where($where)->first();
         if (empty($row)) {
             $row = new static;
+            if ($update instanceof \Closure) {
+                $update = $update();
+            }
+            if ($insert instanceof \Closure) {
+                $insert = $insert();
+            }
             $array = array_merge($where, $insert ?: $update);
             if (isset($array[$row->primaryKey])) {
                 unset($array[$row->primaryKey]);
             }
             $row->updateInstance($array);
+            $isInsert = true;
         } elseif ($update) {
+            if ($update instanceof \Closure) {
+                $update = $update();
+            }
             $row->updateInstance($update);
+            $isInsert = false;
         }
         if (!$row->save()) {
             return null;
@@ -194,10 +265,9 @@ class AbstractModel extends Model
                 info($eb);
             }
             if ($e instanceof ApiException) {
-                throw new ApiException($e->getMessage(), $e->getData(), $e->getCode());
+                throw new ApiException( $e->getMessage() , $e->getData(), $e->getCode());
             } else {
-                info($e);
-                throw new ApiException($e->getMessage() ?: '处理错误');
+                throw new ApiException( $e->getMessage() ?: '处理错误');
             }
         }
     }

app/Models/ApproveProcInstHistory.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Models;
+
+use Cache;
+use Carbon\Carbon;
+use DB;
+
+/**
+ * App\Models\ApproveProcInstHistory
+ *
+ * @property int $id
+ * @property int $proc_def_id 流程定义ID
+ * @property string|null $proc_def_name 流程定义名
+ * @property string|null $title 标题
+ * @property int|null $department_id 用户部门ID
+ * @property string|null $department 用户部门
+ * @property string|null $company 用户公司
+ * @property string|null $node_id 当前节点
+ * @property string|null $candidate 审批人
+ * @property int|null $task_id 当前任务
+ * @property string|null $start_time 开始时间
+ * @property string|null $end_time 结束时间
+ * @property int|null $duration 持续时间
+ * @property string|null $start_user_id 开始用户ID
+ * @property string|null $start_user_name 开始用户名
+ * @property int|null $is_finished 是否完成
+ * @property string|null $var
+ * @property int $state 当前状态: 0待审批，1审批中，2通过，3拒绝，4撤回
+ * @property string|null $latest_comment
+ * @property string|null $global_comment
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereCandidate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereCompany($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereDepartment($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereDepartmentId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereDuration($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereEndTime($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereGlobalComment($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereIsFinished($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereLatestComment($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereNodeId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereProcDefId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereProcDefName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereStartTime($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereStartUserId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereStartUserName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereState($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereTaskId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereTitle($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcInstHistory whereVar($value)
+ * @mixin \Eloquent
+ */
+class ApproveProcInstHistory extends AbstractModel
+{
+    protected $table = 'approve_proc_inst_history';
+
+    /**
+     * 获取用户审批状态（请假、外出）
+     * @param $userid
+     * @return mixed|null
+     */
+    public static function getUserApprovalStatus($userid)
+    {
+        if (empty($userid)) {
+            return null;
+        }
+        return Cache::remember('user_is_leave_' . $userid, Carbon::now()->addMinute(), function () use ($userid) {
+            return self::where([
+                ['start_user_id', '=', $userid],
+                [DB::raw("JSON_UNQUOTE(JSON_EXTRACT(var, '$.startTime'))"), '<=', Carbon::now()->toDateTimeString()],
+                [DB::raw("JSON_UNQUOTE(JSON_EXTRACT(var, '$.endTime'))"), '>=', Carbon::now()->toDateTimeString()],
+                ['state', '=', 2]
+            ])->where(function ($query) {
+                $query->where('proc_def_name', 'like', '%请假%')
+                    ->orWhere('proc_def_name', 'like', '%外出%');
+            })->orderByDesc('id')->value('proc_def_name');
+        });
+    }
+
+    /**
+     * 判断用户是否请假（包含：请假、外出）
+     * @param $userid
+     * @return bool
+     */
+    public static function userIsLeave($userid)
+    {
+        return (bool)self::getUserApprovalStatus($userid);
+    }
+}

app/Models/ApproveProcMsg.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\ApproveProcMsg
+ *
+ * @property int $id
+ * @property int|null $proc_inst_id 流程实例ID
+ * @property int|null $userid 会员ID
+ * @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)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg whereProcInstId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg whereUserid($value)
+ * @mixin \Eloquent
+ */
+class ApproveProcMsg extends AbstractModel
+{
+
+}

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

@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Models;
+
+use Carbon\Carbon;
+
+/**
+ * App\Models\Deleted
+ *
+ * @property int $id
+ * @property string|null $type 删除的数据类型（如：project、task、dialog）
+ * @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)
+ * @method static \Illuminate\Database\Eloquent\Builder|Deleted whereType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Deleted whereUserid($value)
+ * @mixin \Eloquent
+ */
+class Deleted extends AbstractModel
+{
+    const UPDATED_AT = null;
+
+    /**
+     * 获取删除的ID
+     * @param $type
+     * @param $userid
+     * @param $time
+     * @return array
+     */
+    public static function ids($type, $userid, $time): array
+    {
+        $builder = self::where([
+            'type' => $type,
+            'userid' => $userid
+        ])->orderByDesc('id');
+        if (empty($time)) {
+            $builder = $builder->take(50);
+        } else {
+            $builder = $builder->where('created_at', '>=', Carbon::parse($time))->take(500);
+        }
+        return $builder->pluck('did')->toArray();
+    }
+
+    /**
+     * 忘记（恢复或添加数据时删除记录）
+     * @param $type
+     * @param $id
+     * @param $userid
+     * @return void
+     */
+    public static function forget($type, $id, $userid): void
+    {
+        if (is_array($userid)) {
+            self::where([
+                'type' => $type,
+                'did' => $id,
+            ])->whereIn('userid', $userid)->delete();
+        } else {
+            self::where([
+                'type' => $type,
+                'did' => $id,
+                'userid' => $userid,
+            ])->delete();
+        }
+    }
+
+    /**
+     * 记录（删除数据时添加记录）
+     * @param $type
+     * @param $id
+     * @param $userid
+     * @return void
+     */
+    public static function record($type, $id, $userid): void
+    {
+        $array = is_array($userid) ? $userid : [$userid];
+        foreach ($array as $value) {
+            if (!self::where('type', $type)->where('did', $id)->where('userid', $value)->exists()) {
+                self::updateInsert([
+                    'type' => $type,
+                    'did' => $id,
+                    'userid' => $value,
+                ]);
+            }
+        }
+    }
+}

app/Models/File.php

@@ -2,18 +2,20 @@
 
 namespace App\Models;
 
-use App\Exceptions\ApiException;
+use Request;
 use App\Module\Base;
 use App\Tasks\PushTask;
+use App\Exceptions\ApiException;
+use Illuminate\Support\Facades\DB;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Request;
 
 /**
  * App\Models\File
  *
  * @property int $id
  * @property int|null $pid 上级ID
+ * @property string|null $pids 上级ID递归
  * @property int|null $cid 复制ID
  * @property string|null $name 名称
  * @property string|null $type 类型
@@ -21,14 +23,21 @@ use Request;
  * @property int|null $size 大小(B)
  * @property int|null $userid 拥有者ID
  * @property int|null $share 是否共享
+ * @property int|null $pshare 所属分享ID
  * @property int|null $created_id 创建者
  * @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\Query\Builder|File onlyTrashed()
+ * @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)
@@ -37,36 +46,340 @@ use Request;
  * @method static \Illuminate\Database\Eloquent\Builder|File whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereName($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File wherePid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|File wherePids($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|File wherePshare($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereShare($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereSize($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereUserid($value)
- * @method static \Illuminate\Database\Query\Builder|File withTrashed()
- * @method static \Illuminate\Database\Query\Builder|File withoutTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|File withTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|File withoutTrashed()
  * @mixin \Eloquent
  */
 class File extends AbstractModel
 {
     use SoftDeletes;
 
+    /**
+     * 文件文件
+     */
+    const codeExt = [
+        'txt',
+        'htaccess', 'htgroups', 'htpasswd', 'conf', 'bat', 'cmd', 'cpp', 'c', 'cc', 'cxx', 'h', 'hh', 'hpp', 'ino', 'cs', 'css',
+        'dockerfile', 'go', 'golang', 'html', 'htm', 'xhtml', 'vue', 'we', 'wpy', 'java', 'js', 'jsm', 'jsx', 'json', 'jsp', 'less', 'lua', 'makefile', 'gnumakefile',
+        'ocamlmakefile', 'make', 'mysql', 'nginx', 'ini', 'cfg', 'prefs', 'm', 'mm', 'pl', 'pm', 'p6', 'pl6', 'pm6', 'pgsql', 'php',
+        'inc', 'phtml', 'shtml', 'php3', 'php4', 'php5', 'phps', 'phpt', 'aw', 'ctp', 'module', 'ps1', 'py', 'r', 'rb', 'ru', 'gemspec', 'rake', 'guardfile', 'rakefile',
+        'gemfile', 'rs', 'sass', 'scss', 'sh', 'bash', 'bashrc', 'sql', 'sqlserver', 'swift', 'ts', 'typescript', 'str', 'vbs', 'vb', 'v', 'vh', 'sv', 'svh', 'xml',
+        'rdf', 'rss', 'wsdl', 'xslt', 'atom', 'mathml', 'mml', 'xul', 'xbl', 'xaml', 'yaml', 'yml',
+        'asp', 'properties', 'gitignore', 'log', 'bas', 'prg', 'python', 'ftl', 'aspx', 'plist'
+    ];
+
+    /**
+     * office文件
+     */
+    const officeExt = [
+        // 文本文件
+        'doc', 'docx',    // Microsoft Word 文档
+        'dot', 'dotx',    // Word 模板
+        'odt',            // OpenDocument 文本格式
+        'ott',            // OpenDocument 文本模板
+        'rtf',            // 富文本格式
+
+        // 电子表格
+        'xls', 'xlsx',    // Microsoft Excel 电子表格
+        'xlsm',           // Excel 含宏的工作簿
+        'xlt', 'xltx',    // Excel 模板
+        'ods',            // OpenDocument 电子表格格式
+        'ots',            // OpenDocument 电子表格模板
+        'csv',            // 逗号分隔值
+        'tsv',            // 制表符分隔值
+
+        // 演示文稿
+        'ppt', 'pptx',    // Microsoft PowerPoint 演示文稿
+        'pps', 'ppsx',    // PowerPoint 幻灯片放映
+        'pot', 'potx',    // PowerPoint 模板
+        'odp',            // OpenDocument 演示文稿格式
+        'otp',            // OpenDocument 演示文稿模板
+    ];
+
+    /**
+     * 图片文件
+     */
+    const imageExt = [
+        'jpg', 'jpeg', 'webp', 'png', 'gif', 'bmp'
+    ];
+
+    /**
+     * 本地媒体文件
+     */
+    const localExt = [
+        'jpg', 'jpeg', 'webp', 'png', 'gif', 'bmp', 'ico', 'raw',
+        'tif', 'tiff',
+        'mp3', 'wav', 'mp4', 'flv',
+        'avi', 'mov', 'wmv', 'mkv', '3gp', 'rm',
+    ];
+
+    /**
+     * 压缩包下载大小限制
+     */
+    const zipMaxSize = 1024 * 1024 * 1024; // 1G
+
+
+    /**
+     * 获取文件列表
+     * @param user $user
+     * @param int $pid
+     * @param string $type
+     * @param bool $isGetparent
+     * @return array
+     */
+    public function getFileList($user, int $pid, $type = "all", $isGetparent = true)
+    {
+        $permission = 1000;
+        $userids = $user->isTemp() ? [$user->userid] : [0, $user->userid];
+        $builder = File::wherePid($pid)
+            ->when($type == 'dir', function ($q) {
+                $q->whereType('folder');
+            });
+        if ($pid > 0) {
+            File::permissionFind($pid, $userids, 0, $permission);
+        } else {
+            $builder->whereUserid($user->userid);
+        }
+        //
+        $array = $builder->take(500)->get()->toArray();
+        foreach ($array as &$item) {
+            $item['permission'] = $permission;
+        }
+        //
+        if ($pid > 0) {
+            // 遍历获取父级
+            if ($isGetparent) {
+                while ($pid > 0) {
+                    $file = File::whereId($pid)->first();
+                    if (empty($file)) {
+                        break;
+                    }
+                    $pid = $file->pid;
+                    $temp = $file->toArray();
+                    $temp['permission'] = $file->getPermission($userids);
+                    $array[] = $temp;
+                }
+            }
+            // 去除没有权限的文件
+            $isUnset = false;
+            foreach ($array as $index1 => $item1) {
+                if ($item1['permission'] === -1) {
+                    foreach ($array as $index2 => $item2) {
+                        if ($item2['pid'] === $item1['id']) {
+                            $array[$index2]['pid'] = 0;
+                        }
+                    }
+                    $isUnset = true;
+                    unset($array[$index1]);
+                }
+            }
+            if ($isUnset) {
+                $array = array_values($array);
+            }
+        } else {
+            // 获取共享相关
+            DB::statement("SET SQL_MODE=''");
+            $pre = DB::connection()->getTablePrefix();
+            $list = File::select(["files.*", DB::raw("MAX({$pre}file_users.permission) as permission")])
+                ->join('file_users', 'files.id', '=', 'file_users.file_id')
+                ->where('files.userid', '!=', $user->userid)
+                ->whereIn('file_users.userid', $userids)
+                ->groupBy('files.id')
+                ->take(100)
+                ->when($type == 'dir', function ($q) {
+                    $q->where('files.type', 'folder');
+                })
+                ->get();
+            if ($list->isNotEmpty()) {
+                foreach ($list as $file) {
+                    $temp = $file->toArray();
+                    $temp['pid'] = 0;
+                    $array[] = $temp;
+                }
+            }
+        }
+        // 图片直接返回预览地址
+        foreach ($array as &$item) {
+            $item = File::handleImageUrl($item);
+        }
+        return $array;
+    }
+
+    /**
+     * 保存文件内容（上传文件）
+     * @param user $user
+     * @param int $pid
+     * @param string $webkitRelativePath
+     * @param bool $overwrite
+     * @return array
+     */
+    public function contentUpload($user, int $pid, $webkitRelativePath, $overwrite = false)
+    {
+        $userid = $user->userid;
+        if ($pid > 0) {
+            if (File::wherePid($pid)->count() >= 300) {
+                return Base::retError('每个文件夹里最多只能创建300个文件或文件夹');
+            }
+            $row = File::permissionFind($pid, $user, 1);
+            $userid = $row->userid;
+        } else {
+            if (File::whereUserid($user->userid)->wherePid(0)->count() >= 300) {
+                return Base::retError('每个文件夹里最多只能创建300个文件或文件夹');
+            }
+        }
+        //
+        $dirs = explode("/", $webkitRelativePath);
+        $addItem = [];
+        while (count($dirs) > 1) {
+            $dirName = array_shift($dirs);
+            if ($dirName) {
+                AbstractModel::transaction(function () use ($dirName, $user, $userid, &$pid, &$addItem) {
+                    $dirRow = File::wherePid($pid)->whereType('folder')->whereName($dirName)->lockForUpdate()->first();
+                    if (empty($dirRow)) {
+                        $dirRow = File::createInstance([
+                            'pid' => $pid,
+                            'type' => 'folder',
+                            'name' => $dirName,
+                            'userid' => $userid,
+                            'created_id' => $user->userid,
+                        ]);
+                        $dirRow->handleDuplicateName();
+                        if ($dirRow->saveBeforePP()) {
+                            $addItem[] = File::find($dirRow->id);
+                        }
+                    }
+                    if (empty($dirRow)) {
+                        throw new ApiException('创建文件夹失败');
+                    }
+                    $pid = $dirRow->id;
+                });
+                foreach ($addItem as $tmpRow) {
+                    $tmpRow->pushMsg('add', $tmpRow);
+                }
+            }
+        }
+        //
+        $path = 'uploads/tmp/file/' . date("Ym") . '/';
+        $data = Base::upload([
+            "file" => Request::file('files'),
+            "type" => 'more',
+            "autoThumb" => false,
+            "path" => $path,
+            "quality" => true
+        ]);
+        if (Base::isError($data)) {
+            throw new ApiException($data['msg']);
+        }
+        $data = $data['data'];
+        //
+        $type = match ($data['ext']) {
+            'text', 'md', 'markdown' => 'document',
+            'drawio' => 'drawio',
+            'mind' => 'mind',
+            'doc', 'docx', 'dot', 'dotx', 'odt', 'ott', 'rtf' => "word",
+            'xls', 'xlsx', 'xlsm', 'xlt', 'xltx', 'ods', 'ots', 'csv', 'tsv' => "excel",
+            'ppt', 'pptx', 'pps', 'ppsx', 'pot', 'potx', 'odp', 'otp'  => "ppt",
+            'wps' => "wps",
+            'jpg', 'jpeg', 'webp', 'png', 'gif', 'bmp', 'ico', 'raw', 'svg' => "picture",
+            'rar', 'zip', 'jar', '7-zip', 'tar', 'gzip', '7z', 'gz', 'apk', 'dmg' => "archive",
+            'tif', 'tiff' => "tif",
+            'dwg', 'dxf' => "cad",
+            'ofd' => "ofd",
+            'pdf' => "pdf",
+            'txt' => "txt",
+            'htaccess', 'htgroups', 'htpasswd', 'conf', 'bat', 'cmd', 'cpp', 'c', 'cc', 'cxx', 'h', 'hh', 'hpp', 'ino', 'cs', 'css',
+            'dockerfile', 'go', 'golang', 'html', 'htm', 'xhtml', 'vue', 'we', 'wpy', 'java', 'js', 'jsm', 'jsx', 'json', 'jsp', 'less', 'lua', 'makefile', 'gnumakefile',
+            'ocamlmakefile', 'make', 'mysql', 'nginx', 'ini', 'cfg', 'prefs', 'm', 'mm', 'pl', 'pm', 'p6', 'pl6', 'pm6', 'pgsql', 'php',
+            'inc', 'phtml', 'shtml', 'php3', 'php4', 'php5', 'phps', 'phpt', 'aw', 'ctp', 'module', 'ps1', 'py', 'r', 'rb', 'ru', 'gemspec', 'rake', 'guardfile', 'rakefile',
+            'gemfile', 'rs', 'sass', 'scss', 'sh', 'bash', 'bashrc', 'sql', 'sqlserver', 'swift', 'ts', 'typescript', 'str', 'vbs', 'vb', 'v', 'vh', 'sv', 'svh', 'xml',
+            'rdf', 'rss', 'wsdl', 'xslt', 'atom', 'mathml', 'mml', 'xul', 'xbl', 'xaml', 'yaml', 'yml',
+            'asp', 'properties', 'gitignore', 'log', 'bas', 'prg', 'python', 'ftl', 'aspx', 'plist' => "code",
+            'mp3', 'wav', 'mp4', 'flv',
+            'avi', 'mov', 'wmv', 'mkv', '3gp', 'rm' => "media",
+            'xmind' => "xmind",
+            'rp' => "axure",
+            default => "",
+        };
+        if ($data['ext'] == 'markdown') {
+            $data['ext'] = 'md';
+        }
+        $file = null;
+        $params = [
+            'pid' => $pid,
+            'name' => Base::rightDelete($data['name'], '.' . $data['ext']),
+            'type' => $type,
+            'ext' => $data['ext'],
+            'userid' => $userid,
+            'created_id' => $user->userid,
+        ];
+        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 ($overwrite, $addItem, $webkitRelativePath, $type, $user, $data, $file) {
+            $file->size = $data['size'] * 1024;
+            $file->saveBeforePP();
+            //
+            $data = Base::uploadMove($data, "uploads/file/" . $file->type . "/" . date("Ym") . "/" . $file->id . "/");
+            $content = [
+                'from' => '',
+                'type' => $type,
+                'ext' => $data['ext'],
+                'url' => $data['path'],
+            ];
+            if (isset($data['width'])) {
+                $content['width'] = $data['width'];
+                $content['height'] = $data['height'];
+            }
+            $content = FileContent::createInstance([
+                'fid' => $file->id,
+                'content' => $content,
+                'text' => '',
+                'size' => $file->size,
+                'userid' => $user->userid,
+            ]);
+            $content->save();
+            //
+            $tmpRow = File::find($file->id);
+            $tmpRow->pushMsg('add', $tmpRow);
+            //
+            $data = File::handleImageUrl($tmpRow->toArray());
+            $data['full_name'] = $webkitRelativePath ?: ($data['name'] . '.' . $data['ext']);
+            $data['overwrite'] = $overwrite ? 1 : 0;
+            //
+            $addItem[] = $data;
+
+            return ['data' => $data, 'addItem' => $addItem];
+        });
+    }
+
     /**
      * 是否有访问权限
-     * @param $userid
+     * @param array $userids
      * @return int -1:没有权限，0:访问权限，1:读写权限，1000:所有者或创建者
      */
-    public function getPermission($userid)
+    public function getPermission(array $userids)
     {
-        if ($userid == $this->userid || $userid == $this->created_id) {
+        $validUserIds = array_filter($userids);
+        if (in_array($this->userid, $validUserIds) || in_array($this->created_id, $validUserIds)) {
             // ① 自己的文件夹 或 自己创建的文件夹
             return 1000;
         }
         $row = $this->getShareInfo();
         if ($row) {
-            $fileUser = FileUser::whereFileId($row->id)->where(function ($query) use ($userid) {
-                $query->where('userid', 0);
-                $query->orWhere('userid', $userid);
-            })->orderByDesc('permission')->first();
+            $fileUser = FileUser::whereFileId($row->id)->whereIn('userid', $userids)->orderByDesc('permission')->first();
             if ($fileUser) {
                 // ② 在指定共享成员内
                 return $fileUser->permission;
@@ -100,7 +413,7 @@ class File extends AbstractModel
 
     /**
      * 是否处于共享文件夹内（不含自身）
-     * @return bool
+     * @return File|false
      */
     public function isNnShare()
     {
@@ -111,19 +424,28 @@ class File extends AbstractModel
                 break;
             }
             if ($row->share) {
-                return true;
+                return $row;
             }
             $pid = $row->pid;
         }
         return false;
     }
 
+    /**
+     * 目录内是否存在共享文件或文件夹
+     * @return bool
+     */
+    public function isSubShare()
+    {
+        return $this->type == 'folder' && File::where("pids", "like", "%,{$this->id},%")->whereShare(1)->exists();
+    }
+
     /**
      * 设置/关闭 共享（同时遍历取消里面的共享）
      * @param $share
      * @return bool
      */
-    public function setShare($share = null)
+    public function updataShare($share = null)
     {
         if ($share === null) {
             $share = FileUser::whereFileId($this->id)->count() == 0 ? 0 : 1;
@@ -131,11 +453,16 @@ class File extends AbstractModel
         if ($this->share != $share) {
             AbstractModel::transaction(function () use ($share) {
                 $this->share = $share;
+                $this->pshare = $share ? $this->id : 0;
                 $this->save();
+                File::where("pids", "like", "%,{$this->id},%")->update(['pshare' => $share ? $this->id : 0]);
+                if ($share === 0) {
+                    FileUser::deleteFileAll($this->id, $this->userid);
+                }
                 $list = self::wherePid($this->id)->get();
                 if ($list->isNotEmpty()) {
                     foreach ($list as $item) {
-                        $item->setShare(0);
+                        $item->updataShare(0);
                     }
                 }
             });
@@ -143,6 +470,75 @@ class File extends AbstractModel
         return true;
     }
 
+    /**
+     * 处理重名
+     * @return void
+     */
+    public function handleDuplicateName()
+    {
+        $builder = self::wherePid($this->pid)->whereUserid($this->userid)->whereExt($this->ext);
+        $exist = $builder->clone()->whereName($this->name)->exists();
+        if (!$exist) {
+            return;    // 未重名，不需要处理
+        }
+        // 发现重名，自动重命名
+        $nextNum = 2;
+        if (preg_match("/(.*?)(\s+\(\d+\))*$/", $this->name)) {
+            $preName = preg_replace("/(.*?)(\s+\(\d+\))*$/", "$1", $this->name);
+            $nextNum = $builder->clone()->where("name", "LIKE", "{$preName}%")->count() + 1;
+        }
+        $newName = "{$this->name} ({$nextNum})";
+        if ($builder->clone()->whereName($newName)->exists()) {
+            $nextNum = rand(100, 9999);
+            $newName = "{$this->name} ({$nextNum})";
+        }
+        $this->name = $newName;
+    }
+
+    /**
+     * 保存前更新pids/pshare
+     * @return bool
+     */
+    public function saveBeforePP()
+    {
+        $pid = $this->pid;
+        $pshare = $this->share ? $this->id : 0;
+        $array = [];
+        while ($pid > 0) {
+            $array[] = $pid;
+            $file = self::select(['id', 'pid', 'share'])->find($pid);
+            if ($file) {
+                $pid = $file->pid;
+                if ($file->share) {
+                    $pshare = $file->id;
+                }
+            } else {
+                $pid = 0;
+            }
+        }
+        $opids = $this->pids;
+        if ($array) {
+            $array = array_values(array_reverse($array));
+            $this->pids = ',' . implode(',', $array) . ',';
+        } else {
+            $this->pids = '';
+        }
+        $this->pshare = $pshare;
+        if (!$this->save()) {
+            return false;
+        }
+        // 更新子文件（夹）
+        if ($opids != $this->pids) {
+            self::wherePid($this->id)->chunkById(100, function ($lists) {
+                /** @var self $item */
+                foreach ($lists as $item) {
+                    $item->saveBeforePP();
+                }
+            });
+        }
+        return true;
+    }
+
     /**
      * 遍历删除文件(夹)
      * @return bool
@@ -152,8 +548,7 @@ class File extends AbstractModel
         AbstractModel::transaction(function () {
             $this->delete();
             $this->pushMsg('delete');
-            FileLink::whereFileId($this->id)->delete();
-            FileUser::whereFileId($this->id)->delete();
+            FileUser::deleteFileAll($this->id);
             FileContent::whereFid($this->id)->delete();
             $list = self::wherePid($this->id)->get();
             if ($list->isNotEmpty()) {
@@ -165,6 +560,50 @@ class File extends AbstractModel
         return true;
     }
 
+    /**
+     * 强制删除文件
+     * @return true
+     */
+    public function forceDeleteFile()
+    {
+        AbstractModel::transaction(function () {
+            $this->forceDelete();
+            FileContent::withTrashed()
+                ->whereFid($this->id)
+                ->orderBy('id')
+                ->chunk(500, function ($contents) {
+                    /** @var FileContent $content */
+                    foreach ($contents as $content) {
+                        $content->forceDeleteContent();
+                    }
+                });
+        });
+        return true;
+    }
+
+    /**
+     * 获取文件分享链接
+     * @param $userid
+     * @param $refresh
+     * @return array
+     */
+    public function getShareLink($userid, $refresh = false)
+    {
+        if ($this->type == 'folder') {
+            throw new ApiException('文件夹不支持分享');
+        }
+        return FileLink::generateLink($this->id, $userid, $refresh);
+    }
+
+    /**
+     * 获取文件名称加后缀
+     * @return string|null
+     */
+    public function getNameAndExt()
+    {
+        return $this->ext ? "{$this->name}.{$this->ext}" : $this->name;
+    }
+
     /**
      * 推送消息
      * @param $action
@@ -179,19 +618,7 @@ class File extends AbstractModel
             ];
         }
         //
-        if ($userid === null) {
-            $userid = [$this->userid];
-            if ($this->share == 1) {
-                $builder = WebSocket::select(['userid']);
-                if ($action == 'content') {
-                    $builder->wherePath('file/content/' . $this->id);
-                }
-                $userid = array_merge($userid, $builder->pluck('userid')->toArray());
-            } elseif ($this->share == 2) {
-                $userid = array_merge($userid, FileUser::whereFileId($this->id)->pluck('userid')->toArray());
-            }
-            $userid = array_values(array_filter(array_unique($userid)));
-        }
+        $userid = $this->pushUserid($action, $userid);
         if (empty($userid)) {
             return;
         }
@@ -215,28 +642,340 @@ class File extends AbstractModel
     }
 
     /**
-     * 获取文件并检测权限
-     * @param $id
-     * @param int $limit 要求权限: 0-访问权限、1-读写权限、1000-所有者或创建者
-     * @param $permission
+     * 获取推送会员
+     * @param $action
+     * @param $userid
+     * @return array|int[]|mixed|null[]
+     */
+    public function pushUserid($action, $userid = null) {
+        $wherePath = "/manage/file";
+        if ($userid === null) {
+            $array = [$this->userid];
+            if ($action == 'add' && $this->pid == 0) {
+                return $array;
+            }
+            if ($action == 'content') {
+                $wherePath = "/single/file/{$this->id}";
+            } elseif ($this->pid > 0) {
+                $wherePath = "/manage/file/{$this->pid}";
+            } else {
+                $tmpArray = FileUser::whereFileId($this->id)->pluck('userid')->toArray();
+                if (empty($tmpArray)) {
+                    return $array;
+                }
+                if (!in_array(0, $tmpArray)) {
+                    return $tmpArray;
+                }
+            }
+            $tmpArray = WebSocket::wherePath($wherePath)->pluck('userid')->toArray();
+            if (empty($tmpArray)) {
+                return $array;
+            }
+            $array = array_values(array_filter(array_unique(array_merge($array, $tmpArray))));
+        } else {
+            $array = is_array($userid) ? $userid : [$userid];
+            if (in_array(0, $array)) {
+                return WebSocket::wherePath($wherePath)->pluck('userid')->toArray();
+            }
+        }
+        return $array;
+    }
+
+    /**
+     * code获取文件ID、名称
+     * @param $code
      * @return File
      */
-    public static function permissionFind($id, $limit = 0, &$permission = -1)
+    public static function code2IdName($code) {
+        $arr = explode(",", base64_decode($code));
+        if (empty($arr)) {
+            return null;
+        }
+        $fileId = intval($arr[0]);
+        if (empty($fileId)) {
+            return null;
+        }
+        return File::select(['id', 'name'])->find($fileId);
+    }
+
+
+    /**
+     * 处理返回图片地址
+     * @param array $item
+     * @return array
+     */
+    public static function handleImageUrl($item)
     {
-        $file = File::find($id);
+        if (in_array($item['ext'], self::imageExt) ) {
+            $content = Base::json2array(FileContent::whereFid($item['id'])->orderByDesc('id')->value('content'));
+            if ($content) {
+                $item['image_url'] = Base::fillUrl($content['url']);
+                $item['image_width'] = intval($content['width']);
+                $item['image_height'] = intval($content['height']);
+            }
+        }
+        return $item;
+    }
+
+    /**
+     * 获取文件并检测权限
+     * @param int $id
+     * @param User|array|int $user      要求权限的用户，如：[0, 1]
+     * @param int $limit                要求权限: 0-访问权限、1-读写权限、1000-所有者或创建者
+     * @param int $permission
+     * @return File
+     */
+    public static function permissionFind($id, $user, int $limit = 0, int &$permission = -1)
+    {
+        $file = File::find(intval($id));
         if (empty($file)) {
             throw new ApiException('文件不存在或已被删除');
         }
         //
-        $permission = $file->getPermission(User::userid());
+        if ($user instanceof User) {
+            $userids = $user->isTemp() ? [$user->userid] : [0, $user->userid];
+        } else {
+            $userids = is_array($user) ? $user : [$user];
+        }
+        $permission = $file->getPermission($userids);
         if ($permission < $limit) {
             $msg = match ($limit) {
                 1000 => '仅限所有者或创建者操作',
-                1 => '没有读写权限',
-                default => '没有访问权限',
+                1 => '没有修改写入权限',
+                default => '没有查看访问权限',
             };
             throw new ApiException($msg);
         }
         return $file;
     }
+
+    /**
+     * 格式化内容数据
+     * @param array $data [path, size, ext, name]
+     * @return array
+     */
+    public static function formatFileData(array $data)
+    {
+        $fileName = $data['name'];
+        $filePath = $data['path'];
+        $fileSize = $data['size'];
+        $fileExt = $data['ext'];
+        $publicPath = public_path($filePath);
+        //
+        switch ($fileExt) {
+            case 'md':
+            case 'text':
+                // 文本
+                $data['content'] = [
+                    'type' => $fileExt,
+                    'content' => file_get_contents($publicPath) ?: 'Content deleted',
+                ];
+                $data['file_mode'] = $fileExt;
+                break;
+
+            case 'drawio':
+                // 图表
+                $data['content'] = [
+                    'xml' => file_get_contents($publicPath)
+                ];
+                $data['file_mode'] = $fileExt;
+                break;
+
+            case 'mind':
+                // 思维导图
+                $data['content'] = Base::json2array(file_get_contents($publicPath));
+                $data['file_mode'] = $fileExt;
+                break;
+
+            default:
+                if (in_array($fileExt, self::codeExt) && $fileSize < 2 * 1024 * 1024)
+                {
+                    // 文本预览，限制2M内的文件
+                    $data['content'] = [
+                        'content' => file_get_contents($publicPath) ?: 'Content deleted',
+                    ];
+                    $data['file_mode'] = 'code';
+                }
+                elseif (in_array($fileExt, File::officeExt))
+                {
+                    // office预览
+                    $data['content'] = json_decode('{}');
+                    $data['file_mode'] = 'office';
+                }
+                else
+                {
+                    // 其他预览
+                    $name = Base::rightDelete($fileName, ".{$fileExt}") . ".{$fileExt}";
+                    $data['content'] = [
+                        'preview' => true,
+                        'name' => $name,
+                        'key' => urlencode(Base::urlAddparameter($filePath, [
+                            'name' => $name,
+                            'ext' => $fileExt
+                        ])),
+                    ];
+                    $data['file_mode'] = 'preview';
+                }
+                break;
+        }
+        return $data;
+    }
+
+    /**
+     * 移交文件
+     * @param $originalUserid
+     * @param $newUserid
+     * @return void
+     */
+    public static function transfer($originalUserid, $newUserid)
+    {
+        if (!self::whereUserid($originalUserid)->exists()) {
+            return;
+        }
+
+        // 创建一个文件夹存放移交的文件
+        $name = User::userid2nickname($originalUserid) ?: ('ID:' . $originalUserid);
+        $file = File::createInstance([
+            'pid' => 0,
+            'name' => "【{$name}】移交的文件",
+            'type' => "folder",
+            'ext' => "",
+            'userid' => $newUserid,
+            'created_id' => 0,
+        ]);
+        $file->handleDuplicateName();
+        $file->saveBeforePP();
+
+        // 移交文件
+        self::whereUserid($originalUserid)->chunkById(100, function($list) use ($file, $newUserid) {
+            /** @var self $item */
+            foreach ($list as $item) {
+                if ($item->pid === 0) {
+                    $item->pid = $file->id;
+                }
+                $item->userid = $newUserid;
+                $item->saveBeforePP();
+            }
+        });
+
+        // 移交文件权限
+        FileUser::whereUserid($originalUserid)->chunkById(100, function ($list) use ($newUserid) {
+            /** @var FileUser $item */
+            foreach ($list as $item) {
+                $row = FileUser::whereFileId($item->file_id)->whereUserid($newUserid)->first();
+                if ($row) {
+                    // 已存在则删除原数据，判断改变已存在的数据
+                    $row->permission = max($row->permission, $item->permission);
+                    $row->save();
+                    $item->delete();
+                } else {
+                    // 不存在则改变原数据
+                    $item->userid = $newUserid;
+                    $item->save();
+                }
+            }
+        });
+    }
+
+    /**
+     * 获取文件树并计算文件总大小
+     *
+     * @param int $fileId
+     * @param User $user
+     * @param int $permission 0-访问权限、1-读写权限、1000-所有者或创建者
+     * @param string $path
+     * @param int $totalSize
+     * @return object
+     */
+    public static function getFilesTree(int $fileId, User $user, $permission = 1, $path = '', &$totalSize = 0) {
+        $file = File::permissionFind($fileId, $user, $permission);
+        $file->path = ltrim($path . '/' . $file->name, '/');
+        $file->children = [];
+        if ($file->type == 'folder') {
+            $files = $file->getFileList($user, $fileId, 'all', false);
+            foreach ($files as &$childFile) {
+                $childFile['path'] = $file->path . '/' . $childFile['name'];
+                if ($childFile['type'] == 'folder') {
+                    $childFile['children'] = self::getFilesTree($childFile['id'], $user, $permission, $file->path, $totalSize);
+                } else {
+                    $totalSize += $childFile['size'];
+                }
+            }
+            $file->children = $files;
+        } else {
+            $totalSize += $file->size;
+        }
+        $file->totalSize = $totalSize;
+        return $file;
+    }
+
+    /**
+     * 文件夹文件添加到压缩文件
+     *
+     * @param \ZipArchive $zip
+     * @param object $file
+     * @return void
+     */
+    public static function addFileTreeToZip($zip, $file)
+    {
+        if ($file->type != 'folder' && $file->name != '') {
+            $content = FileContent::whereFid($file->id)->orderByDesc('id')->first();
+            $content = Base::json2array($content?->content ?: []);
+            $typeExtensions = [
+                'word' => 'docx',
+                'excel' => 'xlsx',
+                'ppt' => 'pptx',
+            ];
+            if (array_key_exists($file->type, $typeExtensions)) {
+                $filePath = empty($content) ? public_path('assets/office/empty.' . $typeExtensions[$file->type]) : public_path($content['url']);
+            }
+            //
+            $relativePath = $file->path . '.' . $file->ext;
+            if (file_exists($filePath)) {
+                $zip->addFile($filePath, $relativePath);
+            } else {
+                if (empty($content['url'])) {
+                    $zip->addFromString($relativePath, $content['content']);
+                } else {
+                    $filePath = public_path($content['url']);
+                    $zip->addFile($filePath, $relativePath);
+                }
+            }
+        } else {
+            if (isset($file->children)) {
+                foreach ($file->children as $childFile) {
+                    try {
+                        self::addFileTreeToZip($zip, (object)$childFile);
+                    } catch (\Exception $e) {
+                    }
+                }
+            }
+            // 在压缩包中创建文件夹
+            $zip->addEmptyDir($file->path);
+        }
+    }
+
+    /**
+     * 文件推送消息
+     * @param $action
+     * @param array|null $data   发送内容
+     * @param array $userid      会员ID
+     */
+    public static function filePushMsg($action, $data = null, $userid = null)
+    {
+        $userid = User::userid();
+        if (empty($userid)) {
+            return;
+        }
+        $msg = [
+            'type' => 'file',
+            'action' => $action,
+            'data' => $data,
+        ];
+        $params = [
+            'userid' => $userid,
+            'msg' => $msg
+        ];
+        Task::deliver(new PushTask($params));
+    }
 }

app/Models/FileContent.php

@@ -2,10 +2,10 @@
 
 namespace App\Models;
 
-
 use App\Module\Base;
+use App\Module\Timer;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Response;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 /**
  * App\Models\FileContent
@@ -19,10 +19,16 @@ use Response;
  * @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\Query\Builder|FileContent onlyTrashed()
+ * @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)
@@ -32,8 +38,8 @@ use Response;
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent whereText($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent whereUserid($value)
- * @method static \Illuminate\Database\Query\Builder|FileContent withTrashed()
- * @method static \Illuminate\Database\Query\Builder|FileContent withoutTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|FileContent withTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|FileContent withoutTrashed()
  * @mixin \Eloquent
  */
 class FileContent extends AbstractModel
@@ -41,11 +47,67 @@ class FileContent extends AbstractModel
     use SoftDeletes;
 
     /**
-     * 获取格式内容（或下载）
+     * 强制删除文件内容
+     * @return void
+     */
+    public function forceDeleteContent()
+    {
+        $this->forceDelete();
+        $content = Base::json2array($this->content ?: []);
+        if (str_starts_with($content['url'], 'uploads/')) {
+            $path = public_path($content['url']);
+            if (file_exists($path)) {
+                @unlink($path);
+            }
+        }
+    }
+
+    /**
+     * 转预览地址
+     * @param array $array
+     * @return string
+     */
+    public static function toPreviewUrl($array)
+    {
+        $fileExt = $array['ext'];
+        $fileName = $array['name'];
+        $filePath = $array['path'];
+        $name = Base::rightDelete($fileName, ".{$fileExt}") . ".{$fileExt}";
+        $key = urlencode(Base::urlAddparameter($filePath, [
+            'name' => $name,
+            'ext' => $fileExt
+        ]));
+        return Base::fillUrl("online/preview/{$name}?key={$key}&version=" . Base::getVersion() . "&__=" . Timer::msecTime());
+    }
+
+    /**
+     * 转预览地址
      * @param File $file
      * @param $content
+     * @return string
+     */
+    public static function formatPreview($file, $content)
+    {
+        $content = Base::json2array($content ?: []);
+        $filePath = $content['url'];
+        if (in_array($file->type, ['word', 'excel', 'ppt'])) {
+            if (empty($content)) {
+                $filePath = 'assets/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $file->type);
+            }
+        }
+        return self::toPreviewUrl([
+            'ext' => $file->ext,
+            'name' => $file->name,
+            'path' => $filePath,
+        ]);
+    }
+
+    /**
+     * 获取格式内容（或下载）
+     * @param $file
+     * @param $content
      * @param $download
-     * @return array|\Symfony\Component\HttpFoundation\BinaryFileResponse
+     * @return array|StreamedResponse
      */
     public static function formatContent($file, $content, $download = false)
     {
@@ -53,14 +115,16 @@ class FileContent extends AbstractModel
         $content = Base::json2array($content ?: []);
         if (in_array($file->type, ['word', 'excel', 'ppt'])) {
             if (empty($content)) {
-                return Response::download(resource_path('assets/statics/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $file->type)), $name);
+                $filePath = public_path('assets/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $file->type));
+            } else {
+                $filePath = public_path($content['url']);
             }
-            return Response::download(public_path($content['url']), $name);
+            return Base::DownloadFileResponse($filePath, $name);
         }
         if (empty($content)) {
             $content = match ($file->type) {
                 'document' => [
-                    "type" => "md",
+                    "type" => $file->ext,
                     "content" => "",
                 ],
                 default => json_decode('{}'),
@@ -69,26 +133,22 @@ class FileContent extends AbstractModel
                 abort(403, "This file is empty.");
             }
         } else {
-            $content['preview'] = false;
+            $path = $content['url'];
             if ($file->ext) {
-                $filePath = public_path($content['url']);
-                if (in_array($file->type, ['txt', 'code']) && $file->size < 2 * 1024 * 1024) {
-                    // 支持编辑，限制2M内的文件
-                    $content['content'] = file_get_contents($filePath);
-                } else {
-                    // 支持预览
-                    if (in_array($file->type, ['picture', 'image', 'tif', 'media'])) {
-                        $url = Base::fillUrl($content['url']);
-                    } else {
-                        $url = 'http://' . env('APP_IPPR') . '.3/' . $content['url'];
-                    }
-                    $content['url'] = base64_encode($url);
-                    $content['preview'] = true;
-                }
+                $res = File::formatFileData([
+                    'path' => $path,
+                    'ext' => $file->ext,
+                    'size' => $file->size,
+                    'name' => $file->name,
+                ]);
+                $content = $res['content'];
+            } else {
+                $content['preview'] = false;
             }
             if ($download) {
+                $filePath = public_path($path);
                 if (isset($filePath)) {
-                    return Response::download($filePath, $name);
+                    return Base::DownloadFileResponse($filePath, $name);
                 } else {
                     abort(403, "This file not support download.");
                 }
@@ -96,4 +156,28 @@ class FileContent extends AbstractModel
         }
         return Base::retSuccess('success', [ 'content' => $content ]);
     }
+
+    /**
+     * 获取文件内容
+     * @param $id
+     * @return self|null
+     */
+    public static function idOrCodeToContent($id)
+    {
+        $builder = null;
+        if (Base::isNumber($id)) {
+            $builder = FileContent::whereFid($id);
+        } elseif ($id) {
+            $fileLink = FileLink::whereCode($id)->first();
+            if ($fileLink) {
+                $builder = FileContent::whereFid($fileLink->file_id);
+            }
+        }
+        /** @var self $fileContent */
+        $fileContent = $builder?->orderByDesc('id')->first();
+        if ($fileContent) {
+            $fileContent->content = Base::json2array($fileContent->content ?: []);
+        }
+        return $fileContent;
+    }
 }

app/Models/FileLink.php

@@ -2,25 +2,35 @@
 
 namespace App\Models;
 
+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)
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereNum($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereUserid($value)
  * @mixin \Eloquent
  */
 class FileLink extends AbstractModel
@@ -32,4 +42,35 @@ class FileLink extends AbstractModel
     {
         return $this->hasOne(File::class, 'id', 'file_id');
     }
+
+    /**
+     * 生成链接
+     * @param $fileId
+     * @param $userid
+     * @param $refresh
+     * @return array
+     */
+    public static function generateLink($fileId, $userid, $refresh = false)
+    {
+        $fileLink = FileLink::whereFileId($fileId)->whereUserid($userid)->first();
+        if (empty($fileLink)) {
+            $fileLink = FileLink::createInstance([
+                'file_id' => $fileId,
+                'userid' => $userid,
+                'code' => base64_encode("{$fileId},{$userid}," . Base::generatePassword()),
+            ]);
+            $fileLink->save();
+        } else {
+            if ($refresh == 'yes') {
+                $fileLink->code = base64_encode("{$fileId},{$userid}," . Base::generatePassword());
+                $fileLink->save();
+            }
+        }
+        return [
+            'id' => $fileId,
+            'url' => Base::fillUrl('single/file/' . $fileLink->code),
+            'code' => $fileLink->code,
+            'num' => $fileLink->num
+        ];
+    }
 }

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)
@@ -25,4 +31,34 @@ namespace App\Models;
  */
 class FileUser extends AbstractModel
 {
+    /**
+     * 删除所有共享成员（同时删除成员分享的链接）
+     * @param $file_id
+     * @param int $retain_link_userid       保留指定会员的链接
+     * @return mixed
+     */
+    public static function deleteFileAll($file_id, $retain_link_userid = 0)
+    {
+        return AbstractModel::transaction(function() use ($retain_link_userid, $file_id) {
+            if ($retain_link_userid > 0) {
+                FileLink::whereFileId($file_id)->where('userid', '!=', $retain_link_userid)->delete();
+            } else {
+                FileLink::whereFileId($file_id)->delete();
+            }
+            FileUser::whereFileId($file_id)->delete();
+        });
+    }
+    /**
+     * 删除指定共享成员（同时删除成员分享的链接）
+     * @param $file_id
+     * @param $userid
+     * @return mixed
+     */
+    public static function deleteFileUser($file_id, $userid)
+    {
+        return AbstractModel::transaction(function() use ($userid, $file_id) {
+            FileLink::whereFileId($file_id)->whereUserid($userid)->delete();
+            return self::whereFileId($file_id)->whereUserid($userid)->delete();
+        });
+    }
 }

app/Models/Meeting.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Models;
+
+use Cache;
+use App\Module\Base;
+use Illuminate\Support\Carbon;
+
+/**
+ * App\Models\Meeting
+ *
+ * @property int $id
+ * @property string|null $meetingid 会议ID，不是数字
+ * @property string|null $name 会议主题
+ * @property string|null $channel 频道
+ * @property int|null $userid 创建人
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_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)
+ * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereEndAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereMeetingid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereUserid($value)
+ * @mixin \Eloquent
+ */
+class Meeting extends AbstractModel
+{
+    const CACHE_KEY = 'meeting_share_link_code';
+    const CACHE_EXPIRED_TIME = 6; // 小时
+
+    /**
+     * 获取分享链接
+     * @return mixed
+     */
+    public function getShareLink()
+    {
+        $code = base64_encode("{$this->meetingid}" . Base::generatePassword());
+        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 mixed
+     */
+    public static function getShareInfo($code)
+    {
+        if (Cache::has(self::CACHE_KEY . '_' . $code)) {
+            return Cache::get(self::CACHE_KEY . '_' . $code);
+        }
+        return null;
+    }
+
+    /**
+     * 保存访客信息
+     * @return void
+     */
+    public static function setTouristInfo($data)
+    {
+        Cache::put(Meeting::CACHE_KEY . '_' . $data['uid'], [
+            'uid' => $data['uid'],
+            'userimg' => $data['userimg'],
+            'nickname' => $data['nickname'],
+        ], Carbon::now()->addHours(self::CACHE_EXPIRED_TIME));
+    }
+
+    /**
+     * 获取访客信息
+     * @return mixed
+     */
+    public static function getTouristInfo($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

@@ -5,6 +5,7 @@ namespace App\Models;
 use App\Exceptions\ApiException;
 use App\Module\Base;
 use App\Tasks\PushTask;
+use Arr;
 use Carbon\Carbon;
 use DB;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
@@ -18,25 +19,37 @@ use Request;
  * @property string|null $name 名称
  * @property string|null $desc 描述、备注
  * @property int|null $userid 创建人
+ * @property int|null $personal 是否个人项目
+ * @property string|null $archive_method 自动归档方式
+ * @property int|null $archive_days 自动归档天数
+ * @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
  * @property \Illuminate\Support\Carbon|null $deleted_at
  * @property-read int $owner_userid
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectColumn[] $projectColumn
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ProjectColumn> $projectColumn
  * @property-read int|null $project_column_count
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectLog[] $projectLog
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ProjectLog> $projectLog
  * @property-read int|null $project_log_count
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectUser[] $projectUser
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ProjectUser> $projectUser
  * @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\Query\Builder|Project onlyTrashed()
+ * @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 whereArchiveDays($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Project whereArchiveMethod($value)
  * @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)
@@ -45,10 +58,12 @@ use Request;
  * @method static \Illuminate\Database\Eloquent\Builder|Project whereDialogId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Project whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Project whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Project wherePersonal($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Project whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Project whereUserSimple($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Project whereUserid($value)
- * @method static \Illuminate\Database\Query\Builder|Project withTrashed()
- * @method static \Illuminate\Database\Query\Builder|Project withoutTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|Project withTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|Project withoutTrashed()
  * @mixin \Eloquent
  */
 class Project extends AbstractModel
@@ -113,6 +128,7 @@ class Project extends AbstractModel
             ->select([
                 'projects.*',
                 'project_users.owner',
+                'project_users.top_at',
             ])
             ->leftJoin('project_users', function ($leftJoin) use ($userid) {
                 $leftJoin
@@ -136,6 +152,7 @@ class Project extends AbstractModel
             ->select([
                 'projects.*',
                 'project_users.owner',
+                'project_users.top_at',
             ])
             ->join('project_users', 'projects.id', '=', 'project_users.project_id')
             ->where('project_users.userid', $userid);
@@ -200,9 +217,15 @@ class Project extends AbstractModel
                 WebSocketDialogUser::updateInsert([
                     'dialog_id' => $this->dialog_id,
                     'userid' => $userid,
-                ]);
+                ], [
+                    'important' => 1
+                ], function () use ($userid) {
+                    return [
+                        'bot' => User::isBot($userid) ? 1 : 0,
+                    ];
+                });
             }
-            WebSocketDialogUser::whereDialogId($this->dialog_id)->whereNotIn('userid', $userids)->delete();
+            WebSocketDialogUser::whereDialogId($this->dialog_id)->whereNotIn('userid', $userids)->whereImportant(1)->remove();
         });
     }
 
@@ -242,8 +265,8 @@ class Project extends AbstractModel
                 $this->archived_at = null;
                 $this->archived_userid = User::userid();
                 $this->addLog("项目取消归档");
-                $this->pushMsg('add', $this);
-                ProjectTask::whereProjectId($this->id)->whereArchivedFollow(1)->update([
+                $this->pushMsg('recovery', $this);
+                ProjectTask::whereProjectId($this->id)->whereArchivedFollow(1)->change([
                     'archived_at' => null,
                     'archived_follow' => 0
                 ]);
@@ -253,7 +276,7 @@ class Project extends AbstractModel
                 $this->archived_userid = User::userid();
                 $this->addLog("项目归档");
                 $this->pushMsg('archived');
-                ProjectTask::whereProjectId($this->id)->whereArchivedAt(null)->update([
+                ProjectTask::whereProjectId($this->id)->whereArchivedAt(null)->change([
                     'archived_at' => $archived_at,
                     'archived_follow' => 1
                 ]);
@@ -310,44 +333,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));
         }
     }
 
@@ -374,12 +418,15 @@ class Project extends AbstractModel
             $idc = [];
             $hasStart = false;
             $hasEnd = false;
+            $upTaskList = [];
+            $projectUserids = $this->relationUserids();
             foreach ($flows as $item) {
                 $id = intval($item['id']);
                 $turns = Base::arrayRetainInt($item['turns'] ?: [], true);
                 $userids = Base::arrayRetainInt($item['userids'] ?: [], true);
                 $usertype = trim($item['usertype']);
                 $userlimit = intval($item['userlimit']);
+                $columnid = intval($item['columnid']);
                 if ($usertype == 'replace' && empty($userids)) {
                     throw new ApiException("状态[{$item['name']}]设置错误，设置流转模式时必须填写状态负责人");
                 }
@@ -389,6 +436,12 @@ class Project extends AbstractModel
                 if ($userlimit && empty($userids)) {
                     throw new ApiException("状态[{$item['name']}]设置错误，设置限制负责人时必须填写状态负责人");
                 }
+                foreach ($userids as $userid) {
+                    if (!in_array($userid, $projectUserids)) {
+                        $nickname = User::userid2nickname($userid);
+                        throw new ApiException("状态[{$item['name']}]设置错误，状态负责人[{$nickname}]不在项目成员内");
+                    }
+                }
                 $flow = ProjectFlowItem::updateInsert([
                     'id' => $id,
                     'project_id' => $this->id,
@@ -401,7 +454,8 @@ class Project extends AbstractModel
                     'userids' => $userids,
                     'usertype' => trim($item['usertype']),
                     'userlimit' => $userlimit,
-                ]);
+                    'columnid' => $columnid,
+                ], [], $isInsert);
                 if ($flow) {
                     $ids[] = $flow->id;
                     if ($flow->id != $id) {
@@ -413,6 +467,9 @@ class Project extends AbstractModel
                     if ($flow->status == 'end') {
                         $hasEnd = true;
                     }
+                    if (!$isInsert) {
+                        $upTaskList[$flow->id] = $flow->status . "|" . $flow->name;
+                    }
                 }
             }
             if (!$hasStart) {
@@ -427,6 +484,12 @@ class Project extends AbstractModel
                 }
             });
             //
+            foreach ($upTaskList as $id => $value) {
+                ProjectTask::whereFlowItemId($id)->change([
+                    'flow_item_name' => $value
+                ]);
+            }
+            //
             $projectFlow = ProjectFlow::with(['projectFlowItem'])->whereProjectId($this->id)->find($projectFlow->id);
             $itemIds = $projectFlow->projectFlowItem->pluck('id')->toArray();
             foreach ($projectFlow->projectFlowItem as $item) {
@@ -449,6 +512,93 @@ class Project extends AbstractModel
         });
     }
 
+    /**
+     * 创建项目
+     * @param $params
+     * - name   项目名称
+     * - desc
+     * - flow
+     * - personal
+     * - columns
+     * @return array
+     */
+    public static function createProject($params, $userid)
+    {
+        $name = trim(Arr::get($params, 'name', ''));
+        $desc = trim(Arr::get($params, 'desc', ''));
+        $flow = trim(Arr::get($params, 'flow', 'close'));
+        $isPersonal = intval(Arr::get($params, 'personal'));
+        if (mb_strlen($name) < 2) {
+            return Base::retError('项目名称不可以少于2个字');
+        } elseif (mb_strlen($name) > 32) {
+            return Base::retError('项目名称最多只能设置32个字');
+        }
+        if (mb_strlen($desc) > 255) {
+            return Base::retError('项目介绍最多只能设置255个字');
+        }
+        // 列表
+        $columns = explode(",", Arr::get($params, 'columns'));
+        $insertColumns = [];
+        $sort = 0;
+        foreach ($columns AS $column) {
+            $column = trim($column);
+            if ($column) {
+                $insertColumns[] = [
+                    'name' => $column,
+                    'sort' => $sort++,
+                ];
+            }
+        }
+        if (empty($insertColumns)) {
+            $insertColumns[] = [
+                'name' => 'Default',
+                'sort' => 0,
+            ];
+        }
+        if (count($insertColumns) > 30) {
+            return Base::retError('项目列表最多不能超过30个');
+        }
+        // 开始创建
+        $project = Project::createInstance([
+            'name' => $name,
+            'desc' => $desc,
+            'userid' => $userid,
+        ]);
+        if ($isPersonal) {
+            if (Project::whereUserid($userid)->wherePersonal(1)->exists()) {
+                return Base::retError('个人项目已存在，无须重复创建');
+            }
+            $project->personal = 1;
+        }
+        AbstractModel::transaction(function() use ($flow, $insertColumns, $project) {
+            $project->save();
+            ProjectUser::createInstance([
+                'project_id' => $project->id,
+                'userid' => $project->userid,
+                'owner' => 1,
+            ])->save();
+            foreach ($insertColumns AS $column) {
+                $column['project_id'] = $project->id;
+                ProjectColumn::createInstance($column)->save();
+            }
+            $dialog = WebSocketDialog::createGroup($project->name, $project->userid, 'project');
+            if (empty($dialog)) {
+                throw new ApiException('创建项目聊天室失败');
+            }
+            $project->dialog_id = $dialog->id;
+            $project->save();
+            //
+            if ($flow == 'open') {
+                $project->addFlow(Base::json2array('[{"id":-10,"name":"待处理","status":"start","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0,"columnid":0},{"id":-11,"name":"进行中","status":"progress","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0,"columnid":0},{"id":-12,"name":"待测试","status":"test","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0,"columnid":0},{"id":-13,"name":"已完成","status":"end","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0,"columnid":0},{"id":-14,"name":"已取消","status":"end","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0,"columnid":0}]'));
+            }
+        });
+        //
+        $data = Project::find($project->id);
+        $data->addLog("创建项目");
+        $data->pushMsg('add', $data);
+        return Base::retSuccess('添加成功', $data);
+    }
+
     /**
      * 获取项目信息（用于判断会员是否存在项目内）
      * @param int $project_id

app/Models/ProjectColumn.php

@@ -20,12 +20,18 @@ use Request;
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
  * @property-read \App\Models\Project|null $project
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectTask[] $projectTask
+ * @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\Query\Builder|ProjectColumn onlyTrashed()
+ * @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)
@@ -34,8 +40,8 @@ use Request;
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn whereProjectId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn whereSort($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|ProjectColumn withTrashed()
- * @method static \Illuminate\Database\Query\Builder|ProjectColumn withoutTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn withTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn withoutTrashed()
  * @mixin \Eloquent
  */
 class ProjectColumn extends AbstractModel
@@ -68,7 +74,9 @@ class ProjectColumn extends AbstractModel
         AbstractModel::transaction(function () use ($pushMsg) {
             $tasks = ProjectTask::whereColumnId($this->id)->get();
             foreach ($tasks as $task) {
-                $task->deleteTask($pushMsg);
+                if(!$task->archived_at){
+                    $task->deleteTask($pushMsg);
+                }
             }
             $this->delete();
             $this->addLog("删除列表：" . $this->name);
@@ -119,7 +127,7 @@ class ProjectColumn extends AbstractModel
             $userid = $this->project->relationUserids();
         }
         $params = [
-            'ignoreFd' => Request::header('fd'),
+            'ignoreFd' => $action == 'recovery' ? 0 : Request::header('fd'),
             'userid' => $userid,
             'msg' => [
                 'type' => 'projectColumn',

app/Models/ProjectFlow.php

@@ -2,8 +2,6 @@
 
 namespace App\Models;
 
-use App\Module\Base;
-
 /**
  * App\Models\ProjectFlow
  *
@@ -12,11 +10,17 @@ use App\Module\Base;
  * @property string|null $name 流程名称
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectFlowItem[] $projectFlowItem
+ * @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,16 +13,24 @@ 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 对应的项目列表
  * @property int|null $sort 排序
  * @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)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereId($value)
@@ -81,7 +89,7 @@ class ProjectFlowItem extends AbstractModel
      */
     public function deleteFlowItem()
     {
-        ProjectTask::whereFlowItemId($this->id)->update([
+        ProjectTask::whereFlowItemId($this->id)->change([
             'flow_item_id' => 0,
             'flow_item_name' => "",
         ]);

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

@@ -0,0 +1,211 @@
+<?php
+
+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 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)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectPermission whereProjectId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectPermission whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
+class ProjectPermission extends AbstractModel
+{
+
+    const TASK_LIST_ADD = 'task_list_add';             // 添加列
+    const TASK_LIST_UPDATE = 'task_list_update';       // 修改列
+    const TASK_LIST_REMOVE = 'task_list_remove';       // 删除列
+    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';             // 任务归档
+    const TASK_MOVE = 'task_move';                     // 任务移动
+
+    // 权限列表
+    const PERMISSIONS = [
+        'project_leader' => 1,  // 项目负责人
+        'project_member' => 2,  // 项目成员
+        'task_leader' => 3,     // 任务负责人
+        'task_assist' => 4,     // 任务协助人
+    ];
+
+    // 权限描述
+    const PERMISSIONS_DESC = [
+        1 => "项目负责人",
+        2 => "项目成员",
+        3 => "任务负责人",
+        4 => "任务协助人",
+    ];
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = ['project_id', 'permissions'];
+
+    /**
+     * 权限
+     * @param $value
+     * @return array
+     */
+    public function getPermissionsAttribute($value)
+    {
+        return Base::json2array($value);
+    }
+
+    /**
+     * 获取权限值
+     *
+     * @param int $projectId
+     * @param string $key
+     * @return object|array
+     */
+    public static function getPermission($projectId, $key = '')
+    {
+        $projectPermission = self::initPermissions($projectId);
+        $currentPermissions = $projectPermission->permissions;
+        if ($key) {
+            if (!isset($currentPermissions[$key])) {
+                throw new ApiException('项目权限设置不存在');
+            }
+            return $currentPermissions[$key];
+        }
+        return $projectPermission;
+    }
+
+    /**
+     * 初始化项目权限
+     *
+     * @param int $projectId
+     * @return ProjectPermission
+     */
+    public static function initPermissions($projectId)
+    {
+        $permissions = [
+            self::TASK_LIST_ADD => $projectTaskList = [self::PERMISSIONS['project_leader'], self::PERMISSIONS['project_member']],
+            self::TASK_LIST_UPDATE => $projectTaskList,
+            self::TASK_LIST_REMOVE => [self::PERMISSIONS['project_leader']],
+            self::TASK_LIST_SORT => $projectTaskList,
+            self::TASK_ADD => $projectTaskList,
+            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,
+            self::TASK_MOVE => $taskStatus
+        ];
+        return self::firstOrCreate(
+            ['project_id' => $projectId],
+            ['permissions' => Base::array2json($permissions)]
+        );
+    }
+
+    /**
+     * 更新项目权限
+     *
+     * @param  int  $projectId
+     * @param  array  $permissions
+     * @return ProjectPermission
+     */
+    public static function updatePermissions($projectId, $newPermissions)
+    {
+        $projectPermission = self::initPermissions($projectId);
+        $currentPermissions = $projectPermission->permissions;
+        $mergedPermissions = empty($newPermissions) ? $currentPermissions : array_merge($currentPermissions, $newPermissions);
+
+        $projectPermission->permissions = Base::array2json($mergedPermissions);
+        $projectPermission->save();
+
+        return $projectPermission;
+    }
+
+    /**
+     * 检查用户是否有执行特定动作的权限
+     * @param string $action 动作名称
+     * @param Project $project 项目实例
+     * @param ProjectTask $task 任务实例
+     * @return bool
+     */
+    public static function userTaskPermission(Project $project, $action, ProjectTask $task = null)
+    {
+        $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:
+            case self::TASK_MOVE:
+                $verify = false;
+                // 项目负责人
+                if (in_array(self::PERMISSIONS['project_leader'], $permissions)) {
+                    if ($project->owner) {
+                        $verify = true;
+                    }
+                }
+                // 项目成员
+                if (!$verify && in_array(self::PERMISSIONS['project_member'], $permissions)) {
+                    $user = ProjectUser::whereProjectId($project->id)->whereUserid(intval($userid))->first();
+                    if (!empty($user)) {
+                        $verify = true;
+                    }
+                }
+                // 任务负责人
+                if (!$verify && $task && in_array(self::PERMISSIONS['task_leader'], $permissions)) {
+                    if ($task->isOwner()) {
+                        $verify = true;
+                    }
+                }
+                // 任务协助人
+                if (!$verify && $task && in_array(self::PERMISSIONS['task_assist'], $permissions)) {
+                    if ($task->isAssister()) {
+                        $verify = true;
+                    }
+                }
+                //
+                if (!$verify) {
+                    $desc = [];
+                    rsort($permissions);
+                    foreach ($permissions as $permission) {
+                        $desc[] = Doo::translate(self::PERMISSIONS_DESC[$permission]);
+                    }
+                    $desc = array_reverse($desc);
+                    throw new ApiException(sprintf("仅限%s操作", implode('、', $desc)));
+                }
+                break;
+        }
+        return true;
+    }
+}

app/Models/ProjectTag.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\ProjectTag
+ *
+ * @property int $id
+ * @property int $project_id 项目ID
+ * @property string $name 标签名称
+ * @property string|null $desc 标签描述
+ * @property string|null $color 颜色
+ * @property int $userid 创建人
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\Project $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|ProjectTag newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTag newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTag query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTag whereColor($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTag whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTag whereDesc($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTag whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTag whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTag whereProjectId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTag whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTag whereUserid($value)
+ * @mixin \Eloquent
+ */
+class ProjectTag extends AbstractModel
+{
+    protected $hidden = [
+        'created_at',
+        'updated_at',
+    ];
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'project_id',
+        'name',
+        'desc',
+        'color',
+        'userid'
+    ];
+
+    /**
+     * 关联项目
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function project()
+    {
+        return $this->belongsTo(Project::class);
+    }
+}

app/Models/ProjectTaskContent.php

@@ -2,30 +2,105 @@
 
 namespace App\Models;
 
+use App\Module\Base;
+use App\Exceptions\ApiException;
+
 /**
  * App\Models\ProjectTaskContent
  *
  * @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',
     ];
+
+    /**
+     * 获取内容详情
+     * @return array
+     */
+    public function getContentInfo()
+    {
+        $content = Base::json2array($this->content);
+        if (isset($content['url'])) {
+            $filePath = public_path($content['url']);
+            $array = $this->toArray();
+            $array['content'] = file_get_contents($filePath) ?: '';
+            if ($array['content']) {
+                $replace = Base::fillUrl('uploads');
+                $array['content'] = str_replace('{{RemoteURL}}uploads', $replace, $array['content']);
+            }
+            return $array;
+        }
+        return $this->toArray();
+    }
+
+    /**
+     * 保存任务详情至文件并返回文件路径
+     * @param $task_id
+     * @param $content
+     * @return string
+     */
+    public static function saveContent($task_id, $content)
+    {
+        @ini_set("pcre.backtrack_limit", 999999999);
+        //
+        $oldContent = $content;
+        $path = 'uploads/task/content/' . date("Ym") . '/' . $task_id . '/';
+        //
+        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))) {
+                $paramet = getimagesize(public_path($tmpPath));
+                $content = str_replace($matchs[0][$key], '<img src="{{RemoteURL}}' . $tmpPath . '" original-width="' . $paramet[0] . '" original-height="' . $paramet[1] . '"', $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);
+        Base::makeDir(dirname($publicPath));
+        $result = file_put_contents($publicPath, $content);
+        if(!$result && $oldContent){
+            throw new ApiException("保存任务详情至文件失败,请重试");
+        }
+        //
+        return $filePath;
+    }
 }

app/Models/ProjectTaskFile.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Module\Base;
+use Cache;
 
 /**
  * App\Models\ProjectTaskFile
@@ -19,9 +20,17 @@ use App\Module\Base;
  * @property int|null $download 下载次数
  * @property \Illuminate\Support\Carbon|null $created_at
  * @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)
@@ -38,6 +47,11 @@ use App\Module\Base;
  */
 class ProjectTaskFile extends AbstractModel
 {
+    protected $appends = [
+        'width',
+        'height',
+    ];
+
     /**
      * 地址
      * @param $value
@@ -57,4 +71,50 @@ class ProjectTaskFile extends AbstractModel
     {
         return Base::fillUrl($value ?: Base::extIcon($this->ext));
     }
+
+    /**
+     * 宽
+     * @return int
+     */
+    public function getWidthAttribute()
+    {
+        $this->generateSizeData();
+        return $this->appendattrs['width'];
+    }
+
+    /**
+     * 高
+     * @return int
+     */
+    public function getHeightAttribute()
+    {
+        $this->generateSizeData();
+        return $this->appendattrs['height'];
+    }
+
+    /**
+     * 生成尺寸数据
+     */
+    private function generateSizeData()
+    {
+        if (!isset($this->appendattrs['width'])) {
+            $width = -1;
+            $height = -1;
+            if (in_array($this->ext, ['jpg', 'jpeg', 'webp', 'gif', 'png'])) {
+                $path = public_path($this->getRawOriginal('path'));
+                [$width, $height] = Cache::remember("File::size-" . md5($path), now()->addDays(7), function () use ($path) {
+                    $width = -1;
+                    $height = -1;
+                    if (file_exists($path)) {
+                        $paramet = getimagesize($path);
+                        $width = $paramet[0];
+                        $height = $paramet[1];
+                    }
+                    return [$width, $height];
+                });
+            }
+            $this->appendattrs['width'] = $width;
+            $this->appendattrs['height'] = $height;
+        }
+    }
 }

app/Models/ProjectTaskFlowChange.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\ProjectTaskFlowChange
+ *
+ * @property int $id
+ * @property int|null $task_id 任务ID
+ * @property int|null $userid 会员ID
+ * @property int|null $before_flow_item_id （变化前）工作流状态ID
+ * @property string|null $before_flow_item_name （变化前）工作流状态名称
+ * @property int|null $after_flow_item_id （变化后）工作流状态ID
+ * @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)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereBeforeFlowItemName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereTaskId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereUserid($value)
+ * @mixin \Eloquent
+ */
+class ProjectTaskFlowChange extends AbstractModel
+{
+
+}

app/Models/ProjectTaskPushLog.php

@@ -0,0 +1,45 @@
+<?php
+
+
+namespace App\Models;
+
+
+
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * App\Models\ProjectTaskPushLog
+ *
+ * @property int $id
+ * @property int|null $userid 用户id
+ * @property int|null $task_id 任务id
+ * @property int|null $type 提醒类型：0 任务开始提醒，1 距离到期提醒，2到期超时提醒
+ * @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)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereTaskId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereUserid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog withTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog withoutTrashed()
+ * @mixin \Eloquent
+ */
+class ProjectTaskPushLog extends AbstractModel
+{
+    use SoftDeletes;
+
+}

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

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\ProjectTaskTemplate
+ *
+ * @property int $id
+ * @property int $project_id 项目ID
+ * @property string $name 模板名称
+ * @property string|null $title 任务标题
+ * @property string|null $content 任务内容
+ * @property int $sort 排序
+ * @property int $is_default 是否默认模板
+ * @property int $userid 创建人
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\Project $project
+ * @property-read \App\Models\User $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|ProjectTaskTemplate newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTemplate newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTemplate query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTemplate whereContent($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTemplate whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTemplate whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTemplate whereIsDefault($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTemplate whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTemplate whereProjectId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTemplate whereSort($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTemplate whereTitle($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTemplate whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTemplate whereUserid($value)
+ * @mixin \Eloquent
+ */
+class ProjectTaskTemplate extends AbstractModel
+{
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'project_id',
+        'name',
+        'title',
+        'content',
+        'sort',
+        'is_default',
+        'userid'
+    ];
+
+    /**
+     * 关联项目
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function project()
+    {
+        return $this->belongsTo(Project::class);
+    }
+
+    /**
+     * 关联创建者
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'userid');
+    }
+}

app/Models/ProjectTaskUser.php

@@ -13,9 +13,16 @@ namespace App\Models;
  * @property int|null $owner 是否任务负责人
  * @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)
@@ -29,4 +36,45 @@ namespace App\Models;
 class ProjectTaskUser extends AbstractModel
 {
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function projectTask(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(ProjectTask::class, 'id', 'task_id');
+    }
+
+    /**
+     * 移交任务身份
+     * @param $originalUserid
+     * @param $newUserid
+     * @return void
+     */
+    public static function transfer($originalUserid, $newUserid)
+    {
+        self::whereUserid($originalUserid)->chunkById(100, function ($list) use ($originalUserid, $newUserid) {
+            $tastIds = [];
+            /** @var self $item */
+            foreach ($list as $item) {
+                $row = self::whereTaskId($item->task_id)->whereUserid($newUserid)->first();
+                if ($row) {
+                    // 已存在则删除原数据，判断改变已存在的数据
+                    $row->owner = max($row->owner, $item->owner);
+                    $row->save();
+                    $item->delete();
+                } else {
+                    // 不存在则改变原数据
+                    $item->userid = $newUserid;
+                    $item->save();
+                }
+                if ($item->projectTask) {
+                    $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

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\ProjectTaskVisibilityUser
+ *
+ * @property int $id
+ * @property int|null $project_id 项目ID
+ * @property int|null $task_id 任务ID
+ * @property int|null $userid 成员ID
+ * @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)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser whereTaskId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser whereUserid($value)
+ * @mixin \Eloquent
+ */
+class ProjectTaskVisibilityUser extends AbstractModel
+{
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function projectTask(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(ProjectTask::class, 'id', 'task_id');
+    }
+
+}

app/Models/ProjectUser.php

@@ -11,16 +11,24 @@ use App\Module\Base;
  * @property int|null $project_id 项目ID
  * @property int|null $userid 成员ID
  * @property int|null $owner 是否负责人
+ * @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)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereProjectId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereTopAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereUserid($value)
  * @mixin \Eloquent
@@ -36,6 +44,57 @@ class ProjectUser extends AbstractModel
         return $this->hasOne(Project::class, 'id', 'project_id');
     }
 
+    /**
+     * 移交项目身份
+     * @param $originalUserid
+     * @param $newUserid
+     * @return void
+     */
+    public static function transfer($originalUserid, $newUserid)
+    {
+        $projectIds = [];
+        // 移交项目身份
+        self::whereUserid($originalUserid)->chunkById(100, function ($list) use ($originalUserid, $newUserid, &$projectIds) {
+            /** @var self $item */
+            foreach ($list as $item) {
+                $row = self::whereProjectId($item->project_id)->whereUserid($newUserid)->first();
+                if ($row) {
+                    // 已存在则删除原数据，判断改变已存在的数据
+                    $row->owner = max($row->owner, $item->owner);
+                    $row->save();
+                    $item->delete();
+                } else {
+                    // 不存在则改变原数据
+                    $item->userid = $newUserid;
+                    $item->save();
+                }
+                if ($item->project) {
+                    if ($item->project->personal) {
+                        $name = User::userid2nickname($originalUserid) ?: ('ID:' . $originalUserid);
+                        $item->project->name = "【{$name}】{$item->project->name}";
+                        $item->project->save();
+                    }
+                    $item->project->addLog("移交项目身份", ['userid' => [$originalUserid, ' => ', $newUserid]]);
+                    $item->project->syncDialogUser();
+                    $projectIds[] = $item->project_id;
+                }
+            }
+        });
+        // 移交工作流状态负责人
+        if ($projectIds) {
+            ProjectFlowItem::whereIn('project_id', $projectIds)->chunkById(100, function ($list) use ($originalUserid, $newUserid) {
+                /** @var ProjectFlowItem $item */
+                foreach ($list as $item) {
+                    if (in_array($originalUserid, $item->userids)) {
+                        $userids = array_values(array_diff($item->userids, [$originalUserid]));
+                        $item->userids = Base::array2json(array_merge($userids, [$newUserid]));
+                        $item->save();
+                    }
+                }
+            });
+        }
+    }
+
     /**
      * 退出项目
      */
@@ -45,15 +104,13 @@ class ProjectUser extends AbstractModel
             ->whereUserid($this->userid)
             ->chunk(100, function ($list) {
                 $tastIds = [];
+                /** @var ProjectTaskUser $item */
                 foreach ($list as $item) {
+                    $item->delete();
                     if (!in_array($item->task_pid, $tastIds)) {
                         $tastIds[] = $item->task_pid;
+                        $item->projectTask?->syncDialogUser();
                     }
-                    $item->delete();
-                }
-                $tasks = ProjectTask::whereIn('id', $tastIds)->get();
-                foreach ($tasks as $task) {
-                    $task->syncDialogUser();
                 }
             });
         $this->delete();

app/Models/Report.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Exceptions\ApiException;
+use App\Module\Base;
 use Carbon\Carbon;
 use Carbon\Traits\Creator;
 use Illuminate\Database\Eloquent\Builder;
@@ -23,15 +24,21 @@ use JetBrains\PhpStorm\Pure;
  * @property int $userid
  * @property string $content
  * @property string $sign 汇报唯一标识
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ReportReceive[] $Receives
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ReportReceive> $Receives
  * @property-read int|null $receives_count
  * @property-read mixed $receives
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\User[] $receivesUser
+ * @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 +75,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 +83,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);
@@ -98,18 +96,34 @@ class Report extends AbstractModel
         return $this->appendattrs['receives'];
     }
 
+    /**
+     * 获取汇报内容
+     * @param $id
+     * @return self|null
+     */
+    public static function idOrCodeToContent($id)
+    {
+        if (Base::isNumber($id)) {
+            return self::find($id);
+        } elseif ($id) {
+            $reportLink = ReportLink::whereCode($id)->first();
+            if ($reportLink) {
+                return self::find($reportLink->rid);
+            }
+        }
+        return null;
+    }
+
     /**
      * 获取单条记录
      * @param $id
-     * @param User|null $user
      * @return Report|Builder|Model|object|null
      * @throw ApiException
      */
-    public static function getOne($id, User $user = null)
+    public static function getOne($id)
     {
-        $user === null && $user = User::auth();
-        $one = self::whereUserid($user->userid)->whereId($id)->first();
-        if ( empty($one) )
+        $one = self::whereId($id)->first();
+        if (empty($one))
             throw new ApiException("记录不存在");
         return $one;
     }
@@ -144,12 +158,12 @@ class Report extends AbstractModel
                 // 如果设置了周期偏移量
                 empty( $offset ) || $now_dt->subWeeks( abs( $offset ) );
                 $now_dt->startOfWeek(); // 设置为当周第一天
-                return $now_dt->year . $now_dt->weekOfYear;
+                return now()->year . $now_dt->weekOfYear;
             },
             Report::DAILY => function() use ($now_dt, $offset) {
                 // 如果设置了周期偏移量
                 empty( $offset ) || $now_dt->subDays( abs( $offset ) );
-                return $now_dt->format("Ymd");
+                return now()->format("Ymd");
             },
             default => "",
         };

app/Models/ReportLink.php

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

app/Models/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

@@ -2,18 +2,30 @@
 
 namespace App\Models;
 
+use App\Exceptions\ApiException;
+use App\Module\Base;
+use App\Module\Doo;
+use App\Module\Timer;
+use Carbon\Carbon;
+
 /**
  * App\Models\Setting
  *
  * @property int $id
  * @property string|null $name
  * @property string|null $desc 参数描述、备注
- * @property string|null $setting
+ * @property array $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)
@@ -24,5 +36,266 @@ namespace App\Models;
  */
 class Setting extends AbstractModel
 {
+    /**
+     * 格式化设置参数
+     * @param $value
+     * @return array
+     */
+    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');
+                $value['image_compress'] = $value['image_compress'] ?: 'open';
+                $value['image_quality'] = min(100, max(0, intval($value['image_quality']) ?: 90));
+                $value['image_save_local'] = $value['image_save_local'] ?: 'open';
+                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;
+
+            case 'aibotSetting':
+                if ($value['claude_token'] && empty($value['claude_key'])) {
+                    $value['claude_key'] = $value['claude_token'];
+                }
+                $array = [];
+                $aiList = ['openai', 'claude', 'deepseek', 'gemini', 'grok', 'ollama', 'zhipu', 'qianwen', 'wenxin'];
+                $fieldList = ['key', 'secret', 'models', 'model', 'base_url', 'agency', 'temperature', 'system'];
+                foreach ($aiList as $aiName) {
+                    foreach ($fieldList as $fieldName) {
+                        $key = $aiName . '_' . $fieldName;
+                        $content = $value[$key] ? trim($value[$key]) : '';
+                        switch ($fieldName) {
+                            case 'models':
+                                if ($content) {
+                                    $content = explode("\n", $content);
+                                    $content = array_filter($content);
+                                }
+                                if (empty($content)) {
+                                    $content = self::AIDefaultModels($aiName);
+                                }
+                                $content = implode("\n", $content);
+                                break;
+                            case 'model':
+                                $models = Setting::AIModels2Array($array[$key . 's'], true);
+                                $content = in_array($content, $models) ? $content : ($models[0] ?? '');
+                                break;
+                            case 'temperature':
+                                if ($content) {
+                                    $content = floatval(min(1, max(0, floatval($content) ?: 0.7)));
+                                }
+                                break;
+                        }
+                        $array[$key] = $content;
+                    }
+                }
+                $value = $array;
+                break;
+        }
+        return $value;
+    }
+
+    /**
+     * 是否开启AI
+     * @param $ai
+     * @return bool
+     */
+    public static function AIOpen($ai = 'openai')
+    {
+        $array = Base::setting('aibotSetting');
+        return !!$array[$ai . '_key'];
+    }
+
+    /**
+     * AI默认模型
+     * @param string $ai
+     * @return array
+     */
+    public static function AIDefaultModels($ai = 'openai')
+    {
+        return match ($ai) {
+            'openai' => [
+                'gpt-4 | GPT-4',
+                'gpt-4-turbo | GPT-4 Turbo',
+                'gpt-4o | GPT-4o',
+                'gpt-4o-mini | GPT-4o Mini',
+                'o1 | GPT-o1',
+                'o1-mini | GPT-o1 Mini',
+                'o3-mini | GPT-o3 Mini',
+                'gpt-3.5-turbo | GPT-3.5 Turbo',
+                'gpt-3.5-turbo-16k | GPT-3.5 Turbo 16K',
+                'gpt-3.5-turbo-0125 | GPT-3.5 Turbo 0125',
+                'gpt-3.5-turbo-1106 | GPT-3.5 Turbo 1106'
+            ],
+            'claude' => [
+                'claude-3-5-sonnet-latest | Claude 3.5 Sonnet',
+                'claude-3-5-sonnet-20241022 | Claude 3.5 Sonnet 20241022',
+                'claude-3-5-haiku-latest | Claude 3.5 Haiku',
+                'claude-3-5-haiku-20241022 | Claude 3.5 Haiku 20241022',
+                'claude-3-opus-latest | Claude 3 Opus',
+                'claude-3-opus-20240229 | Claude 3 Opus 20240229',
+                'claude-3-haiku-20240307 | Claude 3 Haiku 20240307',
+                'claude-2.1 | Claude 2.1',
+                'claude-2.0 | Claude 2.0'
+            ],
+            'deepseek' => [
+                'deepseek-chat | DeepSeek V3',
+                'deepseek-reasoner | DeepSeek R1'
+            ],
+            'gemini' => [
+                'gemini-2.0-flash | Gemini 2.0 Flash',
+                'gemini-2.0-flash-lite-preview-02-05 | Gemini 2.0 Flash-Lite Preview',
+                'gemini-1.5-flash | Gemini 1.5 Flash',
+                'gemini-1.5-flash-8b | Gemini 1.5 Flash 8B',
+                'gemini-1.5-pro | Gemini 1.5 Pro',
+                'gemini-1.0-pro | Gemini 1.0 Pro'
+            ],
+            'grok' => [
+                'grok-2-vision-1212 | Grok 2 Vision 1212',
+                'grok-2-vision | Grok 2 Vision',
+                'grok-2-vision-latest | Grok 2 Vision Latest',
+                'grok-2-1212 | Grok 2 1212',
+                'grok-2 | Grok 2',
+                'grok-2-latest | Grok 2 Latest',
+                'grok-vision-beta | Grok Vision Beta',
+                'grok-beta | Grok Beta',
+            ],
+            'zhipu' => [
+                'glm-4 | GLM-4',
+                'glm-4-plus | GLM-4 Plus',
+                'glm-4-air | GLM-4 Air',
+                'glm-4-airx | GLM-4 AirX',
+                'glm-4-long | GLM-4 Long',
+                'glm-4-flash | GLM-4 Flash',
+                'glm-4v | GLM-4V',
+                'glm-4v-plus | GLM-4V Plus',
+                'glm-3-turbo | GLM-3 Turbo'
+            ],
+            'qianwen' => [
+                'qwen-max | QWEN Max',
+                'qwen-max-latest | QWEN Max Latest',
+                'qwen-turbo | QWEN Turbo',
+                'qwen-turbo-latest | QWEN Turbo Latest',
+                'qwen-plus | QWEN Plus',
+                'qwen-plus-latest | QWEN Plus Latest',
+                'qwen-long | QWEN Long'
+            ],
+            'wenxin' => [
+                'ernie-4.0-8k | Ernie 4.0 8K',
+                'ernie-4.0-8k-latest | Ernie 4.0 8K Latest',
+                'ernie-4.0-turbo-128k | Ernie 4.0 Turbo 128K',
+                'ernie-4.0-turbo-8k | Ernie 4.0 Turbo 8K',
+                'ernie-3.5-128k | Ernie 3.5 128K',
+                'ernie-3.5-8k | Ernie 3.5 8K',
+                'ernie-speed-128k | Ernie Speed 128K',
+                'ernie-speed-8k | Ernie Speed 8K',
+                'ernie-lite-8k | Ernie Lite 8K',
+                'ernie-tiny-8k | Ernie Tiny 8K'
+            ],
+            default => [],
+        };
+    }
+
+    /**
+     * AI模型转数组
+     * @param $models
+     * @param bool $retValue
+     * @return array
+     */
+    public static function AIModels2Array($models, $retValue = false)
+    {
+        $list = is_array($models) ? $models : explode("\n", $models);
+        $array = [];
+        foreach ($list as $item) {
+            $arr = Base::newTrim(explode('|', $item . '|'));
+            if ($arr[0]) {
+                $array[] = [
+                    'value' => $arr[0],
+                    'label' => $arr[1] ?: $arr[0]
+                ];
+            }
+        }
+        if ($retValue) {
+            return array_column($array, 'value');
+        }
+        return $array;
+    }
+
+    /**
+     * 验证邮箱地址（过滤忽略地址）
+     * @param $array
+     * @param \Closure $resultClosure
+     * @param \Closure|null $emptyClosure
+     * @return array|mixed
+     */
+    public static function validateAddr($array, $resultClosure, $emptyClosure = null)
+    {
+        if (!is_array($array)) {
+            $array = [$array];
+        }
+        $ignoreAddr = Base::settingFind('emailSetting', 'ignore_addr');
+        $ignoreAddr = explode("\n", $ignoreAddr);
+        $ignoreArray = ['admin@dootask.com', 'test@dootask.com'];
+        foreach ($ignoreAddr as $item) {
+            if (Base::isEmail($item)) {
+                $ignoreArray[] = trim($item);
+            }
+        }
+        if ($ignoreArray) {
+            $array = array_diff($array, $ignoreArray);
+        }
+        if ($array) {
+            if ($resultClosure instanceof \Closure) {
+                foreach ($array as $value) {
+                    $resultClosure($value);
+                }
+            }
+        } else {
+            if ($emptyClosure instanceof \Closure) {
+                $emptyClosure();
+            }
+        }
+        return $array;
+    }
+
+    /**
+     * 验证消息限制
+     * @param $type
+     * @param $msg
+     * @return void
+     */
+    public static function validateMsgLimit($type, $msg)
+    {
+        $keyName = 'msg_edit_limit';
+        $error = '此消息不可修改';
+        if ($type == 'rev') {
+            $keyName = 'msg_rev_limit';
+            $error = '此消息不可撤回';
+        }
+        $limitNum = intval(Base::settingFind('system', $keyName, 0));
+        if ($limitNum <= 0) {
+            return;
+        }
+        if ($msg instanceof WebSocketDialogMsg) {
+            $dialogMsg = $msg;
+        } else {
+            $dialogMsg = WebSocketDialogMsg::find($msg);
+        }
+        if (!$dialogMsg) {
+            return;
+        }
+        $limitTime = Carbon::parse($dialogMsg->created_at)->addMinutes($limitNum);
+        if ($limitTime->lt(Carbon::now())) {
+            throw new ApiException('已超过' . Doo::translate(Base::forumMinuteDay($limitNum)) . '，' . $error);
+        }
+    }
 }

app/Models/TaskWorker.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * App\Models\TaskWorker
+ *
+ * @property int $id
+ * @property string|null $args
+ * @property string|null $error
+ * @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)
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereEndAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereError($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereStartAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker withTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker withoutTrashed()
+ * @mixin \Eloquent
+ */
+class TaskWorker extends AbstractModel
+{
+    use SoftDeletes;
+}

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

@@ -0,0 +1,205 @@
+<?php
+
+namespace App\Models;
+
+use App\Module\Base;
+use Carbon\Carbon;
+use Hedeqiang\UMeng\Android;
+use Hedeqiang\UMeng\IOS;
+
+/**
+ * App\Models\UmengAlias
+ *
+ * @property int $id
+ * @property int|null $userid 会员ID
+ * @property string|null $alias 别名
+ * @property string|null $platform 平台类型
+ * @property string|null $device 设备类型
+ * @property string|null $version 应用版本号
+ * @property string|null $ua userAgent
+ * @property int|null $is_notified 通知权限
+ * @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 whereIsNotified($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias wherePlatform($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUa($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUserid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereVersion($value)
+ * @mixin \Eloquent
+ */
+class UmengAlias extends AbstractModel
+{
+    protected $table = 'umeng_alias';
+
+    /**
+     * 推送内容处理
+     * @param $string
+     * @return string
+     */
+    private static function specialCharacters($string)
+    {
+        return str_replace(["\r\n", "\r", "\n"], '', $string);
+    }
+
+    /**
+     * 获取推送配置
+     * @return array|false
+     */
+    public static function getPushConfig()
+    {
+        $setting = Base::setting('appPushSetting');
+        if ($setting['push'] !== 'open') {
+            return false;
+        }
+        $config = [];
+        if ($setting['ios_key']) {
+            $config['iOS'] = [
+                'appKey' => $setting['ios_key'],
+                'appMasterSecret' => $setting['ios_secret'],
+                'production_mode' => true,
+            ];
+        }
+        if ($setting['android_key']) {
+            $config['Android'] = [
+                'appKey' => $setting['android_key'],
+                'appMasterSecret' => $setting['android_secret'],
+                'production_mode' => true,
+            ];
+        }
+        return $config;
+    }
+
+    /**
+     * 推送消息
+     * @param string $alias
+     * @param string $platform
+     * @param array $array [title, subtitle, body, description, extra, seconds, badge]
+     * @return array|false
+     */
+    public static function pushMsgToAlias($alias, $platform, $array)
+    {
+        $config = self::getPushConfig();
+        if ($config === false) {
+            return false;
+        }
+        //
+        $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;                          // 有效时间（单位：秒）
+        $badge = intval($array['badge']) ?: 0;                                  // 角标数（iOS）
+        //
+        switch ($platform) {
+            case 'ios':
+                if (!isset($config['iOS'])) {
+                    return false;
+                }
+                $ios = new IOS($config);
+                return $ios->send([
+                    'description' => $description,
+                    'payload' => array_merge([
+                        'aps' => [
+                            'alert' => [
+                                'title' => $title,
+                                'subtitle' => $subtitle,
+                                'body' => $body,
+                            ],
+                            'sound' => 'default',
+                            'badge' => $badge,
+                        ],
+                    ], $extra),
+                    'type' => 'customizedcast',
+                    'alias_type' => 'userid',
+                    'alias' => $alias,
+                    'policy' => [
+                        'expire_time' => Carbon::now()->addSeconds($seconds)->toDateTimeString(),
+                    ],
+                ]);
+
+            case 'android':
+                if (!isset($config['Android'])) {
+                    return false;
+                }
+                $android = new Android($config);
+                return $android->send([
+                    'description' => $description,
+                    'payload' => array_merge([
+                        'display_type' => 'notification',
+                        'body' => [
+                            'ticker' => $title,
+                            'text' => $body,
+                            'title' => $title,
+                            'after_open' => 'go_app',
+                            'play_sound' => true,
+                        ],
+                    ], $extra),
+                    'type' => 'customizedcast',
+                    'alias_type' => 'userid',
+                    'alias' => $alias,
+                    'mipush' => true,
+                    'mi_activity' => 'app.eeui.umeng.activity.MfrMessageActivity',
+                    'policy' => [
+                        'expire_time' => Carbon::now()->addSeconds($seconds)->toDateTimeString(),
+                    ],
+                    'channel_properties' => [
+                        'vivo_category' => 'IM',
+                        'huawei_channel_importance' => 'NORMAL',
+                        'huawei_channel_category' => 'IM',
+                        'channel_fcm' => 0,
+                    ],
+                ]);
+
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * 推送给指定会员
+     * @param array|int $userid
+     * @param array $array
+     * @return void
+     */
+    public static function pushMsgToUserid($userid, $array)
+    {
+        $builder = self::select(['id', 'platform', 'alias', 'userid'])->where('updated_at', '>', Carbon::now()->subMonth());
+        if (is_array($userid)) {
+            $builder->whereIn('userid', $userid);
+        } elseif (Base::isNumber($userid)) {
+            $builder->whereUserid($userid);
+        }
+        $builder
+            ->orderByDesc('updated_at')
+            ->chunkById(100, function ($datas) use ($array) {
+                $uids = $datas->groupBy('userid');
+                foreach ($uids as $uid => $rows) {
+                    $array['badge'] = WebSocketDialogMsgRead::whereUserid($uid)->whereSilence(0)->whereReadAt(null)->count();
+                    $lists = $rows->take(5)->groupBy('platform');   // 每个会员最多推送5个别名
+                    foreach ($lists as $platform => $list) {
+                        $alias = $list->pluck('alias')->implode(',');
+                        try {
+                            self::pushMsgToAlias($alias, $platform, $array);
+                        } catch (\Exception $e) {
+                            info("[PushMsg] fail: " . $e->getMessage());
+                        }
+                    }
+                }
+            });
+    }
+}

app/Models/User.php

@@ -5,6 +5,9 @@ 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;
 
@@ -12,37 +15,53 @@ use Carbon\Carbon;
  * App\Models\User
  *
  * @property int $userid
- * @property array $identity 身份
+ * @property array $identity
+ * @property array $department
  * @property string|null $az A-Z
- * @property string|null $email 邮箱
- * @property string $nickname 昵称
- * @property string|null $profession 职位/职称
- * @property string $userimg 头像
+ * @property string|null $pinyin 拼音（主要用于搜索）
+ * @property string|null $email
+ * @property string|null $tel 联系电话
+ * @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)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereCreatedIp($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereDepartment($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereDisableAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereEmail($value)
+ * @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)
@@ -50,8 +69,10 @@ use Carbon\Carbon;
  * @method static \Illuminate\Database\Eloquent\Builder|User whereLoginNum($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereNickname($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User wherePassword($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User wherePinyin($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereProfession($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereTaskDialogId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereTel($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereUserid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereUserimg($value)
@@ -62,22 +83,14 @@ class User extends AbstractModel
     protected $primaryKey = 'userid';
 
     protected $hidden = [
-        'disable_at',
         'updated_at',
     ];
 
-    /**
-     * 更新数据校验
-     * @param array $param
-     */
-    public function updateInstance(array $param)
-    {
-        parent::updateInstance($param);
-        //
-        if (isset($param['line_at']) && $this->userid) {
-            Cache::put("User::online:" . $this->userid, time(), Carbon::now()->addSeconds(30));
-        }
-    }
+    // 默认头像类型：auto自动生成，system系统默认
+    public static $defaultAvatarMode = 'auto';
+
+    // 基本信息的字段
+    public static $basicField = ['userid', 'email', 'nickname', 'profession', 'department', 'userimg', 'bot', 'az', 'pinyin', 'line_at', 'disable_at'];
 
     /**
      * 昵称
@@ -86,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);
     }
 
     /**
@@ -96,11 +115,7 @@ class User extends AbstractModel
      */
     public function getUserimgAttribute($value)
     {
-        if ($value) {
-            return Base::fillUrl($value);
-        }
-        $name = ($this->userid - 1) % 21 + 1;
-        return url("images/avatar/default_{$name}.png");
+        return self::getAvatar($this->userid, $value, $this->email, $this->nickname);
     }
 
     /**
@@ -116,13 +131,71 @@ class User extends AbstractModel
         return array_filter(is_array($value) ? $value : explode(",", trim($value, ",")));
     }
 
+    /**
+     * 部门
+     * @param $value
+     * @return array
+     */
+    public function getDepartmentAttribute($value)
+    {
+        if (empty($value)) {
+            return [];
+        }
+        return array_filter(is_array($value) ? $value : Base::explodeInt($value));
+    }
+
+    /**
+     * 获取所属部门名称
+     * @return string
+     */
+    public function getDepartmentName()
+    {
+        if (empty($this->department)) {
+            return "";
+        }
+        $key = "UserDepartment::" . md5(Cache::get("UserDepartment::rand") . '-' . implode(',' , $this->department));
+        $list = Cache::remember($key, now()->addMonth(), function() {
+            $list = UserDepartment::select(['id', 'owner_userid', 'name'])->whereIn('id', $this->department)->take(10)->get();
+            return $list->toArray();
+        });
+        $array = [];
+        foreach ($list as $item) {
+            $array[] = $item['name'] . ($item['owner_userid'] === $this->userid ? ' (M)' : '');
+        }
+        return implode(', ', $array);
+    }
+
+    /**
+     * 判断是否为部门负责人
+     */
+    public function isDepartmentOwner()
+    {
+        return UserDepartment::where('owner_userid', $this->userid)->exists();
+    }
+
+
+    /**
+     * 获取机器人所有者
+     * @return int|mixed
+     */
+    public function getBotOwner()
+    {
+        if (!$this->bot) {
+            return 0;
+        }
+        $key = "userBotOwner::" . $this->userid;
+        return Cache::remember($key, now()->addMonth(), function() {
+            return intval(UserBot::whereBotId($this->userid)->value('userid')) ?: $this->userid;
+        });
+    }
+
     /**
      * 是否在线
      * @return bool
      */
     public function getOnlineStatus()
     {
-        $online = intval(Cache::get("User::online:" . $this->userid, 0));
+        $online = $this->bot || OnlineData::live($this->userid) > 0;
         if ($online) {
             return true;
         }
@@ -130,9 +203,62 @@ class User extends AbstractModel
     }
 
     /**
-     * 判断是否管理员
+     * 返回是否LDAP用户
+     * @return bool
+     */
+    public function isLdap()
+    {
+        return in_array('ldap', $this->identity);
+    }
+
+    /**
+     * 返回是否临时帐号
+     * @return bool
+     */
+    public function isTemp()
+    {
+        return in_array('temp', $this->identity);
+    }
+
+    /**
+     * 返回是否禁用帐号（离职）
+     * @param bool $incAt 是否包含禁用时间
+     * @return bool
+     */
+    public function isDisable($incAt = false)
+    {
+        if ($incAt) {
+            return in_array('disable', $this->identity) || $this->disable_at;
+        }
+        return in_array('disable', $this->identity);
+    }
+
+    /**
+     * 返回是否管理员
+     * @return bool
      */
     public function isAdmin()
+    {
+        return in_array('admin', $this->identity);
+    }
+
+    /**
+     * 返回是否AI机器人
+     * @return bool
+     */
+    public function isAiBot(&$aiName = '')
+    {
+        if (preg_match('/^ai-(.*?)@bot\.system$/', $this->email, $matches)) {
+            $aiName = $matches[1];
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 判断是否管理员
+     */
+    public function checkAdmin()
     {
         $this->identity('admin');
     }
@@ -167,6 +293,56 @@ class User extends AbstractModel
         }
     }
 
+    /**
+     * 删除会员
+     * @param $reason
+     * @return bool|null
+     */
+    public function deleteUser($reason)
+    {
+        return AbstractModel::transaction(function () use ($reason) {
+            // 删除原因
+            $userDelete = UserDelete::createInstance([
+                'operator' => User::userid(),
+                'userid' => $this->userid,
+                'email' => $this->email,
+                'reason' => $reason,
+                'cache' => array_merge($this->getRawOriginal(), [
+                    'department_name' => $this->getDepartmentName()
+                ])
+            ]);
+            $userDelete->save();
+            // 删除未读
+            WebSocketDialogMsgRead::whereUserid($this->userid)->delete();
+            // 删除待办
+            WebSocketDialogMsgTodo::whereUserid($this->userid)->delete();
+            // 删除邮箱验证记录
+            UserEmailVerification::whereEmail($this->email)->delete();
+            //
+            return $this->delete();
+        });
+    }
+
+    /**
+     * 检查发送聊天内容前必须设置昵称、电话
+     * @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);
+            }
+        }
+    }
+
     /** ***************************************************************************************** */
     /** ***************************************************************************************** */
     /** ***************************************************************************************** */
@@ -180,99 +356,47 @@ class User extends AbstractModel
      */
     public static function reg($email, $password, $other = [])
     {
-        //邮箱
-        if (!Base::isMail($email)) {
+        // 邮箱
+        if (!Base::isEmail($email)) {
             throw new ApiException('请输入正确的邮箱地址');
         }
-        if (User::email2userid($email) > 0) {
+        $user = self::whereEmail($email)->first();
+        if ($user) {
+            $isRegVerify = Base::settingFind('emailSetting', 'reg_verify') === 'open';
+            if ($isRegVerify && $user->email_verity === 0) {
+                UserEmailVerification::userEmailSend($user);
+                throw new ApiException('您的帐号已注册过，请验证邮箱', ['code' => 'email']);
+            }
             throw new ApiException('邮箱地址已存在');
         }
-        //密码
+        // 密码
         self::passwordPolicy($password);
-        //开始注册
-        $encrypt = Base::generatePassword(6);
-        $inArray = [
-            'encrypt' => $encrypt,
-            'email' => $email,
-            'password' => Base::md52($password, $encrypt),
-            'created_ip' => Base::getIp(),
-        ];
+        // 开始注册
+        $user = Doo::userCreate($email, $password);
         if ($other) {
-            $inArray = array_merge($inArray, $other);
+            $user->updateInstance($other);
+        }
+        $user->az = Base::getFirstCharter($user->nickname);
+        $user->pinyin = Base::cn2pinyin($user->nickname);
+        $user->created_ip = Base::getIp();
+        if ($user->save()) {
+            $setting = Base::setting('system');
+            $reg_identity = $setting['reg_identity'] ?: 'normal';
+            $all_group_autoin = $setting['all_group_autoin'] ?: 'yes';
+            // 注册临时身份
+            if ($reg_identity === 'temp') {
+                $user->identity = Base::arrayImplode(array_merge(array_diff($user->identity, ['temp']), ['temp']));
+                $user->save();
+            }
+            // 加入全员群组
+            if ($all_group_autoin === 'yes') {
+                $dialog = WebSocketDialog::whereGroupType('all')->orderByDesc('id')->first();
+                $dialog?->joinGroup($user->userid, 0);
+            }
         }
-        $user = User::createInstance($inArray);
-        $user->save();
-        User::AZUpdate($user->userid);
         return $user->find($user->userid);
     }
 
-    /**
-     * 邮箱获取userid
-     * @param $email
-     * @return int
-     */
-    public static function email2userid($email)
-    {
-        if (empty($email)) {
-            return 0;
-        }
-        return intval(self::whereEmail($email)->value('userid'));
-    }
-
-    /**
-     * token获取会员userid
-     * @return int
-     */
-    public static function token2userid()
-    {
-        return self::authFind('userid', Base::getToken());
-    }
-
-    /**
-     * token获取会员邮箱
-     * @return int
-     */
-    public static function token2email()
-    {
-        return self::authFind('email', Base::getToken());
-    }
-
-    /**
-     * token获取encrypt
-     * @return mixed|string
-     */
-    public static function token2encrypt()
-    {
-        return self::authFind('encrypt', Base::getToken());
-    }
-
-    /**
-     * 获取token身份信息
-     * @param $find
-     * @param null $token
-     * @return array|mixed|string
-     */
-    public static function authFind($find, $token = null)
-    {
-        if ($token === null) {
-            $token = Base::getToken();
-        }
-        list($userid, $email, $encrypt, $timestamp) = explode("#$", base64_decode($token) . "#$#$#$#$");
-        $array = [
-            'userid' => intval($userid),
-            'email' => $email ?: '',
-            'encrypt' => $encrypt ?: '',
-            'timestamp' => intval($timestamp),
-        ];
-        if (isset($array[$find])) {
-            return $array[$find];
-        }
-        if ($find == 'all') {
-            return $array;
-        }
-        return '';
-    }
-
     /**
      * 获取我的ID
      * @return int
@@ -308,14 +432,13 @@ class User extends AbstractModel
     {
         $user = self::authInfo();
         if (!$user) {
-            $authorization = Base::getToken();
-            if ($authorization) {
+            if (Base::token()) {
                 throw new ApiException('身份已失效,请重新登录', [], -1);
             } else {
                 throw new ApiException('请登录后继续...', [], -1);
             }
         }
-        if (in_array('disable', $user->identity)) {
+        if ($user->isDisable()) {
             throw new ApiException('帐号已停用...', [], -1);
         }
         if ($identity) {
@@ -330,61 +453,58 @@ 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');
         }
-        $authorization = Base::getToken();
-        if ($authorization) {
-            $authInfo = self::authFind('all', $authorization);
-            if ($authInfo['userid'] > 0) {
-                $loginValid = floatval(Base::settingFind('system', 'loginValid')) ?: 720;
-                $loginValid *= 3600;
-                if ($authInfo['timestamp'] + $loginValid > time()) {
-                    $row = self::whereUserid($authInfo['userid'])->whereEmail($authInfo['email'])->whereEncrypt($authInfo['encrypt'])->first();
-                    if ($row) {
-                        $upArray = [];
-                        if (Base::getIp() && $row->line_ip != Base::getIp()) {
-                            $upArray['line_ip'] = Base::getIp();
-                        }
-                        if (Carbon::parse($row->line_at)->addSeconds(30)->lt(Carbon::now())) {
-                            $upArray['line_at'] = Carbon::now();
-                        }
-                        if ($upArray) {
-                            $row->updateInstance($upArray);
-                            $row->save();
-                        }
-                        return $_A["__static_auth"] = $row;
-                    }
+        if (Doo::userId() > 0
+            && !Doo::userExpired()
+            && $user = self::whereUserid(Doo::userId())->whereEmail(Doo::userEmail())->whereEncrypt(Doo::userEncrypt())->first()) {
+            $upArray = [];
+            if (Base::getIp() && $user->line_ip != Base::getIp()) {
+                $upArray['line_ip'] = Base::getIp();
+            }
+            if (Carbon::parse($user->line_at)->addSeconds(30)->lt(Carbon::now())) {
+                $upArray['line_at'] = Carbon::now();
+            }
+            $headerLanguage = RequestContext::get('header_language');
+            if (empty($user->lang) || $headerLanguage) {
+                if (Doo::checkLanguage($headerLanguage) && $user->lang != $headerLanguage) {
+                    $upArray['lang'] = $headerLanguage;
                 }
             }
+            if ($upArray) {
+                $user->updateInstance($upArray);
+                $user->save();
+            }
+            return RequestContext::save('auth', $user);
         }
-        return $_A["__static_auth"] = false;
+        return RequestContext::save('auth', false);
     }
 
     /**
-     * 生成token
+     * 生成 token
      * @param self $userinfo
+     * @param bool $refresh  获取新的token
      * @return string
      */
-    public static function token($userinfo)
+    public static function generateToken($userinfo, $refresh = false)
     {
-        $userinfo->token = base64_encode($userinfo->userid . '#$' . $userinfo->email . '#$' . $userinfo->encrypt . '#$' . time() . '#$' . Base::generatePassword(6));
+        if (!$refresh) {
+            if (Doo::userId() != $userinfo->userid
+                || Doo::userEmail() != $userinfo->email
+                || Doo::userEncrypt() != $userinfo->encrypt) {
+                $refresh = true;
+            }
+        }
+        if ($refresh) {
+            $days = $userinfo->bot ? 0 : max(1, intval(Base::settingFind('system', 'token_valid_days', 30)));
+            $token = Doo::tokenEncode($userinfo->userid, $userinfo->email, $userinfo->encrypt, $days);
+        } else {
+            $token = Doo::userToken();
+        }
         unset($userinfo->encrypt);
         unset($userinfo->password);
-        return $userinfo->token;
-    }
-
-    /**
-     * 判断用户权限（身份）
-     * @param $identity
-     * @param $userIdentity
-     * @return bool
-     */
-    public static function identityRaw($identity, $userIdentity)
-    {
-        $userIdentity = is_array($userIdentity) ? $userIdentity : explode(",", trim($userIdentity, ","));
-        return $identity && in_array($identity, $userIdentity);
+        return $userinfo->token = $token;
     }
 
     /**
@@ -392,22 +512,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);
         }
-        $fields = ['userid', 'email', 'nickname', 'profession', 'userimg'];
-        $userInfo = self::whereUserid($userid)->select($fields)->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 ?: []);
     }
 
 
@@ -418,21 +537,7 @@ class User extends AbstractModel
      */
     public static function userid2nickname($userid)
     {
-        $basic = self::userid2basic($userid);
-        return $basic ? $basic->nickname : '';
-    }
-
-    /**
-     * 更新首字母
-     * @param $userid
-     */
-    public static function AZUpdate($userid)
-    {
-        $row = self::whereUserid($userid)->first();
-        if ($row) {
-            $row->az = Base::getFirstCharter($row->nickname);
-            $row->save();
-        }
+        return self::userid2basic($userid)?->nickname ?: '';
     }
 
     /**
@@ -459,6 +564,72 @@ class User extends AbstractModel
         }
     }
 
+    /**
+     * 临时帐号别名
+     * @return mixed|string
+     */
+    public static function tempAccountAlias()
+    {
+        $alias = Base::settingFind('system', 'temp_account_alias');
+        return $alias ?: Doo::translate("临时帐号");
+    }
+
+    /**
+     * 获取头像
+     * @param $userid
+     * @param $userimg
+     * @param $email
+     * @param $nickname
+     * @return string
+     */
+    public static function getAvatar($userid, $userimg, $email, $nickname)
+    {
+        // 自定义头像
+        if ($userimg && !str_contains($userimg, 'avatar/')) {
+            return Base::fillUrl($userimg);
+        }
+        // 机器人头像
+        switch ($email) {
+            case 'system-msg@bot.system':
+                return url("images/avatar/default_system.png");
+            case 'task-alert@bot.system':
+                return url("images/avatar/default_task.png");
+            case 'check-in@bot.system':
+                return url("images/avatar/default_checkin.png");
+            case 'anon-msg@bot.system':
+                return url("images/avatar/default_anon.png");
+            case 'approval-alert@bot.system':
+                return url("images/avatar/default_approval.png");
+            case 'okr-alert@bot.system':
+                return url("images/avatar/default_okr.png");
+            case 'ai-openai@bot.system':
+                return url("images/avatar/default_openai.png");
+            case 'ai-claude@bot.system':
+                return url("images/avatar/default_claude.png");
+            case 'ai-deepseek@bot.system':
+                return url("images/avatar/default_deepseek.png");
+            case 'ai-gemini@bot.system':
+                return url("images/avatar/default_gemini.png");
+            case 'ai-grok@bot.system':
+                return url("images/avatar/default_grok.png");
+            case 'ai-ollama@bot.system':
+                return url("images/avatar/default_ollama.png");
+            case 'ai-zhipu@bot.system':
+                return url("images/avatar/default_zhipu.png");
+            case 'bot-manager@bot.system':
+                return url("images/avatar/default_bot.png");
+            case 'meeting-alert@bot.system':
+                return url("images/avatar/default_meeting.png");
+            }
+        // 生成文字头像
+        if (self::$defaultAvatarMode === 'auto') {
+            return url("avatar/" . urlencode($nickname) . ".png");
+        }
+        // 系统默认头像
+        $name = ($userid - 1) % 21 + 1;
+        return url("images/avatar/default_{$name}.png");
+    }
+
     /**
      * 检测密码策略是否符合
      * @param $password
@@ -489,4 +660,63 @@ class User extends AbstractModel
             }
         }
     }
+
+    /**
+     * 获取机器人或创建
+     * @param $key
+     * @param $update
+     * @param $userid
+     * @return self|null
+     */
+    public static function botGetOrCreate($key, $update = [], $userid = 0)
+    {
+        $email = "{$key}@bot.system";
+        $botUser = self::whereEmail($email)->first();
+        if (empty($botUser)) {
+            $botUser = Doo::userCreate($email, Base::generatePassword(32));
+            if (empty($botUser)) {
+                return null;
+            }
+            $botUser->updateInstance([
+                'created_ip' => Base::getIp(),
+            ]);
+            $botUser->save();
+            if ($userid > 0) {
+                UserBot::createInstance([
+                    'userid' => $userid,
+                    'bot_id' => $botUser->userid,
+                ])->save();
+            }
+            //
+            if (empty($update['nickname'])) {
+                $update['nickname'] = UserBot::systemBotName($email);
+            }
+        }
+        if ($update) {
+            $botUser->updateInstance($update);
+            if (isset($update['nickname'])) {
+                $botUser->az = Base::getFirstCharter($botUser->nickname);
+                $botUser->pinyin = Base::cn2pinyin($botUser->nickname);
+            }
+            $botUser->save();
+        }
+        return $botUser;
+    }
+
+    /**
+     * 是否机器人
+     * @param $userid
+     * @return bool|mixed
+     */
+    public static function isBot($userid)
+    {
+        if (empty($userid)) {
+            return false;
+        }
+        $userid = intval($userid);
+        if (RequestContext::has("isBot_" . $userid)) {
+            return RequestContext::get("isBot_" . $userid);
+        }
+        return (bool)User::find($userid)?->bot;
+    }
 }

app/Models/UserBot.php

@@ -0,0 +1,455 @@
+<?php
+
+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;
+
+/**
+ * App\Models\UserBot
+ *
+ * @property int $id
+ * @property int|null $userid 所属人ID
+ * @property int|null $bot_id 机器人ID
+ * @property int|null $clear_day 消息自动清理天数
+ * @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)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereUserid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereWebhookNum($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereWebhookUrl($value)
+ * @mixin \Eloquent
+ */
+class UserBot extends AbstractModel
+{
+
+    /**
+     * 判断是否系统机器人
+     * @param $email
+     * @return bool
+     */
+    public static function isSystemBot($email)
+    {
+        return str_ends_with($email, '@bot.system') && self::systemBotName($email);
+    }
+
+    /**
+     * 判断是否系统AI机器人
+     * @param $email
+     * @return bool
+     */
+    public static function isAiBot($email)
+    {
+        return str_starts_with($email, 'ai-') && self::isSystemBot($email);
+    }
+
+    /**
+     * 系统机器人名称
+     * @param $name string 邮箱 或 邮箱前缀
+     * @return string
+     */
+    public static function systemBotName($name)
+    {
+        if (str_contains($name, "@")) {
+            $name = explode("@", $name)[0];
+        }
+        $name = match ($name) {
+            'system-msg' => '系统消息',
+            'task-alert' => '任务提醒',
+            'check-in' => '签到打卡',
+            'anon-msg' => '匿名消息',
+            'approval-alert' => '审批',
+            'ai-openai' => 'ChatGPT',
+            'ai-claude' => 'Claude',
+            'ai-deepseek' => 'DeepSeek',
+            'ai-gemini' => 'Gemini',
+            'ai-grok' => 'Grok',
+            'ai-ollama' => 'Ollama',
+            'ai-zhipu' => '智谱清言',
+            'ai-qianwen' => '通义千问',
+            'ai-wenxin' => '文心一言',
+            'bot-manager' => '机器人管理',
+            'meeting-alert' => '会议通知',
+            'okr-alert' => 'OKR提醒',
+            default => '',  // 不是系统机器人时返回空（也可以拿来判断是否是系统机器人）
+        };
+        return Doo::translate($name);
+    }
+
+    /**
+     * 机器人菜单
+     * @param $email
+     * @return array|array[]
+     */
+    public static function quickMsgs($email)
+    {
+        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, $match)) {
+                    if (!Base::judgeClientVersion('0.42.62')) {
+                        return [
+                            'key' => '%3A.clear',
+                            'label' => Doo::translate('清空上下文')
+                        ];
+                    }
+                    $aibotSetting = Base::setting('aibotSetting');
+                    $aibotModel = $aibotSetting[$match[1] . '_model'];
+                    $aibotModels = Setting::AIModels2Array($aibotSetting[$match[1] . '_models']);
+                    if (empty($aibotModels)) {
+                        return [];
+                    }
+                    return [
+                        [
+                            'key' => '~ai-model-select',
+                            'label' => Doo::translate('选择模型'),
+                            'config' => [
+                                'model' => $aibotModel,
+                                'models' => $aibotModels
+                            ]
+                        ],
+                        [
+                            'key' => '~ai-session-create',
+                            'label' => Doo::translate('开启新会话'),
+                        ],
+                        [
+                            'key' => '~ai-session-history',
+                            'label' => Doo::translate('历史会话'),
+                        ]
+                    ];
+                }
+                return [];
+        }
+    }
+
+    /**
+     * 签到机器人
+     * @param $command
+     * @param $userid
+     * @param $extra
+     * @return string
+     */
+    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 === 'manual-checkin') {
+            $setting = Base::setting('checkinSetting');
+            if ($setting['open'] !== 'open') {
+                return '暂未开启签到功能。';
+            }
+            if (!in_array('manual', $setting['modes'])) {
+                return '暂未开放手动签到。';
+            }
+            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);
+        }
+    }
+
+    /**
+     * 签到机器人签到
+     * @param mixed $mac
+     * - 多个使用,分隔
+     * - 支持：mac地址、(manual|locat|face|checkin)-userid
+     * @param $time
+     * @param bool $alreadyTip  签到过是否提示
+     */
+    public static function checkinBotCheckin($mac, $time, $alreadyTip = false)
+    {
+        $setting = Base::setting('checkinSetting');
+        $times = $setting['time'] ? Base::json2array($setting['time']) : ['09:00', '18:00'];
+        $advance = (intval($setting['advance']) ?: 120) * 60;
+        $delay = (intval($setting['delay']) ?: 120) * 60;
+        //
+        $nowDate = date("Y-m-d");
+        $nowTime = date("H:i:s");
+        //
+        $timeStart = strtotime("{$nowDate} {$times[0]}");
+        $timeEnd = strtotime("{$nowDate} {$times[1]}");
+        $timeAdvance = max($timeStart - $advance, strtotime($nowDate));
+        $timeDelay = min($timeEnd + $delay, strtotime("{$nowDate} 23:59:59"));
+        $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);
+            if (Base::isMac($mac)) {
+                // 路由器签到
+                if ($UserCheckinMac = UserCheckinMac::whereMac($mac)->first()) {
+                    $array[] = [
+                        'userid' => $UserCheckinMac->userid,
+                        'mac' => $UserCheckinMac->mac,
+                        'date' => $nowDate,
+                    ];
+                    $checkins[] = [
+                        'userid' => $UserCheckinMac->userid,
+                        'remark' => $UserCheckinMac->remark,
+                    ];
+                }
+            } 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[] = [
+                        'userid' => $UserInfo->userid,
+                        'mac' => '00:00:00:00:00:00',
+                        'date' => $nowDate,
+                    ];
+                    $checkins[] = [
+                        'userid' => $UserInfo->userid,
+                        'remark' => $remark,
+                    ];
+                }
+            }
+        }
+        if (!$errorTime) {
+            foreach ($array as $item) {
+                $record = UserCheckinRecord::where($item)->first();
+                if (empty($record)) {
+                    $record = UserCheckinRecord::createInstance($item);
+                }
+                $record->times = Base::array2json(array_merge($record->times, [$nowTime]));
+                $record->report_time = $time;
+                $record->save();
+            }
+        }
+        //
+        if ($checkins && $botUser = User::botGetOrCreate('check-in')) {
+            $getJokeSoup = function($type, $userid) {
+                $pre = $type == "up" ? "每日开心：" : "心灵鸡汤：";
+                $key = $type == "up" ? "jokes" : "soups";
+                $array = Base::json2array(Cache::get(JokeSoupTask::keyName($key)));
+                if ($array) {
+                    $item = $array[array_rand($array)];
+                    if ($item) {
+                        Doo::setLanguage($userid);
+                        return Doo::translate($pre . $item);
+                    }
+                }
+                return null;
+            };
+            $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'];
+                $typeContent = $type == "up" ? "上班" : "下班";
+                if (Cache::get($cacheKey) === "yes") {
+                    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());
+                // 打卡成功
+                $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 <= Timer::time() && Timer::time() < $timeEnd) {
+                // 上班打卡通知（从最早打卡时间 到 下班打卡时间）
+                foreach ($checkins as $checkin) {
+                    $sendMsg('up', $checkin);
+                }
+            }
+            if ($timeEnd <= Timer::time() && Timer::time() <= $timeDelay) {
+                // 下班打卡通知（下班打卡时间 到 最晚打卡时间）
+                foreach ($checkins as $checkin) {
+                    $sendMsg('down', $checkin);
+                }
+            }
+        }
+    }
+
+    /**
+     * 隐私机器人
+     * @param $command
+     * @return array
+     */
+    public static function anonBotQuickMsg($command)
+    {
+        return match ($command) {
+            "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

@@ -0,0 +1,72 @@
+<?php
+
+
+namespace App\Models;
+
+use App\Exceptions\ApiException;
+use App\Module\Base;
+
+/**
+ * App\Models\UserCheckinMac
+ *
+ * @property int $id
+ * @property int|null $userid 会员id
+ * @property string|null $mac MAC地址
+ * @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)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinMac whereRemark($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinMac whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinMac whereUserid($value)
+ * @mixin \Eloquent
+ */
+class UserCheckinMac extends AbstractModel
+{
+    /**
+     * 保存mac地址
+     * @param $userid
+     * @param $array
+     * @return mixed
+     */
+    public static function saveMac($userid, $array)
+    {
+        return AbstractModel::transaction(function() use ($array, $userid) {
+            $ids = [];
+            $list = [];
+            foreach ($array as $item) {
+                if (self::whereMac($item['mac'])->where('userid', '!=', $userid)->exists()) {
+                    throw new ApiException("{$item['mac']} 已被其他成员设置");
+                }
+                $update = [];
+                if ($item['remark']) {
+                    $update = [
+                        'remark' => $item['remark']
+                    ];
+                }
+                $row = self::updateInsert([
+                    'userid' => $userid,
+                    'mac' => $item['mac']
+                ], $update);
+                if ($row) {
+                    $ids[] = $row->id;
+                    $list[] = $row;
+                }
+            }
+            self::whereUserid($userid)->whereNotIn('id', $ids)->delete();
+            //
+            return Base::retSuccess('修改成功', $list);
+        });
+    }
+}

app/Models/UserCheckinRecord.php

@@ -0,0 +1,140 @@
+<?php
+
+
+namespace App\Models;
+
+use App\Module\Base;
+
+/**
+ * App\Models\UserCheckinRecord
+ *
+ * @property int $id
+ * @property int|null $userid 会员id
+ * @property string|null $mac MAC地址
+ * @property string|null $date 签到日期
+ * @property array $times 签到时间
+ * @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)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord whereMac($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord whereReportTime($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord whereTimes($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord whereUserid($value)
+ * @mixin \Eloquent
+ */
+class UserCheckinRecord extends AbstractModel
+{
+
+    /**
+     * 签到记录
+     * @param $value
+     * @return array
+     */
+    public function getTimesAttribute($value)
+    {
+        if (is_array($value)) {
+            return $value;
+        }
+        return Base::json2array($value);
+    }
+
+    /**
+     * 获取签到时间
+     * @param int $userid
+     * @param array $betweenTimes
+     * @return array
+     */
+    public static function getTimes(int $userid, array $betweenTimes)
+    {
+        $array = [];
+        $records = self::whereUserid($userid)->whereBetween('created_at', $betweenTimes)->orderBy('id')->get();
+        /** @var self $record */
+        foreach ($records as $record) {
+            $times = array_map(function ($time) {
+                return preg_replace("/(\d+):(\d+):\d+$/", "$1:$2", $time);
+            }, $record->times);
+            if (isset($array[$record->date])) {
+                $array[$record->date] = array_merge($array[$record->date], $times);
+            } else {
+                $array[$record->date] = $times;
+            }
+        }
+        //
+        foreach ($array as $date => $times) {
+            $times = array_values(array_filter(array_unique($times)));
+            $inOrder = [];
+            foreach ($times as $key => $time) {
+                $inOrder[$key] = strtotime("2022-01-01 {$time}");
+            }
+            array_multisort($inOrder, SORT_ASC, $times);
+            $array[$date] = $times;
+        }
+        //
+        return $array;
+    }
+
+    /**
+     * 时间收集
+     * @param string $data
+     * @param array $times
+     * @return \Illuminate\Support\Collection
+     */
+    public static function atCollect($data, $times)
+    {
+        $sameTimes = array_map(function($time) use ($data) {
+            return [
+                "datetime" => "{$data} {$time}",
+                "timestamp" => strtotime("{$data} {$time}")
+            ];
+        }, $times);
+        return collect($sameTimes);
+    }
+
+    /**
+     * 签到时段
+     * @param array $times
+     * @param int $diff 多长未签到算失效（秒）
+     * @return array
+     */
+    public static function atSection($times, $diff = 3600)
+    {
+        $start = "";
+        $end = "";
+        $array = [];
+        foreach ($times as $time) {
+            $time = preg_replace("/(\d+):(\d+):\d+$/", "$1:$2", $time);
+            if (empty($start)) {
+                $start = $time;
+                continue;
+            }
+            if (empty($end)) {
+                $end = $time;
+                continue;
+            }
+            if (strtotime("2022-01-01 {$time}") - strtotime("2022-01-01 {$end}") > $diff) {
+                $array[] = [$start, $end];
+                $start = $time;
+                $end = "";
+                continue;
+            }
+            $end = $time;
+        }
+        if ($start) {
+            $array[] = [$start, $end];
+        }
+        return $array;
+    }
+}

app/Models/UserDelete.php

@@ -0,0 +1,77 @@
+<?php
+
+
+namespace App\Models;
+
+use App\Module\Base;
+
+/**
+ * App\Models\UserDelete
+ *
+ * @property int $id
+ * @property int|null $operator 操作人员
+ * @property int|null $userid 用户id
+ * @property string|null $email 邮箱帐号
+ * @property string|null $reason 注销原因
+ * @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)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereOperator($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereReason($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereUserid($value)
+ * @mixin \Eloquent
+ */
+class UserDelete extends AbstractModel
+{
+    /**
+     * 昵称
+     * @param $value
+     * @return string
+     */
+    public function getCacheAttribute($value)
+    {
+        if (!is_array($value)) {
+            $value = Base::json2array($value);
+            // 昵称
+            if (!$value['nickname']) {
+                $value['nickname'] = Base::formatName($value['email']);
+            }
+            // 头像
+            $value['userimg'] = User::getAvatar($value['userid'], $value['userimg'], $value['email'], $value['nickname']);
+            // 部门
+            $value['department'] = array_filter(is_array($value['department']) ? $value['department'] : Base::explodeInt($value['department']));
+        }
+        return $value;
+    }
+
+    /**
+     * userid 获取 基础信息
+     * @param int $userid 会员ID
+     * @return array|null
+     */
+    public static function userid2basic($userid)
+    {
+        $row = self::whereUserid($userid)->first();
+        if (empty($row) || empty($row->cache)) {
+            return null;
+        }
+        $cache = $row->cache;
+        $cache = array_intersect_key($cache, array_flip(array_merge(User::$basicField, ['department_name'])));
+        $cache['delete_at'] = $row->created_at->toDateTimeString();
+        return $cache;
+    }
+}

app/Models/UserDepartment.php

@@ -0,0 +1,171 @@
+<?php
+
+namespace App\Models;
+
+use App\Exceptions\ApiException;
+
+/**
+ * App\Models\UserDepartment
+ *
+ * @property int $id
+ * @property string|null $name 部门名称
+ * @property int|null $dialog_id 聊天会话ID
+ * @property int|null $parent_id 上级部门
+ * @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)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereOwnerUserid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereParentId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
+class UserDepartment extends AbstractModel
+{
+    /**
+     * 获取所有父级部门
+     * @return array
+     */
+    public function parents()
+    {
+        $parents = [];
+        $parent = $this;
+        while ($parent) {
+            $parents[] = $parent;
+            $parent = $parent->parent_id ? self::find($parent->parent_id) : null;
+        }
+        return $parents;
+    }
+
+    /**
+     * 保存部门
+     * @param $data
+     * @param $dialogUseid
+     */
+    public function saveDepartment($data = [], $dialogUseid = 0) {
+        AbstractModel::transaction(function () use ($dialogUseid, $data) {
+            $oldUser = null;
+            $newUser = null;
+            if ($data['owner_userid'] !== $this->owner_userid) {
+                $oldUser = User::find($this->owner_userid);
+                $newUser = User::find($data['owner_userid']);
+            }
+            $this->updateInstance($data);
+            //
+            if ($this->dialog_id > 0) {
+                // 已有群
+                $dialog = WebSocketDialog::find($this->dialog_id);
+                if ($dialog) {
+                    $dialog->name = $this->name;
+                    $dialog->owner_id = $this->owner_userid;
+                    if ($dialog->save()) {
+                        $dialog->joinGroup($this->owner_userid, 0, true);
+                        $dialog->pushMsg("groupUpdate", [
+                            'id' => $dialog->id,
+                            'name' => $dialog->name,
+                            'owner_id' => $dialog->owner_id,
+                        ]);
+                    }
+                }
+            } elseif ($dialogUseid > 0) {
+                // 使用现有群
+                $dialog = WebSocketDialog::whereType('group')->whereGroupType('user')->find($dialogUseid);
+                if (empty($dialog)) {
+                    throw new ApiException("选择现有聊天群不存在");
+                }
+                $dialog->name = $this->name;
+                $dialog->owner_id = $this->owner_userid;
+                $dialog->group_type = 'department';
+                if ($dialog->save()) {
+                    $dialog->joinGroup($this->owner_userid, 0, true);
+                    $dialog->pushMsg("groupUpdate", [
+                        'id' => $dialog->id,
+                        'name' => $dialog->name,
+                        'owner_id' => $dialog->owner_id,
+                        'group_type' => $dialog->group_type,
+                    ]);
+                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'notice', [
+                        'notice' => User::nickname() . " 将此群改为部门群"
+                    ], User::userid(), true, true);
+                }
+                $this->dialog_id = $dialog->id;
+            } else {
+                // 创建群
+                $dialog = WebSocketDialog::createGroup($this->name, [$this->owner_userid], 'department', $this->owner_userid);
+                if (empty($dialog)) {
+                    throw new ApiException("创建群组失败");
+                }
+                $this->dialog_id = $dialog->id;
+            }
+            $this->save();
+            //
+            if ($oldUser) {
+                $oldUser->department = array_diff($oldUser->department, [$this->id]);
+                $oldUser->department = "," . implode(",", $oldUser->department) . ",";
+                $oldUser->save();
+            }
+            if ($newUser) {
+                $newUser->department = array_diff($newUser->department, [$this->id]);
+                $newUser->department = array_merge($newUser->department, [$this->id]);
+                $newUser->department = "," . implode(",", $newUser->department) . ",";
+                $newUser->save();
+            }
+        });
+    }
+
+    /**
+     * 删除部门
+     * @return void
+     */
+    public function deleteDepartment() {
+        // 删除子部门
+        $list = self::whereParentId($this->id)->get();
+        foreach ($list as $item) {
+            $item->deleteDepartment();
+        }
+        // 移出成员
+        User::where("department", "like", "%,{$this->id},%")->chunk(100, function($items) {
+            /** @var User $user */
+            foreach ($items as $user) {
+                $user->department = array_diff($user->department, [$this->id]);
+                $user->department = "," . implode(",", $user->department) . ",";
+                $user->save();
+            }
+        });
+        // 解散群组
+        $dialog = WebSocketDialog::find($this->dialog_id);
+        $dialog?->deleteDialog();
+        //
+        $this->delete();
+    }
+
+    /**
+     * 移交部门身份
+     * @param $originalUserid
+     * @param $newUserid
+     * @return void
+     */
+    public static function transfer($originalUserid, $newUserid)
+    {
+        self::whereOwnerUserid($originalUserid)->chunkById(100, function ($list) use ($originalUserid, $newUserid) {
+            /** @var self $item */
+            foreach ($list as $item) {
+                $item->saveDepartment([
+                    'owner_userid' => $newUserid,
+                ]);
+            }
+        });
+    }
+}

app/Models/UserEmailVerification.php

@@ -0,0 +1,153 @@
+<?php
+
+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;
+
+/**
+ * App\Models\UserEmailVerification
+ *
+ * @property int $id
+ * @property int|null $userid 用户id
+ * @property string|null $code 验证参数
+ * @property string|null $email 电子邮箱
+ * @property int|null $status 0-未验证，1-已验证
+ * @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)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereStatus($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereUserid($value)
+ * @mixin \Eloquent
+ */
+class UserEmailVerification extends AbstractModel
+{
+
+    /**
+     * 发验证邮箱
+     * @param User $user
+     * @param int $type
+     * @param null $email
+     */
+    public static function userEmailSend(User $user, $type = 1, $email = null)
+    {
+        $email = $type == 1 ? $user->email : $email;
+        $res = self::whereEmail($email)->where('created_at', '>', Carbon::now()->subMinutes(30))->whereType($type)->first();
+        if ($res && $type == 1) return;
+        //删除
+        self::whereUserid($email)->delete();
+        $code = $type == 1 ? Base::generatePassword(64) : rand(100000, 999999);
+        $row = self::createInstance([
+            'userid' => $user->userid,
+            'email' => $email,
+            'code' => $code,
+            'status' => 0,
+            'type' => $type
+        ]);
+        $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 = 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 = 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 = 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($alias . " <{$setting['account']}>")
+                    ->to($email)
+                    ->subject($subject)
+                    ->html($content))
+                ->send();
+        } catch (\Throwable $e) {
+            if (str_contains($e->getMessage(), "Timed Out")) {
+                throw new ApiException("邮件发送超时，请检查邮箱配置是否正确");
+            } elseif ($e->getCode() === 550) {
+                throw new ApiException('邮件内容被拒绝，请检查邮箱是否开启接收功能');
+            } else {
+                throw new ApiException($e->getMessage());
+            }
+        }
+    }
+
+    /**
+     * 校验验证码
+     * @param $email
+     * @param $code
+     * @param int $type
+     * @return bool
+     */
+    public static function verify($email, $code, $type = 1)
+    {
+        if (!$code) {
+            throw new ApiException('请输入验证码');
+        }
+        /** @var UserEmailVerification $emailVerify */
+        $emailVerify = self::whereEmail($email)->whereType($type)->orderByDesc('id')->first();
+
+        if (empty($emailVerify) || $emailVerify->code != $code) {
+            throw new ApiException('验证码错误');
+        }
+
+        $oldTime = Carbon::parse($emailVerify->created_at)->timestamp;
+        $time = Timer::Time();
+
+        // 30分钟失效
+        if (abs($time - $oldTime) > 1800) {
+            throw new ApiException('验证码已失效');
+        }
+
+        self::whereEmail($email)->whereCode($code)->whereType($type)->update([
+            'status' => 1
+        ]);
+
+        return true;
+    }
+
+}

app/Models/UserTransfer.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Models;
+
+use App\Exceptions\ApiException;
+use App\Module\Base;
+use Carbon\Carbon;
+use Guanguans\Notify\Factory;
+use Guanguans\Notify\Messages\EmailMessage;
+
+/**
+ * App\Models\UserTransfer
+ *
+ * @property int $id
+ * @property int|null $original_userid 原作者
+ * @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)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer whereOriginalUserid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
+class UserTransfer extends AbstractModel
+{
+
+    /**
+     * 开始移交
+     * @return void
+     */
+    public function start()
+    {
+        // 移交部门
+        UserDepartment::transfer($this->original_userid, $this->new_userid);
+        // 移交项目身份
+        ProjectUser::transfer($this->original_userid, $this->new_userid);
+        // 移交任务身份
+        ProjectTaskUser::transfer($this->original_userid, $this->new_userid);
+        // 移交文件
+        File::transfer($this->original_userid, $this->new_userid);
+        // 离职移出群组
+        $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/WebSocketDialogConfig.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\WebSocketDialogConfig
+ *
+ * @property int $id
+ * @property int $dialog_id 对话ID
+ * @property int $userid 用户ID
+ * @property string $type 配置类型
+ * @property string|null $value 配置值
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\WebSocketDialog|null $dialog
+ * @property-read \App\Models\User $user
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogConfig newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogConfig newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogConfig query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogConfig whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogConfig whereDialogId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogConfig whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogConfig whereType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogConfig whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogConfig whereUserid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogConfig whereValue($value)
+ * @mixin \Eloquent
+ */
+class WebSocketDialogConfig extends AbstractModel
+{
+    /**
+     * 可以批量赋值的属性
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'dialog_id',
+        'userid',
+        'type',
+        'value',
+    ];
+
+    /**
+     * 获取关联的对话
+     */
+    public function dialog()
+    {
+        return $this->belongsTo(WebSocketDialog::class, 'dialog_id');
+    }
+
+    /**
+     * 获取关联的用户
+     */
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'userid');
+    }
+}

app/Models/WebSocketDialogMsgRead.php

@@ -2,23 +2,40 @@
 
 namespace App\Models;
 
+use Carbon\Carbon;
+
 /**
  * App\Models\WebSocketDialogMsgRead
  *
  * @property int $id
  * @property int|null $dialog_id 对话ID
  * @property int|null $msg_id 消息ID
- * @property int|null $userid 发送会员ID
+ * @property int|null $userid 接收会员ID
+ * @property int|null $mention 是否提及（被@）
+ * @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)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereMsgId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereReadAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereSilence($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereUserid($value)
  * @mixin \Eloquent
  */
@@ -29,4 +46,54 @@ class WebSocketDialogMsgRead extends AbstractModel
         parent::__construct($attributes);
         $this->timestamps = false;
     }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function webSocketDialogMsg(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(WebSocketDialogMsg::class, 'id', 'msg_id');
+    }
+
+    /**
+     * 强制标记成阅读
+     * @param $dialogId
+     * @param $userId
+     * @return void
+     */
+    public static function forceRead($dialogId, $userId)
+    {
+        self::whereDialogId($dialogId)
+            ->whereUserid($userId)
+            ->whereNull('read_at')
+            ->update(['read_at' => Carbon::now()]);
+    }
+
+    /**
+     * 仅标记成阅读
+     * @param $list
+     * @return void
+     */
+    public static function onlyMarkRead($list)
+    {
+        $dialogMsg = [];
+        /** @var WebSocketDialogMsgRead $item */
+        foreach ($list as $item) {
+            $item->read_at = Carbon::now();
+            $item->save();
+            if (isset($dialogMsg[$item->msg_id])) {
+                $dialogMsg[$item->msg_id]['readNum']++;
+            } else {
+                $dialogMsg[$item->msg_id] = [
+                    'dialogMsg' => $item->webSocketDialogMsg,
+                    'readNum' => 1
+                ];
+            }
+        }
+        foreach ($dialogMsg as $item) {
+            if ($item['dialogMsg']) {
+                $item['dialogMsg']->increment('read', $item['readNum']);
+            }
+        }
+    }
 }

app/Models/WebSocketDialogMsgTodo.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\WebSocketDialogMsgTodo
+ *
+ * @property int $id
+ * @property int|null $dialog_id 对话ID
+ * @property int|null $msg_id 消息ID
+ * @property int|null $userid 接收会员ID
+ * @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)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTodo whereMsgId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTodo whereUserid($value)
+ * @mixin \Eloquent
+ */
+class WebSocketDialogMsgTodo extends AbstractModel
+{
+    protected $appends = [
+        'msg_data',
+    ];
+
+    function __construct(array $attributes = [])
+    {
+        parent::__construct($attributes);
+        $this->timestamps = false;
+    }
+
+    /**
+     * 消息详情
+     * @return array|mixed
+     */
+    public function getMsgDataAttribute()
+    {
+        if (!isset($this->appendattrs['msgData'])) {
+            $this->appendattrs['msgData'] = WebSocketDialogMsg::select(['id', 'type', 'msg'])->whereId($this->msg_id)->first()?->cancelAppend();
+        }
+        return $this->appendattrs['msgData'];
+    }
+}

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

@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Models;
+
+use App\Module\Base;
+use App\Module\Extranet;
+use Swoole\Coroutine;
+use Cache;
+
+/**
+ * App\Models\WebSocketDialogSession
+ *
+ * @property int $id
+ * @property int $dialog_id 对话ID
+ * @property string $title 会话标题
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\WebSocketDialog|null $dialog
+ * @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|WebSocketDialogSession newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogSession newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogSession query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogSession whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogSession whereDialogId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogSession whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogSession whereTitle($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogSession whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
+class WebSocketDialogSession extends AbstractModel
+{
+    /**
+     * 可以批量赋值的属性
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'dialog_id',
+        'userid',
+        'title',
+    ];
+
+    /**
+     * 获取关联的对话
+     */
+    public function dialog()
+    {
+        return $this->belongsTo(WebSocketDialog::class, 'dialog_id');
+    }
+
+    /**
+     * @param $sessionId
+     * @param WebSocketDialogMsg $dialogMsg
+     * @return void
+     */
+    public static function updateTitle($sessionId, $dialogMsg)
+    {
+        if (!$sessionId) {
+            return;
+        }
+        if ($dialogMsg->type != 'text') {
+            return;
+        }
+        $cacheKey = 'dialog_session_title_' . $sessionId;
+        if (Cache::has($cacheKey)) {
+            return;
+        }
+        $originalTitle = $dialogMsg->key ?: $dialogMsg->msg['text'] ?: 'Untitled';
+        $title = Base::cutStr($originalTitle, 100);
+        if ($title == '...') {
+            return;
+        }
+        $session = self::whereId($sessionId)->first();
+        if (!$session) {
+            return;
+        }
+        $session->title = $title;
+        $session->save();
+        Cache::forever($cacheKey, true);
+        // 通过AI接口更新对话标题
+        go(function () use ($session, $title, $originalTitle) {
+            Coroutine::sleep(0.1);
+            $res = Extranet::openAIGenerateTitle($originalTitle);
+            if (Base::isError($res)) {
+                return;
+            }
+            $newTitle = $res['data'];
+            if ($newTitle && $newTitle != $title) {
+                $session->title = Base::cutStr($newTitle, 100);
+                $session->save();
+            }
+        });
+    }
+}

app/Models/WebSocketDialogUser.php

@@ -8,19 +8,65 @@ namespace App\Models;
  * @property int $id
  * @property int|null $dialog_id 对话ID
  * @property int|null $userid 会员ID
+ * @property int|null $bot 是否机器人
+ * @property \Illuminate\Support\Carbon|null $top_at 置顶时间
+ * @property \Illuminate\Support\Carbon|null $last_at 最后消息时间
+ * @property int|null $mark_unread 是否标记为未读：0否，1是
+ * @property int|null $silence 是否免打扰：0否，1是
+ * @property int|null $hide 不显示会话：0否，1是
+ * @property int|null $inviter 邀请人
+ * @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 whereBot($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereColor($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereDialogId($value)
+ * @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)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereUserid($value)
  * @mixin \Eloquent
  */
 class WebSocketDialogUser extends AbstractModel
 {
+    protected $dateFormat = 'Y-m-d H:i:s.u';
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function webSocketDialog(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        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/Models/clearHelper.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * 清除模型class注释
+ */
+
+@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
+
+// 判断是否通过cmd命令执行的
+if (function_exists('info')){
+    echo "Success \n";
+    return;
+} 
+
+$path = dirname(__FILE__). '/';
+$lists = scandir($path);
+//
+foreach ($lists AS $item) {
+    $fillPath = $path . $item;
+    if (!in_array($item, ['AbstractModel.php', 'clearHelper.php']) && str_ends_with($item, '.php')) {
+        $content = file_get_contents($fillPath);
+        preg_match("/\/\*\*([\s\S]*?)class\s*(.*?)\s*extends\s*AbstractModel/i", $content, $matchs);
+        if ($matchs[0]) {
+            $content = str_replace($matchs[0], 'class ' . $matchs[2] . ' extends AbstractModel', $content);
+            file_put_contents($fillPath, $content);
+        }
+    }
+}
+echo "Success \n";

app/Module/AgoraIO/AccessToken.php

@@ -0,0 +1,193 @@
+<?php
+/**
+ * @Description :
+ *
+ * @Date        : 2019-03-14 13:22
+ * @Author      : hmy940118@gmail.com
+ */
+
+namespace App\Module\AgoraIO;
+
+class AccessToken
+{
+
+    const Privileges = array(
+        "kJoinChannel" => 1,
+        "kPublishAudioStream" => 2,
+        "kPublishVideoStream" => 3,
+        "kPublishDataStream" => 4,
+        "kPublishAudioCdn" => 5,
+        "kPublishVideoCdn" => 6,
+        "kRequestPublishAudioStream" => 7,
+        "kRequestPublishVideoStream" => 8,
+        "kRequestPublishDataStream" => 9,
+        "kInvitePublishAudioStream" => 10,
+        "kInvitePublishVideoStream" => 11,
+        "kInvitePublishDataStream" => 12,
+        "kAdministrateChannel" => 101
+    );
+
+    public $appID, $appCertificate, $channelName, $uid;
+
+    public $message;
+
+    /**
+     * AccessToken constructor.
+     * @throws \Exception
+     */
+    public function __construct()
+    {
+        $this->message = new Message();
+    }
+
+    /**
+     * @param $uid
+     */
+    public function setUid($uid)
+    {
+        if ($uid === 0) {
+            $this->uid = "";
+        } else {
+            $this->uid = $uid . '';
+        }
+    }
+
+    /**
+     * @param $name
+     * @param $str
+     * @return bool
+     */
+    public function is_nonempty_string($name, $str)
+    {
+        if (is_string($str) && $str !== "") {
+            return true;
+        }
+        echo $name . " check failed, should be a non-empty string";
+        return false;
+    }
+
+    /**
+     * @param $appID
+     * @param $appCertificate
+     * @param $channelName
+     * @param $uid
+     * @return AccessToken|null
+     * @throws \Exception
+     */
+    public static function init($appID, $appCertificate, $channelName, $uid)
+    {
+        $accessToken = new AccessToken();
+        if (!$accessToken->is_nonempty_string("appID", $appID) ||
+            !$accessToken->is_nonempty_string("appCertificate", $appCertificate) ||
+            !$accessToken->is_nonempty_string("channelName", $channelName)) {
+            return null;
+        }
+        $accessToken->appID = $appID;
+        $accessToken->appCertificate = $appCertificate;
+        $accessToken->channelName = $channelName;
+        $accessToken->setUid($uid);
+        $accessToken->message = new Message();
+        return $accessToken;
+    }
+
+    /**
+     * @param $token
+     * @param $appCertificate
+     * @param $channel
+     * @param $uid
+     * @return AccessToken|null
+     * @throws \Exception
+     */
+    public static function initWithToken($token, $appCertificate, $channel, $uid)
+    {
+        $accessToken = new AccessToken();
+        if (!$accessToken->extract($token, $appCertificate, $channel, $uid)) {
+            return null;
+        }
+        return $accessToken;
+    }
+
+    /**
+     * @param $key
+     * @param $expireTimestamp
+     * @return $this
+     */
+    public function addPrivilege($key, $expireTimestamp)
+    {
+        $this->message->privileges[$key] = $expireTimestamp;
+        return $this;
+    }
+
+    /**
+     * @param $token
+     * @param $appCertificate
+     * @param $channelName
+     * @param $uid
+     * @return bool
+     * @throws \Exception
+     */
+    protected function extract($token, $appCertificate, $channelName, $uid)
+    {
+        $ver_len = 3;
+        $appid_len = 32;
+        $version = substr($token, 0, $ver_len);
+        if ($version !== "006") {
+            echo 'invalid version ' . $version;
+            return false;
+        }
+        if (!$this->is_nonempty_string("token", $token) ||
+            !$this->is_nonempty_string("appCertificate", $appCertificate) ||
+            !$this->is_nonempty_string("channelName", $channelName)) {
+            return false;
+        }
+        $appid = substr($token, $ver_len, $appid_len);
+        $content = (base64_decode(substr($token, $ver_len + $appid_len, strlen($token) - ($ver_len + $appid_len))));
+        $pos = 0;
+        $len = unpack("v", $content . substr($pos, 2))[1];
+        $pos += 2;
+        $sig = substr($content, $pos, $len);
+        $pos += $len;
+        $crc_channel = unpack("V", substr($content, $pos, 4))[1];
+        $pos += 4;
+        $crc_uid = unpack("V", substr($content, $pos, 4))[1];
+        $pos += 4;
+        $msgLen = unpack("v", substr($content, $pos, 2))[1];
+        $pos += 2;
+        $msg = substr($content, $pos, $msgLen);
+        $this->appID = $appid;
+        $message = new Message();
+        $message->unpackContent($msg);
+        $this->message = $message;
+        //non reversable values
+        $this->appCertificate = $appCertificate;
+        $this->channelName = $channelName;
+        $this->setUid($uid);
+        return true;
+    }
+
+    /**
+     * @return string
+     */
+    public function build()
+    {
+        $msg = $this->message->packContent();
+        $val = array_merge(unpack("C*", $this->appID), unpack("C*", $this->channelName), unpack("C*", $this->uid), $msg);
+
+        $sig = hash_hmac('sha256', implode(array_map("chr", $val)), $this->appCertificate, true);
+        $crc_channel_name = crc32($this->channelName) & 0xffffffff;
+        $crc_uid = crc32($this->uid) & 0xffffffff;
+        $content = array_merge(unpack("C*", $this->packString($sig)), unpack("C*", pack("V", $crc_channel_name)), unpack("C*", pack("V", $crc_uid)), unpack("C*", pack("v", count($msg))), $msg);
+        $version = "006";
+        $ret = $version . $this->appID . base64_encode(implode(array_map("chr", $content)));
+        return $ret;
+    }
+
+    /**
+     * @param $value
+     * @return string
+     */
+    public function packString($value)
+    {
+        return pack("v", strlen($value)) . $value;
+    }
+}

app/Module/AgoraIO/AgoraTokenGenerator.php

@@ -0,0 +1,122 @@
+<?php
+/**
+ * @Description :
+ *
+ * @Date        : 2019-03-14 13:20
+ * @Author      : hmy940118@gmail.com
+ */
+
+namespace App\Module\AgoraIO;
+
+
+class AgoraTokenGenerator
+{
+    const AttendeePrivileges = array(
+        AccessToken::Privileges["kJoinChannel"] => 0,
+        AccessToken::Privileges["kPublishAudioStream"] => 0,
+        AccessToken::Privileges["kPublishVideoStream"] => 0,
+        AccessToken::Privileges["kPublishDataStream"] => 0
+    );
+
+
+    const PublisherPrivileges = array(
+        AccessToken::Privileges["kJoinChannel"] => 0,
+        AccessToken::Privileges["kPublishAudioStream"] => 0,
+        AccessToken::Privileges["kPublishVideoStream"] => 0,
+        AccessToken::Privileges["kPublishDataStream"] => 0,
+        AccessToken::Privileges["kPublishAudioCdn"] => 0,
+        AccessToken::Privileges["kPublishVideoCdn"] => 0,
+        AccessToken::Privileges["kInvitePublishAudioStream"] => 0,
+        AccessToken::Privileges["kInvitePublishVideoStream"] => 0,
+        AccessToken::Privileges["kInvitePublishDataStream"] => 0
+    );
+
+    const SubscriberPrivileges = array(
+        AccessToken::Privileges["kJoinChannel"] => 0,
+        AccessToken::Privileges["kRequestPublishAudioStream"] => 0,
+        AccessToken::Privileges["kRequestPublishVideoStream"] => 0,
+        AccessToken::Privileges["kRequestPublishDataStream"] => 0
+    );
+
+    const AdminPrivileges = array(
+        AccessToken::Privileges["kJoinChannel"] => 0,
+        AccessToken::Privileges["kPublishAudioStream"] => 0,
+        AccessToken::Privileges["kPublishVideoStream"] => 0,
+        AccessToken::Privileges["kPublishDataStream"] => 0,
+        AccessToken::Privileges["kAdministrateChannel"] => 0
+    );
+    const Role = array(
+        "kRoleAttendee" => 0,  // for communication
+        "kRolePublisher" => 1, // for live broadcast
+        "kRoleSubscriber" => 2,  // for live broadcast
+        "kRoleAdmin" => 101
+    );
+
+    const RolePrivileges = array(
+        self::Role["kRoleAttendee"] => self::AttendeePrivileges,
+        self::Role["kRolePublisher"] => self::PublisherPrivileges,
+        self::Role["kRoleSubscriber"] => self::SubscriberPrivileges,
+        self::Role["kRoleAdmin"] => self::AdminPrivileges
+    );
+
+    public $token;
+
+    /**
+     * AgoraTokenGenerator constructor.
+     * @param $appID
+     * @param $appCertificate
+     * @param $channelName
+     * @param $uid
+     * @throws \Exception
+     */
+    public function __construct($appID, $appCertificate, $channelName, $uid){
+        $this->token = new AccessToken();
+        $this->token->appID = $appID;
+        $this->token->appCertificate = $appCertificate;
+        $this->token->channelName = $channelName;
+        $this->token->setUid($uid);
+    }
+
+    /**
+     * @param $token
+     * @param $appCertificate
+     * @param $channel
+     * @param $uid
+     * @throws \Exception
+     */
+    public function initWithToken($token, $appCertificate, $channel, $uid){
+        $this->token = AccessToken::initWithToken($token, $appCertificate, $channel, $uid);
+    }
+
+    /**
+     * @param $role
+     */
+    public function initPrivilege($role){
+        $p = self::RolePrivileges[$role];
+        foreach($p as $key => $value){
+            $this->setPrivilege($key, $value);
+        }
+    }
+
+    /**
+     * @param $privilege
+     * @param $expireTimestamp
+     */
+    public function setPrivilege($privilege, $expireTimestamp){
+        $this->token->addPrivilege($privilege, $expireTimestamp);
+    }
+
+    /**
+     * @param $privilege
+     */
+    public function removePrivilege($privilege){
+        unset($this->token->message->privileges[$privilege]);
+    }
+
+    /**
+     * @return string
+     */
+    public function buildToken(){
+        return $this->token->build();
+    }
+}

app/Module/AgoraIO/Message.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * @Description :
+ *
+ * @Date        : 2019-03-14 13:27
+ * @Author      : hmy940118@gmail.com
+ */
+
+namespace App\Module\AgoraIO;
+
+class Message
+{
+    public $salt;
+
+    public $ts;
+
+    public $privileges;
+
+    /**
+     * Message constructor.
+     * @throws \Exception
+     */
+    public function __construct()
+    {
+        $this->salt = rand(0, 100000);
+        $date = new \DateTime("now", new \DateTimeZone('UTC'));
+        $this->ts = $date->getTimestamp() + 168 * 3600; // 7天时间
+        $this->privileges = array();
+    }
+
+    /**
+     * @return array
+     */
+    public function packContent()
+    {
+        $buffer = unpack("C*", pack("V", $this->salt));
+        $buffer = array_merge($buffer, unpack("C*", pack("V", $this->ts)));
+        $buffer = array_merge($buffer, unpack("C*", pack("v", sizeof($this->privileges))));
+        foreach ($this->privileges as $key => $value) {
+            $buffer = array_merge($buffer, unpack("C*", pack("v", $key)));
+            $buffer = array_merge($buffer, unpack("C*", pack("V", $value)));
+        }
+        return $buffer;
+    }
+
+    /**
+     * @param $msg
+     */
+    public function unpackContent($msg)
+    {
+        $pos = 0;
+        $salt = unpack("V", substr($msg, $pos, 4))[1];
+        $pos += 4;
+        $ts = unpack("V", substr($msg, $pos, 4))[1];
+        $pos += 4;
+        $size = unpack("v", substr($msg, $pos, 2))[1];
+        $pos += 2;
+        $privileges = array();
+        for ($i = 0; $i < $size; $i++) {
+            $key = unpack("v", substr($msg, $pos, 2));
+            $pos += 2;
+            $value = unpack("V", substr($msg, $pos, 4));
+            $pos += 4;
+            $privileges[$key[1]] = $value[1];
+        }
+        $this->salt = $salt;
+        $this->ts = $ts;
+        $this->privileges = $privileges;
+    }
+}

app/Module/BillExport.php

@@ -0,0 +1,152 @@
+<?php
+
+namespace App\Module;
+
+use Excel;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithEvents;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithStrictNullComparison;
+use Maatwebsite\Excel\Concerns\WithTitle;
+use Maatwebsite\Excel\Events\AfterSheet;
+use PhpOffice\PhpSpreadsheet\Cell\DataValidation;
+use PhpOffice\PhpSpreadsheet\Writer\Exception;
+
+class BillExport implements WithHeadings, WithEvents, FromCollection, WithTitle, WithStrictNullComparison
+{
+    protected $title;
+    protected $headings = [];
+    protected $data = [];
+    protected $typeLists = [];
+    protected $typeNumber = 0;
+    protected $styles = [];
+
+    public function __construct($title, array $data)
+    {
+        $this->title = $title;
+        $this->data = $data;
+    }
+
+    public static function create($data = [], $title = "Sheet1") {
+        if (is_string($data)) {
+            list($title, $data) = [$data, $title];
+        }
+        if (!is_array($data)) {
+            $data = [];
+        }
+        return new BillExport($title, $data);
+    }
+
+    public function setTitle($title) {
+        $this->title = $title;
+        return $this;
+    }
+
+    public function setHeadings(array $headings) {
+        $this->headings = $headings;
+        return $this;
+    }
+
+    public function setData(array $data) {
+        $this->data = $data;
+        return $this;
+    }
+
+    public function setTypeList(array $typeList, $number = 0) {
+        $this->typeLists = $typeList;
+        $this->typeNumber = $number;
+        return $this;
+    }
+
+    public function setStyles(array $styles)
+    {
+        $this->styles = $styles;
+        return $this;
+    }
+
+    public function store($fileName = '') {
+        if (empty($fileName)) {
+            $fileName = date("YmdHis") . '.xls';
+        }
+        try {
+            return Excel::store($this, $fileName);
+        } catch (Exception|\PhpOffice\PhpSpreadsheet\Exception $e) {
+            return "导出错误：" . $e->getMessage();
+        }
+    }
+
+    public function download($fileName = '') {
+        if (empty($fileName)) {
+            $fileName = date("YmdHis") . '.xls';
+        }
+        try {
+            return Excel::download($this, $fileName);
+        } catch (Exception|\PhpOffice\PhpSpreadsheet\Exception $e) {
+            return "导出错误：" . $e->getMessage();
+        }
+    }
+
+    /**
+     * 导出的文件标题
+     * @return string
+     */
+    public function title(): string
+    {
+        return $this->title;
+    }
+
+    /**
+     * 标题行
+     * @return array
+     */
+    public function headings(): array
+    {
+        return $this->headings;
+    }
+
+    /**
+     * 导出的内容
+     * @return \Illuminate\Support\Collection
+     */
+    public function collection()
+    {
+        return collect($this->data);
+    }
+
+    /**
+     * 设置单元格事件
+     * @return array
+     */
+    public function registerEvents(): array
+    {
+        return [
+            AfterSheet::Class => function (AfterSheet $event) {
+                if ($this->styles) {
+                    foreach ($this->styles as $cell => $style) {
+                        $event->sheet->getDelegate()->getStyle($cell)->applyFromArray($style);
+                    }
+                }
+                $count = count($this->data);
+                foreach ($this->typeLists AS $cell => $typeList) {
+                    if ($cell && $typeList) {
+                        $p = $this->headings ? 1 : 0;
+                        for ($i = 1 + $p; $i <= max($count, $this->typeNumber) + $p; $i++) {
+                            $validation = $event->sheet->getDelegate()->getCell($cell . $i)->getDataValidation();
+                            $validation->setType(DataValidation::TYPE_LIST);
+                            $validation->setErrorStyle(DataValidation::STYLE_WARNING);
+                            $validation->setAllowBlank(false);
+                            $validation->setShowDropDown(true);
+                            $validation->setShowInputMessage(true);
+                            $validation->setShowErrorMessage(true);
+                            $validation->setErrorTitle('输入的值不合法');
+                            $validation->setError('选择的值不在列表中，请选择列表中的值');
+                            $validation->setPromptTitle('从列表中选择');
+                            $validation->setPrompt('请选择下拉列表中的值');
+                            $validation->setFormula1('"' . implode(',', $typeList) . '"');
+                        }
+                    }
+                }
+            }
+        ];
+    }
+}

app/Module/BillImport.php

@@ -0,0 +1,16 @@
+<?php
+
+
+namespace App\Module;
+
+
+use Maatwebsite\Excel\Concerns\ToArray;
+
+class BillImport implements ToArray
+{
+    public function Array(Array $tables)
+    {
+        return $tables;
+    }
+
+}

app/Module/BillMultipleExport.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Module;
+
+
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;
+
+class BillMultipleExport implements WithMultipleSheets
+{
+    use Exportable;
+
+    protected $data = [];
+
+    public function __construct(array $data)
+    {
+        $this->data = $data;
+    }
+
+    public function sheets(): array
+    {
+        return $this->data;
+    }
+}

app/Module/Doo.php

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

app/Module/ElasticSearch/ElasticSearchBase.php

@@ -0,0 +1,308 @@
+<?php
+
+namespace App\Module\ElasticSearch;
+
+use Elastic\Elasticsearch\ClientBuilder;
+use Elastic\Elasticsearch\Exception\MissingParameterException;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Elasticsearch基础类
+ *
+ * Class ElasticSearchBase
+ * @package App\Module\ElasticSearch
+ */
+class ElasticSearchBase
+{
+    /**
+     * Elasticsearch客户端实例
+     *
+     * @var \Elastic\Elasticsearch\Client
+     */
+    protected $client;
+
+    /**
+     * 当前操作的索引名称
+     *
+     * @var string
+     */
+    protected $index;
+
+    /**
+     * 构造函数
+     *
+     * @param null $index 默认索引名称
+     * @throws \Elastic\Elasticsearch\Exception\ConfigException
+     */
+    public function __construct($index = null)
+    {
+        $host = env('ELASTICSEARCH_HOST', env('APP_IPPR') . '.15');
+        $port = env('ELASTICSEARCH_PORT', '9200');
+        $scheme = env('ELASTICSEARCH_SCHEME', 'http');
+        $user = env('ELASTICSEARCH_USER', '');
+        $pass = env('ELASTICSEARCH_PASS', '');
+        $verifi = env('ELASTICSEARCH_VERIFI', false);
+        $ca = env('ELASTICSEARCH_CA', '');
+        $key = env('ELASTICSEARCH_KEY', '');
+        $cert = env('ELASTICSEARCH_CERT', '');
+        // 为8.x版本客户端配置连接
+        $config = [
+            'hosts' => ["{$scheme}://{$host}:{$port}"]
+        ];
+
+        // 如果设置了用户名和密码
+        if (!empty($user)) {
+            $config['basicAuthentication'] = [$user, $pass];
+        }
+
+        $config['SSLVerification'] = $verifi;
+        if ($verifi) {
+            $config['SSLCert'] = $cert;
+            $config['CABundle'] = $ca;
+            $config['SSLKey'] = $key;
+        }
+        // 8.x版本使用ClientBuilder::fromConfig创建客户端
+        $this->client = ClientBuilder::fromConfig($config);
+
+        if ($index) {
+            $this->index = $index;
+        }
+    }
+
+    /**
+     * 设置索引名称
+     *
+     * @param string $index
+     * @return $this
+     */
+    public function setIndex($index)
+    {
+        $this->index = $index;
+        return $this;
+    }
+
+    /**
+     * 检查索引是否存在
+     *
+     * @return bool
+     * @throws \Exception
+     */
+    public function indexExists()
+    {
+        $params = ['index' => $this->index];
+        return $this->client->indices()->exists($params)->asBool();
+    }
+
+    /**
+     * 创建索引
+     *
+     * @param array $settings 索引设置
+     * @param array $mappings 字段映射
+     * @return array
+     */
+    public function createIndex($settings = [], $mappings = [])
+    {
+        $params = [
+            'index' => $this->index
+        ];
+
+        $body = [];
+        if (!empty($settings)) {
+            $body['settings'] = $settings;
+        }
+
+        if (!empty($mappings)) {
+            $body['mappings'] = $mappings;
+        }
+
+        if (!empty($body)) {
+            $params['body'] = $body;
+        }
+
+        try {
+            // 在8.x中，索引操作位于indices()命名空间
+            return $this->client->indices()->create($params)->asArray();
+        } catch (\Exception $e) {
+            Log::error('创建Elasticsearch索引失败: ' . $e->getMessage());
+            return ['error' => $e->getMessage()];
+        }
+    }
+
+    /**
+     * 删除索引
+     * @return array
+     */
+    public function deleteIndex()
+    {
+        try {
+            $params = ['index' => $this->index];
+            return $this->client->indices()->delete($params)->asArray();
+        } catch (\Exception $e) {
+            Log::error('删除Elasticsearch索引失败: ' . $e->getMessage());
+            return ['error' => $e->getMessage()];
+        }
+    }
+
+    /**
+     * 批量操作（批量添加/更新/删除文档）
+     *
+     * @param array $operations 批量操作的数据
+     * @return array
+     */
+    public function bulk($operations)
+    {
+        try {
+            // 在8.x中，批量操作API签名相同，但内部实现有所变化
+            return $this->client->bulk($operations)->asArray();
+        } catch (\Exception $e) {
+            Log::error('批量操作失败: ' . $e->getMessage());
+            return ['error' => $e->getMessage()];
+        }
+    }
+
+    /**
+     * 索引单个文档
+     *
+     * @param array $document 文档数据
+     * @param string $id 文档ID
+     * @param string|null $routing 路由值，用于父子文档
+     * @return array
+     */
+    public function indexDocument($document, $id, $routing = null)
+    {
+        $params = [
+            'index' => $this->index,
+            'id' => $id,
+            'body' => $document
+        ];
+
+        if ($routing) {
+            $params['routing'] = $routing;
+        }
+
+        try {
+            return $this->client->index($params)->asArray();
+        } catch (\Exception $e) {
+            Log::error('索引文档失败: ' . $e->getMessage());
+            return ['error' => $e->getMessage()];
+        }
+    }
+
+    /**
+     * 删除文档
+     *
+     * @param string $id 文档ID
+     * @param string|null $routing 路由值，用于父子文档
+     * @return array
+     */
+    public function deleteDocument($id, $routing = null)
+    {
+        $params = [
+            'index' => $this->index,
+            'id' => $id
+        ];
+
+        if ($routing) {
+            $params['routing'] = $routing;
+        }
+
+        try {
+            return $this->client->delete($params)->asArray();
+        } catch (MissingParameterException $e) {
+            // 文档不存在时返回成功
+            return ['result' => 'not_found', 'error' => $e->getMessage()];
+        } catch (\Exception $e) {
+            Log::error('删除文档失败: ' . $e->getMessage());
+            return ['error' => $e->getMessage()];
+        }
+    }
+
+    /**
+     * 刷新索引
+     * @return array
+     */
+    public function refreshIndex()
+    {
+        $params = [
+            'index' => $this->index
+        ];
+
+        try {
+            return $this->client->indices()->refresh($params)->asArray();
+        } catch (\Exception $e) {
+            Log::error('刷新索引失败: ' . $e->getMessage());
+            return ['error' => $e->getMessage()];
+        }
+    }
+
+    /**
+     * 检查索引映射
+     * @return array
+     */
+    public function checkIndexMapping()
+    {
+        try {
+            return $this->client->indices()->getMapping(['index' => $this->index])->asArray();
+        } catch (\Exception $e) {
+            return ['error' => $e->getMessage()];
+        }
+    }
+
+    /**
+     * 通用搜索方法
+     *
+     * @param array $query 搜索查询
+     * @param int $from 起始位置
+     * @param int $size 返回结果数量
+     * @param array $sort 排序规则
+     * @return array
+     */
+    public function search($query, $from = 0, $size = 10, $sort = [])
+    {
+        $params = [
+            'index' => $this->index,
+            'body' => [
+                'query' => $query,
+                'from' => $from,
+                'size' => $size
+            ]
+        ];
+
+        if (!empty($sort)) {
+            $params['body']['sort'] = $sort;
+        }
+
+        try {
+            return $this->client->search($params)->asArray();
+        } catch (\Exception $e) {
+            Log::error('搜索失败: ' . $e->getMessage());
+            return ['error' => $e->getMessage(), 'hits' => ['total' => ['value' => 0], 'hits' => []]];
+        }
+    }
+
+    /**
+     * 索引名称
+     */
+    const indexName = 'default';
+
+    /**
+     * 获取索引名称
+     * @param string $index 索引名称
+     * @param string|null $prefix 索引前缀
+     * @param string|null $subfix 索引后缀
+     * @return string
+     */
+    public static function indexName($index = '', $prefix = '', $subfix = '')
+    {
+        $index = $index ?: static::indexName;
+        $prefix = $prefix ?: env('ES_INDEX_PREFIX', '');
+        $subfix = $subfix ?: env('ES_INDEX_SUFFIX', '');
+        if ($prefix) {
+            $index = rtrim($prefix, '_') . '_' . $index;
+        }
+        if ($subfix) {
+            $index = $index . '_' . ltrim($subfix, '_');
+        }
+        return $index;
+    }
+}

app/Module/ElasticSearch/ElasticSearchKeyValue.php

@@ -0,0 +1,204 @@
+<?php
+
+namespace App\Module\ElasticSearch;
+
+use App\Module\Base;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Elasticsearch键值存储
+ *
+ * Class ElasticSearchKeyValue
+ * @package App\Module\ElasticSearch
+ */
+class ElasticSearchKeyValue extends ElasticSearchBase
+{
+    const indexName = 'key_value_store';
+
+    /**
+     * 构造函数
+     * @return ElasticSearchBase
+     * @throws \Elastic\Elasticsearch\Exception\ConfigException
+     */
+    public function __construct()
+    {
+        return parent::__construct(self::indexName());
+    }
+
+    /** ******************************************************************************************************** */
+    /** *********************************** 键值存储方法 ******************************************************** */
+    /** ******************************************************************************************************** */
+
+    /**
+     * 创建键值存储索引
+     * @return array
+     */
+    public static function generateIndex()
+    {
+        try {
+            $es = new self();
+
+            // 如果索引已存在，则直接返回
+            if ($es->indexExists()) {
+                return ['acknowledged' => true, 'message' => '索引已存在'];
+            }
+
+            // 定义映射
+            $mappings = [
+                'properties' => [
+                    'key' => ['type' => 'keyword'],
+                    'value' => ['type' => 'text', 'fields' => ['keyword' => ['type' => 'keyword']]],
+                    'created_at' => ['type' => 'integer'],
+                    'updated_at' => ['type' => 'integer']
+                ]
+            ];
+
+            // 索引设置
+            $settings = [
+                'number_of_shards' => 1,
+                'number_of_replicas' => 1,
+                'refresh_interval' => '1s'
+            ];
+
+            return $es->createIndex($settings, $mappings);
+        } catch (\Exception $e) {
+            Log::error('创建键值存储索引失败: ' . $e->getMessage());
+            return ['error' => $e->getMessage()];
+        }
+    }
+
+    /**
+     * 保存键值对
+     * @param string $key 键名
+     * @param mixed $value 键值
+     * @param string $namespace 命名空间，用于区分不同的键值存储场景
+     * @return array
+     */
+    public static function save($key, $value, $namespace = 'default')
+    {
+        try {
+            // 确保索引存在
+            self::generateIndex();
+
+            $es = new self();
+
+            // 生成文档ID
+            $docId = "{$namespace}:{$key}";
+
+            // 准备文档数据
+            $document = [
+                'key' => $key,
+                'value' => is_array($value) ? json_encode($value, JSON_UNESCAPED_UNICODE) : $value,
+                'namespace' => $namespace,
+                'created_at' => time(),
+                'updated_at' => time()
+            ];
+
+            // 索引文档
+            $result = $es->indexDocument($document, $docId);
+
+            // 刷新索引以确保立即可见
+            $es->refreshIndex();
+
+            return $result;
+        } catch (\Exception $e) {
+            Log::error('保存键值对失败: ' . $e->getMessage());
+            return ['error' => $e->getMessage()];
+        }
+    }
+
+    /**
+     * 获取键值
+     * @param string $key 键名
+     * @param mixed $default 默认值，当键不存在时返回
+     * @param string $namespace 命名空间，用于区分不同的键值存储场景
+     * @return mixed
+     */
+    public static function get($key, $default = null, $namespace = 'default')
+    {
+        try {
+            $es = new self();
+
+            // 如果索引不存在，直接返回默认值
+            if (!$es->indexExists()) {
+                return $default;
+            }
+
+            // 生成文档ID
+            $docId = "{$namespace}:{$key}";
+
+            // 查询参数
+            $params = [
+                'index' => self::indexName(),
+                'id' => $docId
+            ];
+
+            try {
+                // 获取文档
+                $response = $es->client->get($params)->asArray();
+
+                // 获取值
+                $value = $response['_source']['value'] ?? $default;
+
+                // 如果值是JSON字符串，尝试解码
+                if (is_string($value) && $decoded = json_decode($value, true)) {
+                    if (json_last_error() === JSON_ERROR_NONE) {
+                        return $decoded;
+                    }
+                }
+
+                return $value;
+            } catch (\Exception $e) {
+                // 文档不存在或其他错误，返回默认值
+                return $default;
+            }
+        } catch (\Exception $e) {
+            Log::error('获取键值对失败: ' . $e->getMessage());
+            return $default;
+        }
+    }
+
+    /**
+     * 获取键值，返回数组
+     * @param string $key 键名
+     * @param array $default 默认值，当键不存在时返回
+     * @param string $namespace 命名空间，用于区分不同的键值存储场景
+     * @return array
+     */
+    public static function getArray($key, $default = [], $namespace = 'default')
+    {
+        return Base::string2array(self::get($key, $default, $namespace));
+    }
+
+    /**
+     * 删除键值对
+     * @param string $key 键名
+     * @param string $namespace 命名空间
+     * @return array
+     */
+    public static function delete($key, $namespace = 'default')
+    {
+        try {
+            $es = new self();
+
+            // 如果索引不存在，直接返回成功
+            if (!$es->indexExists()) {
+                return ['result' => 'not_found'];
+            }
+
+            // 生成文档ID
+            $docId = "{$namespace}:{$key}";
+
+            // 删除文档
+            $result = $es->deleteDocument($docId);
+
+            // 刷新索引以确保立即生效
+            $es->refreshIndex();
+
+            return $result;
+        } catch (\Exception $e) {
+            Log::error('删除键值对失败: ' . $e->getMessage());
+            return ['error' => $e->getMessage()];
+        }
+    }
+}

app/Module/ElasticSearch/ElasticSearchUserMsg.php

@@ -0,0 +1,375 @@
+<?php
+
+namespace App\Module\ElasticSearch;
+
+use App\Models\WebSocketDialogMsg;
+use App\Models\WebSocketDialogUser;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * 对话系统消息索引
+ *
+ * Class ElasticSearchUserMsg
+ * @package App\Module\ElasticSearch
+ */
+class ElasticSearchUserMsg extends ElasticSearchBase
+{
+    const indexName = 'dialog_user_msg';
+
+    /**
+     * 构造函数
+     * @return ElasticSearchBase
+     * @throws \Elastic\Elasticsearch\Exception\ConfigException
+     */
+    public function __construct()
+    {
+        return parent::__construct(self::indexName());
+    }
+
+    /** ******************************************************************************************************** */
+    /** *********************************************** 基础 ************************************************** */
+    /** ******************************************************************************************************** */
+
+    /**
+     * 创建聊天系统索引 - 使用父子关系
+     * @return array
+     */
+    public static function generateIndex()
+    {
+        // 定义映射
+        $mappings = [
+            'properties' => [
+                // 共用字段
+                'dialog_id' => ['type' => 'keyword'],
+                'created_at' => ['type' => 'date'],
+                'updated_at' => ['type' => 'date'],
+
+                // dialog_users 字段
+                'userid' => ['type' => 'keyword'],
+                'top_at' => ['type' => 'date'],
+                'last_at' => ['type' => 'date'],
+                'mark_unread' => ['type' => 'integer'],
+                'silence' => ['type' => 'integer'],
+                'hide' => ['type' => 'integer'],
+                'color' => ['type' => 'keyword'],
+
+                // dialog_msgs 字段
+                'msg_id' => ['type' => 'keyword'],
+                'sender_userid' => ['type' => 'keyword'],
+                'msg_type' => ['type' => 'keyword'],
+                'key' => ['type' => 'text'],
+                'bot' => ['type' => 'integer'],
+
+                // Join字段定义父子关系
+                'relationship' => [
+                    'type' => 'join',
+                    'relations' => [
+                        'dialog_user' => 'dialog_msg' // dialog_user是父文档，dialog_msg是子文档
+                    ]
+                ],
+            ]
+        ];
+
+        // 索引设置
+        $settings = [
+            'number_of_shards' => 5,
+            'number_of_replicas' => 1,
+            'refresh_interval' => '5s'
+        ];
+
+        try {
+            $es = new self();
+            return $es->createIndex($settings, $mappings);
+        } catch (\Exception $e) {
+            Log::error('创建聊天系统索引失败: ' . $e->getMessage());
+            return ['error' => $e->getMessage()];
+        }
+    }
+
+    /**
+     * 构建对话系统特定的搜索 - 根据用户ID和消息关键词搜索会话
+     * @param string $userid 用户ID
+     * @param string $keyword 消息关键词
+     * @param int $size 返回结果数量
+     * @return array
+     */
+    public static function searchByKeyword($userid, $keyword, $size = 20)
+    {
+        // 注意这里的类型名称要与创建索引时的一致
+        $query = [
+            'bool' => [
+                'must' => [
+                    [
+                        'term' => [
+                            'userid' => $userid
+                        ]
+                    ],
+                    [
+                        'has_child' => [
+                            'type' => 'dialog_msg',
+                            'query' => [
+                                'bool' => [
+                                    'must' => [
+                                        [
+                                            'match_phrase' => [
+                                                'key' => $keyword
+                                            ]
+                                        ],
+                                        [
+                                            'term' => [
+                                                'bot' => 0
+                                            ]
+                                        ]
+                                    ]
+                                ]
+                            ],
+                            'inner_hits' => [
+                                'size' => 1,
+                                'sort' => [
+                                    'msg_id' => 'desc'
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ];
+
+        // 结果集合
+        $searchMap = [];
+
+        try {
+            // 开始搜索
+            $es = new self();
+            $results = $es->search($query, 0, $size, ['last_at' => 'desc']);
+
+            // 处理搜索结果
+            $hits = $results['hits']['hits'] ?? [];
+
+            foreach ($hits as $hit) {
+                if (isset($hit['inner_hits']['dialog_msg']['hits']['hits'][0])) {
+                    $msgHit = $hit['inner_hits']['dialog_msg']['hits']['hits'][0];
+                    $source = $hit['_source'];
+                    $msgSource = $msgHit['_source'];
+
+                    $searchMap[] = [
+                        'id' => $source['dialog_id'],
+                        'top_at' => $source['top_at'],
+                        'last_at' => $source['last_at'],
+                        'mark_unread' => $source['mark_unread'],
+                        'silence' => $source['silence'],
+                        'hide' => $source['hide'],
+                        'color' => $source['color'],
+                        'user_at' => $source['updated_at'],
+                        'search_msg_id' => $msgSource['msg_id'],
+                    ];
+                }
+            }
+        } catch (\Exception $e) {
+            Log::error('searchByKeyword: ' . $e->getMessage());
+        }
+
+        // 返回搜索结果
+        return $searchMap;
+    }
+
+    /** ******************************************************************************************************** */
+    /** *********************************************** 用户 ************************************************** */
+    /** ******************************************************************************************************** */
+
+    /**
+     * 会话用户 - 生成文档ID
+     * @param WebSocketDialogUser $dialogUser
+     * @return string
+     */
+    public static function generateUserDicId(WebSocketDialogUser $dialogUser)
+    {
+        return "user_{$dialogUser->userid}_dialog_{$dialogUser->dialog_id}";
+    }
+
+    /**
+     * 会话用户 - 生成文档格式
+     * @param WebSocketDialogUser $dialogUser
+     * @return array
+     */
+    public static function generateUserFormat(WebSocketDialogUser $dialogUser)
+    {
+        return [
+            'dialog_id' => $dialogUser->dialog_id,
+            'created_at' => $dialogUser->created_at,
+            'updated_at' => $dialogUser->updated_at,
+
+            'userid' => $dialogUser->userid,
+            'top_at' => $dialogUser->top_at,
+            'last_at' => $dialogUser->last_at,
+            'mark_unread' => $dialogUser->mark_unread ? 1 : 0,
+            'silence' => $dialogUser->silence ? 1 : 0,
+            'hide' => $dialogUser->hide ? 1 : 0,
+            'color' => $dialogUser->color,
+
+            'relationship' => [
+                'name' => 'dialog_user'
+            ]
+        ];
+    }
+
+    /**
+     * 会话用户 - 同步到Elasticsearch
+     * @param WebSocketDialogUser $dialogUser
+     * @return void
+     */
+    public static function syncUser(WebSocketDialogUser $dialogUser)
+    {
+        try {
+            $es = new self();
+            $es->indexDocument(self::generateUserFormat($dialogUser), self::generateUserDicId($dialogUser));
+        } catch (\Exception $e) {
+            Log::error('syncUser: ' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 会话用户 - 从Elasticsearch删除
+     */
+    public static function deleteUser(WebSocketDialogUser $dialogUser)
+    {
+        try {
+            $es = new self();
+
+            $docId = "user_{$dialogUser->userid}_dialog_{$dialogUser->dialog_id}";
+
+            // 删除用户-会话文档
+            $es->deleteDocument($docId);
+
+            // 注意：这里可能还需要删除所有关联的消息文档
+            // 但由于父子关系，可以通过查询找到所有子文档并删除
+            // 这里为简化，可以选择在后台任务中处理，或者直接依赖ES的级联删除功能
+
+        } catch (\Exception $e) {
+            Log::error('deleteUser: ' . $e->getMessage());
+        }
+    }
+
+    /** ******************************************************************************************************** */
+    /** *********************************************** 消息 ************************************************** */
+    /** ******************************************************************************************************** */
+
+    /**
+     * 会话消息 - 生成父文档ID
+     * @param WebSocketDialogMsg $dialogMsg
+     * @param $userid
+     * @return string
+     */
+    public static function generateMsgParentId(WebSocketDialogMsg $dialogMsg, $userid)
+    {
+        return "user_{$userid}_dialog_{$dialogMsg->dialog_id}";
+    }
+
+    /**
+     * 会话消息 - 生成文档ID
+     * @param WebSocketDialogMsg $dialogMsg
+     * @param $userid
+     * @return string
+     */
+    public static function generateMsgDicId(WebSocketDialogMsg $dialogMsg, $userid)
+    {
+        return "msg_{$dialogMsg->id}_user_{$userid}";
+    }
+
+    /**
+     * 会话消息 - 生成文档格式
+     * @param WebSocketDialogMsg $dialogMsg
+     * @param $userid
+     * @return array
+     */
+    public static function generateMsgFormat(WebSocketDialogMsg $dialogMsg, $userid)
+    {
+        return [
+            'dialog_id' => $dialogMsg->dialog_id,
+            'created_at' => $dialogMsg->created_at,
+            'updated_at' => $dialogMsg->updated_at,
+
+            'msg_id' => $dialogMsg->id,
+            'sender_userid' => $dialogMsg->userid,
+            'msg_type' => $dialogMsg->type,
+            'key' => $dialogMsg->key,
+            'bot' => $dialogMsg->bot ? 1 : 0,
+
+            'relationship' => [
+                'name' => 'dialog_msg',
+                'parent' => self::generateMsgParentId($dialogMsg, $userid)
+            ]
+        ];
+    }
+
+    /**
+     * 会话消息 - 同步到Elasticsearch
+     */
+    public static function syncMsg(WebSocketDialogMsg $dialogMsg)
+    {
+        try {
+            $es = new self();
+
+            // 获取此会话的所有用户
+            $dialogUsers = WebSocketDialogUser::whereDialogId($dialogMsg->dialog_id)->get();
+
+            if ($dialogUsers->isEmpty()) {
+                return;
+            }
+
+            $params = ['body' => []];
+
+            foreach ($dialogUsers as $dialogUser) {
+                $params['body'][] = [
+                    'index' => [
+                        '_index' => self::indexName(),
+                        '_id' => self::generateMsgDicId($dialogMsg, $dialogUser->userid),
+                        'routing' => self::generateMsgParentId($dialogMsg, $dialogUser->userid)
+                    ]
+                ];
+                $params['body'][] = self::generateMsgFormat($dialogMsg, $dialogUser->userid);
+            }
+
+            if (!empty($params['body'])) {
+                $es->bulk($params);
+            }
+        } catch (\Exception $e) {
+            Log::error('syncMsg: ' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 会话消息 - 从Elasticsearch删除
+     */
+    public static function deleteMsg(WebSocketDialogMsg $dialogMsg)
+    {
+        try {
+            $es = new self();
+
+            // 获取此会话的所有用户
+            $dialogUsers = WebSocketDialogUser::whereDialogId($dialogMsg->dialog_id)->get();
+
+            if ($dialogUsers->isEmpty()) {
+                return;
+            }
+
+            $params = ['body' => []];
+
+            foreach ($dialogUsers as $dialogUser) {
+                $params['body'][] = [
+                    'delete' => [
+                        '_index' => self::indexName(),
+                        '_id' => self::generateMsgDicId($dialogMsg, $dialogUser->userid),
+                        'routing' => self::generateMsgParentId($dialogMsg, $dialogUser->userid)
+                    ]
+                ];
+            }
+
+            if (!empty($params['body'])) {
+                $es->bulk($params);
+            }
+        } catch (\Exception $e) {
+            Log::error('deleteMsg: ' . $e->getMessage());
+        }
+    }
+}