no message

.env.docker

@@ -1,23 +1,19 @@
-TIMEZONE=PRC
-
-APP_NAME=DooTask
+APP_NAME=Dootask
 APP_ENV=local
 APP_KEY=
-APP_DEBUG=false
+APP_DEBUG=true
 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
 
 DB_CONNECTION=mysql
-DB_HOST=mariadb
+DB_HOST="${APP_IPPR}.5"
 DB_PORT=3306
 DB_DATABASE=dootask
 DB_USERNAME=dootask
@@ -34,7 +30,7 @@ SESSION_LIFETIME=120
 
 MEMCACHED_HOST=127.0.0.1
 
-REDIS_HOST=redis
+REDIS_HOST="${APP_IPPR}.4"
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 

.env.example

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

.github/workflows/electron.yml

@@ -0,0 +1,34 @@
+name: Build
+
+on:
+  push:
+    branches: [ build ]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    environment: build
+
+    strategy:
+      matrix:
+        os: [macos-11]
+        platform: [
+            build-mac,
+            build-mac-arm,
+            build-win
+        ]
+
+    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 }}
+        run: ./cmd electron ${{ matrix.platform }}
+

.github/workflows/publish.yml

@@ -1,304 +0,0 @@
-name: "Publish"
-
-on:
-  push:
-    branches:
-      - "pro"
-
-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,61 +1,28 @@
-# Dependencies
 /node_modules
-/vendor
-
-# Build and temporary files
-/build
 /public/hot
 /public/tmp
-/tmp
-
-# Uploads and user-generated content
-/public/summary
 /public/uploads/*
 /public/.well-known
 /public/.user.ini
-
-# Storage and configuration
-/config/LICENSE
 /storage/*.key
-
-# Environment and configuration
+/vendor
+/build
+/tmp
+._*
 .env
-vars.yaml
-
-# IDE and editor files
 .idea
 .vscode
-.windsurfrules
-
-# Development tools
 .vagrant
+.phpunit.result.cache
 Homestead.json
 Homestead.yaml
-
-# Development file
-/index.html
-
-# Testing
-.phpunit.result.cache
-test.*
-
-# Logs and debug files
 npm-debug.log
 yarn-error.log
-
-# Lock files
-dootask.lock
+test.*
+composer.lock
 package-lock.json
-
-# Laravel/Swoole specific
 laravels-timer-process.pid
+.DS_Store
+vars.yaml
 laravels.conf
 laravels.pid
-
-# System files
-._*
-.DS_Store
-
-# Documentation
-AGENTS.md
-README_LOCAL.md

.gitmodules

@@ -1,6 +0,0 @@
-[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

.prefetch

@@ -1,170 +0,0 @@
-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

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

README_CN.md

@@ -1,28 +1,14 @@
-# DooTask - 开源任务管理系统
+# Install (Docker)
 
 **[English](./README.md)** | 中文文档
 
-- [截图预览](./README_PREVIEW.md)
+- [截图预览](README_PREVIEW.md)
 - [演示站点](http://www.dootask.com/)
 
-**QQ交流群**
-
-- QQ群号: `546574618`
-
-## 📍 0.x 迁移到 1.x
-
-- 升级时请务必备份好数据！
-- 如果升级失败请尝试执行 `./cmd update` 重试几次。
-- 如果升级中出现 `没有找到 xxx 容器` 的提示，请运行 `./cmd reup` 后再执行 `./cmd update`。
-- 如果升级后出现502错误请运行 `./cmd reup` 重启服务即可。
-- 如果升级后出现 `应用「xxx」未安装` 的提示，请使用管理员账号进入应用商店安装相关应用。
-
 ## 安装程序
 
-- 必须安装：`Docker v20.10+` 和 `Docker Compose v2.0+`
-- 支持环境：`Centos/Debian/Ubuntu/macOS` 等 linux/unix 系统
-- 硬件建议：2核4G以上
-- 特别说明：Windows 可以使用 WSL2 安装 Linux 环境后再安装 DooTask。
+> 必须安装 `Docker` 和 `Docker Compose`
+
 
 ### 部署项目
 
@@ -30,14 +16,14 @@
 # 1、克隆项目到您的本地或服务器
 
 # 通过github克隆项目
-git clone --depth=1 https://github.com/kuaifan/dootask.git
+git clone https://github.com/kuaifan/dootask.git
 # 或者你也可以使用gitee
-git clone --depth=1 https://gitee.com/aipaw/dootask.git
+git clone https://gitee.com/aipaw/dootask.git
 
 # 2、进入目录
 cd dootask
 
-# 3、一键安装项目（自定义端口安装，如：./cmd install --port 80）
+# 3、一键构建项目
 ./cmd install
 ```
 
@@ -51,44 +37,34 @@ cd dootask
 ### 更换端口
 
 ```bash
-# 此方法仅更换http端口，更换https端口请阅读下面SSL配置
-./cmd port 80
+./cmd php bin/run --port=2222
+./cmd up -d
 ```
 
 ### 停止服务
 
 ```bash
-./cmd down
+./cmd stop
+
+# 一旦应用程序被设置，无论何时你想要启动服务器(如果它被停止)运行以下命令
+./cmd start
 ```
 
-### 启动服务
+### 运行命令的快捷方式
 
 ```bash
-./cmd up
+# 你可以使用以下命令来执行
+./cmd artisan "your command"          // 运行 artisan 命令
+./cmd php "your command"              // 运行 php 命令
+./cmd nginx "your command"            // 运行 nginx 命令
+./cmd redis "your command"            // 运行 redis 命令
+./cmd composer "your command"         // 运行 composer 命令
+./cmd supervisorctl "your command"    // 运行 supervisorctl 命令
+./cmd test "your command"             // 运行 phpunit 命令
+./cmd mysql "your command"            // 运行 mysql 命令 (backup: 备份数据库，recovery: 还原数据库)
 ```
 
-### 开发编译
-
-请确保你已经安装了 `NodeJs 20+`
-
-```bash
-# 开发模式
-./cmd dev
-   
-# 编译项目（这是网页端的，客户端请参考“.github/workflows/publish.yml”文件）
-./cmd prod  
-```
-
-### SSL 配置
-
-#### 方法1：自动配置
-
-```bash 
-# 执行指令，根据提示执行即可
-./cmd https
-```
-
-#### 方法2：Nginx 代理配置
+### NGINX 代理 SSL
 
 ```bash 
 # 1、Nginx 代理配置添加
@@ -96,8 +72,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、执行指令（如果取消 Nginx 代理配置请运行：./cmd https close）
-./cmd https agent
+# 2、进入项目所在目录，运行以下命令
+./cmd https
 ```
 
 ## 升级更新
@@ -105,43 +81,20 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 **注意：在升级之前请备份好你的数据！**
 
 ```bash
+# 方法1：进入项目所在目录，运行以下命令
 ./cmd update
-```
 
-* 跨越大版本升级失败时请重试执行一次。
-* 如果升级后出现502请运行 `./cmd reup` 重启服务即可。
-
-## 迁移项目
-
-在新项目安装好之后按照以下步骤完成项目迁移：
-
-1、备份原数据库
-
-```bash
-# 在旧的项目下执行指令
+# （或者）方法2：如果方法1失败请使用此方法
+git pull
 ./cmd mysql backup
-```
-
-2、将旧项目以下文件和目录拷贝至新项目同路径位置
-
- - `数据库备份文件`
- - `docker/appstore`
- - `public/uploads`
-
-3、还原数据库至新项目
-```bash
-# 在新的项目下执行指令
+./cmd uninstall
+./cmd install
 ./cmd mysql recovery
 ```
 
 ## 卸载项目
 
 ```bash
+# 进入项目所在目录，运行以下命令
 ./cmd uninstall
 ```
-
-### 更多指令
-
-```bash
-./cmd help
-```

README_PUBLISH.md

@@ -1,31 +0,0 @@
-# 发布
-
-## 准备工作
-
-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/SyncUserMsgToZincSearch.php

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

app/Events/ServerStartEvent.php

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

app/Exceptions/ApiException.php

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

app/Exceptions/Handler.php

@@ -3,11 +3,9 @@
 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
@@ -53,11 +51,6 @@ 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) {
@@ -74,168 +67,9 @@ class Handler extends ExceptionHandler
     public function report(Throwable $e)
     {
         if ($e instanceof ApiException) {
-            if ($e->isWriteLog()) {
-                Log::error($e->getMessage(), [
-                    'code' => $e->getCode(),
-                    'data' => $e->getData(),
-                    'exception' => ' at ' . $e->getFile() . ':' . $e->getLine()
-                ]);
-            }
+            Log::error($e->getMessage(), ['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,22 +3,15 @@
 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));
     }
 }
 
 if (!function_exists('seeders_at')) {
     function seeders_at($data)
     {
-        $diff = time() - strtotime("2021-07-02");
+        $diff = time() - strtotime("2021-07-01");
         $time = strtotime($data) + $diff;
         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/AssistantController.php

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

app/Http/Controllers/Api/ComplaintController.php

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

@@ -1,109 +0,0 @@
-<?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

@@ -1,815 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Exceptions\ApiException;
-use App\Models\AbstractModel;
-use App\Models\ProjectTask;
-use App\Models\Report;
-use App\Models\ReportAnalysis;
-use App\Models\ReportLink;
-use App\Models\ReportReceive;
-use App\Models\User;
-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\Relations\BelongsToMany;
-use Illuminate\Validation\Rule;
-use Request;
-use Illuminate\Support\Facades\Validator;
-
-/**
- * @apiDefine report
- *
- * 汇报
- */
-class ReportController extends AbstractController
-{
-    /**
-     * @api {get} api/report/my 我发送的汇报
-     *
-     * @apiDescription 需要token身份
-     * @apiVersion 1.0.0
-     * @apiGroup report
-     * @apiName my
-     *
-     * @apiParam {Object} [keys]             搜索条件
-     * - keys.key: 关键词
-     * - keys.type: 汇报类型，weekly:周报，daily:日报
-     * - keys.created_at: 汇报时间
-     * @apiParam {Number} [page]        当前页，默认:1
-     * @apiParam {Number} [pagesize]    每页显示数量，默认:20，最大:50
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function my(): array
-    {
-        $user = User::auth();
-        //
-        $builder = Report::with(['receivesUser'])->whereUserid($user->userid);
-        $keys = Request::input('keys');
-        if (is_array($keys)) {
-            if ($keys['key']) {
-                if (str_contains($keys['key'], '@')) {
-                    $builder->whereHas('sendUser', function ($q2) use ($keys) {
-                        $q2->where("users.email", "LIKE", "%{$keys['key']}%");
-                    });
-                } else {
-                    $builder->where("title", "LIKE", "%{$keys['key']}%");
-                }
-            }
-            if (in_array($keys['type'], [Report::WEEKLY, Report::DAILY])) {
-                $builder->whereType($keys['type']);
-            }
-            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->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
-        return Base::retSuccess('success', $list);
-    }
-
-    /**
-     * @api {get} api/report/receive 我接收的汇报
-     *
-     * @apiDescription 需要token身份
-     * @apiVersion 1.0.0
-     * @apiGroup report
-     * @apiName receive
-     *
-     * @apiParam {Object} [keys]             搜索条件
-     * - keys.key: 关键词
-     * - keys.department_id: 部门ID
-     * - keys.type: 汇报类型，weekly:周报，daily:日报
-     * - keys.status: 状态，unread:未读，read:已读
-     * - keys.created_at: 汇报时间
-     * @apiParam {Number} [page]        当前页，默认:1
-     * @apiParam {Number} [pagesize]    每页显示数量，默认:20，最大:50
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function receive(): array
-    {
-        $user = User::auth();
-        $builder = Report::with(['receivesUser']);
-        $builder->whereHas("receivesUser", function ($query) use ($user) {
-            $query->where("report_receives.userid", $user->userid);
-        });
-        $keys = Request::input('keys');
-        if (is_array($keys)) {
-            if ($keys['key']) {
-                if (str_contains($keys['key'], '@')) {
-                    $builder->whereHas('sendUser', function ($q2) use ($keys) {
-                        $q2->where("users.email", "LIKE", "%{$keys['key']}%");
-                    });
-                } 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());
-            }
-        }
-        $list = $builder->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
-        if ($list->items()) {
-            foreach ($list->items() as $item) {
-                $item->receive_at = ReportReceive::query()->whereRid($item["id"])->whereUserid($user->userid)->value("receive_at");
-            }
-        }
-        return Base::retSuccess('success', $list);
-    }
-
-    /**
-     * @api {get} api/report/store 保存并发送工作汇报
-     *
-     * @apiDescription 需要token身份
-     * @apiVersion 1.0.0
-     * @apiGroup report
-     * @apiName store
-     *
-     * @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     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function store(): array
-    {
-        $user = User::auth();
-        //
-        $input = [
-            "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" => Request::input("offset", 0),
-        ];
-        $validator = Validator::make($input, [
-            'id' => 'numeric',
-            'title' => 'required',
-            'type' => ['required', Rule::in([Report::WEEKLY, Report::DAILY])],
-            'content' => 'required',
-            'offset' => ['numeric', 'max:0'],
-        ], [
-            'id.numeric' => 'ID只能是数字',
-            'title.required' => '请填写标题',
-            'type.required' => '请选择汇报类型',
-            'type.in' => '汇报类型错误',
-            'content.required' => '请填写汇报内容',
-            'offset.numeric' => '工作汇报周期格式错误，只能是数字',
-            'offset.max' => '只能提交当天/本周或者之前的的工作汇报',
-        ]);
-        if ($validator->fails())
-            return Base::retError($validator->errors()->first());
-
-        // 接收人
-        if (is_array($input["receive"])) {
-            // 删除当前登录人
-            $input["receive"] = array_diff($input["receive"], [$user->userid]);
-
-            // 查询用户是否存在
-            if (count($input["receive"]) !== User::whereIn("userid", $input["receive"])->count())
-                return Base::retError("用户不存在");
-
-            foreach ($input["receive"] as $userid) {
-                $input["receive_content"][] = [
-                    "receive_at" => Carbon::now()->toDateTimeString(),
-                    "userid" => $userid,
-                    "read" => 0,
-                ];
-            }
-        }
-
-        // 在事务中运行
-        return AbstractModel::transaction(function () use ($input, $user) {
-            $id = $input["id"];
-            if ($id) {
-                // 编辑
-                $report = Report::getOne($id);
-                $report->updateInstance([
-                    "title" => $input["title"],
-                    "type" => $input["type"],
-                ]);
-            } else {
-                // 生成唯一标识
-                $sign = Base::isNumber($input["sign"]) ? $input["sign"] : Report::generateSign($input["type"], $input["offset"]);
-                // 检查唯一标识是否存在
-                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"],
-                    "userid" => $user->userid,
-                ]);
-            }
-            $report->save();
-
-            // 保存内容
-            $content = $input["content"];
-            preg_match_all("/<img\s+src=\"data:image\/(png|jpg|jpeg|webp);base64,(.*?)\"/s", $content, $matchs);
-            foreach ($matchs[2] as $key => $text) {
-                $tmpPath = "uploads/report/" . Carbon::parse($report->created_at)->format("Ym") . "/" . $report->id . "/attached/";
-                Base::makeDir(public_path($tmpPath));
-                $tmpPath .= md5($text) . "." . $matchs[1][$key];
-                if (Base::saveContentImage(public_path($tmpPath), base64_decode($text))) {
-                    $paramet = getimagesize(public_path($tmpPath));
-                    $content = str_replace($matchs[0][$key], '<img src="' . Base::fillUrl($tmpPath) . '" original-width="' . $paramet[0] . '" original-height="' . $paramet[1] . '"', $content);
-                }
-            }
-            $report->content = htmlspecialchars($content);
-            $report->save();
-
-            // 删除关联
-            $report->Receives()->delete();
-            if ($input["receive_content"]) {
-                // 保存接收人
-                $report->Receives()->createMany($input["receive_content"]);
-            }
-
-            // 推送消息
-            $userids = [];
-            foreach ($input["receive_content"] as $item) {
-                $userids[] = $item['userid'];
-            }
-            if ($userids) {
-                $params = [
-                    'ignoreFd' => Request::header('fd'),
-                    'userid' => $userids,
-                    'msg' => [
-                        'type' => 'report',
-                        'action' => 'unreadUpdate',
-                    ]
-                ];
-                Task::deliver(new PushTask($params, false));
-            }
-            //
-            return Base::retSuccess('保存成功', $report);
-        });
-    }
-
-    /**
-     * @api {get} api/report/template 生成汇报模板
-     *
-     * @apiDescription 需要token身份
-     * @apiVersion 1.0.0
-     * @apiGroup report
-     * @apiName template
-     *
-     * @apiParam {Array}  [type]         汇报类型，weekly:周报，daily:日报
-     * @apiParam {Number} [offset]       偏移量
-     * @apiParam {String} [date]         时间
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function template(): array
-    {
-        $user = User::auth();
-        $type = trim(Request::input("type"));
-        $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();
-            if ($offset > 0) {
-                // 将当前时间调整为偏移量当天结束
-                $now_dt->subDays($offset)->endOfDay();
-                // 开始时间偏移量计算
-                $start_time->subDays($offset);
-            }
-            $end_time = Carbon::instance($start_time)->endOfDay();
-        } else {
-            $start_time = Carbon::now();
-            if ($offset > 0) {
-                // 将当前时间调整为偏移量当周结束
-                $now_dt->subWeeks($offset)->endOfDay();
-                // 开始时间偏移量计算
-                $start_time->subWeeks($offset);
-            }
-            $start_time->startOfWeek();
-            $end_time = Carbon::instance($start_time)->endOfWeek();
-        }
-
-        // 生成唯一标识
-        $sign = Report::generateSign($type, 0, Carbon::instance($start_time));
-        $one = Report::whereSign($sign)->whereType($type)->first();
-
-        // 如果已经提交了相关汇报
-        if ($one && $id > 0) {
-            return Base::retSuccess('success', [
-                "id" => $one->id,
-                "sign" => $one->sign,
-                "title" => $one->title,
-                "content" => $one->content,
-            ]);
-        }
-
-        // 表格头部
-        $labels = [
-            Doo::translate('项目'),
-            Doo::translate('任务'),
-            Doo::translate('负责人'),
-            Doo::translate('备注'),
-        ];
-
-        // 已完成的任务
-        $completeDatas = [];
-        $complete_task = ProjectTask::query()
-            ->whereNotNull("complete_at")
-            ->whereBetween("complete_at", [$start_time->toDateTimeString(), $end_time->toDateTimeString()])
-            ->whereHas("taskUser", function ($query) use ($user) {
-                $query->where("userid", $user->userid);
-            })
-            ->orderByDesc("id")
-            ->get();
-        if ($complete_task->isNotEmpty()) {
-            foreach ($complete_task as $task) {
-                $complete_at = Carbon::parse($task->complete_at);
-                $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,
-                ];
-            }
-        }
-
-        // 未完成的任务
-        $unfinishedDatas = [];
-        $unfinished_task = ProjectTask::query()
-            ->join("projects", "projects.id", "=", "project_tasks.project_id")
-            ->whereNull("projects.archived_at")
-            ->whereNull("project_tasks.complete_at")
-            ->whereNotNull("project_tasks.start_at")
-            ->where("project_tasks.end_at", "<", $end_time->toDateTimeString())
-            ->whereHas("taskUser", function ($query) use ($user) {
-                $query->where("userid", $user->userid);
-            })
-            ->select("project_tasks.*")
-            ->orderByDesc("project_tasks.id")
-            ->get();
-        if ($unfinished_task->isNotEmpty()) {
-            foreach ($unfinished_task as $task) {
-                empty($task->end_at) || $end_at = Carbon::parse($task->end_at);
-                $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,
-                ];
-            }
-        }
-
-        // 生成标题
-        if ($type === Report::WEEKLY) {
-            $title = $user->nickname . "的周报[" . $start_time->format("m/d") . "-" . $end_time->format("m/d") . "]";
-            $title .= "[" . $start_time->month . "月第" . $start_time->weekOfMonth . "周]";
-        } 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(),
-            "sign" => $sign,
-            "title" => $title,
-            "content" => implode("", $contents),
-        ];
-
-        if ($one) {
-            $data['id'] = $one->id;
-        }
-        return Base::retSuccess('success', $data);
-    }
-
-    /**
-     * @api {get} api/report/detail 报告详情
-     *
-     * @apiDescription 需要token身份
-     * @apiVersion 1.0.0
-     * @apiGroup report
-     * @apiName detail
-     *
-     * @apiParam {Number} [id]           报告ID
-     * @apiParam {String} [code]         报告分享代码，与ID二选一，优先ID
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function detail(): array
-    {
-        $user = User::auth();
-        //
-        $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");
-        }
-        $analysis = ReportAnalysis::query()
-            ->whereRid($one->id)
-            ->whereUserid($user->userid)
-            ->first();
-        if ($analysis) {
-            $updatedAt = $analysis->updated_at ? $analysis->updated_at->toDateTimeString() : null;
-            $one->setAttribute('ai_analysis', [
-                'id' => $analysis->id,
-                'text' => $analysis->analysis_text,
-                'model' => $analysis->model,
-                'updated_at' => $updatedAt,
-            ]);
-        } else {
-            $one->setAttribute('ai_analysis', null);
-        }
-
-        return Base::retSuccess("success", $one);
-    }
-
-    /**
-     * @api {post} api/report/analysave 保存工作汇报 AI 分析
-     *
-     * @apiDescription 需要token身份，仅支持报告提交人或接收人保存分析
-     * @apiVersion 1.0.0
-     * @apiGroup report
-     * @apiName analysave
-     *
-     * @apiParam {Number} id            报告ID
-     * @apiParam {String} text          分析内容（Markdown）
-     * @apiParam {String} [model]       分析使用的模型标识（可选）
-     *
-     * @apiSuccess {Number} ret         返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg         返回信息（错误描述）
-     * @apiSuccess {Object} data        返回数据
-     * @apiSuccess {Number} data.id     分析记录ID
-     * @apiSuccess {String} data.text   分析内容（Markdown）
-     * @apiSuccess {String} data.updated_at 最近更新时间
-     */
-    public function analysave(): array
-    {
-        $user = User::auth();
-        $id = intval(Request::input("id"));
-        if ($id <= 0) {
-            return Base::retError("缺少ID参数");
-        }
-        $text = trim((string)Request::input('text', ''));
-        if ($text === '') {
-            return Base::retError("分析内容不能为空");
-        }
-        $model = trim((string)Request::input('model', ''));
-
-        $report = Report::getOne($id);
-        if (!$this->userCanAccessReport($report, $user)) {
-            return Base::retError("无权访问该工作汇报");
-        }
-
-        $analysis = ReportAnalysis::query()
-            ->whereRid($report->id)
-            ->whereUserid($user->userid)
-            ->first();
-
-        if (!$analysis) {
-            $analysis = ReportAnalysis::fillInstance([
-                'rid' => $report->id,
-                'userid' => $user->userid,
-            ]);
-        }
-
-        $viewerRole = $user->profession ?: (is_array($user->identity) && !empty($user->identity) ? implode('/', $user->identity) : null);
-        $focusMeta = null;
-        $focus = Request::input('focus');
-        if (is_array($focus)) {
-            $focusMeta = array_filter(array_map('trim', $focus));
-        } elseif (is_string($focus) && trim($focus) !== '') {
-            $focusMeta = [trim($focus)];
-        }
-
-        $meta = array_filter([
-            'viewer_role' => $viewerRole,
-            'viewer_name' => $user->nickname ?? null,
-            'focus' => $focusMeta,
-        ], function ($value) {
-            if (is_array($value)) {
-                return !empty($value);
-            }
-            return $value !== null && $value !== '';
-        });
-
-        $analysis->updateInstance([
-            'model' => $model,
-            'analysis_text' => $text,
-            'meta' => $meta,
-        ]);
-        $analysis->save();
-
-        $analysis->refresh();
-
-        return Base::retSuccess("success", [
-            'id' => $analysis->id,
-            'text' => $analysis->analysis_text,
-            'model' => $analysis->model,
-            'updated_at' => $analysis->updated_at ? $analysis->updated_at->toDateTimeString() : null,
-        ]);
-    }
-
-    /**
-     * @api {get} api/report/mark 标记已读/未读
-     *
-     * @apiDescription 需要token身份
-     * @apiVersion 1.0.0
-     * @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 分享报告到消息
-     *
-     * @apiDescription 需要token身份
-     * @apiVersion 1.0.0
-     * @apiGroup report
-     * @apiName share
-     *
-     * @apiParam {Number} id                报告id（组）
-     * @apiParam {Array} dialogids          转发给的对话ID
-     * @apiParam {Array} userids            转发给的成员ID
-     * @apiParam {String} leave_message     转发留言
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function share()
-    {
-        $user = User::auth();
-        //
-        $id = Request::input('id');
-        $dialogids = Request::input('dialogids');
-        $userids = Request::input('userids');
-        $leave_message = Request::input('leave_message');
-        //
-        if (is_array($id)) {
-            if (count(Base::arrayRetainInt($id)) > 20) {
-                return Base::retError("最多只能操作20条数据");
-            }
-            $builder = Report::whereIn("id", Base::arrayRetainInt($id));
-        } else {
-            $builder = Report::whereId(intval($id));
-        }
-        $reportMsgs = [];
-        $builder ->chunkById(100, function ($list) use (&$reportMsgs, $user) {
-            /** @var Report $item */
-            foreach ($list as $item) {
-                $reportLink = ReportLink::generateLink($item->id, $user->userid);
-                $reportMsgs[] = "<a class=\"mention report\" href=\"{{RemoteURL}}single/report/detail/{$reportLink['code']}\" target=\"_blank\">%{$item->title}</a>";
-            }
-        });
-        if (empty($reportMsgs)) {
-            return Base::retError("报告不存在或已被删除");
-        }
-        $reportTag = count($reportMsgs) > 1 ? 'li' : 'p';
-        $reportAttr = $reportTag === 'li' ? ' data-list="ordered"' : '';
-        $reportMsgs = array_map(function ($item) use ($reportAttr, $reportTag) {
-            return "<{$reportTag}{$reportAttr}>{$item}</{$reportTag}>";
-        }, $reportMsgs);
-        if ($reportTag === 'li') {
-            array_unshift($reportMsgs, "<ol>");
-            $reportMsgs[] = "</ol>";
-        }
-        if ($leave_message) {
-            $reportMsgs[] = "<p>{$leave_message}</p>";
-        }
-        $msgText = implode("", $reportMsgs);
-        //
-        return WebSocketDialogMsg::sendMsgBatch($user, $userids, $dialogids, $msgText);
-    }
-
-    /**
-     * @api {get} api/report/last_submitter 获取最后一次提交的接收人
-     *
-     * @apiDescription 需要token身份
-     * @apiVersion 1.0.0
-     * @apiGroup report
-     * @apiName last_submitter
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function last_submitter(): array
-    {
-        $one = Report::getLastOne();
-        return Base::retSuccess("success", empty($one["receives"]) ? [] : $one["receives"]);
-    }
-
-    /**
-     * @api {get} api/report/unread 获取未读
-     *
-     * @apiDescription 需要token身份
-     * @apiVersion 1.0.0
-     * @apiGroup report
-     * @apiName unread
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function unread(): array
-    {
-        $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 标记汇报已读，可批量
-     *
-     * @apiDescription 需要token身份
-     * @apiVersion 1.0.0
-     * @apiGroup report
-     * @apiName read
-     *
-     * @apiParam {String} [ids]      报告id
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function read(): array
-    {
-        $user = User::auth();
-        $ids = Request::input("ids");
-        if (!is_array($ids) && !is_string($ids)) {
-            return Base::retError("请传入正确的工作汇报Id");
-        }
-
-        if (is_string($ids)) {
-            $ids = Base::explodeInt($ids);
-        }
-
-        $data = Report::with(["receivesUser" => function (BelongsToMany $query) use ($user) {
-            $query->where("report_receives.userid", $user->userid)->where("read", 0);
-        }])->whereIn("id", $ids)->get();
-
-        if ($data->isNotEmpty()) {
-            foreach ($data as $item) {
-                (!empty($item->receivesUser) && $item->receivesUser->isNotEmpty()) && $item->receivesUser()->updateExistingPivot($user->userid, [
-                    "read" => 1,
-                ]);
-            }
-        }
-        return Base::retSuccess("success", $data);
-    }
-
-    /**
-     * 判断当前用户是否有权限查看/分析指定工作汇报
-     * @param Report $report
-     * @param User $user
-     * @return bool
-     */
-    protected function userCanAccessReport(Report $report, User $user): bool
-    {
-        if ($report->userid === $user->userid) {
-            return true;
-        }
-
-        return ReportReceive::query()
-            ->whereRid($report->id)
-            ->whereUserid($user->userid)
-            ->exists();
-    }
-}

app/Http/Controllers/Api/TestController.php

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

app/Http/Controllers/Api/apidoc.md

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

app/Http/Controllers/Api/apidoc.php

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

app/Http/Controllers/IndexController.php

@@ -2,29 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use Arr;
-use Cache;
-use Request;
-use Redirect;
-use Response;
-use App\Models\File;
-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\ZincSearchSyncTask;
-use App\Tasks\UnclaimedTaskRemindTask;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
-use Laravolt\Avatar\Avatar;
+use Redirect;
 
 
 /**
@@ -40,9 +21,6 @@ class IndexController extends InvokeController
         if ($action) {
             $app .= "__" . $action;
         }
-        if ($app == 'default') {
-            return '';
-        }
         if (!method_exists($this, $app)) {
             $app = method_exists($this, $method) ? $method : 'main';
         }
@@ -51,179 +29,11 @@ class IndexController extends InvokeController
 
     /**
      * 首页
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function main()
     {
-        $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"));
-            $proxyUri = Base::liveEnv('VSCODE_PROXY_URI');
-            if (is_string($proxyUri) && preg_match('/^https?:\/\//i', $proxyUri)) {
-                $script = preg_replace('/^(https?:\/\/|\/\/)[^\/]+/', rtrim($proxyUri, '/'), $script, 1);
-            }
-        } else {
-            $array = Base::json2array(file_get_contents($manifestFile));
-            $style = asset_main($array['resources/assets/js/app.js']['css'][0]);
-            $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 string
-     */
-    public function health()
-    {
-        return "ok";
-    }
-
-    /**
-     * 头像
-     * @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));
+        return view('main', ['version' => Base::getVersion()]);
     }
 
     /**
@@ -245,266 +55,94 @@ class IndexController extends InvokeController
             // 限制内网访问
             return "Forbidden Access";
         }
-        // 自动归档
-        Task::deliver(new AutoArchivedTask());
-        // 邮件通知
-        Task::deliver(new EmailNoticeTask());
-        // App推送
-        Task::deliver(new AppPushTask());
         // 删除过期的临时表数据
-        Task::deliver(new DeleteTmpTask('tmp_msgs', 1));
-        Task::deliver(new DeleteTmpTask('tmp'));
-        Task::deliver(new DeleteTmpTask('task_worker', 12));
-        Task::deliver(new DeleteTmpTask('file'));
-        Task::deliver(new DeleteTmpTask('tmp_file', 24));
-        Task::deliver(new DeleteTmpTask('user_device', 24));
-        Task::deliver(new DeleteTmpTask('umeng_log', 24 * 3));
-        // 删除机器人消息
-        Task::deliver(new DeleteBotMsgTask());
-        // 周期任务
-        Task::deliver(new LoopTask());
-        // 签到提醒
-        Task::deliver(new CheckinRemindTask());
-        // 获取笑话/心灵鸡汤
-        Task::deliver(new JokeSoupTask());
-        // 未领取任务通知
-        Task::deliver(new UnclaimedTaskRemindTask());
-        // 关闭会议室
-        Task::deliver(new CloseMeetingRoomTask());
-        // ZincSearch 同步
-        Task::deliver(new ZincSearchSyncTask());
+        Task::deliver(new DeleteTmpTask('wg_tmp_msgs', 1));
+        Task::deliver(new DeleteTmpTask('tmp', 24));
 
         return "success";
     }
 
     /**
-     * 桌面客户端发布
+     * 提取所有中文
+     * @return array|string
      */
-    public function desktop__publish($name = '')
+    public function allcn()
     {
-        $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;
+        if (!Base::is_internal_ip(Base::getIp())) {
+            // 限制内网访问
+            return "Forbidden Access";
         }
-
-        // 上传（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");
+        $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, '"'), "'");
                 }
-                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,
-                "saveName" => 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;
-                }
-            }
-            abort_if(empty($avaiPath), 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),
-            ]);
-        }
-
-        // 下载（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_values($array);
     }
 
     /**
-     * Drawio 图标搜索
-     * @return array|mixed
+     * 提取所有中文
+     * @return array|string
      */
-    public function drawio__iconsearch()
+    public function allcn__php()
     {
-        $query = trim(Request::input('q'));
-        $page = trim(Request::input('p'));
-        $size = trim(Request::input('c'));
-        return Extranet::drawioIconSearch($query, $page, $size);
-    }
-
-    /**
-     * 预览文件
-     * @return array|mixed
-     */
-    public function online__preview()
-    {
-        $key = trim(Request::input('key'));
-        //
-        $data = parse_url($key);
-        $path = Arr::get($data, 'path');
-        $file = public_path($path);
-        // 防止 ../ 穿越获取到系统文件
-        abort_if(!str_starts_with(realpath($file), public_path()), 404);
-        // 如果文件不存在，直接返回 404
-        abort_if(!file_exists($file), 404);
-        //
-        parse_str($data['query'], $query);
-        $name = Arr::get($query, 'name');
-        $ext = strtolower(Arr::get($query, 'ext'));
-        $userAgent = strtolower(Request::server('HTTP_USER_AGENT'));
-        if ($ext === 'pdf') {
-            // 文件超过 10m 不支持在线预览，提示下载
-            if (filesize($file) > 10 * 1024 * 1024) {
-                return view('download', [
-                    'system_alias' => Base::settingFind('system', 'system_alias', 'WebPage'),
-                    'name' => $name,
-                    'size' => Base::readableBytes(filesize($file)),
-                    'url' => Base::fillUrl($path),
-                    'button' => Doo::translate('点击下载'),
-                ]);
-            }
-            // 浏览器类型
-            $browser = 'none';
-            if (str_contains($userAgent, 'chrome') || str_contains($userAgent, 'android_kuaifan_eeui')) {
-                $browser = str_contains($userAgent, 'android_kuaifan_eeui') ? 'android-mobile' : 'chrome-desktop';
-            } elseif (str_contains($userAgent, 'safari') || str_contains($userAgent, 'ios_kuaifan_eeui')) {
-                $browser = str_contains($userAgent, 'ios_kuaifan_eeui') ? 'safari-mobile' : 'safari-desktop';
-            }
-            // electron 直接在线预览查看
-            if (str_contains($userAgent, 'electron') || str_contains($browser, 'desktop')) {
-                return Response::download($file, $name, [
-                    'Content-Type' => 'application/pdf'
-                ], 'inline');
-            }
-            // 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 (!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, '"'), "'");
                 }
             }
         }
-        //
-        if (in_array($ext, File::localExt)) {
-            $url = Base::fillUrl($path);
-        } else {
-            $url = 'http://nginx/' . $path;
+        return array_values($array);
+    }
+
+    /**
+     * 提取所有中文
+     * @return array|string
+     */
+    public function allcn__all()
+    {
+        if (!Base::is_internal_ip(Base::getIp())) {
+            // 限制内网访问
+            return "Forbidden Access";
         }
-        $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);
+        $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 (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;
+                    }
+                }
+            }
+        }
+        return implode("\n", array_values($array));
     }
 }

app/Http/Controllers/InvokeController.php

@@ -2,7 +2,10 @@
 
 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;
@@ -29,7 +32,24 @@ 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,10 +12,34 @@ class VerifyCsrfToken extends Middleware
      * @var array
      */
     protected $except = [
-        // 接口部分
-        'api/*',
+        // 上传图片
+        'api/system/imgupload/',
 
-        // 发布桌面端
-        'desktop/publish/',
+        // 上传文件
+        'api/system/fileupload/',
+
+        // 保存任务优先级
+        'api/system/priority/',
+
+        // 添加任务
+        'api/project/task/add/',
+
+        // 修改任务
+        'api/project/task/update/',
+
+        // 上传任务问题
+        'api/project/task/upload/',
+
+        // 聊天发文件
+        'api/dialog/msg/sendfile/',
+
+        // 保存文件内容
+        'api/file/content/save/',
+
+        // 保存文件内容（office）
+        'api/file/content/office/',
+
+        // 保存文件内容（上传）
+        'api/file/content/upload/',
     ];
 }

app/Http/Middleware/WebApi.php

@@ -4,9 +4,8 @@ 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
 {
@@ -19,62 +18,20 @@ class WebApi
      */
     public function handle($request, Closure $next)
     {
-        // 记录请求信息
-        RequestContext::set('start_time', microtime(true));
-        RequestContext::set('header_language', $request->header('language'));
+        global $_A;
+        $_A = [];
 
-        // 更新请求的基本URL
-        RequestContext::updateBaseUrl($request);
-
-        // 加载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);
-                }
-            }
+        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');
         }
 
-        // 强制 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);
         }
 
-        // 执行下一个中间件
-        $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::clean();
+        return $next($request);
     }
 }

app/Ldap/LdapUser.php

@@ -1,251 +0,0 @@
-<?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,21 +10,16 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
 /**
- * App\Models\AbstractModel
+ * App\Model\AbstractModel
  *
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel query()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
- * @method static \Illuminate\Database\Eloquent\Model|object|static|null cancelAppend()
- * @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
@@ -34,26 +29,6 @@ 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',
@@ -61,42 +36,6 @@ 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
@@ -105,7 +44,7 @@ class AbstractModel extends Model
     {
         try {
             return $this->save();
-        } catch (\Throwable) {
+        } catch (\Exception $e) {
             return false;
         }
     }
@@ -123,24 +62,6 @@ class AbstractModel extends Model
         return $this->$key;
     }
 
-    /**
-     * 取消附加值
-     * @return static
-     */
-    protected function scopeCancelAppend()
-    {
-        return $this->setAppends([]);
-    }
-
-    /**
-     * 取消隐藏值
-     * @return static
-     */
-    protected function scopeCancelHidden()
-    {
-        return $this->setHidden([]);
-    }
-
     /**
      * 为数组 / JSON 序列化准备日期。
      * @param DateTimeInterface $date
@@ -151,25 +72,6 @@ class AbstractModel extends Model
         return $date->format($this->dateFormat ?: 'Y-m-d H:i:s');
     }
 
-    /**
-     * 通过模型创建实例
-     * @param array $param
-     * @param bool $force
-     * @return static
-     */
-    public static function fillInstance(array $param = [], bool $force = true)
-    {
-        $instance = new static;
-        if ($param) {
-            if ($force) {
-                $instance->forceFill($param);
-            } else {
-                $instance->fill($param);
-            }
-        }
-        return $instance;
-    }
-
     /**
      * 创建/更新数据
      * @param array $param
@@ -228,46 +130,19 @@ class AbstractModel extends Model
 
     /**
      * 数据库更新或插入
-     * @param array $where              查询条件
-     * @param array|\Closure $update    存在时更新的内容
-     * @param array|\Closure $insert    不存在时插入的内容，如果没有则插入更新内容
-     * @param bool $isInsert            是否是插入数据
-     * @param bool|null $lockForUpdate  是否加锁（true:加锁，false:不加锁，null:在事务中会自动加锁）
+     * @param $where
+     * @param array $update 存在时更新的内容
+     * @param array $insert 不存在时插入的内容，如果没有则插入更新内容
      * @return AbstractModel|\Illuminate\Database\Eloquent\Builder|Model|object|static|null
      */
-    public static function updateInsert($where, $update = [], $insert = [], &$isInsert = true, $lockForUpdate = null)
+    public static function updateInsert($where, $update = [], $insert = [])
     {
-        $query = static::where($where);
-        if ($lockForUpdate === null) {
-            $lockForUpdate = \DB::transactionLevel() > 0;
-        }
-        if ($lockForUpdate) {
-            $query->lockForUpdate();
-        }
-        $row = $query->first();
+        $row = static::where($where)->first();
         if (empty($row)) {
             $row = new static;
-            if ($insert instanceof \Closure) {
-                $insert = $insert();
-            }
-            if (empty($insert)) {
-                if ($update instanceof \Closure) {
-                    $update = $update();
-                }
-                $insert = $update;
-            }
-            $array = array_merge($where, $insert);
-            if (isset($array[$row->primaryKey])) {
-                unset($array[$row->primaryKey]);
-            }
-            $row->updateInstance($array);
-            $isInsert = true;
+            $row->updateInstance(array_merge($where, $insert ?: $update));
         } elseif ($update) {
-            if ($update instanceof \Closure) {
-                $update = $update();
-            }
             $row->updateInstance($update);
-            $isInsert = false;
         }
         if (!$row->save()) {
             return null;
@@ -295,9 +170,10 @@ 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 {
-                throw new ApiException( $e->getMessage() ?: '处理错误');
+                info($e);
+                throw new ApiException($e->getMessage() ?: '处理错误');
             }
         }
     }

app/Models/ApproveProcInstHistory.php

@@ -1,99 +0,0 @@
-<?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

@@ -1,34 +0,0 @@
-<?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

@@ -1,41 +0,0 @@
-<?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

@@ -1,99 +0,0 @@
-<?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/FileContent.php

@@ -2,14 +2,15 @@
 
 namespace App\Models;
 
+
 use App\Module\Base;
-use App\Module\Timer;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Symfony\Component\HttpFoundation\StreamedResponse;
+use Response;
 
 /**
- * App\Models\FileContent
+ * Class FileContent
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $fid 文件ID
  * @property string|null $content 内容
@@ -19,16 +20,10 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|FileContent onlyTrashed()
+ * @method static \Illuminate\Database\Query\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)
@@ -38,8 +33,8 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
  * @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\Eloquent\Builder|FileContent withTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|FileContent withoutTrashed()
+ * @method static \Illuminate\Database\Query\Builder|FileContent withTrashed()
+ * @method static \Illuminate\Database\Query\Builder|FileContent withoutTrashed()
  * @mixin \Eloquent
  */
 class FileContent extends AbstractModel
@@ -47,149 +42,45 @@ 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 $type
      * @param $content
-     * @return string
+     * @return array|\Symfony\Component\HttpFoundation\BinaryFileResponse
      */
-    public static function formatPreview($file, $content)
+    public static function formatContent($type, $content)
     {
-        $content = Base::json2array($content ?: []);
-        $filePath = $content['url'];
-        if (in_array($file->type, ['word', 'excel', 'ppt'])) {
+        $content = Base::json2array($content);
+        if (in_array($type, ['word', 'excel', 'ppt'])) {
             if (empty($content)) {
-                $filePath = 'assets/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $file->type);
+                return Response::download(resource_path('assets/statics/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $type)));
             }
-        }
-        return self::toPreviewUrl([
-            'ext' => $file->ext,
-            'name' => $file->name,
-            'path' => $filePath,
-        ]);
-    }
-
-    /**
-     * 获取格式内容（或下载）
-     * @param $file
-     * @param $content
-     * @param $download
-     * @return array|StreamedResponse
-     */
-    public static function formatContent($file, $content, $download = false)
-    {
-        $name = $file->ext ? "{$file->name}.{$file->ext}" : null;
-        $content = Base::json2array($content ?: []);
-        if (in_array($file->type, ['word', 'excel', 'ppt'])) {
-            if (empty($content)) {
-                $filePath = public_path('assets/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $file->type));
-            } else {
-                $filePath = public_path($content['url']);
-            }
-            return Base::DownloadFileResponse($filePath, $name);
+            return Response::download(public_path($content['url']));
         }
         if (empty($content)) {
-            $content = match ($file->type) {
+            $content = match ($type) {
                 'document' => [
-                    "type" => $file->ext,
+                    "type" => "md",
                     "content" => "",
                 ],
+                'sheet' => [
+                    [
+                        "name" => "Sheet1",
+                        "config" => json_decode('{}'),
+                    ]
+                ],
                 default => json_decode('{}'),
             };
-            abort_if($download, 403, "This file is empty.");
         } else {
-            $path = $content['url'];
-            if ($file->ext) {
-                $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);
-                abort_if(!isset($filePath),403, "This file not support download.");
-                return Base::DownloadFileResponse($filePath, $name);
+            $content['preview'] = false;
+            if ($content['ext'] && !in_array($content['ext'], ['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx'])) {
+                $url = 'http://' . env('APP_IPPR') . '.3/' . $content['url'];
+                if ($type == 'image') {
+                    $url = Base::fillUrl($content['url']);
+                }
+                $content['url'] = base64_encode($url);
+                $content['preview'] = true;
             }
         }
         return Base::retSuccess('success', [ 'content' => $content ]);
     }
-
-    /**
-     * 获取文件访问URL
-     * @param int $fileId 文件ID
-     * @return string|null 返回完整的文件URL，如果文件无内容则返回null
-     */
-    public static function getFileUrl($fileId)
-    {
-        $content = self::whereFid($fileId)->orderByDesc('id')->first();
-        if ($content) {
-            $contentData = Base::json2array($content->content ?: []);
-            if (!empty($contentData['url'])) {
-                return Base::fillUrl($contentData['url']);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 获取文件内容
-     * @param $id
-     * @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

@@ -1,76 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Module\Base;
-
-/**
- * App\Models\FileLink
- *
- * @property int $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
-{
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
-    public function file(): \Illuminate\Database\Eloquent\Relations\HasOne
-    {
-        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

@@ -4,61 +4,24 @@ namespace App\Models;
 
 
 /**
- * App\Models\FileUser
+ * Class FileUser
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $file_id 项目ID
  * @property int|null $userid 成员ID
- * @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)
- * @method static \Illuminate\Database\Eloquent\Builder|FileUser wherePermission($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereUserid($value)
  * @mixin \Eloquent
  */
 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

@@ -1,97 +0,0 @@
-<?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

@@ -1,34 +0,0 @@
-<?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

@@ -3,53 +3,44 @@
 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;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Request;
 
 /**
- * App\Models\Project
+ * Class Project
  *
+ * @package App\Models
  * @property int $id
  * @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 \Illuminate\Support\Carbon|null $archived_at 归档时间
+ * @property int|mixed $dialog_id 聊天会话ID
+ * @property string|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<int, \App\Models\ProjectColumn> $projectColumn
+ * @property-read int $task_complete
+ * @property-read int $task_my_complete
+ * @property-read int $task_my_num
+ * @property-read int $task_my_percent
+ * @property-read int $task_num
+ * @property-read int $task_percent
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectColumn[] $projectColumn
  * @property-read int|null $project_column_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ProjectLog> $projectLog
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectLog[] $projectLog
  * @property-read int|null $project_log_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ProjectUser> $projectUser
+ * @property-read \Illuminate\Database\Eloquent\Collection|\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 authData($userid = null)
  * @method static \Illuminate\Database\Eloquent\Builder|Project newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Project newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|Project onlyTrashed()
+ * @method static \Illuminate\Database\Query\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)
@@ -58,26 +49,109 @@ 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\Eloquent\Builder|Project withTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|Project withoutTrashed()
+ * @method static \Illuminate\Database\Query\Builder|Project withTrashed()
+ * @method static \Illuminate\Database\Query\Builder|Project withoutTrashed()
  * @mixin \Eloquent
  */
 class Project extends AbstractModel
 {
     use SoftDeletes;
 
-    protected $hidden = [
-        'deleted_at',
+    const projectSelect = [
+        'projects.*',
+        'project_users.owner',
     ];
 
     protected $appends = [
+        'task_num',
+        'task_complete',
+        'task_percent',
+        'task_my_num',
+        'task_my_complete',
+        'task_my_percent',
         'owner_userid',
     ];
 
+    /**
+     * 生成任务数据
+     */
+    private function generateTaskData()
+    {
+        if (!isset($this->appendattrs['task_num'])) {
+            $builder = ProjectTask::whereProjectId($this->id)->whereParentId(0)->whereNull('archived_at');
+            $this->appendattrs['task_num'] = $builder->count();
+            $this->appendattrs['task_complete'] = $builder->whereNotNull('complete_at')->count();
+            $this->appendattrs['task_percent'] = $this->appendattrs['task_num'] ? intval($this->appendattrs['task_complete'] / $this->appendattrs['task_num'] * 100) : 0;
+            //
+            $builder = ProjectTask::whereProjectId($this->id)->whereParentId(0)->authData(User::userid())->whereNull('archived_at');
+            $this->appendattrs['task_my_num'] = $builder->count();
+            $this->appendattrs['task_my_complete'] = $builder->whereNotNull('complete_at')->count();
+            $this->appendattrs['task_my_percent'] = $this->appendattrs['task_my_num'] ? intval($this->appendattrs['task_my_complete'] / $this->appendattrs['task_my_num'] * 100) : 0;
+        }
+    }
+
+    /**
+     * 任务数量
+     * @return int
+     */
+    public function getTaskNumAttribute()
+    {
+        $this->generateTaskData();
+        return $this->appendattrs['task_num'];
+    }
+
+    /**
+     * 任务完成数量
+     * @return int
+     */
+    public function getTaskCompleteAttribute()
+    {
+        $this->generateTaskData();
+        return $this->appendattrs['task_complete'];
+    }
+
+    /**
+     * 任务完成率
+     * @return int
+     */
+    public function getTaskPercentAttribute()
+    {
+        $this->generateTaskData();
+        return $this->appendattrs['task_percent'];
+    }
+
+    /**
+     * 任务数量（我的）
+     * @return int
+     */
+    public function getTaskMyNumAttribute()
+    {
+        $this->generateTaskData();
+        return $this->appendattrs['task_my_num'];
+    }
+
+    /**
+     * 任务完成数量（我的）
+     * @return int
+     */
+    public function getTaskMyCompleteAttribute()
+    {
+        $this->generateTaskData();
+        return $this->appendattrs['task_my_complete'];
+    }
+
+    /**
+     * 任务完成率（我的）
+     * @return int
+     */
+    public function getTaskMyPercentAttribute()
+    {
+        $this->generateTaskData();
+        return $this->appendattrs['task_my_percent'];
+    }
+
     /**
      * 负责人会员ID
      * @return int
@@ -85,7 +159,7 @@ class Project extends AbstractModel
     public function getOwnerUseridAttribute()
     {
         if (!isset($this->appendattrs['owner_userid'])) {
-            $ownerUser = ProjectUser::whereProjectId($this->id)->whereOwner(1)->first();
+            $ownerUser = $this->projectUser->where('owner', 1)->first();
             $this->appendattrs['owner_userid'] = $ownerUser ? $ownerUser->userid : 0;
         }
         return $this->appendattrs['owner_userid'];
@@ -116,75 +190,19 @@ class Project extends AbstractModel
     }
 
     /**
-     * 查询所有项目（与正常查询多返回owner字段）
+     * 查询自己的项目
      * @param self $query
      * @param null $userid
      * @return self
      */
-    public function scopeAllData($query, $userid = null)
+    public function scopeAuthData($query, $userid = null)
     {
         $userid = $userid ?: User::userid();
-        $query
-            ->select([
-                'projects.*',
-                'project_users.owner',
-                'project_users.top_at',
-                'project_users.sort',
-            ])
-            ->leftJoin('project_users', function ($leftJoin) use ($userid) {
-                $leftJoin
-                    ->on('project_users.userid', '=', DB::raw($userid))
-                    ->on('projects.id', '=', 'project_users.project_id');
-            });
-        return $query;
-    }
-
-    /**
-     * 查询自己负责或参与的项目
-     * @param self $query
-     * @param null $userid
-     * @param null $owner
-     * @return self
-     */
-    public function scopeAuthData($query, $userid = null, $owner = null)
-    {
-        $userid = $userid ?: User::userid();
-        $query
-            ->select([
-                'projects.*',
-                'project_users.owner',
-                'project_users.top_at',
-                'project_users.sort',
-            ])
-            ->join('project_users', 'projects.id', '=', 'project_users.project_id')
+        $query->join('project_users', 'projects.id', '=', 'project_users.project_id')
             ->where('project_users.userid', $userid);
-        if ($owner !== null) {
-            $query->where('project_users.owner', $owner);
-        }
         return $query;
     }
 
-    /**
-     * 获取任务统计数据
-     * @param $userid
-     * @return array
-     */
-    public function getTaskStatistics($userid)
-    {
-        $array = [];
-        $builder = ProjectTask::whereProjectId($this->id)->whereNull('archived_at');
-        $array['task_num'] = $builder->count();
-        $array['task_complete'] = $builder->whereNotNull('complete_at')->count();
-        $array['task_percent'] = $array['task_num'] ? intval($array['task_complete'] / $array['task_num'] * 100) : 0;
-        //
-        $builder = ProjectTask::authData($userid, 1)->where('project_tasks.project_id', $this->id)->whereNull('project_tasks.archived_at');
-        $array['task_my_num'] = $builder->count();
-        $array['task_my_complete'] = $builder->whereNotNull('project_tasks.complete_at')->count();
-        $array['task_my_percent'] = $array['task_my_num'] ? intval($array['task_my_complete'] / $array['task_my_num'] * 100) : 0;
-        //
-        return $array;
-    }
-
     /**
      * 加入项目
      * @param int $userid   加入的会员ID
@@ -219,16 +237,9 @@ class Project extends AbstractModel
                 WebSocketDialogUser::updateInsert([
                     'dialog_id' => $this->dialog_id,
                     'userid' => $userid,
-                ], [
-                    'important' => 1
-                ], function () use ($userid) {
-                    return [
-                        'important' => 1,
-                        'bot' => User::isBot($userid) ? 1 : 0,
-                    ];
-                });
+                ]);
             }
-            WebSocketDialogUser::whereDialogId($this->dialog_id)->whereNotIn('userid', $userids)->whereImportant(1)->remove();
+            WebSocketDialogUser::whereDialogId($this->dialog_id)->whereNotIn('userid', $userids)->delete();
         });
     }
 
@@ -238,7 +249,7 @@ class Project extends AbstractModel
      */
     public function relationUserids()
     {
-        return ProjectUser::whereProjectId($this->id)->orderBy('id')->pluck('userid')->toArray();
+        return $this->projectUser->pluck('userid')->toArray();
     }
 
     /**
@@ -266,10 +277,9 @@ class Project extends AbstractModel
             if ($archived_at === null) {
                 // 取消归档
                 $this->archived_at = null;
-                $this->archived_userid = User::userid();
                 $this->addLog("项目取消归档");
-                $this->pushMsg('recovery', $this);
-                ProjectTask::whereProjectId($this->id)->whereArchivedFollow(1)->change([
+                $this->pushMsg('add', $this);
+                ProjectTask::whereProjectId($this->id)->whereArchivedFollow(1)->update([
                     'archived_at' => null,
                     'archived_follow' => 0
                 ]);
@@ -279,7 +289,7 @@ class Project extends AbstractModel
                 $this->archived_userid = User::userid();
                 $this->addLog("项目归档");
                 $this->pushMsg('archived');
-                ProjectTask::whereProjectId($this->id)->whereArchivedAt(null)->change([
+                ProjectTask::whereProjectId($this->id)->whereArchivedAt(null)->update([
                     'archived_at' => $archived_at,
                     'archived_follow' => 1
                 ]);
@@ -312,23 +322,18 @@ class Project extends AbstractModel
     /**
      * 添加项目日志
      * @param string $detail
-     * @param array $record
      * @param int $userid
      * @return ProjectLog
      */
-    public function addLog($detail, $record = [], $userid = 0)
+    public function addLog($detail, $userid = 0)
     {
-        $array = [
+        $log = ProjectLog::createInstance([
             'project_id' => $this->id,
             'column_id' => 0,
             'task_id' => 0,
             'userid' => $userid ?: User::userid(),
             'detail' => $detail,
-        ];
-        if ($record) {
-            $array['record'] = $record;
-        }
-        $log = ProjectLog::createInstance($array);
+        ]);
         $log->save();
         return $log;
     }
@@ -336,299 +341,45 @@ class Project extends AbstractModel
     /**
      * 推送消息
      * @param string $action
-     * @param array|self $data      推送内容
-     * @param array $userid         指定会员，默认为项目所有成员
+     * @param array $data       发送内容，默认为[id=>项目ID]
+     * @param array $userid     指定会员，默认为项目所有成员
      */
     public function pushMsg($action, $data = null, $userid = null)
     {
-        // 处理数据
-        if ($data instanceof self) {
-            $data = $data->toArray();
+        if ($data === null) {
+            $data = ['id' => $this->id];
         }
-
-        $data = is_array($data) ? $data : [];
-        $data['id'] = $this->id;
-        $data['name'] = $this->name;
-        $data['desc'] = $this->desc;
-
-        // 处理接收用户
-        $recipients = [$userid, []];
         if ($userid === null) {
-            $recipients[0] = $this->relationUserids();
-        } elseif (!is_array($userid)) {
-            $recipients[0] = [$userid];
+            $userid = $this->relationUserids();
         }
-
-        // 移除不需要的字段
-        unset($data['top_at']);
-
-        // 处理所有者权限
-        if (isset($data['owner'])) {
-            $owners = ProjectUser::whereProjectId($data['id'])
-                ->whereOwner(1)
-                ->pluck('userid')
-                ->toArray();
-            $recipients = [
-                array_intersect($recipients[0], $owners),
-                array_diff($recipients[0], $owners)
-            ];
-        }
-
-        // 发送推送
-        foreach ($recipients as $index => $userids) {
-            if (empty($userids)) {
-                continue;
-            }
-
-            if ($index > 0) {
-                $data['owner'] = 0;
-            }
-
-            $params = [
-                'ignoreFd' => Request::header('fd'),
-                'userid' => array_values($userids),
-                'msg' => [
-                    'type' => 'project',
-                    'action' => $action,
-                    'data' => $data,
-                ]
-            ];
-
-            Task::deliver(new PushTask($params, false));
-        }
-    }
-
-    /**
-     * 添加工作流
-     * @param $flows
-     * @return mixed
-     */
-    public function addFlow($flows)
-    {
-        return AbstractModel::transaction(function() use ($flows) {
-            $projectFlow = ProjectFlow::whereProjectId($this->id)->first();
-            if (empty($projectFlow)) {
-                $projectFlow = ProjectFlow::createInstance([
-                    'project_id' => $this->id,
-                    'name' => 'Default'
-                ]);
-                if (!$projectFlow->save()) {
-                    throw new ApiException('工作流创建失败');
-                }
-            }
-            //
-            $ids = [];
-            $idc = [];
-            $hasStart = false;
-            $hasEnd = false;
-            $upTaskList = [];
-            $projectUserids = $this->relationUserids();
-            foreach ($flows as $item) {
-                $id = intval($item['id']);
-                $name = trim(str_replace('|', '·', $item['name']));
-                $turns = Base::arrayRetainInt($item['turns'] ?: [], true);
-                $userids = Base::arrayRetainInt($item['userids'] ?: [], true);
-                $usertype = trim($item['usertype']);
-                $userlimit = intval($item['userlimit']);
-                $columnid = intval($item['columnid']);
-                if ($usertype == 'replace' && empty($userids)) {
-                    throw new ApiException("状态[{$name}]设置错误，设置流转模式时必须填写状态负责人");
-                }
-                if ($usertype == 'merge' && empty($userids)) {
-                    throw new ApiException("状态[{$name}]设置错误，设置剔除模式时必须填写状态负责人");
-                }
-                if ($userlimit && empty($userids)) {
-                    throw new ApiException("状态[{$name}]设置错误，设置限制负责人时必须填写状态负责人");
-                }
-                foreach ($userids as $userid) {
-                    if (!in_array($userid, $projectUserids)) {
-                        $nickname = User::userid2nickname($userid);
-                        throw new ApiException("状态[{$name}]设置错误，状态负责人[{$nickname}]不在项目成员内");
-                    }
-                }
-                $flow = ProjectFlowItem::updateInsert([
-                    'id' => $id,
-                    'project_id' => $this->id,
-                    'flow_id' => $projectFlow->id,
-                ], [
-                    'name' => $name,
-                    'status' => trim($item['status']),
-                    'color' => trim($item['color']),
-                    'sort' => intval($item['sort']),
-                    'turns' => $turns,
-                    'userids' => $userids,
-                    'usertype' => trim($item['usertype']),
-                    'userlimit' => $userlimit,
-                    'columnid' => $columnid,
-                ], [], $isInsert);
-                if ($flow) {
-                    $ids[] = $flow->id;
-                    if ($flow->id != $id) {
-                        $idc[$id] = $flow->id;
-                    }
-                    if ($flow->status == 'start') {
-                        $hasStart = true;
-                    }
-                    if ($flow->status == 'end') {
-                        $hasEnd = true;
-                    }
-                    if (!$isInsert) {
-                        $upTaskList[$flow->id] = $flow->status . "|" . $flow->name . "|" . $flow->color;
-                    }
-                }
-            }
-            if (!$hasStart) {
-                throw new ApiException('至少需要1个开始状态');
-            }
-            if (!$hasEnd) {
-                throw new ApiException('至少需要1个结束状态');
-            }
-            ProjectFlowItem::whereFlowId($projectFlow->id)->whereNotIn('id', $ids)->chunk(100, function($list) {
-                foreach ($list as $item) {
-                    $item->deleteFlowItem();
-                }
-            });
-            //
-            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) {
-                $turns = $item->turns;
-                foreach ($idc as $oid => $nid) {
-                    if (in_array($oid, $turns)) {
-                        $turns = array_diff($turns, [$oid]);
-                        $turns[] = $nid;
-                    }
-                }
-                if (!in_array($item->id, $turns)) {
-                    $turns[] = $item->id;
-                }
-                $turns = array_values(array_filter(array_unique(array_intersect($turns, $itemIds))));
-                sort($turns);
-                $item->turns = $turns;
-                ProjectFlowItem::whereId($item->id)->update([ 'turns' => Base::array2json($turns) ]);
-            }
-            return $projectFlow;
-        });
-    }
-
-    /**
-     * 创建项目
-     * @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,
+        $params = [
+            'ignoreFd' => Request::header('fd'),
             '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","color":"#999999","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);
+            'msg' => [
+                'type' => 'project',
+                'action' => $action,
+                'data' => $data,
+            ]
+        ];
+        $task = new PushTask($params, false);
+        Task::deliver($task);
     }
 
     /**
-     * 获取项目信息（用于判断会员是否存在项目内）
+     * 根据用户获取项目信息（用于判断会员是否存在项目内）
      * @param int $project_id
-     * @param null|bool $archived true:仅限未归档, false:仅限已归档, null:不限制
-     * @param null|bool $mustOwner true:仅限项目负责人, false:仅限非项目负责人, null:不限制
+     * @param bool $ignoreArchived 排除已归档
      * @return self
      */
-    public static function userProject($project_id, $archived = true, $mustOwner = null)
+    public static function userProject($project_id, $ignoreArchived = true)
     {
-        $project = self::authData()->where('projects.id', intval($project_id))->first();
+        $project = self::select(self::projectSelect)->authData()->where('projects.id', intval($project_id))->first();
         if (empty($project)) {
             throw new ApiException('项目不存在或不在成员列表内', [ 'project_id' => $project_id ], -4001);
         }
-        if ($archived === true && $project->archived_at != null) {
+        if ($ignoreArchived && $project->archived_at != null) {
             throw new ApiException('项目已归档', [ 'project_id' => $project_id ], -4001);
         }
-        if ($archived === false && $project->archived_at == null) {
-            throw new ApiException('项目未归档', [ 'project_id' => $project_id ]);
-        }
-        if ($mustOwner === true && !$project->owner) {
-            throw new ApiException('仅限项目负责人操作', [ 'project_id' => $project_id ]);
-        }
-        if ($mustOwner === false && $project->owner) {
-            throw new ApiException('禁止项目负责人操作', [ 'project_id' => $project_id ]);
-        }
         return $project;
     }
 }

app/Models/ProjectColumn.php

@@ -9,8 +9,9 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Request;
 
 /**
- * App\Models\ProjectColumn
+ * Class ProjectColumn
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property string|null $name 列表名称
@@ -20,18 +21,12 @@ 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<int, \App\Models\ProjectTask> $projectTask
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectTask[] $projectTask
  * @property-read int|null $project_task_count
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn onlyTrashed()
+ * @method static \Illuminate\Database\Query\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)
@@ -40,8 +35,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\Eloquent\Builder|ProjectColumn withTrashed()
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn withoutTrashed()
+ * @method static \Illuminate\Database\Query\Builder|ProjectColumn withTrashed()
+ * @method static \Illuminate\Database\Query\Builder|ProjectColumn withoutTrashed()
  * @mixin \Eloquent
  */
 class ProjectColumn extends AbstractModel
@@ -74,9 +69,7 @@ class ProjectColumn extends AbstractModel
         AbstractModel::transaction(function () use ($pushMsg) {
             $tasks = ProjectTask::whereColumnId($this->id)->get();
             foreach ($tasks as $task) {
-                if(!$task->archived_at){
-                    $task->deleteTask($pushMsg);
-                }
+                $task->deleteTask($pushMsg);
             }
             $this->delete();
             $this->addLog("删除列表：" . $this->name);
@@ -127,7 +120,7 @@ class ProjectColumn extends AbstractModel
             $userid = $this->project->relationUserids();
         }
         $params = [
-            'ignoreFd' => $action == 'recovery' ? 0 : Request::header('fd'),
+            'ignoreFd' => Request::header('fd'),
             'userid' => $userid,
             'msg' => [
                 'type' => 'projectColumn',

app/Models/ProjectFlow.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Models;
-
-/**
- * App\Models\ProjectFlow
- *
- * @property int $id
- * @property int|null $project_id 项目ID
- * @property string|null $name 流程名称
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ProjectFlowItem> $projectFlowItem
- * @property-read int|null $project_flow_item_count
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow query()
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereProjectId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereUpdatedAt($value)
- * @mixin \Eloquent
- */
-class ProjectFlow extends AbstractModel
-{
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function projectFlowItem(): \Illuminate\Database\Eloquent\Relations\HasMany
-    {
-        return $this->hasMany(ProjectFlowItem::class, 'flow_id', 'id')->orderBy('sort');
-    }
-
-    /**
-     * @return mixed
-     */
-    public function deleteFlow()
-    {
-        return AbstractModel::transaction(function() {
-            ProjectFlowItem::whereProjectId($this->project_id)->chunk(100, function($list) {
-                foreach ($list as $item) {
-                    $item->deleteFlowItem();
-                }
-            });
-            return $this->delete();
-        });
-    }
-}

app/Models/ProjectFlowItem.php

@@ -1,100 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Module\Base;
-
-/**
- * App\Models\ProjectFlowItem
- *
- * @property int $id
- * @property int|null $project_id 项目ID
- * @property int|null $flow_id 流程ID
- * @property string|null $name 名称
- * @property string|null $status 状态
- * @property string|null $color 自定义颜色
- * @property array $turns 可流转
- * @property array $userids 状态负责人ID
- * @property string|null $usertype 流转模式
- * @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 whereColor($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereColumnid($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereFlowId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereProjectId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereSort($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereStatus($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereTurns($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereUserids($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereUserlimit($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereUsertype($value)
- * @mixin \Eloquent
- */
-class ProjectFlowItem extends AbstractModel
-{
-    protected $hidden = [
-        'created_at',
-        'updated_at',
-    ];
-
-    /**
-     * @param $value
-     * @return array
-     */
-    public function getTurnsAttribute($value)
-    {
-        if (is_array($value)) {
-            return $value;
-        }
-        return Base::json2array($value);
-    }
-
-    /**
-     * @param $value
-     * @return array
-     */
-    public function getUseridsAttribute($value)
-    {
-        if (is_array($value)) {
-            return $value;
-        }
-        return Base::json2array($value);
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
-    public function projectFlow(): \Illuminate\Database\Eloquent\Relations\HasOne
-    {
-        return $this->hasOne(ProjectFlow::class, 'id', 'flow_id');
-    }
-
-    /**
-     * @return bool|null
-     */
-    public function deleteFlowItem()
-    {
-        ProjectTask::whereFlowItemId($this->id)->change([
-            'flow_item_id' => 0,
-            'flow_item_name' => "",
-        ]);
-        return $this->delete();
-    }
-}

app/Models/ProjectInvite.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Models;
-
-/**
- * App\Models\ProjectInvite
- *
- * @property int $id
- * @property int|null $project_id 项目ID
- * @property int|null $num 累计邀请
- * @property string|null $code 链接码
- * @property \Illuminate\Support\Carbon|null $created_at
- * @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)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite whereNum($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite whereProjectId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite whereUpdatedAt($value)
- * @mixin \Eloquent
- */
-class ProjectInvite extends AbstractModel
-{
-    protected $appends = [
-        'already',
-    ];
-
-    /**
-     * 是否已加入
-     * @return bool
-     */
-    public function getAlreadyAttribute()
-    {
-        if (!isset($this->appendattrs['already'])) {
-            $this->appendattrs['already'] = false;
-            if (User::userid()) {
-                $this->appendattrs['already']  = (bool)$this->project?->projectUser?->where('userid', User::userid())->count();
-            }
-        }
-        return $this->appendattrs['already'];
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
-    public function project(): \Illuminate\Database\Eloquent\Relations\HasOne
-    {
-        return $this->hasOne(Project::class, 'id', 'project_id');
-    }
-}

app/Models/ProjectLog.php

@@ -2,61 +2,34 @@
 
 namespace App\Models;
 
-use App\Module\Base;
-
 /**
- * App\Models\ProjectLog
+ * Class ProjectLog
  *
+ * @package App\Models
  * @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_only 仅任务日志：0否，1是
+ * @property int|null $task_id 项目ID
  * @property int|null $userid 会员ID
  * @property string|null $detail 详细信息
- * @property array $record 记录数据
  * @property \Illuminate\Support\Carbon|null $created_at
  * @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)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereId($value)
  * @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
-     * @return array
-     */
-    public function getRecordAttribute($value)
-    {
-        if (is_array($value)) {
-            return $value;
-        }
-        return Base::json2array($value);
-    }
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
@@ -66,12 +39,4 @@ class ProjectLog extends AbstractModel
         return $this->hasOne(User::class, 'userid', 'userid');
     }
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
-    public function projectTask(): \Illuminate\Database\Eloquent\Relations\HasOne
-    {
-        return $this->hasOne(ProjectTask::class, 'id', 'task_id');
-    }
-
 }

app/Models/ProjectPermission.php

@@ -1,211 +0,0 @@
-<?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 $newPermissions
-     * @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 Project $project 项目实例
-     * @param string $action 动作名称
-     * @param ProjectTask|null $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

@@ -1,67 +0,0 @@
-<?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 $sort 排序
- * @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 whereSort($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 = [
-        'updated_at',
-    ];
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
-    protected $fillable = [
-        'project_id',
-        'name',
-        'desc',
-        'color',
-        'sort',
-        'userid'
-    ];
-
-    /**
-     * 关联项目
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function project()
-    {
-        return $this->belongsTo(Project::class);
-    }
-}

app/Models/ProjectTaskContent.php

@@ -2,105 +2,31 @@
 
 namespace App\Models;
 
-use App\Module\Base;
-use App\Exceptions\ApiException;
-
 /**
- * App\Models\ProjectTaskContent
+ * Class ProjectTaskContent
  *
+ * @package App\Models
  * @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,34 +3,26 @@
 namespace App\Models;
 
 use App\Module\Base;
-use Cache;
 
 /**
- * App\Models\ProjectTaskFile
+ * Class ProjectTaskFile
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $task_id 任务ID
  * @property string|null $name 文件名称
  * @property int|null $size 文件大小(B)
  * @property string|null $ext 文件格式
- * @property string $path 文件地址
- * @property string $thumb 缩略图
+ * @property string|null $path 文件地址
+ * @property string|null $thumb 缩略图
  * @property int|null $userid 上传用户ID
  * @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)
@@ -47,11 +39,6 @@ use Cache;
  */
 class ProjectTaskFile extends AbstractModel
 {
-    protected $appends = [
-        'width',
-        'height',
-    ];
-
     /**
      * 地址
      * @param $value
@@ -71,50 +58,4 @@ 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

@@ -1,40 +0,0 @@
-<?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

@@ -1,45 +0,0 @@
-<?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/ProjectTaskRelation.php

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

app/Models/ProjectTaskTag.php

@@ -3,8 +3,9 @@
 namespace App\Models;
 
 /**
- * App\Models\ProjectTaskTag
+ * Class ProjectTaskTag
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $task_id 任务ID
@@ -12,15 +13,9 @@ 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

@@ -1,77 +0,0 @@
-<?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

@@ -3,8 +3,9 @@
 namespace App\Models;
 
 /**
- * App\Models\ProjectTaskUser
+ * Class ProjectTaskUser
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $task_id 任务ID
@@ -13,16 +14,9 @@ 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)
@@ -36,56 +30,4 @@ 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("移交{任务}身份", [
-                        'change' => [
-                            [
-                                'type' => 'user',
-                                'data' => $originalUserid,
-                            ],
-                            [
-                                'type' => 'user',
-                                'data' => $newUserid,
-                            ]
-                        ],
-                    ], 0, 1);
-                    if (!in_array($item->task_pid, $tastIds)) {
-                        $tastIds[] = $item->task_pid;
-                        $item->projectTask->syncDialogUser();
-                    }
-                }
-            }
-        });
-    }
 }

app/Models/ProjectTaskVisibilityUser.php

@@ -1,43 +0,0 @@
-<?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

@@ -5,32 +5,23 @@ namespace App\Models;
 use App\Module\Base;
 
 /**
- * App\Models\ProjectUser
+ * Class ProjectUser
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $userid 成员ID
  * @property int|null $owner 是否负责人
- * @property \Illuminate\Support\Carbon|null $top_at 置顶时间
- * @property int|null $sort 排序(ASC)
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\Project|null $project
- * @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 whereSort($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereTopAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereUserid($value)
  * @mixin \Eloquent
@@ -46,86 +37,17 @@ 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("移交项目身份", [
-                        'change' => [
-                            [
-                                'type' => 'user',
-                                'data' => $originalUserid
-                            ],
-                            [
-                                'type' => 'user',
-                                'data' => $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();
-                    }
-                }
-            });
-        }
-    }
-
     /**
      * 退出项目
      */
     public function exitProject()
     {
-        ProjectTaskUser::whereProjectId($this->project_id)
-            ->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();
-                    }
-                }
-            });
+        $tasks = ProjectTask::whereProjectId($this->project_id)->authData($this->userid)->get();
+        foreach ($tasks as $task) {
+            if (ProjectTaskUser::whereTaskId($task->id)->whereUserid($this->userid)->delete()) {
+                $task->syncDialogUser();
+            }
+        }
         $this->delete();
     }
 }

app/Models/Report.php

@@ -1,183 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Exceptions\ApiException;
-use App\Module\Base;
-use Carbon\Carbon;
-use Carbon\Traits\Creator;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\HasOne;
-use JetBrains\PhpStorm\Pure;
-
-/**
- * App\Models\Report
- *
- * @property int $id
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property string $title 标题
- * @property string $type 汇报类型
- * @property int $userid
- * @property string $content
- * @property string $sign 汇报唯一标识
- * @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<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)
- * @method static Builder|Report whereSign($value)
- * @method static Builder|Report whereTitle($value)
- * @method static Builder|Report whereType($value)
- * @method static Builder|Report whereUpdatedAt($value)
- * @method static Builder|Report whereUserid($value)
- * @mixin \Eloquent
- */
-class Report extends AbstractModel
-{
-    use HasFactory;
-
-    const WEEKLY = "weekly";
-    const DAILY = "daily";
-
-    protected $fillable = [
-        "title",
-        "type",
-        "userid",
-        "content",
-    ];
-
-    protected $appends = [
-        'receives',
-    ];
-
-    public function Receives(): HasMany
-    {
-        return $this->hasMany(ReportReceive::class, "rid");
-    }
-
-    public function receivesUser(): BelongsToMany
-    {
-        return $this->belongsToMany(User::class, ReportReceive::class, "rid", "userid")
-            ->withPivot("receive_at", "read");
-    }
-
-    public function aiAnalyses(): HasMany
-    {
-        return $this->hasMany(ReportAnalysis::class, 'rid');
-    }
-
-    public function aiAnalysis(): HasOne
-    {
-        return $this->hasOne(ReportAnalysis::class, 'rid');
-    }
-
-    public function sendUser()
-    {
-        return $this->hasOne(User::class, "userid", "userid");
-    }
-
-    public function getContentAttribute($value): string
-    {
-        return htmlspecialchars_decode($value);
-    }
-
-    public function getReceivesAttribute()
-    {
-        if (!isset($this->appendattrs['receives'])) {
-            $this->appendattrs['receives'] = empty( $this->receivesUser ) ? [] : array_column($this->receivesUser->toArray(), "userid");
-        }
-        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
-     * @return Report|Builder|Model|object|null
-     * @throw ApiException
-     */
-    public static function getOne($id)
-    {
-        $one = self::whereId($id)->first();
-        if (empty($one))
-            throw new ApiException("记录不存在");
-        return $one;
-    }
-
-    /**
-     * 获取最后一条提交记录
-     * @param User|null $user
-     * @return Builder|Model|\Illuminate\Database\Query\Builder|object
-     */
-    public static function getLastOne(User $user = null)
-    {
-        $user === null && $user = User::auth();
-        $one = self::whereUserid($user->userid)->orderByDesc("created_at")->first();
-        if ( empty($one) )
-            throw new ApiException("记录不存在");
-        return $one;
-    }
-
-    /**
-     * 生成唯一标识
-     * @param $type
-     * @param $offset
-     * @param Carbon|null $time
-     * @return string
-     */
-    public static function generateSign($type, $offset, Carbon $time = null): string
-    {
-        $user = User::auth();
-        $now_dt = $time === null ? Carbon::now() : $time;
-        $time_s = match ($type) {
-            Report::WEEKLY => function() use ($now_dt, $offset) {
-                // 如果设置了周期偏移量
-                empty( $offset ) || $now_dt->subWeeks( abs( $offset ) );
-                $now_dt->startOfWeek(); // 设置为当周第一天
-                return now()->year . $now_dt->weekOfYear;
-            },
-            Report::DAILY => function() use ($now_dt, $offset) {
-                // 如果设置了周期偏移量
-                empty( $offset ) || $now_dt->subDays( abs( $offset ) );
-                return now()->format("Ymd");
-            },
-            default => "",
-        };
-        return $user->userid . ( is_callable($time_s) ? $time_s() : "" );
-    }
-}

app/Models/ReportAnalysis.php

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

app/Models/ReportLink.php

@@ -1,86 +0,0 @@
-<?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

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * App\Models\ReportReceive
- *
- * @property int $id
- * @property int $rid
- * @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 whereReceiveAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereRid($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereUserid($value)
- * @mixin \Eloquent
- */
-class ReportReceive extends AbstractModel
-{
-    use HasFactory;
-
-    // 关闭时间戳自动写入
-    public $timestamps = false;
-
-    protected $fillable = [
-        "rid",
-        "receive_at",
-        "userid",
-        "read",
-    ];
-}

app/Models/Setting.php

@@ -2,31 +2,19 @@
 
 namespace App\Models;
 
-use App\Exceptions\ApiException;
-use App\Module\Base;
-use App\Module\Doo;
-use App\Module\Timer;
-use App\Module\AI;
-use Carbon\Carbon;
-
 /**
- * App\Models\Setting
+ * Class Setting
  *
+ * @package App\Models
  * @property int $id
  * @property string|null $name
  * @property string|null $desc 参数描述、备注
- * @property array $setting
+ * @property string|null $setting
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|Setting newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Setting newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Setting query()
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|Setting whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Setting whereDesc($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Setting whereId($value)
@@ -37,199 +25,5 @@ use Carbon\Carbon;
  */
 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;
-
-            // AI 机器人设置
-            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);
-                                }
-                                $content = is_array($content) ? implode("\n", $content) : '';
-                                break;
-                            case 'model':
-                                $models = Setting::AIBotModels2Array($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 助手
-     * @return bool
-     */
-    public static function AIOpen()
-    {
-        $setting = Base::setting('aibotSetting');
-        if (!is_array($setting) || empty($setting)) {
-            return false;
-        }
-        foreach (AI::TEXT_MODEL_PRIORITY as $vendor) {
-            if (self::isAIBotVendorEnabled($setting, $vendor)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 判断 AI 机器人厂商是否启用
-     * @param array $setting
-     * @param string $vendor
-     * @return bool
-     */
-    protected static function isAIBotVendorEnabled(array $setting, string $vendor): bool
-    {
-        $key = trim((string)($setting[$vendor . '_key'] ?? ''));
-        return match ($vendor) {
-            'ollama' => $key !== '' || !empty($setting['ollama_base_url']),
-            'wenxin' => $key !== '' && !empty($setting['wenxin_secret']),
-            default => $key !== '',
-        };
-    }
-
-    /**
-     * AI 机器人模型转数组
-     * @param $models
-     * @param bool $retValue
-     * @return array
-     */
-    public static function AIBotModels2Array($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

@@ -1,43 +0,0 @@
-<?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

@@ -3,23 +3,18 @@
 namespace App\Models;
 
 /**
- * App\Models\Tmp
+ * Class Tmp
  *
+ * @package App\Models
  * @property int $id
  * @property string|null $name
  * @property string|null $value
  * @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

@@ -1,280 +0,0 @@
-<?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 $device_hash 设备哈希值，用于关联UserDevice表
- * @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 whereDeviceHash($value)
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereIsNotified($value)
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias wherePlatform($value)
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUa($value)
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUserid($value)
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereVersion($value)
- * @mixin \Eloquent
- */
-class UmengAlias extends AbstractModel
-{
-    protected $table = 'umeng_alias';
-
-    private static $waitSend = [];
-
-
-    /**
-     * 推送消息
-     * @param $push
-     * @return void
-     */
-    private static function sendTask($push = null)
-    {
-        if ($push) {
-            self::$waitSend[] = $push;
-        }
-
-        if (!self::$waitSend) {
-            return;
-        }
-
-        $first = array_shift(self::$waitSend);
-        if (empty($first)) {
-            return;
-        }
-
-        $instance = null;
-        $responsePayload = null;
-
-        try {
-            switch ($first['platform']) {
-                case 'ios':
-                    $instance = new IOS($first['config']);
-                    break;
-                case 'android':
-                    $instance = new Android($first['config']);
-                    break;
-                default:
-                    return;
-            }
-            $responsePayload = $instance->send($first['data']);
-        } catch (\Exception $e) {
-            $responsePayload = [
-                'error' => $e->getMessage(),
-            ];
-            $first['retry'] = intval($first['retry'] ?? 0) + 1;
-            if ($first['retry'] > 3) {
-                info("[PushMsg] fail: " . $e->getMessage());
-            } else {
-                info("[PushMsg] retry ({$first['retry']}): " . $e->getMessage());
-                self::$waitSend[] = $first;
-            }
-        } finally {
-            if ($instance !== null) {
-                UmengLog::create([
-                    'request' => Base::array2json($first['data']),
-                    'response' => Base::array2json($responsePayload),
-                ]);
-            }
-            self::sendTask();
-        }
-    }
-
-    /**
-     * 推送内容处理
-     * @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 void
-     */
-    private static function pushMsgToAlias($alias, $platform, $array)
-    {
-        $config = self::getPushConfig();
-        if ($config === false) {
-            return;
-        }
-        //
-        $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;                                  // 角标数
-        //
-        switch ($platform) {
-            case 'ios':
-                if (!isset($config['iOS'])) {
-                    return;
-                }
-                self::sendTask([
-                    'platform' => $platform,
-                    'config' => $config,
-                    'data' => [
-                        '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(),
-                        ],
-                    ]
-                ]);
-                break;
-
-            case 'android':
-                if (!isset($config['Android'])) {
-                    return;
-                }
-                self::sendTask([
-                    'platform' => $platform,
-                    'config' => $config,
-                    'data' => [
-                        'description' => $description,
-                        'payload' => array_merge([
-                            'display_type' => 'notification',
-                            'body' => [
-                                'ticker' => $title,
-                                'text' => $body,
-                                'title' => $title,
-                                'after_open' => 'go_app',
-                                'play_sound' => true,
-                                'set_badge' => min(99, $badge),
-                            ],
-                        ], $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(),
-                        ],
-                        'category' => 1,
-                        'channel_properties' => [
-                            'main_activity' => 'com.dootask.task.WelcomeActivity',
-                            'oppo_channel_id' => 'dootask',
-                            'vivo_category' => 'IM',
-                            'huawei_channel_importance' => 'NORMAL',
-                            'huawei_channel_category' => 'IM',
-                            'channel_fcm' => 0,
-                        ],
-                        'local_properties' => [
-                            'importance' => 'IMPORTANCE_DEFAULT',
-                            'category' => 'CATEGORY_MESSAGE',
-                        ]
-                    ]
-                ]);
-                break;
-        }
-    }
-
-    /**
-     * 推送给指定会员
-     * @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/UmengLog.php

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

app/Models/User.php

@@ -2,68 +2,45 @@
 
 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;
 
 /**
- * App\Models\User
+ * Class User
  *
+ * @package App\Models
  * @property int $userid
  * @property array $identity 身份
- * @property array $department 所属部门
  * @property string|null $az A-Z
- * @property string|null $pinyin 拼音（主要用于搜索）
  * @property string|null $email 邮箱
- * @property string|null $tel 联系电话
  * @property string $nickname 昵称
  * @property string|null $profession 职位/职称
- * @property \Illuminate\Support\Carbon|null $birthday 生日
- * @property string|null $address 地址
- * @property string|null $introduction 个人简介
  * @property string $userimg 头像
  * @property string|null $encrypt
  * @property string|null $password 登录密码
  * @property int|null $changepass 登录需要修改密码
  * @property int|null $login_num 累计登录次数
  * @property string|null $last_ip 最后登录IP
- * @property \Illuminate\Support\Carbon|null $last_at 最后登录时间
+ * @property string|null $last_at 最后登录时间
  * @property string|null $line_ip 最后在线IP（接口）
- * @property \Illuminate\Support\Carbon|null $line_at 最后在线时间（接口）
+ * @property string|null $line_at 最后在线时间（接口）
  * @property int|null $task_dialog_id 最后打开的任务会话ID
  * @property string|null $created_ip 注册IP
- * @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)
@@ -71,10 +48,8 @@ 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)
@@ -88,11 +63,18 @@ class User extends AbstractModel
         'updated_at',
     ];
 
-    // 默认头像类型：auto自动生成，system系统默认
-    public static $defaultAvatarMode = 'auto';
-
-    // 基本信息的字段
-    public static $basicField = ['userid', 'email', 'nickname', 'profession', 'department', 'userimg', 'bot', 'az', 'pinyin', 'line_at', 'disable_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));
+        }
+    }
 
     /**
      * 昵称
@@ -101,13 +83,7 @@ class User extends AbstractModel
      */
     public function getNicknameAttribute($value)
     {
-        if ($value) {
-            if (UserBot::isSystemBot($this->email)) {
-                return Doo::translate($value);
-            }
-            return $value;
-        }
-        return Base::formatName($this->email);
+        return $value ?: Base::cardFormat($this->email);
     }
 
     /**
@@ -117,7 +93,11 @@ class User extends AbstractModel
      */
     public function getUserimgAttribute($value)
     {
-        return self::getAvatar($this->userid, $value, $this->email, $this->nickname);
+        if ($value) {
+            return Base::fillUrl($value);
+        }
+        $name = ($this->userid - 1) % 21 + 1;
+        return url("images/avatar/default_{$name}.png");
     }
 
     /**
@@ -133,145 +113,23 @@ 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
-     */
-    public function getBotOwner()
-    {
-        if (!$this->bot) {
-            return 0;
-        }
-        $key = "userBotOwner::" . $this->userid;
-        return intval(Cache::remember($key, now()->addMonth(), function() {
-            return intval(UserBot::whereBotId($this->userid)->value('userid')) ?: $this->userid;
-        }));
-    }
-
     /**
      * 是否在线
      * @return bool
      */
     public function getOnlineStatus()
     {
-        $online = $this->bot || OnlineData::live($this->userid) > 0;
+        $online = intval(Cache::get("User::online:" . $this->userid, 0));
         if ($online) {
             return true;
         }
         return WebSocket::whereUserid($this->userid)->exists();
     }
 
-    /**
-     * 返回是否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;
-    }
-
-    /**
-     * 返回是否用户机器人
-     * @return bool
-     */
-    public function isUserBot()
-    {
-        if (preg_match('/^user-(.*?)@bot\.system$/', $this->email)) {
-            return true;
-        }
-        return false;
-    }
-
     /**
      * 判断是否管理员
      */
-    public function checkAdmin()
+    public function isAdmin()
     {
         $this->identity('admin');
     }
@@ -306,56 +164,6 @@ 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);
-            }
-        }
-    }
-
     /** ***************************************************************************************** */
     /** ***************************************************************************************** */
     /** ***************************************************************************************** */
@@ -369,47 +177,99 @@ class User extends AbstractModel
      */
     public static function reg($email, $password, $other = [])
     {
-        // 邮箱
-        if (!Base::isEmail($email)) {
+        //邮箱
+        if (!Base::isMail($email)) {
             throw new ApiException('请输入正确的邮箱地址');
         }
-        $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']);
-            }
+        if (User::email2userid($email) > 0) {
             throw new ApiException('邮箱地址已存在');
         }
-        // 密码
+        //密码
         self::passwordPolicy($password);
-        // 开始注册
-        $user = Doo::userCreate($email, $password);
+        //开始注册
+        $encrypt = Base::generatePassword(6);
+        $inArray = [
+            'encrypt' => $encrypt,
+            'email' => $email,
+            'password' => Base::md52($password, $encrypt),
+            'created_ip' => Base::getIp(),
+        ];
         if ($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);
-            }
+            $inArray = array_merge($inArray, $other);
         }
+        $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
@@ -445,15 +305,14 @@ class User extends AbstractModel
     {
         $user = self::authInfo();
         if (!$user) {
-            $token = Base::token();
-            if ($token) {
-                UserDevice::forget($token);
+            $authorization = Base::getToken();
+            if ($authorization) {
                 throw new ApiException('身份已失效,请重新登录', [], -1);
             } else {
                 throw new ApiException('请登录后继续...', [], -1);
             }
         }
-        if ($user->isDisable()) {
+        if (in_array('disable', $user->identity)) {
             throw new ApiException('帐号已停用...', [], -1);
         }
         if ($identity) {
@@ -468,90 +327,61 @@ class User extends AbstractModel
      */
     private static function authInfo()
     {
-        if (RequestContext::has('auth')) {
-            // 缓存
-            return RequestContext::get('auth');
+        global $_A;
+        if (isset($_A["__static_auth"])) {
+            return $_A["__static_auth"];
         }
-        if (Doo::userId() <= 0) {
-            // 没有登录
-            return RequestContext::save('auth', false);
-        }
-        if (Doo::userExpired()) {
-            // 登录过期
-            return RequestContext::save('auth', false);
-        }
-        if (!UserDevice::check()) {
-            // token 不存在
-            return RequestContext::save('auth', false);
-        }
-        $user = self::whereUserid(Doo::userId())->whereEmail(Doo::userEmail())->whereEncrypt(Doo::userEncrypt())->first();
-        if (!$user) {
-            // 登录信息不匹配
-            return RequestContext::save('auth', false);
-        }
-
-        // 更新登录信息
-        $upArray = [];
-        if (Base::getIp() && $user->line_ip != Base::getIp()) {
-            $upArray['line_ip'] = Base::getIp();
-        }
-        if (Carbon::parse($user->line_at)->addSeconds(30)->lt(Carbon::now())) {
-            $upArray['line_at'] = Carbon::now();
-        }
-        $headerLanguage = RequestContext::get('header_language');
-        if (empty($user->lang) || $headerLanguage) {
-            if (Doo::checkLanguage($headerLanguage) && $user->lang != $headerLanguage) {
-                $upArray['lang'] = $headerLanguage;
+        $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 ($upArray) {
-            $user->updateInstance($upArray);
-            $user->save();
-        }
-        return RequestContext::save('auth', $user);
+        return $_A["__static_auth"] = false;
     }
 
     /**
-     * 生成 token
+     * 生成token
      * @param self $userinfo
-     * @param bool $refresh  获取新的token
      * @return string
      */
-    public static function generateToken($userinfo, $refresh = false)
+    public static function token($userinfo)
     {
-        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();
-        }
-        UserDevice::record($token);
+        $userinfo->token = base64_encode($userinfo->userid . '#$' . $userinfo->email . '#$' . $userinfo->encrypt . '#$' . time() . '#$' . Base::generatePassword(6));
         unset($userinfo->encrypt);
         unset($userinfo->password);
-        return $userinfo->token = $token;
+        return $userinfo->token;
     }
 
     /**
-     * 生成无设备的 token（主要用于接口调用，此 token 不检查设备是否存在）
-     * @param self $userinfo
-     * @param $ttl
-     * @return mixed
+     * 判断用户权限（身份）
+     * @param $identity
+     * @param $userIdentity
+     * @return bool
      */
-    public static function generateTokenNoDevice($userinfo, $ttl)
+    public static function identityRaw($identity, $userIdentity)
     {
-        $key = 'user_token_no_device_' . $userinfo->userid;
-        return Cache::remember($key, $ttl, function () use ($userinfo, $ttl) {
-            $token = Doo::tokenEncode($userinfo->userid, $userinfo->email, $userinfo->encrypt);
-            Cache::put(UserDevice::ck(md5($token)), $userinfo->userid, $ttl);
-            return $token;
-        });
+        $userIdentity = is_array($userIdentity) ? $userIdentity : explode(",", trim($userIdentity, ","));
+        return $identity && in_array($identity, $userIdentity);
     }
 
     /**
@@ -559,21 +389,22 @@ class User extends AbstractModel
      * @param int $userid 会员ID
      * @return self
      */
-    public static function userid2basic($userid, $addField = [])
+    public static function userid2basic($userid)
     {
+        global $_A;
         if (empty($userid)) {
             return null;
         }
         $userid = intval($userid);
-        if (RequestContext::has("userid2basic_" . $userid)) {
-            return RequestContext::get("userid2basic_" . $userid);
+        if (isset($_A["__static_userid2basic_" . $userid])) {
+            return $_A["__static_userid2basic_" . $userid];
         }
-        $userInfo = self::whereUserid($userid)->select(array_merge(User::$basicField, $addField))->first();
+        $fields = ['userid', 'email', 'nickname', 'profession', 'userimg'];
+        $userInfo = self::whereUserid($userid)->select($fields)->first();
         if ($userInfo) {
             $userInfo->online = $userInfo->getOnlineStatus();
-            $userInfo->department_name = $userInfo->getDepartmentName();
         }
-        return RequestContext::save("userid2basic_" . $userid, $userInfo ?: []);
+        return $_A["__static_userid2basic_" . $userid] = ($userInfo ?: []);
     }
 
 
@@ -584,7 +415,21 @@ class User extends AbstractModel
      */
     public static function userid2nickname($userid)
     {
-        return self::userid2basic($userid)?->nickname ?: '';
+        $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();
+        }
     }
 
     /**
@@ -611,72 +456,6 @@ 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
@@ -707,84 +486,4 @@ 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) {
-            if (isset($update['nickname']) && $botUser->nickname != $update['nickname']) {
-                $botUser->az = Base::getFirstCharter($botUser->nickname);
-                $botUser->pinyin = Base::cn2pinyin($botUser->nickname);
-            }
-            $botUser->updateInstance($update);
-            $botUser->save();
-        }
-        return $botUser;
-    }
-
-    /**
-     * 是否机器人
-     * @param $userid
-     * @return bool
-     */
-    public static function isBot($userid)
-    {
-        if (empty($userid)) {
-            return false;
-        }
-        // 这个不会有变化，所以可以使用永久缓存
-        return (bool)Cache::rememberForever('is-bot-user-' . $userid, function () use ($userid) {
-            return (bool)User::find($userid)?->bot;
-        });
-    }
-
-    /**
-     * 搜索用户
-     * @param $key
-     * @param $take
-     * @return User[]|\Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection|\Illuminate\Database\Query\Builder[]|\Illuminate\Support\Collection
-     */
-    public static function searchUser($key, $take = 20)
-    {
-        return User::select(User::$basicField)
-            ->where(function ($query) use ($key) {
-                if (str_contains($key, "@")) {
-                    $query->where("email", "like", "%{$key}%");
-                } else {
-                    $query->where("nickname", "like", "%{$key}%")
-                        ->orWhere("pinyin", "like", "%{$key}%")
-                        ->orWhere("profession", "like", "%{$key}%");
-                }
-            })->orderBy('userid')
-            ->take($take)
-            ->get();
-    }
 }

app/Models/UserAppSort.php

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

app/Models/UserBot.php

@@ -1,602 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Module\Base;
-use App\Module\Doo;
-use App\Module\Ihttp;
-use App\Module\Timer;
-use App\Tasks\JokeSoupTask;
-use Cache;
-use Carbon\Carbon;
-use Throwable;
-
-/**
- * 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 array|null $webhook_events Webhook事件配置
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
- * @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
-{
-    public const WEBHOOK_EVENT_MESSAGE = 'message';
-    public const WEBHOOK_EVENT_DIALOG_OPEN = 'dialog_open';
-    public const WEBHOOK_EVENT_MEMBER_JOIN = 'member_join';
-    public const WEBHOOK_EVENT_MEMBER_LEAVE = 'member_leave';
-
-    protected $casts = [
-        'webhook_events' => 'array',
-    ];
-
-    /**
-     * 获取 webhook 事件配置
-     *
-     * @param mixed $value
-     * @return array
-     */
-    public function getWebhookEventsAttribute(mixed $value): array
-    {
-        if ($value === null || $value === '') {
-            return self::normalizeWebhookEvents(null, true);
-        }
-        return self::normalizeWebhookEvents($value, false);
-    }
-
-    /**
-     * 设置 webhook 事件配置
-     *
-     * @param mixed $value
-     * @return void
-     */
-    public function setWebhookEventsAttribute(mixed $value): void
-    {
-        $useFallback = $value === null;
-        $this->attributes['webhook_events'] = Base::array2json(self::normalizeWebhookEvents($value, $useFallback));
-    }
-
-    /**
-     * 判断是否需要触发指定 webhook 事件
-     *
-     * @param string $event
-     * @return bool
-     */
-    public function shouldDispatchWebhook(string $event): bool
-    {
-        if (!$this->webhook_url) {
-            return false;
-        }
-        if (!preg_match('/^https?:\/\//', $this->webhook_url)) {
-            return false;
-        }
-        return in_array($event, $this->webhook_events ?? [], true);
-    }
-
-    /**
-     * 发送 webhook
-     *
-     * @param string $event
-     * @param array $data
-     * @param int $timeout
-     * @return array|null
-     */
-    public function dispatchWebhook(string $event, array $data, int $timeout = 30): ?array
-    {
-        if (!$this->shouldDispatchWebhook($event)) {
-            return null;
-        }
-
-        try {
-            $data['event'] = $event;
-            $result = Ihttp::ihttp_post($this->webhook_url, $data, $timeout);
-            $this->increment('webhook_num');
-            return $result;
-        } catch (Throwable $th) {
-            info(Base::array2json([
-                'webhook_url' => $this->webhook_url,
-                'data' => $data,
-                'error' => $th->getMessage(),
-            ]));
-            return null;
-        }
-    }
-
-    /**
-     * 判断是否系统机器人
-     * @param $email
-     * @return bool
-     */
-    public static function isSystemBot($email)
-    {
-        return str_ends_with($email, '@bot.system') && self::systemBotName($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 = [];
-                $setting = Base::setting('checkinSetting');
-                if ($setting['open'] !== 'open') {
-                    return $menu;
-                }
-                if (in_array('locat', $setting['modes']) && Base::isEEUIApp()) {
-                    $mapTypes = [
-                        'baidu' => ['key' => 'locat_bd_lbs_key', 'point' => 'locat_bd_lbs_point', 'msg' => '请填写百度地图AK'],
-                        'amap' => ['key' => 'locat_amap_key', 'point' => 'locat_amap_point', 'msg' => '请填写高德地图Key'],
-                        'tencent' => ['key' => 'locat_tencent_key', 'point' => 'locat_tencent_point', 'msg' => '请填写腾讯地图Key'],
-                    ];
-                    $type = $setting['locat_map_type'];
-                    if (isset($mapTypes[$type])) {
-                        $conf = $mapTypes[$type];
-                        $point = $setting[$conf['point']];
-                        $menu[] = [
-                            'key' => 'locat-checkin',
-                            'label' => Doo::translate('定位签到'),
-                            'config' => [
-                                'type' => $type,
-                                'key' => $setting[$conf['key']],
-                                'lng' => $point['lng'],
-                                'lat' => $point['lat'],
-                                'radius' => intval($point['radius']),
-                            ]
-                        ];
-                    }
-                }
-                if (in_array('manual', $setting['modes'])) {
-                    $menu[] = [
-                        '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-|user-session-)(.*?)@bot\.system$/', $email, $match)) {
-                    $menus = [
-                        [
-                            'key' => '~ai-session-create',
-                            'label' => Doo::translate('开启新会话'),
-                        ],
-                        [
-                            'key' => '~ai-session-history',
-                            'label' => Doo::translate('历史会话'),
-                        ]
-                    ];
-                    if ($match[1] === "ai-") {
-                        $aibotSetting = Base::setting('aibotSetting');
-                        $aibotModel = $aibotSetting[$match[2] . '_model'];
-                        $aibotModels = Setting::AIBotModels2Array($aibotSetting[$match[2] . '_models']);
-                        if ($aibotModels) {
-                            $menus = array_merge(
-                                [
-                                    [
-                                        'key' => '~ai-model-select',
-                                        'label' => Doo::translate('选择模型'),
-                                        'config' => [
-                                            'model' => $aibotModel,
-                                            'models' => $aibotModels
-                                        ]
-                                    ]
-                                ],
-                                $menus
-                            );
-                        }
-                    }
-                    return $menus;
-                }
-                return [];
-        }
-    }
-
-    /**
-     * 签到机器人
-     * @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);
-        } 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 (in_array($extra['type'], ['baidu', 'amap', 'tencent'])) {
-                // todo 判断距离
-            } else {
-                return '错误的定位签到。';
-            }
-            UserBot::checkinBotCheckin('locat-' . $userid, Timer::time(), true);
-        }
-        return null;
-    }
-
-    /**
-     * 签到机器人签到
-     * @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 => [],
-        };
-    }
-
-    /**
-     * 创建我的机器人
-     * @param int $userid               创建人userid
-     * @param string $botName           机器人名称
-     * @param bool $sessionSupported    是否支持会话
-     * @return array
-     */
-    public static function newBot($userid, $botName, $sessionSupported = false)
-    {
-        if (User::select(['users.*'])
-                ->join('user_bots', 'users.userid', '=', 'user_bots.bot_id')
-                ->where('users.bot', 1)
-                ->where('user_bots.userid', $userid)
-                ->count() >= 50) {
-            return Base::retError("超过最大创建数量。");
-        }
-        if (strlen($botName) < 2 || strlen($botName) > 20) {
-            return Base::retError("机器人名称由2-20个字符组成。");
-        }
-        $botType = ($sessionSupported ? "user-session-" : "user-normal-") . Base::generatePassword();
-        $data = User::botGetOrCreate($botType, [
-            'nickname' => $botName
-        ], $userid);
-        if (empty($data)) {
-            return Base::retError("创建失败。");
-        }
-        $dialog = WebSocketDialog::checkUserDialog($data, $userid);
-        if ($dialog) {
-            if ($sessionSupported) {
-                $dialogSession = WebSocketDialogSession::create([
-                    'dialog_id' => $dialog->id,
-                ]);
-                $dialogSession->save();
-                $dialog->session_id = $dialogSession->id;
-                $dialog->save();
-            }
-            WebSocketDialogMsg::sendMsg(null, $dialog->id, 'template', [
-                'type' => '/hello',
-                'title' => '创建成功。',
-                'data' => $data,
-            ], $data->userid);
-        }
-        return Base::retSuccess("创建成功。", $data);
-    }
-
-    /**
-     * 获取可选的 webhook 事件
-     *
-     * @return string[]
-     */
-    public static function webhookEventOptions(): array
-    {
-        return [
-            self::WEBHOOK_EVENT_MESSAGE,
-            self::WEBHOOK_EVENT_DIALOG_OPEN,
-            self::WEBHOOK_EVENT_MEMBER_JOIN,
-            self::WEBHOOK_EVENT_MEMBER_LEAVE,
-        ];
-    }
-
-    /**
-     * 标准化 webhook 事件配置
-     *
-     * @param mixed $events
-     * @param bool $useFallback
-     * @return array
-     */
-    public static function normalizeWebhookEvents(mixed $events, bool $useFallback = true): array
-    {
-        if (is_string($events)) {
-            $events = Base::json2array($events);
-        }
-        if ($events === null) {
-            $events = [];
-        }
-        if (!is_array($events)) {
-            $events = [$events];
-        }
-        $events = array_filter(array_map('strval', $events));
-        $events = array_values(array_intersect($events, self::webhookEventOptions()));
-        return $events ?: ($useFallback ? [self::WEBHOOK_EVENT_MESSAGE] : []);
-    }
-}

app/Models/UserCheckinFace.php

@@ -1,108 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Exceptions\ApiException;
-use App\Module\Apps;
-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 = '')
-    {
-        Apps::isInstalledThrow('face');
-        // 取上传图片的URL
-        $faceimg = Base::unFillUrl($faceimg);
-        $record = "";
-        if ($faceimg != '') {
-            $faceFile = public_path($faceimg);
-            $record = base64_encode(file_get_contents($faceFile));
-        }
-
-        $url = "http://face: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 == '') {
-                UserCheckinFace::deleteDeviceUser($userid);
-            }
-            return Base::retSuccess('设置成功');
-        });
-    }
-
-    private static function deleteDeviceUser($userid)
-    {
-        $url = "http://face:7788/user/delete";
-        $data = [
-            'enrollid' => $userid,
-            'backupnum' => 50, // 13 删除整个用户  50 删除图片
-        ];
-
-        $res = Ihttp::ihttp_post($url, json_encode($data));
-        if ($res['data'] && $data = json_decode($res['data'])) {
-            if ($data->ret != 1 && $data->msg) {
-                throw new ApiException($data->msg);
-            }
-        }
-    }
-}

app/Models/UserCheckinMac.php

@@ -1,72 +0,0 @@
-<?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

@@ -1,140 +0,0 @@
-<?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

@@ -1,84 +0,0 @@
-<?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|null $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
-{
-    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)
-    {
-        return \Cache::remember("UserDelete:{$userid}", now()->addDays(3), function () use ($userid) {
-            $row = self::whereUserid($userid)->first();
-            if (empty($row) || empty($row->cache)) {
-                return null;
-            }
-            $cache = $row->cache;
-            $cache = array_intersect_key($cache, array_flip(array_merge(User::$basicField, ['department_name'])));
-            $cache['delete_at'] = $row->created_at->toDateTimeString();
-            return $cache;
-        });
-    }
-
-    /**
-     * userid 获取 昵称
-     * @param $userid
-     * @return string
-     */
-    public static function userid2nickname($userid)
-    {
-        return self::userid2basic($userid)['nickname'] ?? '';
-    }
-}

app/Models/UserDepartment.php

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

app/Models/UserDevice.php

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

app/Models/UserEmailVerification.php

@@ -1,153 +0,0 @@
-<?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/UserFavorite.php

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

app/Models/UserRecentItem.php

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

app/Models/UserTag.php

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

app/Models/UserTagRecognition.php

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

app/Models/UserTaskBrowse.php

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

app/Models/UserTransfer.php

@@ -1,107 +0,0 @@
-<?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

@@ -4,24 +4,19 @@ namespace App\Models;
 
 
 /**
- * App\Models\WebSocket
+ * Class WebSocket
  *
+ * @package App\Models
  * @property int $id
  * @property string $key
  * @property string|null $fd
- * @property string|null $path
  * @property int|null $userid
+ * @property string|null $path
  * @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

@@ -1,64 +0,0 @@
-<?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,41 +2,24 @@
 
 namespace App\Models;
 
-use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
-
 /**
- * App\Models\WebSocketDialogMsgRead
+ * Class WebSocketDialogMsgRead
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $dialog_id 对话ID
  * @property int|null $msg_id 消息ID
- * @property int|null $userid 接收会员ID
- * @property int|null $mention 是否提及（被@）
- * @property int|null $silence 是否免打扰：0否，1是
- * @property int|null $email 是否发了邮件
+ * @property int|null $userid 发送会员ID
  * @property int|null $after 在阅读之后才添加的记录
- * @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()
+ * @property string|null $read_at 阅读时间
  * @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
  */
@@ -47,104 +30,4 @@ 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)
-    {
-        if (empty($list)) {
-            return;
-        }
-
-        $collection = collect($list);
-        if ($collection->isEmpty()) {
-            return;
-        }
-
-        $now = Carbon::now();
-        $ids = [];
-        $msgCounts = [];
-
-        /** @var WebSocketDialogMsgRead $item */
-        foreach ($collection as $item) {
-            $ids[] = $item->id;
-            if ($item->msg_id) {
-                $msgCounts[$item->msg_id] = ($msgCounts[$item->msg_id] ?? 0) + 1;
-            }
-        }
-
-        if (!empty($ids)) {
-            DB::table((new self())->getTable())
-                ->whereIn('id', $ids)
-                ->whereNull('read_at')
-                ->update(['read_at' => $now]);
-        }
-
-        if (!empty($msgCounts)) {
-            $cases = [];
-            $bindings = [];
-            foreach ($msgCounts as $msgId => $num) {
-                $cases[] = 'WHEN ? THEN ?';
-                $bindings[] = $msgId;
-                $bindings[] = $num;
-            }
-            $msgIds = array_keys($msgCounts);
-            $bindings = array_merge($bindings, $msgIds);
-            $placeholders = implode(',', array_fill(0, count($msgIds), '?'));
-            $table = DB::getTablePrefix() . (new WebSocketDialogMsg())->getTable();
-            $sql = "UPDATE {$table} SET `read` = `read` + CASE `id` " . implode(' ', $cases) . " END WHERE `deleted_at` IS NULL AND `id` IN ({$placeholders})";
-            DB::update($sql, $bindings);
-        }
-    }
-
-    /**
-     * 标记指定会话的历史消息为已读
-     * @param int $dialogId
-     * @param int $sessionId
-     * @param int $chunkSize
-     * @return void
-     */
-    public static function markSessionMessagesAsRead(int $dialogId, int $sessionId, int $chunkSize = 100): void
-    {
-        if ($dialogId <= 0 || $sessionId <= 0) {
-            return;
-        }
-
-        self::whereDialogId($dialogId)
-            ->whereNull('read_at')
-            ->whereIn('msg_id', function ($query) use ($dialogId, $sessionId) {
-                $query->select('id')
-                    ->from((new WebSocketDialogMsg())->getTable())
-                    ->where('dialog_id', $dialogId)
-                    ->where('session_id', $sessionId);
-            })
-            ->chunkById($chunkSize, function ($list) {
-                self::onlyMarkRead($list);
-            });
-    }
 }

app/Models/WebSocketDialogMsgTodo.php

@@ -1,53 +0,0 @@
-<?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

@@ -1,36 +0,0 @@
-<?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

@@ -1,86 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Module\Base;
-use App\Tasks\UpdateSessionTitleViaAiTask;
-use Hhxsv5\LaravelS\Swoole\Task\Task;
-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;
-        }
-        if ($dialogMsg->msg['text'] === '...') {
-            return;
-        }
-        $cacheKey = 'dialog_session_title_' . $sessionId;
-        if (Cache::has($cacheKey)) {
-            return;
-        }
-        $title = $dialogMsg->key ?: WebSocketDialogMsg::previewTextMsg($dialogMsg->msg) ?: 'Untitled';
-        $session = self::whereId($sessionId)->first();
-        if (!$session) {
-            return;
-        }
-        $session->title = $title;
-        $session->save();
-        Cache::forever($cacheKey, true);
-        Task::deliver(new UpdateSessionTitleViaAiTask($session->id, $dialogMsg->msg['text']));
-    }
-}

app/Models/WebSocketDialogUser.php

@@ -3,70 +3,25 @@
 namespace App\Models;
 
 /**
- * App\Models\WebSocketDialogUser
+ * Class WebSocketDialogUser
  *
+ * @package 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;
-    }
 }