build

# Conflicts:
#	resources/assets/js/pages/manage/components/DialogWrapper.vue
#	resources/assets/sass/components/user-select.scss
#	resources/assets/sass/pages/components/dialog-wrapper.scss

.env.docker

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

.env.example

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

.github/workflows/electron.yml

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

.github/workflows/publish-android.yml

@@ -0,0 +1,55 @@
+name: Publish Android
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  Build:
+    name: Build Android
+    runs-on: ubuntu-latest
+    environment: build
+
+    if: startsWith(github.event.ref, 'refs/tags/v')
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 20.x
+
+      - name: Build Js
+        run: |
+          git submodule init
+          git submodule update --remote "resources/mobile"
+          ./cmd appbuild publish
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+
+      - name: Build Android
+        run: |
+          cd resources/mobile/platforms/android/eeuiApp
+          chmod +x ./gradlew
+          ./gradlew assembleRelease --quiet
+
+      - name: Upload File
+        env:
+          DP_KEY: ${{ secrets.DP_KEY }}
+        run: |
+          node ./electron/build.js android-upload
+
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+        with:
+          files: |
+            resources/mobile/platforms/android/eeuiApp/app/build/outputs/apk/release/*.apk

.github/workflows/publish-desktop-mac.yml

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

.github/workflows/publish-desktop-win.yml

@@ -0,0 +1,31 @@
+name: Publish Win
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  Build:
+    name: Build Windows
+    runs-on: windows-latest
+    environment: build
+
+    if: startsWith(github.event.ref, 'refs/tags/v')
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 20.x
+
+      - name: Build
+        env:
+          DP_KEY: ${{ secrets.DP_KEY }}
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          GH_REPOSITORY: ${{ github.repository }}
+        shell: bash
+        run: |
+          ./cmd electron win

.gitignore

@@ -1,10 +1,12 @@
 /node_modules
 /public/hot
 /public/tmp
+/public/summary
 /public/uploads/*
 /public/.well-known
 /public/.user.ini
 /storage/*.key
+/config/LICENSE
 /vendor
 /build
 /tmp
@@ -19,10 +21,10 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 test.*
-composer.lock
 package-lock.json
 laravels-timer-process.pid
 .DS_Store
 vars.yaml
 laravels.conf
 laravels.pid
+README_LOCAL.md

.gitmodules

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

.gitpod.yml

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

.prefetch

@@ -0,0 +1,27 @@
+office/web-apps/apps/api/documents/api.js?hash={version}
+office/7.5.1-23/sdkjs/cell/css/main.css
+office/7.5.1-23/web-apps/apps/spreadsheeteditor/main/resources/css/app.css
+office/7.5.1-23/web-apps/vendor/requirejs/require.js
+office/7.5.1-23/web-apps/apps/spreadsheeteditor/main/app.js
+office/7.5.1-23/sdkjs/common/AllFonts.js
+office/7.5.1-23/web-apps/vendor/xregexp/xregexp-all-min.js
+office/7.5.1-23/web-apps/vendor/socketio/socket.io.min.js
+office/7.5.1-23/sdkjs/cell/sdk-all-min.js
+office/7.5.1-23/sdkjs/cell/sdk-all.js
+office/7.5.1-23/sdkjs/common/libfont/engine/fonts.js
+office/7.5.1-23/sdkjs/common/Charts/ChartStyles.js
+office/7.5.1-23/sdkjs/common/libfont/engine/fonts.wasm
+office/7.5.1-23/web-apps/apps/presentationeditor/main/resources/css/app.css
+office/7.5.1-23/web-apps/apps/presentationeditor/main/app.js
+office/7.5.1-23/sdkjs/slide/sdk-all-min.js
+office/7.5.1-23/sdkjs/slide/sdk-all.js
+office/7.5.1-23/sdkjs/slide/themes//themes.js
+office/7.5.1-23/web-apps/apps/documenteditor/main/resources/css/app.css
+office/7.5.1-23/web-apps/apps/documenteditor/main/app.js
+office/7.5.1-23/sdkjs/word/sdk-all-min.js
+office/7.5.1-23/sdkjs/word/sdk-all.js
+drawio/webapp/js/app.min.js
+drawio/webapp/js/stencils.min.js
+drawio/webapp/js/extensions.min.js
+drawio/webapp/js/shapes-14-6-5.min.js
+drawio/webapp/math/es5/output/svg/fonts/tex.js

README.md

@@ -2,7 +2,7 @@
 
 English | **[中文文档](./README_CN.md)**
 
-- [Screenshot Preview](README_PREVIEW.md)
+- [Screenshot preview](./README_PREVIEW.md)
 - [Demo site](http://www.dootask.com/)
 
 **QQ Group**
@@ -11,24 +11,25 @@ Group No.: `546574618`
 
 ## Setup
 
-- `Docker` & `Docker Compose v2.0+` must be installed
-- System: `Centos/Debian/Ubuntu/macOS`
-- Hardware suggestion: 2 cores and above 2G memory
+- `Docker v20.10+` & `Docker Compose v2.0+` must be installed
+- System: `Centos/Debian/Ubuntu/macOS/Windows`
+- Hardware suggestion: 2 cores and above 4G memory
+- Special note: Windows users please use `git bash` or `cmder` to run the command
 
-### Deployment project
+### Deployment (Pro Edition)
 
 ```bash
 # 1、Clone the repository
 
 # Clone projects on github
-git clone https://github.com/kuaifan/dootask.git
+git clone -b pro --depth=1 https://github.com/kuaifan/dootask.git
 # Or you can use gitee
-git clone https://gitee.com/aipaw/dootask.git
+git clone -b pro --depth=1 https://gitee.com/aipaw/dootask.git
 
 # 2、Enter directory
 cd dootask
 
-# 3、Installation（Custom port installation: ./cmd install --port 2222）
+# 3、Installation（Custom port installation, as: ./cmd install --port 80）
 ./cmd install
 ```
 
@@ -42,7 +43,18 @@ cd dootask
 ### Change port
 
 ```bash
-./cmd port 2222
+# This method only replaces the HTTP port. To replace the HTTPS port, please read the SSL configuration below
+./cmd port 80
+```
+
+### Change App Url
+
+```bash
+# This URL only affects the email reply.
+./cmd url {Your domain url}
+
+# example:
+./cmd url https://domain.com
 ```
 
 ### Stop server
@@ -56,11 +68,13 @@ cd dootask
 
 ### Development compilation
 
+- `NodeJs 20+` must be installed
+
 ```bash
-# Development mode, Mac OS only
+# Development
 ./cmd dev
    
-# Production projects, macOS only
+# Production (This is web client. For App/PC/Mac clients, Please read README-CLIENT.md)
 ./cmd prod  
 ```
 
@@ -74,11 +88,19 @@ cd dootask
 ./cmd redis "your command"            # To run a redis command
 ./cmd composer "your command"         # To run a composer command
 ./cmd supervisorctl "your command"    # To run a supervisorctl command
-./cmd test "your command"             # To run a phpunit command
 ./cmd mysql "your command"            # To run a mysql command (backup: Backup database, recovery: Restore database)
 ```
 
-### NGINX PROXY SSL
+### SSL configuration
+
+#### Method 1: Automatic configuration
+
+```bash 
+# Running commands in a project
+./cmd https
+```
+
+#### Or Method 2: Nginx Agent Configuration
 
 ```bash 
 # 1、Nginx config add
@@ -86,8 +108,8 @@ proxy_set_header X-Forwarded-Host $http_host;
 proxy_set_header X-Forwarded-Proto $scheme;
 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-# 2、Enter directory and run command
-./cmd https
+# 2、Running commands in a project (If you unconfigure the NGINX agent, run: ./cmd https close)
+./cmd https agent
 ```
 
 ## Upgrade
@@ -95,7 +117,7 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 **Note: Please back up your data before upgrading!**
 
 ```bash
-# Method 1: enter directory and run command
+# Method 1: Running commands in a project
 ./cmd update
 
 # Or method 2: use this method if method 1 fails
@@ -104,12 +126,33 @@ git pull
 ./cmd uninstall
 ./cmd install
 ./cmd mysql recovery
-./cmd artisan migrate
+```
+
+* Please try again if the upgrade fails across a large version.
+* If 502 after the upgrade please run `./cmd restart` restart the service.
+
+## Transfer
+
+Follow these steps to complete the project migration after the new project is installed:
+
+1. Backup original database
+
+```bash
+# Run command under old project
+./cmd mysql backup
+```
+
+2. Copy `database backup file` and `public/uploads` directory to the new project.
+
+3. Restore database to new project
+```bash
+# Run command under new project
+./cmd mysql recovery
 ```
 
 ## Uninstall
 
 ```bash
-# Enter directory and run command
+# Running commands in a project
 ./cmd uninstall
 ```

README_CLIENT.md

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

README_CN.md

@@ -2,7 +2,7 @@
 
 **[English](./README.md)** | 中文文档
 
-- [截图预览](README_PREVIEW.md)
+- [截图预览](./README_PREVIEW.md)
 - [演示站点](http://www.dootask.com/)
 
 **QQ交流群**
@@ -11,24 +11,25 @@
 
 ## 安装程序
 
-- 必须安装：`Docker` 和 `Docker Compose v2.0+`
-- 支持环境：`Centos/Debian/Ubuntu/macOS`
-- 硬件建议：2核2G以上
+- 必须安装：`Docker v20.10+` 和 `Docker Compose v2.0+`
+- 支持环境：`Centos/Debian/Ubuntu/macOS/Windows`
+- 硬件建议：2核4G以上
+- 特别说明：Windows 用户请使用 `git bash` 或者 `cmder` 运行命令
 
-### 部署项目
+### 部署项目（Pro版）
 
 ```bash
 # 1、克隆项目到您的本地或服务器
 
 # 通过github克隆项目
-git clone https://github.com/kuaifan/dootask.git
+git clone -b pro --depth=1 https://github.com/kuaifan/dootask.git
 # 或者你也可以使用gitee
-git clone https://gitee.com/aipaw/dootask.git
+git clone -b pro --depth=1 https://gitee.com/aipaw/dootask.git
 
 # 2、进入目录
 cd dootask
 
-# 3、一键安装项目（自定义端口安装 ./cmd install --port 2222）
+# 3、一键安装项目（自定义端口安装，如：./cmd install --port 80）
 ./cmd install
 ```
 
@@ -42,7 +43,18 @@ cd dootask
 ### 更换端口
 
 ```bash
-./cmd port 2222
+# 此方法仅更换http端口，更换https端口请阅读下面SSL配置
+./cmd port 80
+```
+
+### 更换URL
+
+```bash
+# 此地址仅影响邮件回复功能
+./cmd url {域名地址}
+
+# 例如:
+./cmd url https://domain.com
 ```
 
 ### 停止服务
@@ -56,11 +68,13 @@ cd dootask
 
 ### 开发编译
 
+- 请确保你已经安装了 `NodeJs 20+`
+
 ```bash
-# 开发模式，仅限macOS
+# 开发模式
 ./cmd dev
    
-# 编译项目，仅限macOS
+# 编译项目（这是网页端的，App/Pc/Mac客户端请查看 README_CLIENT.md）
 ./cmd prod  
 ```
 
@@ -75,11 +89,19 @@ cd dootask
 ./cmd redis "your command"            # 运行 redis 命令
 ./cmd composer "your command"         # 运行 composer 命令
 ./cmd supervisorctl "your command"    # 运行 supervisorctl 命令
-./cmd test "your command"             # 运行 phpunit 命令
 ./cmd mysql "your command"            # 运行 mysql 命令 (backup: 备份数据库，recovery: 还原数据库)
 ```
 
-### NGINX 代理 SSL
+### SSL 配置
+
+#### 方法1：自动配置
+
+```bash 
+# 在项目下运行命令，根据提示执行即可
+./cmd https
+```
+
+#### （或者）方法2：Nginx 代理配置
 
 ```bash 
 # 1、Nginx 代理配置添加
@@ -87,8 +109,8 @@ proxy_set_header X-Forwarded-Host $http_host;
 proxy_set_header X-Forwarded-Proto $scheme;
 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-# 2、进入项目所在目录，运行以下命令
-./cmd https
+# 2、在项目下运行命令（如果取消 Nginx 代理配置请运行：./cmd https close）
+./cmd https agent
 ```
 
 ## 升级更新
@@ -96,7 +118,7 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 **注意：在升级之前请备份好你的数据！**
 
 ```bash
-# 方法1：进入项目所在目录，运行以下命令
+# 方法1：在项目下运行命令
 ./cmd update
 
 # （或者）方法2：如果方法1失败请使用此方法
@@ -105,12 +127,33 @@ git pull
 ./cmd uninstall
 ./cmd install
 ./cmd mysql recovery
-./cmd artisan migrate
+```
+
+* 跨越大版本升级失败时请重试执行一次。
+* 如果升级后出现502请运行 `./cmd restart` 重启服务即可。
+
+## 迁移项目
+
+在新项目安装好之后按照以下步骤完成项目迁移：
+
+1、备份原数据库
+
+```bash
+# 在旧的项目下运行命令
+./cmd mysql backup
+```
+
+2、将`数据库备份文件`及`public/uploads`目录拷贝至新项目
+
+3、还原数据库至新项目
+```bash
+# 在新的项目下运行命令
+./cmd mysql recovery
 ```
 
 ## 卸载项目
 
 ```bash
-# 进入项目所在目录，运行以下命令
+# 在项目下运行命令
 ./cmd uninstall
 ```

README_PUBLISH.md

@@ -0,0 +1,26 @@
+# 发布说明
+
+## 发布前
+
+1. 添加环境变量 `APPLEID`、`APPLEIDPASS` 用于公证
+2. 添加环境变量 `CSC_LINK`、`CSC_KEY_PASSWORD` 用于签名
+3. 添加环境变量 `GH_TOKEN`、`GH_REPOSITORY` 用于发布到GitHub
+4. 添加环境变量 `DP_KEY` 用于发布到私有服务器
+
+## 通过 GitHub Actions 发布
+
+1. 执行 `npm run version` 生成版本
+2. 执行 `npm run build` 编译前端
+3. 执行 `git commit` 提交并推送
+4. 添加并推送标签
+
+## 本地发布
+
+1. 执行 `npm run version` 生成版本
+2. 执行 `npm run build` 编译前端
+3. 执行 `./cmd electron` 相关操作
+
+## 编译App
+
+1. 执行 `./cmd appbuild [setting]` 编译
+2. 进入 `resources/mobile` eeui框架内打包Android或iOS应用

app/Exceptions/Handler.php

@@ -67,7 +67,13 @@ class Handler extends ExceptionHandler
     public function report(Throwable $e)
     {
         if ($e instanceof ApiException) {
-            Log::error($e->getMessage(), ['exception' => ' at ' . $e->getFile() .':' . $e->getLine()]);
+            if ($e->getCode() !== -1) {
+                Log::error($e->getMessage(), [
+                    'code' => $e->getCode(),
+                    'data' => $e->getData(),
+                    'exception' => ' at ' . $e->getFile() . ':' . $e->getLine()
+                ]);
+            }
         } else {
             parent::report($e);
         }

app/Helpers/Function.php

@@ -15,3 +15,10 @@ if (!function_exists('seeders_at')) {
         return date("Y-m-d H:i:s", $time);
     }
 }
+
+if (!function_exists('md5s')) {
+    function md5s($val, $len = 16)
+    {
+        return substr(md5($val), 32 - $len);
+    }
+}

app/Http/Controllers/Api/ComplaintController.php

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

app/Http/Controllers/Api/PublicController.php

@@ -0,0 +1,97 @@
+<?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} 签到 - 路由器（openwrt）上报
+     *
+     * @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'));
+        //
+        $setting = Base::setting('checkinSetting');
+        if ($setting['open'] !== 'open') {
+            return 'function off';
+        }
+        if (!in_array('auto', $setting['modes'])) {
+            return 'mode off';
+        }
+        if ($key != $setting['key']) {
+            return 'key error';
+        }
+        if ($error = UserBot::checkinBotCheckin($mac, $time)) {
+            return $error;
+        }
+        return 'success';
+    }
+}

app/Http/Controllers/Api/ReportController.php

@@ -3,15 +3,16 @@
 namespace App\Http\Controllers\Api;
 
 use App\Exceptions\ApiException;
+use App\Models\AbstractModel;
 use App\Models\ProjectTask;
 use App\Models\Report;
 use App\Models\ReportReceive;
 use App\Models\User;
 use App\Module\Base;
+use App\Module\Doo;
 use App\Tasks\PushTask;
 use Carbon\Carbon;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Validation\Rule;
 use Request;
@@ -31,8 +32,9 @@ class ReportController extends AbstractController
      * @apiGroup report
      * @apiName my
      *
-     * @apiParam {String} [type]        汇报类型，weekly:周报，daily:日报
-     * @apiParam {Array} [created_at]   汇报时间
+     * @apiParam {Object} [keys]             搜索条件
+     * - keys.type: 汇报类型，weekly:周报，daily:日报
+     * - keys.created_at: 汇报时间
      * @apiParam {Number} [page]        当前页，默认:1
      * @apiParam {Number} [pagesize]    每页显示数量，默认:20，最大:50
      *
@@ -43,17 +45,19 @@ class ReportController extends AbstractController
     public function my(): array
     {
         $user = User::auth();
-        // 搜索当前用户
+        //
         $builder = Report::with(['receivesUser'])->whereUserid($user->userid);
-        $type = trim(Request::input('type'));
-        $createAt = Request::input('created_at');
-        in_array($type, [Report::WEEKLY, Report::DAILY]) && $builder->whereType($type);
-        $whereArray = [];
-        if (is_array($createAt)) {
-            if ($createAt[0] > 0) $whereArray[] = ['created_at', '>=', date('Y-m-d H:i:s', Base::dayTimeF($createAt[0]))];
-            if ($createAt[1] > 0) $whereArray[] = ['created_at', '<=', date('Y-m-d H:i:s', Base::dayTimeE($createAt[1]))];
+        $keys = Request::input('keys');
+        if (is_array($keys)) {
+            if (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', '>=', date('Y-m-d H:i:s', Base::dayTimeF($keys['created_at'][0])));
+                if ($keys['created_at'][1] > 0) $builder->where('created_at', '<=', date('Y-m-d H:i:s', Base::dayTimeE($keys['created_at'][1])));
+            }
         }
-        $list = $builder->where($whereArray)->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
+        $list = $builder->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
         return Base::retSuccess('success', $list);
     }
 
@@ -64,9 +68,10 @@ class ReportController extends AbstractController
      * @apiGroup report
      * @apiName receive
      *
-     * @apiParam {String} [username]    会员名
-     * @apiParam {String} [type]        汇报类型，weekly:周报，daily:日报
-     * @apiParam {Array} [created_at]   汇报时间
+     * @apiParam {Object} [keys]             搜索条件
+     * - keys.key: 关键词
+     * - keys.type: 汇报类型，weekly:周报，daily:日报
+     * - keys.created_at: 汇报时间
      * @apiParam {Number} [page]        当前页，默认:1
      * @apiParam {Number} [pagesize]    每页显示数量，默认:20，最大:50
      *
@@ -81,21 +86,24 @@ class ReportController extends AbstractController
         $builder->whereHas("receivesUser", function ($query) use ($user) {
             $query->where("report_receives.userid", $user->userid);
         });
-        $type = trim(Request::input('type'));
-        $createAt = Request::input('created_at');
-        $username = trim(Request::input('username', ''));
-        $builder->whereHas('sendUser', function ($query) use ($username) {
-            if (!empty($username)) {
-                $query->where('users.email', 'LIKE', '%' . $username . '%');
+        $keys = Request::input('keys');
+        if (is_array($keys)) {
+            if ($keys['key']) {
+                $builder->where(function($query) use ($keys) {
+                    $query->whereHas('sendUser', function ($q2) use ($keys) {
+                        $q2->where("users.email", "LIKE", "%{$keys['key']}%");
+                    })->orWhere("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', '>=', date('Y-m-d H:i:s', Base::dayTimeF($keys['created_at'][0])));
+                if ($keys['created_at'][1] > 0) $builder->where('created_at', '<=', date('Y-m-d H:i:s', Base::dayTimeE($keys['created_at'][1])));
             }
-        });
-        in_array($type, [Report::WEEKLY, Report::DAILY]) && $builder->whereType($type);
-        $whereArray = [];
-        if (is_array($createAt)) {
-            if ($createAt[0] > 0) $whereArray[] = ['created_at', '>=', date('Y-m-d H:i:s', Base::dayTimeF($createAt[0]))];
-            if ($createAt[1] > 0) $whereArray[] = ['created_at', '<=', date('Y-m-d H:i:s', Base::dayTimeE($createAt[1]))];
         }
-        $list = $builder->where($whereArray)->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
+        $list = $builder->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
         if ($list->items()) {
             foreach ($list->items() as $item) {
                 $item->receive_time = ReportReceive::query()->whereRid($item["id"])->whereUserid($user->userid)->value("receive_time");
@@ -111,12 +119,13 @@ class ReportController extends AbstractController
      * @apiGroup report
      * @apiName store
      *
-     * @apiParam {Number} [id]           汇报ID
-     * @apiParam {String} [title]        汇报标题
-     * @apiParam {Array}  [type]         汇报类型，weekly:周报，daily:日报
-     * @apiParam {Number} [content]      内容
-     * @apiParam {Number} [receive]      汇报对象
-     * @apiParam {Number} [offset]       偏移量
+     * @apiParam {Number} id            汇报ID，0为新建
+     * @apiParam {String} [sign]        唯一签名，通过[api/report/template]接口返回
+     * @apiParam {String} title         汇报标题
+     * @apiParam {Array}  type          汇报类型，weekly:周报，daily:日报
+     * @apiParam {Number} content       内容
+     * @apiParam {Number} [receive]     汇报对象
+     * @apiParam {Number} offset        时间偏移量
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -124,21 +133,23 @@ class ReportController extends AbstractController
      */
     public function store(): array
     {
+        $user = User::auth();
+        //
         $input = [
-            "id" => Base::getPostValue("id", 0),
-            "title" => Base::getPostValue("title"),
-            "type" => Base::getPostValue("type"),
-            "content" => Base::getPostValue("content"),
-            "receive" => Base::getPostValue("receive"),
+            "id" => Request::input("id", 0),
+            "sign" => Request::input("sign"),
+            "title" => Request::input("title"),
+            "type" => Request::input("type"),
+            "content" => Request::input("content"),
+            "receive" => Request::input("receive"),
             // 以当前日期为基础的周期偏移量。例如选择了上一周那么就是 -1，上一天同理。
-            "offset" => Base::getPostValue("offset", 0),
+            "offset" => Request::input("offset", 0),
         ];
         $validator = Validator::make($input, [
             'id' => 'numeric',
             'title' => 'required',
             'type' => ['required', Rule::in([Report::WEEKLY, Report::DAILY])],
             'content' => 'required',
-            'receive' => 'required',
             'offset' => ['numeric', 'max:0'],
         ], [
             'id.numeric' => 'ID只能是数字',
@@ -146,14 +157,12 @@ class ReportController extends AbstractController
             'type.required' => '请选择汇报类型',
             'type.in' => '汇报类型错误',
             'content.required' => '请填写汇报内容',
-            'receive.required' => '请选择接收人',
             'offset.numeric' => '工作汇报周期格式错误，只能是数字',
             'offset.max' => '只能提交当天/本周或者之前的的工作汇报',
         ]);
         if ($validator->fails())
             return Base::retError($validator->errors()->first());
 
-        $user = User::auth();
         // 接收人
         if (is_array($input["receive"])) {
             // 删除当前登录人
@@ -173,7 +182,7 @@ class ReportController extends AbstractController
         }
 
         // 在事务中运行
-        Report::transaction(function () use ($input, $user) {
+        return AbstractModel::transaction(function () use ($input, $user) {
             $id = $input["id"];
             if ($id) {
                 // 编辑
@@ -185,25 +194,24 @@ class ReportController extends AbstractController
                 ]);
             } else {
                 // 生成唯一标识
-                $sign = Report::generateSign($input["type"], $input["offset"]);
+                $sign = Base::isNumber($input["sign"]) ? $input["sign"] : Report::generateSign($input["type"], $input["offset"]);
                 // 检查唯一标识是否存在
-                if (empty($input["id"])) {
-                    if (Report::query()->whereSign($sign)->whereType($input["type"])->count() > 0)
-                        throw new ApiException("请勿重复提交工作汇报");
+                if (empty($input["id"]) && Report::query()->whereSign($sign)->whereType($input["type"])->count() > 0) {
+                    throw new ApiException("请勿重复提交工作汇报");
                 }
                 $report = Report::createInstance([
+                    "sign" => $sign,
                     "title" => $input["title"],
                     "type" => $input["type"],
-                    "content" => htmlspecialchars($input["content"]),
                     "userid" => $user->userid,
-                    "sign" => $sign,
+                    "content" => htmlspecialchars($input["content"]),
                 ]);
             }
-
             $report->save();
-            if (!empty($input["receive_content"])) {
-                // 删除关联
-                $report->Receives()->delete();
+
+            // 删除关联
+            $report->Receives()->delete();
+            if ($input["receive_content"]) {
                 // 保存接收人
                 $report->Receives()->createMany($input["receive_content"]);
             }
@@ -224,8 +232,9 @@ class ReportController extends AbstractController
                 ];
                 Task::deliver(new PushTask($params, false));
             }
+            //
+            return Base::retSuccess('保存成功', $report);
         });
-        return Base::retSuccess('保存成功');
     }
 
     /**
@@ -273,17 +282,17 @@ class ReportController extends AbstractController
         }
         // 生成唯一标识
         $sign = Report::generateSign($type, 0, Carbon::instance($start_time));
-        $one = Report::query()->whereSign($sign)->whereType($type)->first();
+        $one = Report::whereSign($sign)->whereType($type)->first();
         // 如果已经提交了相关汇报
         if ($one && $id > 0) {
             return Base::retSuccess('success', [
-                "content" => $one->content,
-                "title" => $one->title,
                 "id" => $one->id,
+                "sign" => $one->sign,
+                "title" => $one->title,
+                "content" => $one->content,
             ]);
         }
 
-
         // 已完成的任务
         $completeContent = "";
         $complete_task = ProjectTask::query()
@@ -297,8 +306,8 @@ class ReportController extends AbstractController
         if ($complete_task->isNotEmpty()) {
             foreach ($complete_task as $task) {
                 $complete_at = Carbon::parse($task->complete_at);
-                $pre = $type == Report::WEEKLY ? ('<span>[' . Base::Lang('周' . ['日', '一', '二', '三', '四', '五', '六'][$complete_at->dayOfWeek]) . ']</span>&nbsp;') : '';
-                $completeContent .= '<li>' . $pre . $task->name . '</li>';
+                $pre = $type == Report::WEEKLY ? ('<span>[' . Doo::translate('周' . ['日', '一', '二', '三', '四', '五', '六'][$complete_at->dayOfWeek]) . ']</span>&nbsp;') : '';
+                $completeContent .= "<li>{$pre}[{$task->project->name}] {$task->name}</li>";
             }
         } else {
             $completeContent = '<li>&nbsp;</li>';
@@ -307,19 +316,22 @@ class ReportController extends AbstractController
         // 未完成的任务
         $unfinishedContent = "";
         $unfinished_task = ProjectTask::query()
-            ->whereNull("complete_at")
-            ->whereNotNull("start_at")
-            ->where("end_at", "<", $end_time->toDateTimeString())
+            ->join("projects", "projects.id", "=", "project_tasks.project_id")
+            ->whereNull("projects.archived_at")
+            ->whereNull("project_tasks.complete_at")
+            ->whereNotNull("project_tasks.start_at")
+            ->where("project_tasks.end_at", "<", $end_time->toDateTimeString())
             ->whereHas("taskUser", function ($query) use ($user) {
                 $query->where("userid", $user->userid);
             })
-            ->orderByDesc("id")
+            ->select("project_tasks.*")
+            ->orderByDesc("project_tasks.id")
             ->get();
         if ($unfinished_task->isNotEmpty()) {
             foreach ($unfinished_task as $task) {
                 empty($task->end_at) || $end_at = Carbon::parse($task->end_at);
-                $pre = (!empty($end_at) && $end_at->lt($now_dt)) ? '<span style="color:#ff0000;">[' . Base::Lang('超期') . ']</span>&nbsp;' : '';
-                $unfinishedContent .= '<li>' . $pre . $task->name . '</li>';
+                $pre = (!empty($end_at) && $end_at->lt($now_dt)) ? '<span style="color:#ff0000;">[' . Doo::translate('超期') . ']</span>&nbsp;' : '';
+                $unfinishedContent .= "<li>{$pre}[{$task->project->name}] {$task->name}</li>";
             }
         } else {
             $unfinishedContent = '<li>&nbsp;</li>';
@@ -331,15 +343,21 @@ class ReportController extends AbstractController
         } else {
             $title = $user->nickname . "的日报[" . $start_time->format("Y/m/d") . "]";
         }
+        // 生成内容
+        $content = '<h2>' . Doo::translate('已完成工作') . '</h2><ol>' .
+            $completeContent . '</ol><h2>' .
+            Doo::translate('未完成的工作') . '</h2><ol>' .
+            $unfinishedContent . '</ol>';
+        if ($type === Report::WEEKLY) {
+            $content .= "<h2>" . Doo::translate("下周拟定计划") . "[" . $start_time->addWeek()->format("m/d") . "-" . $end_time->addWeek()->format("m/d") . "]</h2><ol><li>&nbsp;</li></ol>";
+        }
         $data = [
             "time" => $start_time->toDateTimeString(),
+            "sign" => $sign,
+            "title" => $title,
+            "content" => $content,
             "complete_task" => $complete_task,
             "unfinished_task" => $unfinished_task,
-            "content" => '<h2>' . Base::Lang('已完成工作') . '</h2><ol>' .
-                $completeContent . '</ol><h2>' .
-                Base::Lang('未完成的工作') . '</h2><ol>' .
-                $unfinishedContent . '</ol>',
-            "title" => $title,
         ];
         if ($one) {
             $data['id'] = $one->id;
@@ -362,6 +380,7 @@ class ReportController extends AbstractController
      */
     public function detail(): array
     {
+        $user = User::auth();
         $id = intval(trim(Request::input("id")));
         if (empty($id))
             return Base::retError("缺少ID参数");
@@ -369,7 +388,6 @@ class ReportController extends AbstractController
         $one = Report::getOne($id);
         $one->type_val = $one->getRawOriginal("type");
 
-        $user = User::auth();
         // 标记为已读
         if (!empty($one->receivesUser)) {
             foreach ($one->receivesUser as $item) {
@@ -385,7 +403,49 @@ class ReportController extends AbstractController
     }
 
     /**
-     * @api {get} api/report/last_submitter          06. 获取最后一次提交的接收人
+     * @api {get} api/report/mark          06. 标记已读/未读
+     *
+     * @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/last_submitter          07. 获取最后一次提交的接收人
      *
      * @apiVersion 1.0.0
      * @apiGroup report
@@ -402,31 +462,31 @@ class ReportController extends AbstractController
     }
 
     /**
-     * @api {get} api/report/unread          07. 获取未读
+     * @api {get} api/report/unread          08. 获取未读
      *
      * @apiVersion 1.0.0
      * @apiGroup report
      * @apiName unread
      *
-     * @apiParam {Number} [userid]          用户id
-     *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
      * @apiSuccess {Object} data    返回数据
      */
     public function unread(): array
     {
-        $userid = intval(trim(Request::input("userid")));
-        $user = empty($userid) ? User::auth() : User::find($userid);
-
-        $data = Report::whereHas("Receives", function (Builder $query) use ($user) {
-            $query->where("userid", $user->userid)->where("read", 0);
-        })->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
-        return Base::retSuccess("success", $data);
+        $user = User::auth();
+        //
+        $total = Report::select('reports.id')
+            ->join('report_receives', 'report_receives.rid', '=', 'reports.id')
+            ->where('report_receives.userid', $user->userid)
+            ->where('report_receives.read', 0)
+            ->count();
+        //
+        return Base::retSuccess("success", compact("total"));
     }
 
     /**
-     * @api {get} api/report/read          08. 标记汇报已读，可批量
+     * @api {get} api/report/read          09. 标记汇报已读，可批量
      *
      * @apiVersion 1.0.0
      * @apiGroup report
@@ -447,7 +507,7 @@ class ReportController extends AbstractController
         }
 
         if (is_string($ids)) {
-            $ids = explode(",", $ids);
+            $ids = Base::explodeInt($ids);
         }
 
         $data = Report::with(["receivesUser" => function (BelongsToMany $query) use ($user) {

app/Http/Controllers/Api/TestController.php

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

app/Http/Controllers/IndexController.php

@@ -2,11 +2,28 @@
 
 namespace App\Http\Controllers;
 
-use App\Module\Base;
-use App\Tasks\AutoArchivedTask;
-use App\Tasks\DeleteTmpTask;
-use Hhxsv5\LaravelS\Swoole\Task\Task;
+use Arr;
+use Cache;
+use Request;
 use Redirect;
+use Response;
+use App\Module\Doo;
+use App\Models\File;
+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\UnclaimedTaskRemindTask;
+use Hhxsv5\LaravelS\Swoole\Task\Task;
+use LasseRafn\InitialAvatarGenerator\InitialAvatar;
 
 
 /**
@@ -22,6 +39,9 @@ class IndexController extends InvokeController
         if ($action) {
             $app .= "__" . $action;
         }
+        if ($app == 'default') {
+            return '';
+        }
         if (!method_exists($this, $app)) {
             $app = method_exists($this, $method) ? $method : 'main';
         }
@@ -30,11 +50,79 @@ class IndexController extends InvokeController
 
     /**
      * 首页
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return \Illuminate\Http\Response
      */
     public function main()
     {
-        return view('main', ['version' => Base::getVersion()]);
+        $hotFile = public_path('hot');
+        $manifestFile = public_path('manifest.json');
+        if (file_exists($hotFile)) {
+            $array = Base::json2array(file_get_contents($hotFile));
+            $style = null;
+            $script = preg_replace("/^(\/\/(.*?))(:\d+)?\//i", "$1:" . $array['APP_DEV_PORT'] . "/", asset_main("resources/assets/js/app.js"));
+        } else {
+            $array = Base::json2array(file_get_contents($manifestFile));
+            $style = asset_main($array['resources/assets/js/app.js']['css'][0]);
+            $script = asset_main($array['resources/assets/js/app.js']['file']);
+        }
+        return response()->view('main', [
+            'version' => Base::getVersion(),
+            'style' => $style,
+            'script' => $script,
+        ]);
+    }
+
+    /**
+     * 获取版本号
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function version()
+    {
+        return Redirect::to(Base::fillUrl('api/system/version'), 301);
+    }
+
+    /**
+     * 头像
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
+     */
+    public function avatar()
+    {
+        $segment = Request::segment(2);
+        if ($segment && preg_match('/.*?\.png$/i', $segment)) {
+            $name = substr($segment, 0, -4);
+        } else {
+            $name = Request::input('name', 'H');
+        }
+        $size = Request::input('size', 128);
+        $color = Request::input('color');
+        $background = Request::input('background');
+        //
+        if (preg_match('/^[\x{4e00}-\x{9fa5}]+$/u', $name)) {
+            $name = mb_substr($name, mb_strlen($name) - 2);
+        }
+        if (empty($color)) {
+            $color = '#ffffff';
+            $cacheKey = "avatarBackgroundColor::" . md5($name);
+            $background = Cache::rememberForever($cacheKey, function() {
+                return RandomColor::one(['luminosity' => 'dark']);
+            });
+        }
+        //
+        $avatar = new InitialAvatar();
+        $content = $avatar->name($name)
+            ->size($size)
+            ->color($color)
+            ->background($background)
+            ->fontSize(0.35)
+            ->autoFont()
+            ->generate()
+            ->stream('png', 100);
+        //
+        return response($content)
+            ->header('Pragma', 'public')
+            ->header('Cache-Control', 'max-age=1814400')
+            ->header('Content-type', 'image/png')
+            ->header('Expires', gmdate('D, d M Y H:i:s \G\M\T', time() + 1814400));
     }
 
     /**
@@ -56,15 +144,225 @@ class IndexController extends InvokeController
             // 限制内网访问
             return "Forbidden Access";
         }
+        // 自动归档
+        Task::deliver(new AutoArchivedTask());
+        // 邮件通知
+        Task::deliver(new EmailNoticeTask());
+        // App推送
+        Task::deliver(new AppPushTask());
         // 删除过期的临时表数据
         Task::deliver(new DeleteTmpTask('wg_tmp_msgs', 1));
-        Task::deliver(new DeleteTmpTask('tmp', 24));
-        // 自动归档任务
-        Task::deliver(new AutoArchivedTask());
+        Task::deliver(new DeleteTmpTask('task_worker', 12));
+        Task::deliver(new DeleteTmpTask('tmp'));
+        Task::deliver(new DeleteTmpTask('file'));
+        Task::deliver(new DeleteTmpTask('file_pack'));
+        // 删除机器人消息
+        Task::deliver(new DeleteBotMsgTask());
+        // 周期任务
+        Task::deliver(new LoopTask());
+        // 签到提醒
+        Task::deliver(new CheckinRemindTask());
+        // 获取笑话/心灵鸡汤
+        Task::deliver(new JokeSoupTask());
+        // 未领取任务通知
+        Task::deliver(new UnclaimedTaskRemindTask());
+        // 关闭会议室
+        Task::deliver(new CloseMeetingRoomTask());
 
         return "success";
     }
 
+    /**
+     * 桌面客户端发布
+     */
+    public function desktop__publish($name = '')
+    {
+        $publishVersion = Request::header('publish-version');
+        $fileNum = Request::get('file_num', 1);
+        $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 (preg_match("/^\d+\.\d+\.\d+$/", $publishVersion)) {
+            $uploadSuccessFileNum  = (int)Cache::get($publishVersion, 0);
+            $publishKey = Request::header('publish-key');
+            if ($publishKey !== env('APP_KEY')) {
+                return Base::retError("key error");
+            }
+            if (version_compare($publishVersion, $latestVersion) > -1) {    // 限制上传版本必须 ≥ 当前版本
+                $publishPath = "uploads/desktop/{$publishVersion}/";
+                $res = Base::upload([
+                    "file" => Request::file('file'),
+                    "type" => 'publish',
+                    "path" => $publishPath,
+                    "fileName" => true
+                ]);
+                if (Base::isSuccess($res)) {
+                    file_put_contents($latestFile, $publishVersion);
+                    $uploadSuccessFileNum = $uploadSuccessFileNum + 1;
+                    Cache::set($publishVersion, $uploadSuccessFileNum, 7200);
+                }
+                if ($uploadSuccessFileNum >= $fileNum){
+                    $directoryPath = public_path("uploads/desktop");
+                    $files = array_filter(scandir($directoryPath), function($file) use($directoryPath) {
+                        return preg_match("/^\d+\.\d+\.\d+$/", $file) && is_dir($directoryPath . '/' . $file) && $file != '.' && $file != '..';
+                    });
+                    sort($files);
+                    foreach ($files as $key => $file) {
+                        if ($file != $publishVersion && $key < count($files) - 2) {
+                            Base::deleteDirAndFile($directoryPath . '/' . $file);
+                        }
+                    }
+                }
+                return $res;
+            }
+        }
+        // 列表
+        if (preg_match("/^\d+\.\d+\.\d+$/", $name)) {
+            $path = "uploads/desktop/{$name}";
+            $dirPath = public_path($path);
+            $lists = Base::readDir($dirPath);
+            $files = [];
+            foreach ($lists as $file) {
+                if (str_ends_with($file, '.yml') || str_ends_with($file, '.yaml') || str_ends_with($file, '.blockmap')) {
+                    continue;
+                }
+                $fileName = Base::leftDelete($file, $dirPath);
+                $fileSize = filesize($file);
+                $files[] = [
+                    'name' => substr($fileName, 1),
+                    'time' => date("Y-m-d H:i:s", filemtime($file)),
+                    'size' => $fileSize > 0 ? Base::readableBytes($fileSize) : 0,
+                    'url' => Base::fillUrl($path . $fileName),
+                ];
+            }
+            //
+            return view('desktop', ['version' => $name, 'files' => $files]);
+        }
+        // 下载
+        if ($name && file_exists($latestFile)) {
+            $publishVersion = file_get_contents($latestFile);
+            if (preg_match("/^\d+\.\d+\.\d+$/", $publishVersion)) {
+                $filePath = public_path("uploads/desktop/{$publishVersion}/{$name}");
+                if (file_exists($filePath)) {
+                    return Response::download($filePath);
+                }
+            }
+        }
+        return abort(404);
+    }
+
+    /**
+     * Drawio 图标搜索
+     * @return array|mixed
+     */
+    public function drawio__iconsearch()
+    {
+        $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);
+        // 防止 ../ 穿越获取到系统文件
+        if (!str_starts_with(realpath($file), public_path())) {
+            abort(404);
+        }
+        //
+        if (!file_exists($file)) {
+            abort(404);
+        }
+        //
+        parse_str($data['query'], $query);
+        $name = Arr::get($query, 'name');
+        $ext = strtolower(Arr::get($query, 'ext'));
+        $userAgent = strtolower(Request::server('HTTP_USER_AGENT'));
+        if ($ext === 'pdf') {
+            // 文件超过 10m 不支持在线预览，提示下载
+            if (filesize($file) > 10 * 1024 * 1024) {
+                return view('download', [
+                    '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 (str_contains($userAgent, 'eeui') && Base::judgeClientVersion("0.34.47")) {
+                if ($browser === 'safari-mobile') {
+                    $redirectUrl = Base::fillUrl($path);
+                    return <<<EOF
+                        <script>
+                            window.top.postMessage({
+                                action: "eeuiAppSendMessage",
+                                data: [
+                                    {
+                                        action: 'setPageData',
+                                        data: {
+                                            showProgress: true,
+                                            titleFixed: true,
+                                            urlFixed: true,
+                                        }
+                                    },
+                                    {
+                                        action: 'createTarget',
+                                        url: "{$redirectUrl}",
+                                    }
+                                ]
+                            }, "*")
+                        </script>
+                        EOF;
+                }
+            }
+        }
+        //
+        if (in_array($ext, File::localExt)) {
+            $url = Base::fillUrl($path);
+        } else {
+            $url = 'http://' . env('APP_IPPR') . '.3/' . $path;
+        }
+        $url = Base::urlAddparameter($url, [
+            'fullfilename' => Base::rightDelete($name, '.' . $ext) . '_' . filemtime($file) . '.' . $ext
+        ]);
+        $redirectUrl = Base::fillUrl("fileview/onlinePreview?url=" . urlencode(base64_encode($url)));
+        return Redirect::to($redirectUrl, 301);
+    }
+
+    /**
+     * 保存配置 (todo 已废弃)
+     * @return string
+     */
+    public function storage__synch()
+    {
+        return '<!-- Deprecated -->';
+    }
+
     /**
      * 提取所有中文
      * @return array|string
@@ -126,9 +424,6 @@ class IndexController extends InvokeController
         $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);

app/Http/Middleware/VerifyCsrfToken.php

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

app/Http/Middleware/WebApi.php

@@ -4,8 +4,8 @@ namespace App\Http\Middleware;
 
 @error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
 
+use App\Module\Doo;
 use Closure;
-use Request;
 
 class WebApi
 {
@@ -21,17 +21,42 @@ class WebApi
         global $_A;
         $_A = [];
 
-        if (Request::input('__Access-Control-Allow-Origin') || Request::header('__Access-Control-Allow-Origin')) {
-            header('Access-Control-Allow-Origin:*');
-            header('Access-Control-Allow-Methods:GET,POST,PUT,DELETE,OPTIONS');
-            header('Access-Control-Allow-Headers:Content-Type, platform, platform-channel, token, release, Access-Control-Allow-Origin');
+        Doo::load();
+
+        $encrypt = Doo::pgpParseStr($request->header('encrypt'));
+        if ($request->isMethod('post')) {
+            $version = $request->header('version');
+            if ($version && version_compare($version, '0.25.48', '<')) {
+                // 旧版本兼容 php://input
+                parse_str($request->getContent(), $content);
+                if ($content) {
+                    $request->merge($content);
+                }
+            } elseif ($encrypt['encrypt_type'] === 'pgp' && $content = $request->input('encrypted')) {
+                // 新版本解密提交的内容
+                $content = Doo::pgpDecryptApi($content, $encrypt['encrypt_id']);
+                if ($content) {
+                    $request->merge($content);
+                }
+            }
         }
 
+        // 强制 https
         $APP_SCHEME = env('APP_SCHEME', 'auto');
         if (in_array(strtolower($APP_SCHEME), ['https', 'on', 'ssl', '1', 'true', 'yes'], true)) {
             $request->setTrustedProxies([$request->getClientIp()], $request::HEADER_X_FORWARDED_PROTO);
         }
 
-        return $next($request);
+        $response = $next($request);
+
+        // 加密返回内容
+        if ($encrypt['client_type'] === 'pgp' && $content = $response->getContent()) {
+            $content = Doo::pgpEncryptApi($content, $encrypt['client_key']);
+            if ($content) {
+                $response->setContent(json_encode(['encrypted' => $content]));
+            }
+        }
+
+        return $response;
     }
 }

app/Ldap/LdapUser.php

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

app/Models/AbstractModel.php

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

app/Models/ApproveProcMsg.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\ApproveProcMsg
+ *
+ * @property int $id
+ * @property int|null $proc_inst_id 流程实例ID
+ * @property int|null $userid 会员ID
+ * @property int|null $msg_id 消息ID
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg whereMsgId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg whereProcInstId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg whereUserid($value)
+ * @mixin \Eloquent
+ */
+class ApproveProcMsg extends AbstractModel
+{
+
+}

app/Models/Complaint.php

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

app/Models/Deleted.php

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

app/Models/File.php

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

app/Models/FileContent.php

@@ -5,7 +5,6 @@ namespace App\Models;
 
 use App\Module\Base;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Response;
 
 /**
  * App\Models\FileContent
@@ -19,10 +18,16 @@ use Response;
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent newQuery()
- * @method static \Illuminate\Database\Query\Builder|FileContent onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|FileContent onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent whereContent($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent whereDeletedAt($value)
@@ -32,20 +37,76 @@ use Response;
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent whereText($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileContent whereUserid($value)
- * @method static \Illuminate\Database\Query\Builder|FileContent withTrashed()
- * @method static \Illuminate\Database\Query\Builder|FileContent withoutTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|FileContent withTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|FileContent withoutTrashed()
  * @mixin \Eloquent
  */
 class FileContent extends AbstractModel
 {
     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() . "&__=" . Base::msecTime());
+    }
+
+    /**
+     * 转预览地址
+     * @param File $file
+     * @param $content
+     * @return string
+     */
+    public static function formatPreview($file, $content)
+    {
+        $content = Base::json2array($content ?: []);
+        $filePath = $content['url'];
+        if (in_array($file->type, ['word', 'excel', 'ppt'])) {
+            if (empty($content)) {
+                $filePath = 'assets/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $file->type);
+            }
+        }
+        return self::toPreviewUrl([
+            'ext' => $file->ext,
+            'name' => $file->name,
+            'path' => $filePath,
+        ]);
+    }
+
     /**
      * 获取格式内容（或下载）
      * @param File $file
      * @param $content
      * @param $download
-     * @return array|\Symfony\Component\HttpFoundation\BinaryFileResponse
+     * @return array|\Symfony\Component\HttpFoundation\StreamedResponse
      */
     public static function formatContent($file, $content, $download = false)
     {
@@ -53,14 +114,16 @@ class FileContent extends AbstractModel
         $content = Base::json2array($content ?: []);
         if (in_array($file->type, ['word', 'excel', 'ppt'])) {
             if (empty($content)) {
-                return Response::download(resource_path('assets/statics/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $file->type)), $name);
+                $filePath = public_path('assets/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $file->type));
+            } else {
+                $filePath = public_path($content['url']);
             }
-            return Response::download(public_path($content['url']), $name);
+            return Base::streamDownload($filePath, $name);
         }
         if (empty($content)) {
             $content = match ($file->type) {
                 'document' => [
-                    "type" => "md",
+                    "type" => $file->ext,
                     "content" => "",
                 ],
                 default => json_decode('{}'),
@@ -69,26 +132,22 @@ class FileContent extends AbstractModel
                 abort(403, "This file is empty.");
             }
         } else {
-            $content['preview'] = false;
+            $path = $content['url'];
             if ($file->ext) {
-                $filePath = public_path($content['url']);
-                if (in_array($file->type, ['txt', 'code']) && $file->size < 2 * 1024 * 1024) {
-                    // 支持编辑，限制2M内的文件
-                    $content['content'] = file_get_contents($filePath);
-                } else {
-                    // 支持预览
-                    if (in_array($file->type, ['picture', 'image', 'tif', 'media'])) {
-                        $url = Base::fillUrl($content['url']);
-                    } else {
-                        $url = 'http://' . env('APP_IPPR') . '.3/' . $content['url'];
-                    }
-                    $content['url'] = base64_encode($url);
-                    $content['preview'] = true;
-                }
+                $res = File::formatFileData([
+                    'path' => $path,
+                    'ext' => $file->ext,
+                    'size' => $file->size,
+                    'name' => $file->name,
+                ]);
+                $content = $res['content'];
+            } else {
+                $content['preview'] = false;
             }
             if ($download) {
+                $filePath = public_path($path);
                 if (isset($filePath)) {
-                    return Response::download($filePath, $name);
+                    return Base::streamDownload($filePath, $name);
                 } else {
                     abort(403, "This file not support download.");
                 }

app/Models/FileLink.php

@@ -2,25 +2,35 @@
 
 namespace App\Models;
 
+use App\Module\Base;
+
 /**
  * App\Models\FileLink
  *
  * @property int $id
- * @property int|null $file_id 项目ID
+ * @property int|null $file_id 文件ID
  * @property int|null $num 累计访问
  * @property string|null $code 链接码
+ * @property int|null $userid 会员ID
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\File|null $file
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereCode($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereFileId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereNum($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereUserid($value)
  * @mixin \Eloquent
  */
 class FileLink extends AbstractModel
@@ -32,4 +42,35 @@ class FileLink extends AbstractModel
     {
         return $this->hasOne(File::class, 'id', 'file_id');
     }
+
+    /**
+     * 生成链接
+     * @param $fileId
+     * @param $userid
+     * @param $refresh
+     * @return array
+     */
+    public static function generateLink($fileId, $userid, $refresh = false)
+    {
+        $fileLink = FileLink::whereFileId($fileId)->whereUserid($userid)->first();
+        if (empty($fileLink)) {
+            $fileLink = FileLink::createInstance([
+                'file_id' => $fileId,
+                'userid' => $userid,
+                'code' => base64_encode("{$fileId},{$userid}," . Base::generatePassword()),
+            ]);
+            $fileLink->save();
+        } else {
+            if ($refresh == 'yes') {
+                $fileLink->code = base64_encode("{$fileId},{$userid}," . Base::generatePassword());
+                $fileLink->save();
+            }
+        }
+        return [
+            'id' => $fileId,
+            'url' => Base::fillUrl('single/file/' . $fileLink->code),
+            'code' => $fileLink->code,
+            'num' => $fileLink->num
+        ];
+    }
 }

app/Models/FileUser.php

@@ -12,9 +12,15 @@ namespace App\Models;
  * @property int|null $permission 权限：0只读，1读写
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereFileId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereId($value)
@@ -25,4 +31,34 @@ namespace App\Models;
  */
 class FileUser extends AbstractModel
 {
+    /**
+     * 删除所有共享成员（同时删除成员分享的链接）
+     * @param $file_id
+     * @param int $retain_link_userid       保留指定会员的链接
+     * @return mixed
+     */
+    public static function deleteFileAll($file_id, $retain_link_userid = 0)
+    {
+        return AbstractModel::transaction(function() use ($retain_link_userid, $file_id) {
+            if ($retain_link_userid > 0) {
+                FileLink::whereFileId($file_id)->where('userid', '!=', $retain_link_userid)->delete();
+            } else {
+                FileLink::whereFileId($file_id)->delete();
+            }
+            FileUser::whereFileId($file_id)->delete();
+        });
+    }
+    /**
+     * 删除指定共享成员（同时删除成员分享的链接）
+     * @param $file_id
+     * @param $userid
+     * @return mixed
+     */
+    public static function deleteFileUser($file_id, $userid)
+    {
+        return AbstractModel::transaction(function() use ($userid, $file_id) {
+            FileLink::whereFileId($file_id)->whereUserid($userid)->delete();
+            return self::whereFileId($file_id)->whereUserid($userid)->delete();
+        });
+    }
 }

app/Models/Meeting.php

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

app/Models/MeetingMsg.php

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

app/Models/Project.php

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

app/Models/ProjectColumn.php

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

app/Models/ProjectFlow.php

@@ -2,8 +2,6 @@
 
 namespace App\Models;
 
-use App\Module\Base;
-
 /**
  * App\Models\ProjectFlow
  *
@@ -12,11 +10,17 @@ use App\Module\Base;
  * @property string|null $name 流程名称
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectFlowItem[] $projectFlowItem
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ProjectFlowItem> $projectFlowItem
  * @property-read int|null $project_flow_item_count
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereName($value)

app/Models/ProjectFlowItem.php

@@ -13,16 +13,24 @@ use App\Module\Base;
  * @property string|null $name 名称
  * @property string|null $status 状态
  * @property array $turns 可流转
- * @property array $userids 自动负责人ID
+ * @property array $userids 状态负责人ID
  * @property string|null $usertype 流转模式
  * @property int|null $userlimit 限制负责人
+ * @property int|null $columnid 对应的项目列表
  * @property int|null $sort 排序
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\ProjectFlow|null $projectFlow
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereColumnid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereFlowId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereId($value)
@@ -81,7 +89,7 @@ class ProjectFlowItem extends AbstractModel
      */
     public function deleteFlowItem()
     {
-        ProjectTask::whereFlowItemId($this->id)->update([
+        ProjectTask::whereFlowItemId($this->id)->change([
             'flow_item_id' => 0,
             'flow_item_name' => "",
         ]);

app/Models/ProjectInvite.php

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

app/Models/ProjectLog.php

@@ -10,7 +10,7 @@ use App\Module\Base;
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $column_id 列表ID
- * @property int|null $task_id 项目ID
+ * @property int|null $task_id 任务ID
  * @property int|null $userid 会员ID
  * @property string|null $detail 详细信息
  * @property array $record 记录数据
@@ -18,9 +18,15 @@ use App\Module\Base;
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\ProjectTask|null $projectTask
  * @property-read \App\Models\User|null $user
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereColumnId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereDetail($value)

app/Models/ProjectPermission.php

@@ -0,0 +1,207 @@
+<?php
+
+namespace App\Models;
+
+use App\Exceptions\ApiException;
+use App\Module\Base;
+
+/**
+ * App\Models\ProjectPermission
+ *
+ * @property int $id
+ * @property int|null $project_id 项目ID
+ * @property string $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_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 string
+     */
+    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 => [self::PERMISSIONS['project_leader'], self::PERMISSIONS['task_leader'], self::PERMISSIONS['task_assist']],
+            self::TASK_STATUS => $taskStatus = [self::PERMISSIONS['project_leader'], self::PERMISSIONS['task_leader']],
+            self::TASK_REMOVE => $taskStatus,
+            self::TASK_ARCHIVED => $taskStatus,
+            self::TASK_MOVE => $taskStatus
+        ];
+        return self::firstOrCreate(
+            ['project_id' => $projectId],
+            ['permissions' => Base::array2json($permissions)]
+        );
+    }
+
+    /**
+     * 更新项目权限
+     *
+     * @param  int  $projectId
+     * @param  array  $permissions
+     * @return ProjectPermission
+     */
+    public static function updatePermissions($projectId, $newPermissions)
+    {
+        $projectPermission = self::initPermissions($projectId);
+        $currentPermissions = $projectPermission->permissions;
+        $mergedPermissions = empty($newPermissions) ? $currentPermissions : array_merge($currentPermissions, $newPermissions);
+
+        $projectPermission->permissions = Base::array2json($mergedPermissions);
+        $projectPermission->save();
+
+        return $projectPermission;
+    }
+
+    /**
+     * 检查用户是否有执行特定动作的权限
+     * @param string $action 动作名称
+     * @param Project $project 项目实例
+     * @param ProjectTask $task 任务实例
+     * @return bool
+     */
+    public static function userTaskPermission(Project $project, $action, ProjectTask $task = null)
+    {
+        $userid = User::userid();
+        $permissions = self::getPermission($project->id, $action);
+        switch ($action) {
+                // 任务添加，任务更新, 任务状态, 任务删除, 任务完成, 任务归档, 任务移动
+            case self::TASK_LIST_ADD:
+            case self::TASK_LIST_UPDATE:
+            case self::TASK_LIST_REMOVE:
+            case self::TASK_LIST_SORT:
+            case self::TASK_ADD:
+            case self::TASK_UPDATE:
+            case self::TASK_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[] = self::PERMISSIONS_DESC[$permission];
+                    }
+                    $desc = array_reverse($desc);
+                    throw new ApiException(sprintf("仅限%s操作", implode('、', $desc)));
+                }
+                break;
+        }
+        return true;
+    }
+}

app/Models/ProjectTaskContent.php

@@ -2,30 +2,99 @@
 
 namespace App\Models;
 
+use App\Module\Base;
+use App\Exceptions\ApiException;
+
 /**
  * App\Models\ProjectTaskContent
  *
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $task_id 任务ID
+ * @property int|null $userid 用户ID
+ * @property string|null $desc 内容描述
  * @property string|null $content 内容
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereContent($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereDesc($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereProjectId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereTaskId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereUserid($value)
  * @mixin \Eloquent
  */
 class ProjectTaskContent extends AbstractModel
 {
     protected $hidden = [
-        'created_at',
         'updated_at',
     ];
+
+    /**
+     * 获取内容详情
+     * @return array
+     */
+    public function getContentInfo()
+    {
+        $content = Base::json2array($this->content);
+        if (isset($content['url'])) {
+            $filePath = public_path($content['url']);
+            $array = $this->toArray();
+            $array['content'] = file_get_contents($filePath) ?: '';
+            if ($array['content']) {
+                $replace = Base::fillUrl('uploads/task');
+                $array['content'] = str_replace('{{RemoteURL}}uploads/task', $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\s+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);
+            }
+        }
+        $pattern = '/<img(.*?)src=("|\')https*:\/\/(.*?)\/(uploads\/task\/content\/(.*?))\2/is';
+        $content = preg_replace($pattern, '<img$1src=$2{{RemoteURL}}$4$2', $content);
+        //
+        $filePath = $path . md5($content);
+        $publicPath = public_path($filePath);
+        Base::makeDir(dirname($publicPath));
+        $result = file_put_contents($publicPath, $content);
+        if(!$result && $oldContent){
+            throw new ApiException("保存任务详情至文件失败,请重试");
+        }
+        //
+        return $filePath;
+    }
 }

app/Models/ProjectTaskFile.php

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

app/Models/ProjectTaskFlowChange.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\ProjectTaskFlowChange
+ *
+ * @property int $id
+ * @property int|null $task_id 任务ID
+ * @property int|null $userid 会员ID
+ * @property int|null $before_flow_item_id （变化前）工作流状态ID
+ * @property string|null $before_flow_item_name （变化前）工作流状态名称
+ * @property int|null $after_flow_item_id （变化后）工作流状态ID
+ * @property string|null $after_flow_item_name （变化后）工作流状态名称
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereAfterFlowItemId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereAfterFlowItemName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereBeforeFlowItemId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereBeforeFlowItemName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereTaskId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereUserid($value)
+ * @mixin \Eloquent
+ */
+class ProjectTaskFlowChange extends AbstractModel
+{
+
+}

app/Models/ProjectTaskPushLog.php

@@ -0,0 +1,45 @@
+<?php
+
+
+namespace App\Models;
+
+
+
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * App\Models\ProjectTaskPushLog
+ *
+ * @property int $id
+ * @property int|null $userid 用户id
+ * @property int|null $task_id 任务id
+ * @property int|null $type 提醒类型：0 任务开始提醒，1 距离到期提醒，2到期超时提醒
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereTaskId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereUserid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog withTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog withoutTrashed()
+ * @mixin \Eloquent
+ */
+class ProjectTaskPushLog extends AbstractModel
+{
+    use SoftDeletes;
+
+}

app/Models/ProjectTaskTag.php

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

app/Models/ProjectTaskUser.php

@@ -13,9 +13,16 @@ namespace App\Models;
  * @property int|null $owner 是否任务负责人
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\ProjectTask|null $projectTask
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser whereOwner($value)
@@ -29,4 +36,45 @@ namespace App\Models;
 class ProjectTaskUser extends AbstractModel
 {
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function projectTask(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(ProjectTask::class, 'id', 'task_id');
+    }
+
+    /**
+     * 移交任务身份
+     * @param $originalUserid
+     * @param $newUserid
+     * @return void
+     */
+    public static function transfer($originalUserid, $newUserid)
+    {
+        self::whereUserid($originalUserid)->chunk(100, function ($list) use ($originalUserid, $newUserid) {
+            $tastIds = [];
+            /** @var self $item */
+            foreach ($list as $item) {
+                $row = self::whereTaskId($item->task_id)->whereUserid($newUserid)->first();
+                if ($row) {
+                    // 已存在则删除原数据，判断改变已存在的数据
+                    $row->owner = max($row->owner, $item->owner);
+                    $row->save();
+                    $item->delete();
+                } else {
+                    // 不存在则改变原数据
+                    $item->userid = $newUserid;
+                    $item->save();
+                }
+                if ($item->projectTask) {
+                    $item->projectTask->addLog("移交{任务}身份", ['userid' => [$originalUserid, ' => ', $newUserid]]);
+                    if (!in_array($item->task_pid, $tastIds)) {
+                        $tastIds[] = $item->task_pid;
+                        $item->projectTask->syncDialogUser();
+                    }
+                }
+            }
+        });
+    }
 }

app/Models/ProjectTaskVisibilityUser.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\ProjectTaskVisibilityUser
+ *
+ * @property int $id
+ * @property int|null $project_id 项目ID
+ * @property int|null $task_id 任务ID
+ * @property int|null $userid 成员ID
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\ProjectTask|null $projectTask
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser whereProjectId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser whereTaskId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser whereUserid($value)
+ * @mixin \Eloquent
+ */
+class ProjectTaskVisibilityUser extends AbstractModel
+{
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function projectTask(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(ProjectTask::class, 'id', 'task_id');
+    }
+
+}

app/Models/ProjectUser.php

@@ -2,8 +2,6 @@
 
 namespace App\Models;
 
-use App\Module\Base;
-
 /**
  * App\Models\ProjectUser
  *
@@ -11,16 +9,24 @@ use App\Module\Base;
  * @property int|null $project_id 项目ID
  * @property int|null $userid 成员ID
  * @property int|null $owner 是否负责人
+ * @property string|null $top_at 置顶时间
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\Project|null $project
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereOwner($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereProjectId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereTopAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereUserid($value)
  * @mixin \Eloquent
@@ -36,6 +42,41 @@ class ProjectUser extends AbstractModel
         return $this->hasOne(Project::class, 'id', 'project_id');
     }
 
+    /**
+     * 移交项目身份
+     * @param $originalUserid
+     * @param $newUserid
+     * @return void
+     */
+    public static function transfer($originalUserid, $newUserid)
+    {
+        self::whereUserid($originalUserid)->chunkById(100, function ($list) use ($originalUserid, $newUserid) {
+            /** @var self $item */
+            foreach ($list as $item) {
+                $row = self::whereProjectId($item->project_id)->whereUserid($newUserid)->first();
+                if ($row) {
+                    // 已存在则删除原数据，判断改变已存在的数据
+                    $row->owner = max($row->owner, $item->owner);
+                    $row->save();
+                    $item->delete();
+                } else {
+                    // 不存在则改变原数据
+                    $item->userid = $newUserid;
+                    $item->save();
+                }
+                if ($item->project) {
+                    if ($item->project->personal) {
+                        $name = User::userid2nickname($originalUserid) ?: ('ID:' . $originalUserid);
+                        $item->project->name = "【{$name}】{$item->project->name}";
+                        $item->project->save();
+                    }
+                    $item->project->addLog("移交项目身份", ['userid' => [$originalUserid, ' => ', $newUserid]]);
+                    $item->project->syncDialogUser();
+                }
+            }
+        });
+    }
+
     /**
      * 退出项目
      */
@@ -45,15 +86,13 @@ class ProjectUser extends AbstractModel
             ->whereUserid($this->userid)
             ->chunk(100, function ($list) {
                 $tastIds = [];
+                /** @var ProjectTaskUser $item */
                 foreach ($list as $item) {
+                    $item->delete();
                     if (!in_array($item->task_pid, $tastIds)) {
                         $tastIds[] = $item->task_pid;
+                        $item->projectTask?->syncDialogUser();
                     }
-                    $item->delete();
-                }
-                $tasks = ProjectTask::whereIn('id', $tastIds)->get();
-                foreach ($tasks as $task) {
-                    $task->syncDialogUser();
                 }
             });
         $this->delete();

app/Models/Report.php

@@ -23,15 +23,21 @@ use JetBrains\PhpStorm\Pure;
  * @property int $userid
  * @property string $content
  * @property string $sign 汇报唯一标识
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ReportReceive[] $Receives
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ReportReceive> $Receives
  * @property-read int|null $receives_count
  * @property-read mixed $receives
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\User[] $receivesUser
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $receivesUser
  * @property-read int|null $receives_user_count
  * @property-read \App\Models\User|null $sendUser
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static Builder|Report newModelQuery()
  * @method static Builder|Report newQuery()
  * @method static Builder|Report query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static Builder|Report whereContent($value)
  * @method static Builder|Report whereCreatedAt($value)
  * @method static Builder|Report whereId($value)
@@ -101,15 +107,13 @@ class Report extends AbstractModel
     /**
      * 获取单条记录
      * @param $id
-     * @param User|null $user
      * @return Report|Builder|Model|object|null
      * @throw ApiException
      */
-    public static function getOne($id, User $user = null)
+    public static function getOne($id)
     {
-        $user === null && $user = User::auth();
-        $one = self::whereUserid($user->userid)->whereId($id)->first();
-        if ( empty($one) )
+        $one = self::whereId($id)->first();
+        if (empty($one))
             throw new ApiException("记录不存在");
         return $one;
     }

app/Models/ReportReceive.php

@@ -13,9 +13,15 @@ use Illuminate\Database\Eloquent\Model;
  * @property string|null $receive_time 接收时间
  * @property int $userid 接收人
  * @property int $read 是否已读
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereRead($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereReceiveTime($value)

app/Models/Setting.php

@@ -2,6 +2,8 @@
 
 namespace App\Models;
 
+use App\Module\Base;
+
 /**
  * App\Models\Setting
  *
@@ -11,9 +13,15 @@ namespace App\Models;
  * @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)
@@ -24,5 +32,40 @@ namespace App\Models;
  */
 class Setting extends AbstractModel
 {
-
+    /**
+     * 验证邮箱地址（过滤忽略地址）
+     * @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;
+    }
 }

app/Models/TaskWorker.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * App\Models\TaskWorker
+ *
+ * @property int $id
+ * @property string|null $args
+ * @property string|null $error
+ * @property string|null $start_at 开始时间
+ * @property string|null $end_at 结束时间
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereArgs($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereEndAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereError($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereStartAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker withTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker withoutTrashed()
+ * @mixin \Eloquent
+ */
+class TaskWorker extends AbstractModel
+{
+    use SoftDeletes;
+}

app/Models/Tmp.php

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

app/Models/UmengAlias.php

@@ -0,0 +1,197 @@
+<?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 $ua userAgent
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereAlias($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereDevice($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias wherePlatform($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUa($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUserid($value)
+ * @mixin \Eloquent
+ */
+class UmengAlias extends AbstractModel
+{
+    protected $table = 'umeng_alias';
+
+    /**
+     * 推送内容处理
+     * @param $string
+     * @return string
+     */
+    private static function specialCharacters($string)
+    {
+        return str_replace(["\r\n", "\r", "\n"], '', $string);
+    }
+
+    /**
+     * 获取推送配置
+     * @return array|false
+     */
+    public static function getPushConfig()
+    {
+        $setting = Base::setting('appPushSetting');
+        if ($setting['push'] !== 'open') {
+            return false;
+        }
+        $config = [];
+        if ($setting['ios_key']) {
+            $config['iOS'] = [
+                'appKey' => $setting['ios_key'],
+                'appMasterSecret' => $setting['ios_secret'],
+                'production_mode' => true,
+            ];
+        }
+        if ($setting['android_key']) {
+            $config['Android'] = [
+                'appKey' => $setting['android_key'],
+                'appMasterSecret' => $setting['android_secret'],
+                'production_mode' => true,
+            ];
+        }
+        return $config;
+    }
+
+    /**
+     * 推送消息
+     * @param string $alias
+     * @param string $platform
+     * @param array $array [title, subtitle, body, description, extra, seconds, badge]
+     * @return array|false
+     */
+    public static function pushMsgToAlias($alias, $platform, $array)
+    {
+        $config = self::getPushConfig();
+        if ($config === false) {
+            return false;
+        }
+        //
+        $title = self::specialCharacters($array['title'] ?: '');        // 标题
+        $subtitle = self::specialCharacters($array['subtitle'] ?: '');  // 副标题（iOS）
+        $body = self::specialCharacters($array['body'] ?: '');          // 通知内容
+        $description = $array['description'] ?: 'no description';               // 描述
+        $extra = is_array($array['extra']) ? $array['extra'] : [];              // 额外参数
+        $seconds = intval($array['seconds']) ?: 86400;                          // 有效时间（单位：秒）
+        $badge = intval($array['badge']) ?: 0;                                  // 角标数（iOS）
+        //
+        switch ($platform) {
+            case 'ios':
+                if (!isset($config['iOS'])) {
+                    return false;
+                }
+                $ios = new IOS($config);
+                return $ios->send([
+                    'description' => $description,
+                    'payload' => array_merge([
+                        'aps' => [
+                            'alert' => [
+                                'title' => $title,
+                                'subtitle' => $subtitle,
+                                'body' => $body,
+                            ],
+                            'sound' => 'default',
+                            'badge' => $badge,
+                        ],
+                    ], $extra),
+                    'type' => 'customizedcast',
+                    'alias_type' => 'userid',
+                    'alias' => $alias,
+                    'policy' => [
+                        'expire_time' => Carbon::now()->addSeconds($seconds)->toDateTimeString(),
+                    ],
+                ]);
+
+            case 'android':
+                if (!isset($config['Android'])) {
+                    return false;
+                }
+                $android = new Android($config);
+                return $android->send([
+                    'description' => $description,
+                    'payload' => array_merge([
+                        'display_type' => 'notification',
+                        'body' => [
+                            'ticker' => $title,
+                            'text' => $body,
+                            'title' => $title,
+                            'after_open' => 'go_app',
+                            'play_sound' => true,
+                        ],
+                    ], $extra),
+                    'type' => 'customizedcast',
+                    'alias_type' => 'userid',
+                    'alias' => $alias,
+                    'mipush' => true,
+                    'mi_activity' => 'app.eeui.umeng.activity.MfrMessageActivity',
+                    'policy' => [
+                        'expire_time' => Carbon::now()->addSeconds($seconds)->toDateTimeString(),
+                    ],
+                    'channel_properties' => [
+                        'vivo_category' => 'IM',
+                        'huawei_channel_importance' => 'NORMAL',
+                        'huawei_channel_category' => 'IM',
+                        'channel_fcm' => 1,
+                    ],
+                ]);
+
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * 推送给指定会员
+     * @param array|int $userid
+     * @param array $array
+     * @return void
+     */
+    public static function pushMsgToUserid($userid, $array)
+    {
+        $builder = self::select(['id', 'platform', 'alias', 'userid'])->where('updated_at', '>', Carbon::now()->subMonth());
+        if (is_array($userid)) {
+            $builder->whereIn('userid', $userid);
+        } elseif (Base::isNumber($userid)) {
+            $builder->whereUserid($userid);
+        }
+        $builder
+            ->orderByDesc('updated_at')
+            ->chunkById(100, function ($datas) use ($array) {
+                $uids = $datas->groupBy('userid');
+                foreach ($uids as $uid => $rows) {
+                    $array['badge'] = WebSocketDialogMsgRead::whereUserid($uid)->whereSilence(0)->whereReadAt(null)->count();
+                    $lists = $rows->take(5)->groupBy('platform');   // 每个会员最多推送5个别名
+                    foreach ($lists as $platform => $list) {
+                        $alias = $list->pluck('alias')->implode(',');
+                        self::pushMsgToAlias($alias, $platform, $array);
+                    }
+                }
+            });
+    }
+}

app/Models/User.php

@@ -5,6 +5,7 @@ namespace App\Models;
 
 use App\Exceptions\ApiException;
 use App\Module\Base;
+use App\Module\Doo;
 use Cache;
 use Carbon\Carbon;
 
@@ -13,8 +14,11 @@ use Carbon\Carbon;
  *
  * @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 string $userimg 头像
@@ -28,19 +32,30 @@ use Carbon\Carbon;
  * @property string|null $line_at 最后在线时间（接口）
  * @property int|null $task_dialog_id 最后打开的任务会话ID
  * @property string|null $created_ip 注册IP
- * @property string|null $disable_at 禁用时间
+ * @property string|null $disable_at 禁用时间（离职时间）
+ * @property int|null $email_verity 邮箱是否已验证
+ * @property int|null $bot 是否机器人
  * @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 whereLastAt($value)
@@ -50,8 +65,10 @@ use Carbon\Carbon;
  * @method static \Illuminate\Database\Eloquent\Builder|User whereLoginNum($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereNickname($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User wherePassword($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User wherePinyin($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereProfession($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereTaskDialogId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereTel($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereUserid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereUserimg($value)
@@ -62,22 +79,14 @@ class User extends AbstractModel
     protected $primaryKey = 'userid';
 
     protected $hidden = [
-        'disable_at',
         'updated_at',
     ];
 
-    /**
-     * 更新数据校验
-     * @param array $param
-     */
-    public function updateInstance(array $param)
-    {
-        parent::updateInstance($param);
-        //
-        if (isset($param['line_at']) && $this->userid) {
-            Cache::put("User::online:" . $this->userid, time(), Carbon::now()->addSeconds(30));
-        }
-    }
+    // 默认头像类型：auto自动生成，system系统默认
+    public static $defaultAvatarMode = 'auto';
+
+    // 基本信息的字段
+    public static $basicField = ['userid', 'email', 'nickname', 'profession', 'department', 'userimg', 'bot', 'az', 'pinyin', 'line_at', 'disable_at'];
 
     /**
      * 昵称
@@ -96,11 +105,7 @@ class User extends AbstractModel
      */
     public function getUserimgAttribute($value)
     {
-        if ($value) {
-            return Base::fillUrl($value);
-        }
-        $name = ($this->userid - 1) % 21 + 1;
-        return url("images/avatar/default_{$name}.png");
+        return self::getAvatar($this->userid, $value, $this->email, $this->nickname);
     }
 
     /**
@@ -116,13 +121,71 @@ class User extends AbstractModel
         return array_filter(is_array($value) ? $value : explode(",", trim($value, ",")));
     }
 
+    /**
+     * 部门
+     * @param $value
+     * @return array
+     */
+    public function getDepartmentAttribute($value)
+    {
+        if (empty($value)) {
+            return [];
+        }
+        return array_filter(is_array($value) ? $value : Base::explodeInt($value));
+    }
+
+    /**
+     * 获取所属部门名称
+     * @return string
+     */
+    public function getDepartmentName()
+    {
+        if (empty($this->department)) {
+            return "";
+        }
+        $key = "UserDepartment::" . md5(Cache::get("UserDepartment::rand") . '-' . implode(',' , $this->department));
+        $list = Cache::remember($key, now()->addMonth(), function() {
+            $list = UserDepartment::select(['id', 'owner_userid', 'name'])->whereIn('id', $this->department)->take(10)->get();
+            return $list->toArray();
+        });
+        $array = [];
+        foreach ($list as $item) {
+            $array[] = $item['name'] . ($item['owner_userid'] === $this->userid ? '(M)' : '');
+        }
+        return implode(', ', $array);
+    }
+
+    /**
+     * 判断是否为部门负责人
+     */
+    public function isDepartmentOwner()
+    {
+        return UserDepartment::where('owner_userid', $this->userid)->exists();
+    }
+
+
+    /**
+     * 获取机器人所有者
+     * @return int|mixed
+     */
+    public function getBotOwner()
+    {
+        if (!$this->bot) {
+            return 0;
+        }
+        $key = "userBotOwner::" . $this->userid;
+        return Cache::remember($key, now()->addMonth(), function() {
+            return intval(UserBot::whereBotId($this->userid)->value('userid')) ?: $this->userid;
+        });
+    }
+
     /**
      * 是否在线
      * @return bool
      */
     public function getOnlineStatus()
     {
-        $online = intval(Cache::get("User::online:" . $this->userid, 0));
+        $online = $this->bot || Cache::get("User::online:" . $this->userid) === "on";
         if ($online) {
             return true;
         }
@@ -130,9 +193,45 @@ class User extends AbstractModel
     }
 
     /**
-     * 判断是否管理员
+     * 返回是否LDAP用户
+     * @return bool
+     */
+    public function isLdap()
+    {
+        return in_array('ldap', $this->identity);
+    }
+
+    /**
+     * 返回是否临时帐号
+     * @return bool
+     */
+    public function isTemp()
+    {
+        return in_array('temp', $this->identity);
+    }
+
+    /**
+     * 返回是否禁用帐号（离职）
+     * @return bool
+     */
+    public function isDisable()
+    {
+        return in_array('disable', $this->identity);
+    }
+
+    /**
+     * 返回是否管理员
+     * @return bool
      */
     public function isAdmin()
+    {
+        return in_array('admin', $this->identity);
+    }
+
+    /**
+     * 判断是否管理员
+     */
+    public function checkAdmin()
     {
         $this->identity('admin');
     }
@@ -167,6 +266,56 @@ class User extends AbstractModel
         }
     }
 
+    /**
+     * 删除会员
+     * @param $reason
+     * @return bool|null
+     */
+    public function deleteUser($reason)
+    {
+        return AbstractModel::transaction(function () use ($reason) {
+            // 删除原因
+            $userDelete = UserDelete::createInstance([
+                'operator' => User::userid(),
+                'userid' => $this->userid,
+                'email' => $this->email,
+                'reason' => $reason,
+                'cache' => array_merge($this->getRawOriginal(), [
+                    'department_name' => $this->getDepartmentName()
+                ])
+            ]);
+            $userDelete->save();
+            // 删除未读
+            WebSocketDialogMsgRead::whereUserid($this->userid)->delete();
+            // 删除待办
+            WebSocketDialogMsgTodo::whereUserid($this->userid)->delete();
+            // 删除邮箱验证记录
+            UserEmailVerification::whereEmail($this->email)->delete();
+            //
+            return $this->delete();
+        });
+    }
+
+    /**
+     * 检查发送聊天内容前必须设置昵称、电话
+     * @return void
+     */
+    public function checkChatInformation()
+    {
+        if ($this->bot) {
+            return;
+        }
+        $chatInformation = Base::settingFind('system', 'chat_information');
+        if ($chatInformation == 'required') {
+            if (empty($this->getRawOriginal('nickname'))) {
+                throw new ApiException('请设置昵称', [], -2);
+            }
+            if (empty($this->getRawOriginal('tel'))) {
+                throw new ApiException('请设置联系电话', [], -3);
+            }
+        }
+    }
+
     /** ***************************************************************************************** */
     /** ***************************************************************************************** */
     /** ***************************************************************************************** */
@@ -180,99 +329,47 @@ class User extends AbstractModel
      */
     public static function reg($email, $password, $other = [])
     {
-        //邮箱
-        if (!Base::isMail($email)) {
+        // 邮箱
+        if (!Base::isEmail($email)) {
             throw new ApiException('请输入正确的邮箱地址');
         }
-        if (User::email2userid($email) > 0) {
+        $user = self::whereEmail($email)->first();
+        if ($user) {
+            $isRegVerify = Base::settingFind('emailSetting', 'reg_verify') === 'open';
+            if ($isRegVerify && $user->email_verity === 0) {
+                UserEmailVerification::userEmailSend($user);
+                throw new ApiException('您的帐号已注册过，请验证邮箱', ['code' => 'email']);
+            }
             throw new ApiException('邮箱地址已存在');
         }
-        //密码
+        // 密码
         self::passwordPolicy($password);
-        //开始注册
-        $encrypt = Base::generatePassword(6);
-        $inArray = [
-            'encrypt' => $encrypt,
-            'email' => $email,
-            'password' => Base::md52($password, $encrypt),
-            'created_ip' => Base::getIp(),
-        ];
+        // 开始注册
+        $user = Doo::userCreate($email, $password);
         if ($other) {
-            $inArray = array_merge($inArray, $other);
+            $user->updateInstance($other);
+        }
+        $user->az = Base::getFirstCharter($user->nickname);
+        $user->pinyin = Base::cn2pinyin($user->nickname);
+        $user->created_ip = Base::getIp();
+        if ($user->save()) {
+            $setting = Base::setting('system');
+            $reg_identity = $setting['reg_identity'] ?: 'normal';
+            $all_group_autoin = $setting['all_group_autoin'] ?: 'yes';
+            // 注册临时身份
+            if ($reg_identity === 'temp') {
+                $user->identity = Base::arrayImplode(array_merge(array_diff($user->identity, ['temp']), ['temp']));
+                $user->save();
+            }
+            // 加入全员群组
+            if ($all_group_autoin === 'yes') {
+                $dialog = WebSocketDialog::whereGroupType('all')->orderByDesc('id')->first();
+                $dialog?->joinGroup($user->userid, 0);
+            }
         }
-        $user = User::createInstance($inArray);
-        $user->save();
-        User::AZUpdate($user->userid);
         return $user->find($user->userid);
     }
 
-    /**
-     * 邮箱获取userid
-     * @param $email
-     * @return int
-     */
-    public static function email2userid($email)
-    {
-        if (empty($email)) {
-            return 0;
-        }
-        return intval(self::whereEmail($email)->value('userid'));
-    }
-
-    /**
-     * token获取会员userid
-     * @return int
-     */
-    public static function token2userid()
-    {
-        return self::authFind('userid', Base::getToken());
-    }
-
-    /**
-     * token获取会员邮箱
-     * @return int
-     */
-    public static function token2email()
-    {
-        return self::authFind('email', Base::getToken());
-    }
-
-    /**
-     * token获取encrypt
-     * @return mixed|string
-     */
-    public static function token2encrypt()
-    {
-        return self::authFind('encrypt', Base::getToken());
-    }
-
-    /**
-     * 获取token身份信息
-     * @param $find
-     * @param null $token
-     * @return array|mixed|string
-     */
-    public static function authFind($find, $token = null)
-    {
-        if ($token === null) {
-            $token = Base::getToken();
-        }
-        list($userid, $email, $encrypt, $timestamp) = explode("#$", base64_decode($token) . "#$#$#$#$");
-        $array = [
-            'userid' => intval($userid),
-            'email' => $email ?: '',
-            'encrypt' => $encrypt ?: '',
-            'timestamp' => intval($timestamp),
-        ];
-        if (isset($array[$find])) {
-            return $array[$find];
-        }
-        if ($find == 'all') {
-            return $array;
-        }
-        return '';
-    }
-
     /**
      * 获取我的ID
      * @return int
@@ -308,8 +405,7 @@ class User extends AbstractModel
     {
         $user = self::authInfo();
         if (!$user) {
-            $authorization = Base::getToken();
-            if ($authorization) {
+            if (Base::token()) {
                 throw new ApiException('身份已失效,请重新登录', [], -1);
             } else {
                 throw new ApiException('请登录后继续...', [], -1);
@@ -334,57 +430,49 @@ class User extends AbstractModel
         if (isset($_A["__static_auth"])) {
             return $_A["__static_auth"];
         }
-        $authorization = Base::getToken();
-        if ($authorization) {
-            $authInfo = self::authFind('all', $authorization);
-            if ($authInfo['userid'] > 0) {
-                $loginValid = floatval(Base::settingFind('system', 'loginValid')) ?: 720;
-                $loginValid *= 3600;
-                if ($authInfo['timestamp'] + $loginValid > time()) {
-                    $row = self::whereUserid($authInfo['userid'])->whereEmail($authInfo['email'])->whereEncrypt($authInfo['encrypt'])->first();
-                    if ($row) {
-                        $upArray = [];
-                        if (Base::getIp() && $row->line_ip != Base::getIp()) {
-                            $upArray['line_ip'] = Base::getIp();
-                        }
-                        if (Carbon::parse($row->line_at)->addSeconds(30)->lt(Carbon::now())) {
-                            $upArray['line_at'] = Carbon::now();
-                        }
-                        if ($upArray) {
-                            $row->updateInstance($upArray);
-                            $row->save();
-                        }
-                        return $_A["__static_auth"] = $row;
-                    }
-                }
+        if (Doo::userId() > 0
+            && !Doo::userExpired()
+            && $user = self::whereUserid(Doo::userId())->whereEmail(Doo::userEmail())->whereEncrypt(Doo::userEncrypt())->first()) {
+            $upArray = [];
+            if (Base::getIp() && $user->line_ip != Base::getIp()) {
+                $upArray['line_ip'] = Base::getIp();
             }
+            if (Carbon::parse($user->line_at)->addSeconds(30)->lt(Carbon::now())) {
+                $upArray['line_at'] = Carbon::now();
+            }
+            if ($upArray) {
+                $user->updateInstance($upArray);
+                $user->save();
+            }
+            return $_A["__static_auth"] = $user;
         }
         return $_A["__static_auth"] = false;
     }
 
     /**
-     * 生成token
+     * 生成 token
      * @param self $userinfo
+     * @param bool $refresh  获取新的token
      * @return string
      */
-    public static function token($userinfo)
+    public static function generateToken($userinfo, $refresh = false)
     {
-        $userinfo->token = base64_encode($userinfo->userid . '#$' . $userinfo->email . '#$' . $userinfo->encrypt . '#$' . time() . '#$' . Base::generatePassword(6));
+        if (!$refresh) {
+            if (Doo::userId() != $userinfo->userid
+                || Doo::userEmail() != $userinfo->email
+                || Doo::userEncrypt() != $userinfo->encrypt) {
+                $refresh = true;
+            }
+        }
+        if ($refresh) {
+            $days = $userinfo->bot ? 0 : max(1, intval(Base::settingFind('system', 'token_valid_days', 30)));
+            $token = Doo::tokenEncode($userinfo->userid, $userinfo->email, $userinfo->encrypt, $days);
+        } else {
+            $token = Doo::userToken();
+        }
         unset($userinfo->encrypt);
         unset($userinfo->password);
-        return $userinfo->token;
-    }
-
-    /**
-     * 判断用户权限（身份）
-     * @param $identity
-     * @param $userIdentity
-     * @return bool
-     */
-    public static function identityRaw($identity, $userIdentity)
-    {
-        $userIdentity = is_array($userIdentity) ? $userIdentity : explode(",", trim($userIdentity, ","));
-        return $identity && in_array($identity, $userIdentity);
+        return $userinfo->token = $token;
     }
 
     /**
@@ -402,10 +490,10 @@ class User extends AbstractModel
         if (isset($_A["__static_userid2basic_" . $userid])) {
             return $_A["__static_userid2basic_" . $userid];
         }
-        $fields = ['userid', 'email', 'nickname', 'profession', 'userimg'];
-        $userInfo = self::whereUserid($userid)->select($fields)->first();
+        $userInfo = self::whereUserid($userid)->select(User::$basicField)->first();
         if ($userInfo) {
             $userInfo->online = $userInfo->getOnlineStatus();
+            $userInfo->department_name = $userInfo->getDepartmentName();
         }
         return $_A["__static_userid2basic_" . $userid] = ($userInfo ?: []);
     }
@@ -418,21 +506,7 @@ class User extends AbstractModel
      */
     public static function userid2nickname($userid)
     {
-        $basic = self::userid2basic($userid);
-        return $basic ? $basic->nickname : '';
-    }
-
-    /**
-     * 更新首字母
-     * @param $userid
-     */
-    public static function AZUpdate($userid)
-    {
-        $row = self::whereUserid($userid)->first();
-        if ($row) {
-            $row->az = Base::getFirstCharter($row->nickname);
-            $row->save();
-        }
+        return self::userid2basic($userid)?->nickname ?: '';
     }
 
     /**
@@ -459,6 +533,64 @@ 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-gemini@bot.system':
+                return url("images/avatar/default_gemini.png");
+            case 'bot-manager@bot.system':
+                return url("images/avatar/default_bot.png");
+            case 'meeting-alert@bot.system':
+                return url("images/avatar/default_meeting.png");
+            }
+        // 生成文字头像
+        if (self::$defaultAvatarMode === 'auto') {
+            return url("avatar/" . urlencode($nickname) . ".png");
+        }
+        // 系统默认头像
+        $name = ($userid - 1) % 21 + 1;
+        return url("images/avatar/default_{$name}.png");
+    }
+
     /**
      * 检测密码策略是否符合
      * @param $password
@@ -489,4 +621,44 @@ 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();
+            }
+            //
+            $update['nickname'] = UserBot::systemBotName($email);
+        }
+        if ($update) {
+            $botUser->updateInstance($update);
+            if (isset($update['nickname'])) {
+                $botUser->az = Base::getFirstCharter($botUser->nickname);
+                $botUser->pinyin = Base::cn2pinyin($botUser->nickname);
+            }
+            $botUser->save();
+        }
+        return $botUser;
+    }
 }

app/Models/UserBot.php

@@ -0,0 +1,301 @@
+<?php
+
+namespace App\Models;
+
+use App\Module\Base;
+use App\Module\Doo;
+use App\Module\Extranet;
+use App\Tasks\JokeSoupTask;
+use Cache;
+use Carbon\Carbon;
+
+/**
+ * App\Models\UserBot
+ *
+ * @property int $id
+ * @property int|null $userid 所属人ID
+ * @property int|null $bot_id 机器人ID
+ * @property int|null $clear_day 消息自动清理天数
+ * @property string|null $clear_at 下一次清理时间
+ * @property string|null $webhook_url 消息webhook地址
+ * @property int|null $webhook_num 消息webhook请求次数
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereBotId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereClearAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereClearDay($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereUserid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereWebhookNum($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereWebhookUrl($value)
+ * @mixin \Eloquent
+ */
+class UserBot extends AbstractModel
+{
+
+    /**
+     * 系统机器人名称
+     * @param $name string 邮箱 或 邮箱前缀
+     * @return string
+     */
+    public static function systemBotName($name)
+    {
+        if (str_contains($name, "@")) {
+            $name = explode("@", $name)[0];
+        }
+        return match ($name) {
+            'system-msg' => '系统消息',
+            'task-alert' => '任务提醒',
+            'check-in' => '签到打卡',
+            'anon-msg' => '匿名消息',
+            'approval-alert' => '审批',
+            'ai-openai' => 'ChatGPT',
+            'ai-claude' => 'Claude',
+            'ai-wenxin' => '文心一言',
+            'ai-qianwen' => '通义千问',
+            'ai-gemini' => 'Gemini',
+            'bot-manager' => '机器人管理',
+            'meeting-alert' => '会议通知',
+            'okr-alert' => 'OKR提醒',
+            default => '',  // 不是系统机器人时返回空（也可以拿来判断是否是系统机器人）
+        };
+    }
+
+    /**
+     * 机器人菜单
+     * @param $email
+     * @return array|array[]
+     */
+    public static function quickMsgs($email)
+    {
+        return match ($email) {
+            'check-in@bot.system' => [
+                [
+                    'key' => 'checkin',
+                    'label' => Doo::translate('我要打卡')
+                ], [
+                    'key' => 'it',
+                    'label' => Doo::translate('IT资讯')
+                ], [
+                    'key' => '36ke',
+                    'label' => Doo::translate('36氪')
+                ], [
+                    'key' => '60s',
+                    'label' => Doo::translate('60s读世界')
+                ], [
+                    'key' => 'joke',
+                    'label' => Doo::translate('开心笑话')
+                ], [
+                    'key' => 'soup',
+                    'label' => Doo::translate('心灵鸡汤')
+                ]
+            ],
+            'anon-msg@bot.system' => [
+                [
+                    'key' => 'help',
+                    'label' => Doo::translate('使用说明')
+                ], [
+                    'key' => 'privacy',
+                    'label' => Doo::translate('隐私说明')
+                ],
+            ],
+            'bot-manager@bot.system' => [
+                [
+                    'key' => '/help',
+                    'label' => Doo::translate('帮助指令')
+                ], [
+                    'key' => '/api',
+                    'label' => Doo::translate('Api接口文档')
+                ], [
+                    'key' => '/list',
+                    'label' => Doo::translate('我的机器人')
+                ],
+            ],
+            'ai-openai@bot.system',
+            'ai-claude@bot.system',
+            'ai-wenxin@bot.system',
+            'ai-gemini@bot.system',
+            'ai-qianwen@bot.system' => [
+                [
+                    'key' => '%3A.clear',
+                    'label' => Doo::translate('清空上下文')
+                ]
+            ],
+            default => [],
+        };
+
+    }
+
+    /**
+     * 签到机器人
+     * @param $command
+     * @param $userid
+     * @return string
+     */
+    public static function checkinBotQuickMsg($command, $userid)
+    {
+        if (Cache::get("UserBot::checkinBotQuickMsg:{$userid}") === "yes") {
+            return "操作频繁！";
+        }
+        Cache::put("UserBot::checkinBotQuickMsg:{$userid}", "yes", Carbon::now()->addSecond());
+        //
+        if ($command === 'checkin') {
+            $setting = Base::setting('checkinSetting');
+            if ($setting['open'] !== 'open') {
+                return '暂未开启签到功能。';
+            }
+            if (!in_array('manual', $setting['modes'])) {
+                return '暂未开放手动签到。';
+            }
+            if ($error = UserBot::checkinBotCheckin($userid, Base::time(), true)) {
+                return $error;
+            }
+            return null;
+        } else {
+            return Extranet::checkinBotQuickMsg($command);
+        }
+    }
+
+    /**
+     * 签到机器人签到
+     * @param $mac
+     * @param $time
+     * @param bool $alreadyTip  签到过是否提示
+     * @return string|null 返回string表示错误信息，返回null表示签到成功
+     */
+    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"));
+        if (Base::time() < $timeAdvance || $timeDelay < Base::time()) {
+            return "不在有效时间内，有效时间为：" . date("H:i", $timeAdvance) . "-" . date("H:i", $timeDelay);
+        }
+        //
+        $macs = explode(",", $mac);
+        $checkins = [];
+        foreach ($macs as $mac) {
+            $mac = strtoupper($mac);
+            $array = [];
+            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 (Base::isNumber($mac)) {
+                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' => '手动签到',
+                    ];
+                }
+            }
+            if ($array) {
+                $record = UserCheckinRecord::where($array)->first();
+                if (empty($record)) {
+                    $record = UserCheckinRecord::createInstance($array);
+                }
+                $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) {
+                $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) {
+                        return $pre . $item;
+                    }
+                }
+                return null;
+            };
+            $sendMsg = function($type, $checkin) use ($alreadyTip, $getJokeSoup, $botUser, $nowDate) {
+                $cacheKey = "Checkin::sendMsg-{$nowDate}-{$type}:" . $checkin['userid'];
+                $typeDesc = $type == "up" ? "上班" : "下班";
+                if (Cache::get($cacheKey) === "yes") {
+                    if ($alreadyTip && $dialog = WebSocketDialog::checkUserDialog($botUser, $checkin['userid'])) {
+                        $text = "<p>今日已{$typeDesc}打卡，无需重复打卡。</p>";
+                        WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, $type != "up");
+                    }
+                    return;
+                }
+                Cache::put($cacheKey, "yes", Carbon::now()->addDay());
+                //
+                if ($dialog = WebSocketDialog::checkUserDialog($botUser, $checkin['userid'])) {
+                    $hi = date("H:i");
+                    $remark = $checkin['remark'] ? " ({$checkin['remark']})": "";
+                    $text = "<p>{$typeDesc}打卡成功，打卡时间: {$hi}{$remark}</p>";
+                    $suff = $getJokeSoup($type);
+                    if ($suff) {
+                        $text = "{$text}<p>----------</p><p>{$suff}</p>";
+                    }
+                    WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, $type != "up");
+                }
+            };
+            if ($timeAdvance <= Base::time() && Base::time() < $timeEnd) {
+                // 上班打卡通知（从最早打卡时间 到 下班打卡时间）
+                foreach ($checkins as $checkin) {
+                    $sendMsg('up', $checkin);
+                }
+            }
+            if ($timeEnd <= Base::time() && Base::time() <= $timeDelay) {
+                // 下班打卡通知（下班打卡时间 到 最晚打卡时间）
+                foreach ($checkins as $checkin) {
+                    $sendMsg('down', $checkin);
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 隐私机器人
+     * @param $command
+     * @return string
+     */
+    public static function anonBotQuickMsg($command)
+    {
+        return match ($command) {
+            "help" => "使用说明：打开你想要发匿名消息的个人对话，点击输入框右边的 ⊕ 号，选择 <u>匿名消息</u> 即可输入你想要发送的匿名消息内容。",
+            "privacy" => "匿名消息将通过 <u>匿名消息（机器人）</u> 发送给对方，不会记录你的身份信息。",
+            default => '',
+        };
+    }
+}

app/Models/UserCheckinMac.php

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

app/Models/UserCheckinRecord.php

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

app/Models/UserDelete.php

@@ -0,0 +1,77 @@
+<?php
+
+
+namespace App\Models;
+
+use App\Module\Base;
+
+/**
+ * App\Models\UserDelete
+ *
+ * @property int $id
+ * @property int|null $operator 操作人员
+ * @property int|null $userid 用户id
+ * @property string|null $email 邮箱帐号
+ * @property string|null $reason 注销原因
+ * @property string $cache 会员资料缓存
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDelete newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDelete newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDelete query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereCache($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereEmail($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereOperator($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereReason($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereUserid($value)
+ * @mixin \Eloquent
+ */
+class UserDelete extends AbstractModel
+{
+    /**
+     * 昵称
+     * @param $value
+     * @return string
+     */
+    public function getCacheAttribute($value)
+    {
+        if (!is_array($value)) {
+            $value = Base::json2array($value);
+            // 昵称
+            if (!$value['nickname']) {
+                $value['nickname'] = Base::cardFormat($value['email']);
+            }
+            // 头像
+            $value['userimg'] = User::getAvatar($value['userid'], $value['userimg'], $value['email'], $value['nickname']);
+            // 部门
+            $value['department'] = array_filter(is_array($value['department']) ? $value['department'] : Base::explodeInt($value['department']));
+        }
+        return $value;
+    }
+
+    /**
+     * userid 获取 基础信息
+     * @param int $userid 会员ID
+     * @return array|null
+     */
+    public static function userid2basic($userid)
+    {
+        $row = self::whereUserid($userid)->first();
+        if (empty($row) || empty($row->cache)) {
+            return null;
+        }
+        $cache = $row->cache;
+        $cache = array_intersect_key($cache, array_flip(array_merge(User::$basicField, ['department_name'])));
+        $cache['delete_at'] = $row->created_at->format($row->dateFormat ?: 'Y-m-d H:i:s');
+        return $cache;
+    }
+}

app/Models/UserDepartment.php

@@ -0,0 +1,158 @@
+<?php
+
+namespace App\Models;
+
+use App\Exceptions\ApiException;
+
+/**
+ * App\Models\UserDepartment
+ *
+ * @property int $id
+ * @property string|null $name 部门名称
+ * @property int|null $dialog_id 聊天会话ID
+ * @property int|null $parent_id 上级部门
+ * @property int|null $owner_userid 部门负责人
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereDialogId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereOwnerUserid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereParentId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
+class UserDepartment extends AbstractModel
+{
+    /**
+     * 保存部门
+     * @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);
+        if ($dialog) {
+            $dialog->deleteDialog();
+        }
+        //
+        $this->delete();
+    }
+
+    /**
+     * 移交部门身份
+     * @param $originalUserid
+     * @param $newUserid
+     * @return void
+     */
+    public static function transfer($originalUserid, $newUserid)
+    {
+        self::whereOwnerUserid($originalUserid)->chunkById(100, function ($list) use ($originalUserid, $newUserid) {
+            /** @var self $item */
+            foreach ($list as $item) {
+                $item->saveDepartment([
+                    'owner_userid' => $newUserid,
+                ]);
+            }
+        });
+    }
+}

app/Models/UserEmailVerification.php

@@ -0,0 +1,139 @@
+<?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\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');
+        try {
+            if (!Base::isEmail($email)) {
+                throw new \Exception("User email '{$email}' address error");
+            }
+            switch ($type) {
+                case 2:
+                    $subject = env('APP_NAME') . "修改邮箱验证";
+                    $content = "<p>{$user->nickname} 您好，您正在修改 " . env('APP_NAME') . " 的邮箱，验证码如下。请在30分钟内输入验证码</p><p style='color: #0000DD;'><u>$code</u></p><p>如果不是本人操作，您的帐号可能存在风险，请及时修改密码!</p>";
+                    break;
+                case 3:
+                    $subject = env('APP_NAME') . "注销帐号验证";
+                    $content = "<p>{$user->nickname} 您好，您正在注销 " . env('APP_NAME') . " 的帐号，验证码如下。请在30分钟内输入验证码</p><p style='color: #0000DD;'><u>$code</u></p><p>如果不是本人操作，您的帐号可能存在风险，请及时修改密码!</p>";
+                    break;
+                default:
+                    $url = Base::fillUrl('single/valid/email') . '?code=' . $row->code;
+                    $subject = env('APP_NAME') . "绑定邮箱验证";
+                    $content = "<p>{$user->nickname} 您好，您正在绑定 " . env('APP_NAME') . " 的邮箱，请于30分钟之内点击以下链接完成验证 :</p><p style='display: flex; justify-content: center;'><a href='{$url}' target='_blank'>{$url}</a></p>";
+                    break;
+            }
+            Factory::mailer()
+                ->setDsn("smtp://{$setting['account']}:{$setting['password']}@{$setting['smtp_server']}:{$setting['port']}?verify_peer=0")
+                ->setMessage(EmailMessage::create()
+                    ->from(env('APP_NAME', 'Task') . " <{$setting['account']}>")
+                    ->to($email)
+                    ->subject($subject)
+                    ->html($content))
+                ->send();
+        } catch (\Throwable $e) {
+            if (str_contains($e->getMessage(), "Timed Out")) {
+                throw new ApiException("language.TimedOut");
+            } 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 = Base::Time();
+
+        // 30分钟失效
+        if (abs($time - $oldTime) > 1800) {
+            throw new ApiException('验证码已失效');
+        }
+
+        self::whereEmail($email)->whereCode($code)->whereType($type)->update([
+            'status' => 1
+        ]);
+
+        return true;
+    }
+
+}

app/Models/UserTransfer.php

@@ -0,0 +1,77 @@
+<?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);
+        // 离职移出群组
+        WebSocketDialog::select(['web_socket_dialogs.*'])
+            ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
+            ->where('web_socket_dialogs.type', 'group')
+            ->where('u.userid', $this->original_userid)
+            ->orderByDesc('web_socket_dialogs.id')
+            ->chunk(100, function($list) {
+                /** @var WebSocketDialog $dialog */
+                foreach ($list as $dialog) {
+                    // 离职员工退出群
+                    $dialog->exitGroup($this->original_userid, 'remove', false, false);
+                    if ($dialog->owner_id === $this->original_userid) {
+                        // 如果是群主则把交接人设为群主
+                        $dialog->owner_id = $this->new_userid;
+                        if ($dialog->save()) {
+                            $dialog->joinGroup($this->new_userid, 0);
+                            $dialog->pushMsg("groupUpdate", [
+                                'id' => $dialog->id,
+                                'owner_id' => $dialog->owner_id,
+                            ]);
+                        }
+                    }
+                }
+            });
+    }
+}

app/Models/WebSocket.php

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

app/Models/WebSocketDialog.php

@@ -3,8 +3,14 @@
 namespace App\Models;
 
 use App\Exceptions\ApiException;
+use App\Module\Base;
+use App\Module\Doo;
+use App\Tasks\PushTask;
+use Cache;
 use Carbon\Carbon;
+use Hhxsv5\LaravelS\Swoole\Task\Task;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\DB;
 
 /**
  * App\Models\WebSocketDialog
@@ -13,32 +19,56 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string|null $type 对话类型
  * @property string|null $group_type 聊天室类型
  * @property string|null $name 对话名称
- * @property string|null $last_at 最后消息时间
+ * @property string $avatar 头像（群）
+ * @property int|null $owner_id 群主用户ID
+ * @property int|null $link_id 关联id
+ * @property int|null $top_userid 置顶的用户ID
+ * @property int|null $top_msg_id 置顶的消息ID
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\WebSocketDialogUser[] $dialogUser
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\WebSocketDialogUser> $dialogUser
  * @property-read int|null $dialog_user_count
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog newQuery()
- * @method static \Illuminate\Database\Query\Builder|WebSocketDialog onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereAvatar($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereGroupType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereLastAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereLinkId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereOwnerId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereTopMsgId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereTopUserid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|WebSocketDialog withTrashed()
- * @method static \Illuminate\Database\Query\Builder|WebSocketDialog withoutTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog withTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog withoutTrashed()
  * @mixin \Eloquent
  */
 class WebSocketDialog extends AbstractModel
 {
     use SoftDeletes;
 
+    /**
+     * 头像地址
+     * @param $value
+     * @return string
+     */
+    public function getAvatarAttribute($value)
+    {
+        return $value ? Base::fillUrl($value) : $value;
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
@@ -47,6 +77,385 @@ class WebSocketDialog extends AbstractModel
         return $this->hasMany(WebSocketDialogUser::class, 'dialog_id', 'id');
     }
 
+
+    /**
+     * 获取对话列表
+     * @param int $userid 会员ID
+     * @param $updated
+     * @param $deleted
+     * @return array
+     */
+    public static function getDialogList($userid, $updated = "", $deleted = "")
+    {
+        $builder = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.last_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
+            ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
+            ->where('u.userid', $userid);
+        if ($updated) {
+            $builder->where('u.updated_at', '>', $updated);
+        }
+        $list = $builder
+            ->orderByDesc('u.top_at')
+            ->orderByDesc('u.last_at')
+            ->paginate(Base::getPaginate(100, 50));
+        $list->transform(function (WebSocketDialog $item) use ($userid) {
+            return $item->formatData($userid);
+        });
+        //
+        $data = $list->toArray();
+        if ($list->currentPage() === 1) {
+            $data['deleted_id'] = Deleted::ids('dialog', $userid, $deleted);
+        }
+        return $data;
+    }
+
+    /**
+     * 列表外的未读对话 和 列表外的待办对话
+     * @param $userid
+     * @param $unreadAt
+     * @param $todoAt
+     * @return WebSocketDialog[]
+     */
+    public static function getDialogBeyond($userid, $unreadAt, $todoAt)
+    {
+        DB::statement("SET SQL_MODE=''");
+        $ids = [];
+        $array = [];
+        if ($unreadAt) {
+            // 未读对话
+            $list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.last_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
+                ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
+                ->join('web_socket_dialog_msg_reads as r', 'web_socket_dialogs.id', '=', 'r.dialog_id')
+                ->where('u.userid', $userid)
+                ->where('r.userid', $userid)
+                ->where('r.read_at')
+                ->where('u.last_at', '<', $unreadAt)
+                ->groupBy('u.dialog_id')
+                ->take(20)
+                ->get();
+            $list->transform(function (WebSocketDialog $item) use ($userid, &$ids, &$array) {
+                if (!in_array($item->id, $ids)) {
+                    $ids[] = $item->id;
+                    $array[] = $item->formatData($userid);
+                }
+            });
+            // 标记未读会话
+            $list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.last_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
+                ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
+                ->where('u.userid', $userid)
+                ->where('u.mark_unread', 1)
+                ->where('u.last_at', '<', $unreadAt)
+                ->take(20)
+                ->get();
+            $list->transform(function (WebSocketDialog $item) use ($userid, &$ids, &$array) {
+                if (!in_array($item->id, $ids)) {
+                    $ids[] = $item->id;
+                    $array[] = $item->formatData($userid);
+                }
+            });
+        }
+        if ($todoAt) {
+            // 待办会话
+            $list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.last_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
+                ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
+                ->join('web_socket_dialog_msg_todos as t', 'web_socket_dialogs.id', '=', 't.dialog_id')
+                ->where('u.userid', $userid)
+                ->where('t.userid', $userid)
+                ->where('t.done_at')
+                ->where('u.last_at', '<', $todoAt)
+                ->groupBy('u.dialog_id')
+                ->take(20)
+                ->get();
+            $list->transform(function (WebSocketDialog $item) use ($userid, &$ids, &$array) {
+                if (!in_array($item->id, $ids)) {
+                    $ids[] = $item->id;
+                    $array[] = $item->formatData($userid);
+                }
+            });
+        }
+        return $array;
+    }
+
+
+    /**
+     * 格式化对话
+     * @param int $userid   会员ID
+     * @param bool $hasData
+     * @return $this
+     */
+    public function formatData($userid, $hasData = false)
+    {
+        $dialogUserFun = function ($key, $default = null) use ($userid) {
+            $data = Cache::remember("Dialog::formatData-{$this->id}-{$userid}", now()->addSeconds(10), function () use ($userid) {
+                return WebSocketDialogUser::whereDialogId($this->id)->whereUserid($userid)->first()?->toArray();
+            });
+            return $data[$key] ?? $default;
+        };
+        //
+        $time = Carbon::parse($this->user_at ?? $dialogUserFun('updated_at'));
+        $this->hide = $this->hide ?? $dialogUserFun('hide');
+        $this->top_at = $this->top_at ?? $dialogUserFun('top_at');
+        $this->last_at = $this->last_at ?? $dialogUserFun('last_at');
+        $this->user_at = $time->toDateTimeString('millisecond');
+        $this->user_ms = $time->valueOf();
+        //
+        if (isset($this->search_msg_id)) {
+            // 最后消息 (搜索预览消息)
+            $this->last_msg = WebSocketDialogMsg::whereDialogId($this->id)->find($this->search_msg_id);
+            $this->last_at = $this->last_msg ? Carbon::parse($this->last_msg->created_at)->format('Y-m-d H:i:s') : null;
+        } else {
+            // 未读信息
+            if (Base::judgeClientVersion("0.34.0")) {
+                $this->generateUnread($userid);
+            } else {
+                $this->generateUnread_03398($userid, $hasData);
+            }
+            // 未读标记
+            $this->mark_unread = $this->mark_unread ?? $dialogUserFun('mark_unread');
+            // 是否免打扰
+            $this->silence = $this->silence ?? $dialogUserFun('silence');
+            // 对话人数
+            $this->people = WebSocketDialogUser::whereDialogId($this->id)->count();
+            // 有待办
+            $this->todo_num = WebSocketDialogMsgTodo::whereDialogId($this->id)->whereUserid($userid)->whereDoneAt(null)->count();
+            // 最后消息
+            $this->last_msg = WebSocketDialogMsg::whereDialogId($this->id)->orderByDesc('id')->first();
+        }
+        // 对方信息
+        $this->pinyin = Base::cn2pinyin($this->name);
+        $this->quick_msgs = [];
+        $this->dialog_user = null;
+        $this->group_info = null;
+        $this->bot = 0;
+        switch ($this->type) {
+            case "user":
+                $dialog_user = WebSocketDialogUser::whereDialogId($this->id)->where('userid', '!=', $userid)->first();
+                if ($dialog_user->userid === 0) {
+                    $dialog_user->userid = $userid;
+                }
+                $basic = User::userid2basic($dialog_user->userid);
+                if ($basic) {
+                    $this->name = $basic->nickname;
+                    $this->email = $basic->email;
+                    $this->userimg = $basic->userimg;
+                    $this->bot = $basic->getBotOwner();
+                    $this->quick_msgs = UserBot::quickMsgs($basic->email);
+                } else {
+                    $this->name = 'non-existent';
+                    $this->dialog_delete = 1;
+                }
+                $this->dialog_user = $dialog_user;
+                $this->dialog_mute = Base::settingFind('system', 'user_private_chat_mute');
+                break;
+            case "group":
+                switch ($this->group_type) {
+                    case 'user':
+                        $this->dialog_mute = Base::settingFind('system', 'user_group_chat_mute');
+                        break;
+                    case 'project':
+                        $this->group_info = Project::withTrashed()->select(['id', 'name', 'archived_at', 'deleted_at'])->whereDialogId($this->id)->first()?->cancelAppend()->cancelHidden();
+                        if ($this->group_info) {
+                            $this->name = $this->group_info->name;
+                        } else {
+                            $this->name = '[Delete]';
+                            $this->dialog_delete = 1;
+                        }
+                        break;
+                    case 'task':
+                        $this->group_info = ProjectTask::withTrashed()->select(['id', 'name', 'complete_at', 'archived_at', 'deleted_at'])->whereDialogId($this->id)->first()?->cancelAppend()->cancelHidden();
+                        if ($this->group_info) {
+                            $this->name = $this->group_info->name;
+                        } else {
+                            $this->name = '[Delete]';
+                            $this->dialog_delete = 1;
+                        }
+                        break;
+                    case 'all':
+                        $this->name = Doo::translate('全体成员');
+                        $this->dialog_mute = Base::settingFind('system', 'all_group_mute');
+                        break;
+                }
+                break;
+        }
+        if ($hasData === true) {
+            $msgBuilder = WebSocketDialogMsg::whereDialogId($this->id);
+            $this->has_tag = $msgBuilder->clone()->where('tag', '>', 0)->exists();
+            $this->has_todo = $msgBuilder->clone()->where('todo', '>', 0)->exists();
+            $this->has_image = $msgBuilder->clone()->whereMtype('image')->exists();
+            $this->has_file = $msgBuilder->clone()->whereMtype('file')->exists();
+            $this->has_link = $msgBuilder->clone()->whereLink(1)->exists();
+            Cache::forever("Dialog::tag:" . $this->id, Base::array2json([
+                'has_tag' => $this->has_tag,
+                'has_todo' => $this->has_todo,
+                'has_image' => $this->has_image,
+                'has_file' => $this->has_file,
+                'has_link' => $this->has_link,
+            ]));
+        } else {
+            $tagData = Base::json2array(Cache::get("Dialog::tag:" . $this->id));
+            if ($tagData) {
+                $this->has_tag = !!$tagData['has_tag'];
+                $this->has_todo = !!$tagData['has_todo'];
+                $this->has_image = !!$tagData['has_image'];
+                $this->has_file = !!$tagData['has_file'];
+                $this->has_link = !!$tagData['has_link'];
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * 生成未读数据
+     * @param $userid
+     * @return $this
+     */
+    public function generateUnread($userid)
+    {
+        $builder = WebSocketDialogMsgRead::whereDialogId($this->id)->whereUserid($userid)->whereReadAt(null);
+        // 未读消息
+        $this->unread = $builder->count();
+        // 最早一条未读消息
+        $this->unread_one = $this->unread > 0 ? intval($builder->clone()->orderBy('msg_id')->value('msg_id')) : 0;
+        // @我的消息
+        $this->mention = $this->unread > 0 ? $builder->clone()->whereMention(1)->count() : 0;
+        // @我的消息（id集合）
+        $this->mention_ids = $this->mention > 0 ? $builder->clone()->whereMention(1)->orderByDesc('msg_id')->take(20)->pluck('msg_id')->toArray() : [];
+        return $this;
+    }
+
+    /**
+     * 生成未读数据   // todo: 旧版兼容，后续删除
+     * @param $userid
+     * @param $positionData
+     * @return $this
+     */
+    public function generateUnread_03398($userid, $positionData = false)
+    {
+        $builder = WebSocketDialogMsgRead::whereDialogId($this->id)->whereUserid($userid)->whereReadAt(null);
+        $this->unread = $builder->count();
+        $this->mention = $this->unread > 0 ? $builder->clone()->whereMention(1)->count() : 0;
+        if ($positionData) {
+            $array = [];
+            // @我的消息
+            if ($this->mention > 0) {
+                $list = $builder->clone()->whereMention(1)->orderByDesc('msg_id')->take(20)->get();
+                foreach ($list as $item) {
+                    $array[] = [
+                        'msg_id' => $item->msg_id,
+                        'label' => Doo::translate('@我的消息'),
+                    ];
+                }
+            }
+            // 最早一条未读消息
+            if ($this->unread > 0
+                && $first_id = intval($builder->clone()->orderBy('msg_id')->value('msg_id'))) {
+                $array[] = [
+                    'msg_id' => $first_id,
+                    'label' => '{UNREAD}'
+                ];
+            }
+            //
+            $this->position_msgs = $array;
+        }
+        return $this;
+    }
+
+    /**
+     * 加入聊天室
+     * @param int|array $userid         加入的会员ID或会员ID组
+     * @param int $inviter              邀请人
+     * @param bool|null $important      重要人员(null不修改、bool修改)
+     * @return bool
+     */
+    public function joinGroup($userid, $inviter, $important = null)
+    {
+        AbstractModel::transaction(function () use ($important, $inviter, $userid) {
+            foreach (is_array($userid) ? $userid : [$userid] as $value) {
+                if ($value > 0) {
+                    $updateData = [
+                        'inviter' => $inviter,
+                    ];
+                    if (is_bool($important)) {
+                        $updateData['important'] = $important ? 1 : 0;
+                    }
+                    $isInsert = false;
+                    WebSocketDialogUser::updateInsert([
+                        'dialog_id' => $this->id,
+                        'userid' => $value,
+                    ], $updateData, [], $isInsert);
+                    if ($isInsert) {
+                        WebSocketDialogMsg::sendMsg(null, $this->id, 'notice', [
+                            'notice' => User::userid2nickname($value) . " 已加入群组"
+                        ], $inviter, true, true);
+                    }
+                }
+            }
+        });
+        $this->pushMsg("groupUpdate", [
+            'id' => $this->id,
+            'people' => WebSocketDialogUser::whereDialogId($this->id)->count()
+        ]);
+        return true;
+    }
+
+    /**
+     * 退出聊天室
+     * @param int|array $userid     退出的会员ID或会员ID组
+     * @param string $type          exit|remove
+     * @param bool $checkDelete     是否检查删除
+     * @param bool $pushMsg         是否推送消息
+     */
+    public function exitGroup($userid, $type = 'exit', $checkDelete = true, $pushMsg = true)
+    {
+        $typeDesc = $type === 'remove' ? '移出' : '退出';
+        AbstractModel::transaction(function () use ($pushMsg, $checkDelete, $typeDesc, $type, $userid) {
+            $builder = WebSocketDialogUser::whereDialogId($this->id);
+            if (is_array($userid)) {
+                $builder->whereIn('userid', $userid);
+            } else {
+                $builder->whereUserid($userid);
+            }
+            $builder->chunkById(100, function($list) use ($pushMsg, $checkDelete, $typeDesc, $type) {
+                /** @var WebSocketDialogUser $item */
+                foreach ($list as $item) {
+                    if ($checkDelete) {
+                        if ($type === 'remove') {
+                            // 移出时：如果是全员群仅允许管理员操作，其他群仅群主或邀请人可以操作
+                            if ($this->group_type === 'all') {
+                                User::auth("admin");
+                            } elseif (!in_array(User::userid(), [$this->owner_id, $item->inviter])) {
+                                throw new ApiException('只有群主或邀请人可以移出成员');
+                            }
+                        }
+                        if ($item->userid == $this->owner_id) {
+                            throw new ApiException('群主不可' . $typeDesc);
+                        }
+                        if ($item->important) {
+                            throw new ApiException('部门成员、项目人员或任务人员不可' . $typeDesc);
+                        }
+                    }
+                    //
+                    $item->delete();
+                    //
+                    if ($pushMsg) {
+                        if ($type === 'remove') {
+                            $notice = User::nickname() . " 将 " . User::userid2nickname($item->userid) . " 移出群组";
+                        } else {
+                            $notice = User::userid2nickname($item->userid) . " 退出群组";
+                        }
+                        WebSocketDialogMsg::sendMsg(null, $this->id, 'notice', [
+                            'notice' => $notice
+                        ], User::userid(), true, true);
+                    }
+                }
+            });
+        });
+        //
+        $this->pushMsg("groupUpdate", [
+            'id' => $this->id,
+            'people' => WebSocketDialogUser::whereDialogId($this->id)->count()
+        ]);
+    }
+
     /**
      * 删除会话
      * @return bool
@@ -54,20 +463,148 @@ class WebSocketDialog extends AbstractModel
     public function deleteDialog()
     {
         AbstractModel::transaction(function () {
-            WebSocketDialogMsgRead::whereDialogId($this->id)->whereNull('read_at')->update([
-                'read_at' => Carbon::now()
-            ]);
+            WebSocketDialogMsgRead::whereDialogId($this->id)
+                ->whereNull('read_at')
+                ->chunkById(100, function ($list) {
+                    WebSocketDialogMsgRead::onlyMarkRead($list);
+                });
             $this->delete();
         });
+        $this->pushMsg("groupDelete");
         return true;
     }
 
+    /**
+     * 还原会话
+     * @return bool
+     */
+    public function restoreDialog()
+    {
+        $this->restore();
+        $this->pushMsg("groupRestore");
+        return true;
+    }
+
+    /**
+     * 检查群组类型
+     * @param string|array|null $groupType
+     * @return void
+     */
+    public function checkGroup($groupType = null)
+    {
+        if ($this->type !== 'group') {
+            throw new ApiException('仅限群组操作');
+        }
+        if ($groupType) {
+            $groupTypes = is_array($groupType) ? $groupType : [$groupType];
+            if (!in_array($this->group_type, $groupTypes)) {
+                throw new ApiException('操作的群组类型错误');
+            }
+        }
+    }
+
+    /**
+     * 检查禁言
+     * @param $userid
+     * @return void
+     */
+    public function checkMute($userid)
+    {
+        $muteMsgTip = null;
+        $systemConfig = Base::setting('system');
+        switch ($this->type) {
+            case 'user':
+                if ($systemConfig['user_private_chat_mute'] === 'close') {
+                    $muteMsgTip = '个人会话禁言';
+                }
+                break;
+
+            case 'group':
+                if ($this->group_type === 'user') {
+                    if ($systemConfig['user_group_chat_mute'] === 'close') {
+                        $muteMsgTip = '个人群组禁言';
+                    }
+                } elseif ($this->group_type === 'all') {
+                    if ($systemConfig['all_group_mute'] === 'close') {
+                        $muteMsgTip = '当前会话全员禁言';
+                    }
+                }
+                break;
+        }
+        if ($muteMsgTip === null) {
+            return;
+        }
+        if ($userid) {
+            $user = User::find($userid);
+            if ($user?->bot || $user?->isAdmin()) { // 机器人或管理员不受禁言
+                return;
+            }
+        }
+        throw new ApiException($muteMsgTip);
+    }
+
+    /**
+     * 获取群组名称
+     * @return mixed|string|null
+     */
+    public function getGroupName()
+    {
+        if (!isset($this->appendattrs['groupName'])) {
+            $name = $this->name;
+            if ($this->type == "group") {
+                switch ($this->group_type) {
+                    case 'project':
+                        $name = \DB::table('projects')->where('dialog_id', $this->id)->value('name');
+                        break;
+                    case 'task':
+                        $name = \DB::table('project_tasks')->where('dialog_id', $this->id)->value('name');
+                        break;
+                    case 'all':
+                        $name = Doo::translate('全体成员');
+                        break;
+                }
+            }
+            $this->appendattrs['groupName'] = $name;
+        }
+        return $this->appendattrs['groupName'];
+    }
+
+    /**
+     * 推送消息
+     * @param $action
+     * @param array $data           发送内容，默认为[id=>会话ID]
+     * @param array $userid         指定会员，默认为群组所有成员
+     * @return void
+     */
+    public function pushMsg($action, $data = null, $userid = null)
+    {
+        if ($data === null) {
+            $data = ['id' => $this->id];
+        }
+        //
+        if ($userid === null) {
+            $userid = $this->dialogUser->pluck('userid')->toArray();
+        }
+        //
+        $params = [
+            'userid' => $userid,
+            'msg' => [
+                'type' => 'dialog',
+                'mode' => $action,
+                'data' => $data,
+            ]
+        ];
+        $task = new PushTask($params, false);
+        Task::deliver($task);
+    }
+
     /**
      * 获取对话（同时检验对话身份）
      * @param $dialog_id
+     * @param bool|string $checkOwner 是否校验群组身份，'auto'时有群主为true无群主为false
      * @return self
      */
-    public static function checkDialog($dialog_id)
+    public static function checkDialog($dialog_id, $checkOwner = false)
     {
         $dialog = WebSocketDialog::find($dialog_id);
         if (empty($dialog)) {
@@ -75,7 +612,14 @@ class WebSocketDialog extends AbstractModel
         }
         //
         $userid = User::userid();
-        if ($dialog->type === 'group' && $dialog->group_type === 'task') {
+        if ($checkOwner === 'auto') {
+            $checkOwner = $dialog->owner_id > 0;
+        }
+        if ($checkOwner === true && $dialog->owner_id != $userid) {
+            throw new ApiException('仅限群主操作');
+        }
+        //
+        if ($dialog->group_type === 'task') {
             // 任务群对话校验是否在项目内
             $project_id = intval(ProjectTask::whereDialogId($dialog->id)->value('project_id'));
             if ($project_id > 0) {
@@ -84,49 +628,12 @@ class WebSocketDialog extends AbstractModel
                 }
             }
         }
+        if ($dialog->group_type == 'okr') {
+            return $dialog;
+        }
         if (!WebSocketDialogUser::whereDialogId($dialog->id)->whereUserid($userid)->exists()) {
-            throw new ApiException('不在成员列表内');
-        }
-        return $dialog;
-    }
-
-    /**
-     * 格式化对话
-     * @param WebSocketDialog $dialog
-     * @param int $userid   会员ID
-     * @return self|null
-     */
-    public static function formatData(WebSocketDialog $dialog, $userid)
-    {
-        if (empty($dialog)) {
-            return null;
-        }
-        // 最后消息
-        $last_msg = WebSocketDialogMsg::whereDialogId($dialog->id)->orderByDesc('id')->first();
-        $dialog->last_msg = $last_msg;
-        // 未读信息
-        $dialog->unread = WebSocketDialogMsgRead::whereDialogId($dialog->id)->whereUserid($userid)->whereReadAt(null)->count();
-        // 对话人数
-        $builder = WebSocketDialogUser::whereDialogId($dialog->id);
-        $dialog->people = $builder->count();
-        // 对方信息
-        $dialog->dialog_user = null;
-        $dialog->group_info = null;
-        switch ($dialog->type) {
-            case "user":
-                $dialog_user = $builder->where('userid', '!=', $userid)->first();
-                $dialog->name = User::userid2nickname($dialog_user->userid);
-                $dialog->dialog_user = $dialog_user;
-                break;
-            case "group":
-                if ($dialog->group_type === 'project') {
-                    $dialog->group_info = Project::withTrashed()->select(['id', 'name', 'archived_at', 'deleted_at'])->whereDialogId($dialog->id)->first()?->cancelAppend()->cancelHidden();
-                    $dialog->name = $dialog->group_info ? $dialog->group_info->name : '';
-                } elseif ($dialog->group_type === 'task') {
-                    $dialog->group_info = ProjectTask::withTrashed()->select(['id', 'name', 'complete_at', 'archived_at', 'deleted_at'])->whereDialogId($dialog->id)->first()?->cancelAppend()->cancelHidden();
-                    $dialog->name = $dialog->group_info ? $dialog->group_info->name : '';
-                }
-                break;
+            WebSocketDialogMsgRead::forceRead($dialog_id, $userid);
+            throw new ApiException('不在成员列表内', ['dialog_id' => $dialog_id], -4003);
         }
         return $dialog;
     }
@@ -134,17 +641,19 @@ class WebSocketDialog extends AbstractModel
     /**
      * 创建聊天室
      * @param string $name          聊天室名称
-     * @param int|array $userid     加入的会员ID或会员ID组
+     * @param int|array $userid     加入的会员ID(组)
      * @param string $group_type    聊天室类型
+     * @param int $owner_id         群主会员ID
      * @return self|null
      */
-    public static function createGroup($name, $userid, $group_type = '')
+    public static function createGroup($name, $userid, $group_type = '', $owner_id = 0)
     {
-        return AbstractModel::transaction(function () use ($userid, $group_type, $name) {
+        return AbstractModel::transaction(function () use ($owner_id, $userid, $group_type, $name) {
             $dialog = self::createInstance([
                 'type' => 'group',
                 'name' => $name ?: '',
                 'group_type' => $group_type,
+                'owner_id' => $owner_id,
             ]);
             $dialog->save();
             foreach (is_array($userid) ? $userid : [$userid] as $value) {
@@ -152,6 +661,8 @@ class WebSocketDialog extends AbstractModel
                     WebSocketDialogUser::createInstance([
                         'dialog_id' => $dialog->id,
                         'userid' => $value,
+                        'important' => !in_array($group_type, ['user', 'all']),
+                        'last_at' => in_array($group_type, ['user', 'department', 'all']) ? Carbon::now() : null,
                     ])->save();
                 }
             }
@@ -159,80 +670,124 @@ class WebSocketDialog extends AbstractModel
         });
     }
 
-    /**
-     * 加入聊天室
-     * @param int $dialog_id        会话ID（即 聊天室ID）
-     * @param int|array $userid     加入的会员ID或会员ID组
-     * @return bool
-     */
-    public static function joinGroup($dialog_id, $userid)
-    {
-        $dialog = self::whereId($dialog_id)->whereType('group')->first();
-        if (empty($dialog)) {
-            return false;
-        }
-        AbstractModel::transaction(function () use ($dialog, $userid) {
-            foreach (is_array($userid) ? $userid : [$userid] as $value) {
-                if ($value > 0) {
-                    WebSocketDialogUser::createInstance([
-                        'dialog_id' => $dialog->id,
-                        'userid' => $value,
-                    ])->save();
-                }
-            }
-        });
-        return true;
-    }
-
-    /**
-     * 退出聊天室
-     * @param int $dialog_id        会话ID（即 聊天室ID）
-     * @param int|array $userid     加入的会员ID或会员ID组
-     * @return bool
-     */
-    public static function exitGroup($dialog_id, $userid)
-    {
-        if (is_array($userid)) {
-            WebSocketDialogUser::whereDialogId($dialog_id)->whereIn('userid', $userid)->delete();
-        } else {
-            WebSocketDialogUser::whereDialogId($dialog_id)->whereUserid($userid)->delete();
-        }
-        return true;
-    }
-
     /**
      * 获取会员对话（没有自动创建）
-     * @param int $userid   会员ID
-     * @param int $userid2  另一个会员ID
+     * @param User $user    发起会话的会员
+     * @param int $receiver  另一个会员ID
      * @return self|null
      */
-    public static function checkUserDialog($userid, $userid2)
+    public static function checkUserDialog($user, $receiver)
     {
+        if ($user->userid == $receiver) {
+            $receiver = 0;
+        }
         $dialogUser = self::select(['web_socket_dialogs.*'])
             ->join('web_socket_dialog_users as u1', 'web_socket_dialogs.id', '=', 'u1.dialog_id')
             ->join('web_socket_dialog_users as u2', 'web_socket_dialogs.id', '=', 'u2.dialog_id')
-            ->where('u1.userid', $userid)
-            ->where('u2.userid', $userid2)
+            ->where('u1.userid', $user->userid)
+            ->where('u2.userid', $receiver)
             ->where('web_socket_dialogs.type', 'user')
             ->first();
         if ($dialogUser) {
             return $dialogUser;
         }
-        return AbstractModel::transaction(function () use ($userid2, $userid) {
+        if ($receiver > 0 && $user->isTemp() && !User::whereUserid($receiver)->whereBot(1)->exists() ) {
+            throw new ApiException('无法发起会话，请联系管理员。');
+        }
+        return AbstractModel::transaction(function () use ($receiver, $user) {
             $dialog = self::createInstance([
                 'type' => 'user',
             ]);
             $dialog->save();
             WebSocketDialogUser::createInstance([
                 'dialog_id' => $dialog->id,
-                'userid' => $userid,
+                'userid' => $user->userid,
             ])->save();
             WebSocketDialogUser::createInstance([
                 'dialog_id' => $dialog->id,
-                'userid' => $userid2,
+                'userid' => $receiver,
             ])->save();
             return $dialog;
         });
     }
 
+    /**
+     * 发送消息文件
+     *
+     * @param User $user 发起会话的会员
+     * @param array $dialogIds 对话id
+     * @param file $files 文件对象
+     * @param string $image64 base64文件
+     * @param string $fileName 文件名称
+     * @param int $replyId 恢复id
+     * @param int $imageAttachment
+     * @return array
+     */
+    public static function sendMsgFiles($user, $dialogIds, $files, $image64, $fileName, $replyId, $imageAttachment)
+    {
+        $filePath = '';
+        $result = [];
+        foreach ($dialogIds as $dialog_id) {
+            $dialog = WebSocketDialog::checkDialog($dialog_id);
+            //
+            $action = $replyId > 0 ? "reply-$replyId" : "";
+            $path = "uploads/chat/" . date("Ym") . "/" . $dialog_id . "/";
+            if ($image64) {
+                $data = Base::image64save([
+                    "image64" => $image64,
+                    "path" => $path,
+                    "fileName" => $fileName,
+                ]);
+            } else if ($filePath) {
+                Base::makeDir(public_path($path));
+                copy($filePath, public_path($path) . basename($filePath));
+            } else {
+                $setting = Base::setting('system');
+                $data = Base::upload([
+                    "file" => $files,
+                    "type" => 'more',
+                    "path" => $path,
+                    "fileName" => $fileName,
+                    "size" => ($setting['file_upload_limit'] ?: 0) * 1024
+                ]);
+            }
+            //
+            if (Base::isError($data)) {
+                throw new ApiException($data['msg']);
+            } else {
+                $fileData = $data['data'];
+                $filePath = $fileData['file'];
+                $fileName = $fileData['name'];
+                $fileData['thumb'] = Base::unFillUrl($fileData['thumb']);
+                $fileData['size'] *= 1024;
+                //
+                if ($dialog->type === 'group' && $dialog->group_type === 'task') {                // 任务群组保存文件
+                    if ($imageAttachment || !in_array($fileData['ext'], File::imageExt)) {         // 如果是图片不保存
+                        $task = ProjectTask::whereDialogId($dialog->id)->first();
+                        if ($task) {
+                            $file = ProjectTaskFile::createInstance([
+                                'project_id' => $task->project_id,
+                                'task_id' => $task->id,
+                                'name' => $fileData['name'],
+                                'size' => $fileData['size'],
+                                'ext' => $fileData['ext'],
+                                'path' => $fileData['path'],
+                                'thumb' => $fileData['thumb'],
+                                'userid' => $user->userid,
+                            ]);
+                            $file->save();
+                        }
+                    }
+                }
+                //
+                $result = WebSocketDialogMsg::sendMsg($action, $dialog_id, 'file', $fileData, $user->userid);
+                if (Base::isSuccess($result)) {
+                    if (isset($task)) {
+                        $result['data']['task_id'] = $task->id;
+                    }
+                }
+            }
+        }
+        return $result;
+    }
 }

app/Models/WebSocketDialogMsgRead.php

@@ -2,23 +2,38 @@
 
 namespace App\Models;
 
+use Carbon\Carbon;
+
 /**
  * App\Models\WebSocketDialogMsgRead
  *
  * @property int $id
  * @property int|null $dialog_id 对话ID
  * @property int|null $msg_id 消息ID
- * @property int|null $userid 发送会员ID
+ * @property int|null $userid 接收会员ID
+ * @property int|null $mention 是否提及（被@）
+ * @property int|null $silence 是否免打扰：0否，1是
+ * @property int|null $email 是否发了邮件
  * @property int|null $after 在阅读之后才添加的记录
  * @property string|null $read_at 阅读时间
+ * @property-read \App\Models\WebSocketDialogMsg|null $webSocketDialogMsg
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereAfter($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereDialogId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereEmail($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereMention($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereMsgId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereReadAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereSilence($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereUserid($value)
  * @mixin \Eloquent
  */
@@ -29,4 +44,52 @@ class WebSocketDialogMsgRead extends AbstractModel
         parent::__construct($attributes);
         $this->timestamps = false;
     }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function webSocketDialogMsg(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(WebSocketDialogMsg::class, 'id', 'msg_id');
+    }
+
+    /**
+     * 强制标记成阅读
+     * @param $dialogId
+     * @param $userId
+     * @return void
+     */
+    public static function forceRead($dialogId, $userId)
+    {
+        self::whereDialogId($dialogId)
+            ->whereUserid($userId)
+            ->whereNull('read_at')
+            ->update(['read_at' => Carbon::now()]);
+    }
+
+    /**
+     * 仅标记成阅读
+     * @param $list
+     * @return void
+     */
+    public static function onlyMarkRead($list)
+    {
+        $dialogMsg = [];
+        /** @var WebSocketDialogMsgRead $item */
+        foreach ($list as $item) {
+            $item->read_at = Carbon::now();
+            $item->save();
+            if (isset($dialogMsg[$item->msg_id])) {
+                $dialogMsg[$item->msg_id]['readNum']++;
+            } else {
+                $dialogMsg[$item->msg_id] = [
+                    'dialogMsg' => $item->webSocketDialogMsg,
+                    'readNum' => 1
+                ];
+            }
+        }
+        foreach ($dialogMsg as $item) {
+            $item['dialogMsg']?->generatePercentage($item['readNum']);
+        }
+    }
 }

app/Models/WebSocketDialogMsgTodo.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\WebSocketDialogMsgTodo
+ *
+ * @property int $id
+ * @property int|null $dialog_id 对话ID
+ * @property int|null $msg_id 消息ID
+ * @property int|null $userid 接收会员ID
+ * @property string|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/WebSocketDialogUser.php

@@ -2,25 +2,71 @@
 
 namespace App\Models;
 
+use Carbon\Carbon;
+
 /**
  * App\Models\WebSocketDialogUser
  *
  * @property int $id
  * @property int|null $dialog_id 对话ID
  * @property int|null $userid 会员ID
+ * @property string|null $top_at 置顶时间
+ * @property string|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 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.v';
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function webSocketDialog(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(WebSocketDialog::class, 'id', 'dialog_id');
+    }
+
+    /**
+     * 更新对话最后消息时间
+     * @return WebSocketDialogMsg|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Model|\Illuminate\Database\Query\Builder|object|null
+     */
+    public static function updateMsgLastAt($dialogId)
+    {
+        $lastMsg = WebSocketDialogMsg::whereDialogId($dialogId)->orderByDesc('id')->first();
+        if ($lastMsg) {
+            WebSocketDialogUser::whereDialogId($dialogId)->change(['last_at' => $lastMsg->created_at]);
+        }
+        return $lastMsg;
+    }
 }

app/Models/WebSocketTmpMsg.php

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

app/Models/clearHelper.php

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

app/Module/AgoraIO/AccessToken.php

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

app/Module/AgoraIO/AgoraTokenGenerator.php

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

app/Module/AgoraIO/Message.php

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

app/Module/BillExport.php

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

app/Module/BillImport.php

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

app/Module/BillMultipleExport.php

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

app/Module/Doo.php

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

app/Module/Extranet.php

@@ -0,0 +1,358 @@
+<?php
+
+namespace App\Module;
+
+use Cache;
+use Carbon\Carbon;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Config;
+
+/**
+ * 外网资源请求
+ */
+class Extranet
+{
+    /**
+     * 通过 openAI 语音转文字
+     * @param string $filePath
+     * @return array
+     */
+    public static function openAItranscriptions($filePath)
+    {
+        if (!file_exists($filePath)) {
+            return Base::retError("语音文件不存在");
+        }
+        $systemSetting = Base::setting('system');
+        $aibotSetting = Base::setting('aibotSetting');
+        if ($systemSetting['voice2text'] !== 'open' || empty($aibotSetting['openai_key'])) {
+            return Base::retError("语音转文字功能未开启");
+        }
+        //
+        $extra = [
+            'Content-Type' => 'multipart/form-data',
+            'Authorization' => 'Bearer ' . $aibotSetting['openai_key'],
+        ];
+        if ($aibotSetting['openai_agency']) {
+            $extra['CURLOPT_PROXY'] = $aibotSetting['openai_agency'];
+            if (str_contains($aibotSetting['openai_agency'], 'socks')) {
+                $extra['CURLOPT_PROXYTYPE'] = CURLPROXY_SOCKS5;
+            } else {
+                $extra['CURLOPT_PROXYTYPE'] = CURLPROXY_HTTP;
+            }
+        }
+        $res = Ihttp::ihttp_request('https://api.openai.com/v1/audio/transcriptions', [
+            'file' => new \CURLFile($filePath),
+            'model' => 'whisper-1'
+        ], $extra, 15);
+        if (Base::isError($res)) {
+            return Base::retError("语音转文字失败", $res);
+        }
+        $resData = Base::json2array($res['data']);
+        if (empty($resData['text'])) {
+            return Base::retError("语音转文字失败", $resData);
+        }
+        //
+        return Base::retSuccess("success", $resData['text']);
+    }
+
+    /**
+     * 获取IP地址经纬度
+     * @param string $ip
+     * @return array
+     */
+    public static function getIpGcj02(string $ip = ''): array
+    {
+        if (empty($ip)) {
+            $ip = Base::getIp();
+        }
+        $cacheKey = "getIpPoint::" . md5($ip);
+        $result = Cache::rememberForever($cacheKey, function () use ($ip) {
+            return Ihttp::ihttp_request("https://www.ifreesite.com/ipaddress/address.php?q=" . $ip, [], [], 12);
+        });
+        if (Base::isError($result)) {
+            Cache::forget($cacheKey);
+            return $result;
+        }
+        $data = $result['data'];
+        $lastPos = strrpos($data, ',');
+        $long = floatval(Base::getMiddle(substr($data, $lastPos + 1), null, ')'));
+        $lat = floatval(Base::getMiddle(substr($data, strrpos(substr($data, 0, $lastPos), ',') + 1), null, ','));
+        return Base::retSuccess("success", [
+            'long' => $long,
+            'lat' => $lat,
+        ]);
+    }
+
+    /**
+     * 百度接口：根据ip获取经纬度
+     * @param string $ip
+     * @return array
+     */
+    public static function getIpGcj02ByBaidu(string $ip = ''): array
+    {
+        if (empty($ip)) {
+            $ip = Base::getIp();
+        }
+
+        $cacheKey = "getIpPoint::" . md5($ip);
+        $result = Cache::rememberForever($cacheKey, function () use ($ip) {
+            $ak = Config::get('app.baidu_app_key');
+            $url = 'http://api.map.baidu.com/location/ip?ak=' . $ak . '&ip=' . $ip . '&coor=bd09ll';
+            return Ihttp::ihttp_request($url, [], [], 12);
+        });
+
+        if (Base::isError($result)) {
+            Cache::forget($cacheKey);
+            return $result;
+        }
+        $data = json_decode($result['data'], true);
+
+        // x坐标纬度, y坐标经度
+        $long = Arr::get($data, 'content.point.x');
+        $lat = Arr::get($data, 'content.point.y');
+        return Base::retSuccess("success", [
+            'long' => $long,
+            'lat' => $lat,
+        ]);
+    }
+
+    /**
+     * 获取IP地址详情
+     * @param string $ip
+     * @return array
+     */
+    public static function getIpInfo(string $ip = ''): array
+    {
+        if (empty($ip)) {
+            $ip = Base::getIp();
+        }
+        $cacheKey = "getIpInfo::" . md5($ip);
+        $result = Cache::rememberForever($cacheKey, function () use ($ip) {
+            return Ihttp::ihttp_request("http://ip.taobao.com/service/getIpInfo.php?accessKey=alibaba-inc&ip=" . $ip, [], [], 12);
+        });
+        if (Base::isError($result)) {
+            Cache::forget($cacheKey);
+            return $result;
+        }
+        $data = json_decode($result['data'], true);
+        if (!is_array($data) || intval($data['code']) != 0) {
+            Cache::forget($cacheKey);
+            return Base::retError("error ip: -1");
+        }
+        $data = $data['data'];
+        if (!is_array($data) || !isset($data['country'])) {
+            return Base::retError("error ip: -2");
+        }
+        $data['text'] = $data['country'];
+        $data['textSmall'] = $data['country'];
+        if ($data['region'] && $data['region'] != $data['country'] && $data['region'] != "XX") {
+            $data['text'] .= " " . $data['region'];
+            $data['textSmall'] = $data['region'];
+        }
+        if ($data['city'] && $data['city'] != $data['region'] && $data['city'] != "XX") {
+            $data['text'] .= " " . $data['city'];
+            $data['textSmall'] .= " " . $data['city'];
+        }
+        if ($data['county'] && $data['county'] != $data['city'] && $data['county'] != "XX") {
+            $data['text'] .= " " . $data['county'];
+            $data['textSmall'] .= " " . $data['county'];
+        }
+        return Base::retSuccess("success", $data);
+    }
+
+    /**
+     * 判断是否工作日
+     * @param string $Ymd 年月日（如：20220102）
+     * @return int
+     * 0: 工作日
+     * 1: 非工作日
+     * 2: 获取不到远程数据的非工作日（周六、日）
+     * 所以可以用>0来判断是否工作日
+     */
+    public static function isHoliday(string $Ymd): int
+    {
+        $time = strtotime($Ymd . " 00:00:00");
+        $holidayKey = "holiday::" . date("Ym", $time);
+        $holidayData = Cache::remember($holidayKey, now()->addMonth(), function () use ($time) {
+            $apiMonth = date("Ym", $time);
+            $apiResult = Ihttp::ihttp_request("https://api.apihubs.cn/holiday/get?field=date&month={$apiMonth}&workday=2&size=31", [], [], 20);
+            if (Base::isError($apiResult)) {
+                info('[holiday] get error');
+                return [];
+            }
+            $apiResult = Base::json2array($apiResult['data']);
+            if ($apiResult['code'] !== 0) {
+                info('[holiday] result error');
+                return [];
+            }
+            return array_map(function ($item) {
+                return $item['date'];
+            }, $apiResult['data']['list']);
+        });
+        if (empty($holidayData)) {
+            Cache::forget($holidayKey);
+            return in_array(date("w", $time), [0, 6]) ? 2 : 0;
+        }
+        return in_array($Ymd, $holidayData) ? 1 : 0;
+    }
+
+    /**
+     * Drawio 图标搜索
+     * @param $query
+     * @param $page
+     * @param $size
+     * @return array
+     */
+    public static function drawioIconSearch($query, $page, $size): array
+    {
+        $result = self::curl("https://app.diagrams.net/iconSearch?q={$query}&p={$page}&c={$size}", 15 * 86400);
+        if ($result = Base::json2array($result)) {
+            return $result;
+        }
+        return [
+            'icons' => [],
+            'total_count' => 0
+        ];
+    }
+
+    /**
+     * 随机笑话接口
+     * @return string
+     */
+    public static function randJoke(): string
+    {
+        $data = self::curl("https://hmajax.itheima.net/api/randjoke");
+        $data = Base::json2array($data);
+        if ($data['message'] === '获取成功' && $text = trim($data['data'])) {
+            return $text;
+        }
+        return "";
+    }
+
+    /**
+     * 心灵鸡汤
+     * @return string
+     */
+    public static function soups(): string
+    {
+        $data = self::curl("https://hmajax.itheima.net/api/ambition");
+        $data = Base::json2array($data);
+        if ($data['message'] === '获取成功' && $text = trim($data['data'])) {
+            return $text;
+        }
+        return "";
+    }
+
+    /**
+     * 签到机器人网络内容
+     * @param $type
+     * @return string
+     */
+    public static function checkinBotQuickMsg($type): string
+    {
+        $text = "维护中...";
+        switch ($type) {
+            case "it":
+                $data = self::curl('http://vvhan.api.hitosea.com/api/hotlist?type=itNews', 3600);
+                if ($data = Base::json2array($data)) {
+                    $i = 1;
+                    $array = array_map(function ($item) use (&$i) {
+                        if ($item['title'] && $item['desc']) {
+                            return "<p>" . ($i++) . ". <strong><a href='{$item['mobilUrl']}' target='_blank'>{$item['title']}</a></strong></p><p>{$item['desc']}</p>";
+                        } else {
+                            return null;
+                        }
+                    }, $data['data']);
+                    $array = array_values(array_filter($array));
+                    if ($array) {
+                        array_unshift($array, "<p><strong>{$data['title']}</strong>（{$data['update_time']}）</p>");
+                        $text = implode("<p>&nbsp;</p>", $array);
+                    }
+                }
+                break;
+
+            case "36ke":
+                $data = self::curl('http://vvhan.api.hitosea.com/api/hotlist?type=36Ke', 3600);
+                if ($data = Base::json2array($data)) {
+                    $i = 1;
+                    $array = array_map(function ($item) use (&$i) {
+                        if ($item['title'] && $item['desc']) {
+                            return "<p>" . ($i++) . ". <strong><a href='{$item['mobilUrl']}' target='_blank'>{$item['title']}</a></strong></p><p>{$item['desc']}</p>";
+                        } else {
+                            return null;
+                        }
+                    }, $data['data']);
+                    $array = array_values(array_filter($array));
+                    if ($array) {
+                        array_unshift($array, "<p><strong>{$data['title']}</strong>（{$data['update_time']}）</p>");
+                        $text = implode("<p>&nbsp;</p>", $array);
+                    }
+                }
+                break;
+
+            case "60s":
+                $data = self::curl('http://vvhan.api.hitosea.com/api/60s?type=json', 3600);
+                if ($data = Base::json2array($data)) {
+                    $i = 1;
+                    $array = array_map(function ($item) use (&$i) {
+                        if ($item) {
+                            return "<p>" . ($i++) . ". {$item}</p>";
+                        } else {
+                            return null;
+                        }
+                    }, $data['data']);
+                    $array = array_values(array_filter($array));
+                    if ($array) {
+                        array_unshift($array, "<p><strong>{$data['name']}</strong>（{$data['time'][0]}）</p>");
+                        $text = implode("<p>&nbsp;</p>", $array);
+                    }
+                }
+                break;
+
+            case "joke":
+                $text = "笑话被掏空";
+                $data = self::curl('http://vvhan.api.hitosea.com/api/joke?type=json', 5);
+                if ($data = Base::json2array($data)) {
+                    if ($data = trim($data['joke'])) {
+                        $text = "开心笑话：{$data}";
+                    }
+                }
+                break;
+
+            case "soup":
+                $text = "鸡汤分完了";
+                $data = self::curl('https://api.ayfre.com/jt/?type=bot', 5);
+                if ($data) {
+                    $text = "心灵鸡汤：{$data}";
+                }
+                break;
+        }
+        return $text;
+    }
+
+    /**
+     * @param $url
+     * @param int $cacheSecond 缓存时间（秒），如果结果为空则缓存有效30秒
+     * @param int $timeout
+     * @return string
+     */
+    private static function curl($url, int $cacheSecond = 0, int $timeout = 15): string
+    {
+        if ($cacheSecond > 0) {
+            $key = "curlCache::" . md5($url);
+            $content = Cache::remember($key, Carbon::now()->addSeconds($cacheSecond), function () use ($cacheSecond, $key, $timeout, $url) {
+                $result = Ihttp::ihttp_request($url, [], [], $timeout);
+                $content = Base::isSuccess($result) ? trim($result['data']) : '';
+                if (empty($content) && $cacheSecond > 30) {
+                    Cache::put($key, "", Carbon::now()->addSeconds(30));
+                }
+                return $content;
+            });
+        } else {
+            $result = Ihttp::ihttp_request($url, [], [], $timeout);
+            $content = Base::isSuccess($result) ? trim($result['data']) : '';
+        }
+        //
+        return $content;
+    }
+}

app/Module/Ihttp.php

@@ -2,8 +2,6 @@
 
 namespace App\Module;
 
-use Exception;
-
 @error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
 
 class Ihttp
@@ -37,8 +35,12 @@ class Ihttp
             if($post) {
                 if (is_array($post)) {
                     $filepost = false;
-                    foreach ($post as $name => $value) {
-                        if (is_string($value) && substr($value, 0, 1) == '@') {
+                    foreach ($post as $value) {
+                        if (is_string($value) && str_starts_with($value, '@')) {
+                            $filepost = true;
+                            break;
+                        }
+                        if ($value instanceof \CURLFile) {
                             $filepost = true;
                             break;
                         }
@@ -88,7 +90,7 @@ class Ihttp
                 return Base::retError($error);
             } else {
                 if ($isGb2312) {
-                    try { $data = iconv('GB2312', 'UTF-8', $data); }catch (Exception $e) { }
+                    try { $data = iconv('GB2312', 'UTF-8', $data); }catch (\Throwable) { }
                 }
                 $response = self::ihttp_response_parse($data);
                 Base::addLog([
@@ -148,7 +150,7 @@ class Ihttp
                 $content .= fgets($fp, 512);
             fclose($fp);
             if ($isGb2312) {
-                try { $content = iconv('GB2312', 'UTF-8', $content); }catch (Exception $e) { }
+                try { $content = iconv('GB2312', 'UTF-8', $content); }catch (\Throwable) { }
             }
             $response = self::ihttp_response_parse($content, true);
             Base::addLog([

app/Module/Image.php

@@ -0,0 +1,235 @@
+<?php
+
+namespace App\Module;
+
+use Imagick;
+
+/**
+ * 图片类：缩略图、调整大小、压缩
+ */
+class Image
+{
+    private Imagick $image;
+
+    private string $path;
+
+    private int $height;
+
+    private int $width;
+
+    /**
+     * @param $imagePath
+     * @throws \ImagickException
+     */
+    public function __construct($imagePath) {
+        $this->path = $imagePath;
+        $this->image = new Imagick($this->path);
+        $geo = $this->image->getImageGeometry();
+        $this->height = $geo['height'];
+        $this->width = $geo['width'];
+    }
+
+    /**
+     * 获取图片宽度
+     * @return int
+     */
+    public function getWidth(): int
+    {
+        return $this->width;
+    }
+
+    /**
+     * 获取图片高度
+     * @return int
+     */
+    public function getHeight(): int
+    {
+        return $this->height;
+    }
+
+    /**
+     * 创建缩略图
+     * @param int $width
+     * @param int $height
+     * @param string $mode = 'percentage|cover|contain' ($width 和 $height 都设置的情况下有效)
+     * @return Image
+     * @throws \ImagickException
+     */
+    public function thumb(int $width, int $height, string $mode = 'percentage'): static
+    {
+        if ($height === 0 && $width === 0) {
+            return $this;
+        }
+        if ($width && $height) {
+            if ($mode === 'cover') {
+                // 铺满背景（超出被裁掉）
+                $this->image->cropThumbnailImage($width, $height);
+            } else {
+                // 等比缩放
+                if ($this->width >= $this->height) {
+                    $this->image->thumbnailImage($width, 0);
+                } else {
+                    $this->image->thumbnailImage(0, $height);
+                }
+                if ($mode === 'contain') {
+                    // 显示完整的图
+                    $background = new Imagick();
+                    $background->newImage($width, $height, 'none', strtolower(pathinfo($this->path, PATHINFO_EXTENSION)));
+                    $bg_width = $background->getImageWidth();
+                    $bg_height = $background->getImageHeight();
+                    $img_width = $this->image->getImageWidth();
+                    $img_height = $this->image->getImageHeight();
+                    if ($img_width / $bg_width > $img_height / $bg_height) {
+                        $width = $bg_width;
+                        $height = intval($img_height / ($img_width / $width));
+                    } else {
+                        $height = $bg_height;
+                        $width = intval($img_width / ($img_height / $height));
+                    }
+                    $this->image->resizeImage($width, $height, Imagick::FILTER_LANCZOS, 1);
+                    $x = intval(($bg_width - $width) / 2);
+                    $y = intval(($bg_height - $height) / 2);
+                    $background->compositeImage($this->image, Imagick::COMPOSITE_DEFAULT, $x, $y);
+                    $this->image->destroy();
+                    $this->image = $background;
+                }
+            }
+        } else {
+            $this->image->thumbnailImage($width, $height);
+        }
+        return $this;
+    }
+
+    /**
+     * 调整图像大小
+     * @param int $width
+     * @param int $height
+     * @return Image
+     * @throws \ImagickException
+     */
+    public function resize(int $width, int $height): static
+    {
+        if ($height === 0 && $width === 0) {
+            return $this;
+        }
+        $this->image->adaptiveResizeImage($width, $height);
+        return $this;
+    }
+
+    /**
+     * 压缩图片
+     * @param int $quality
+     * @return $this
+     * @throws \ImagickException
+     */
+    public function compress(int $quality = 100): static
+    {
+        $format = strtolower($this->image->getImageFormat());
+        switch ($format) {
+            case 'jpeg':
+            case 'jpg':
+                $this->image->setImageCompression(Imagick::COMPRESSION_JPEG);
+                break;
+            case 'png':
+                $this->image->setImageCompression(Imagick::COMPRESSION_ZIP);
+                break;
+            case 'gif':
+                $this->image->setImageCompression(Imagick::COMPRESSION_LZW);
+                break;
+            default:
+                return $this;
+        }
+        if ($quality > 1) {
+            $this->image->setImageCompressionQuality($quality);
+        } elseif ($quality > 0) {
+            $this->image->setImageCompressionQuality($quality * 100);
+        } else {
+            $this->image->setImageCompressionQuality(100);
+        }
+        return $this;
+    }
+
+    /**
+     * 保存结果到文件
+     * @param string $savePath Save path
+     * @return void
+     * @throws \ImagickException
+     */
+    public function saveTo(string $savePath): void
+    {
+        $this->image->writeImage($savePath);
+        $this->image->destroy();
+    }
+
+    /** ******************************************************************************/
+    /** ******************************************************************************/
+    /** ******************************************************************************/
+
+    /**
+     * 生成缩略图
+     * @param string $imagePath 图片路径
+     * @param string $savePath  保存路径
+     * @param int $width        宽度
+     * @param int $height       高度
+     * @param string $mode      模式（percentage|cover|contain）
+     * @return string|null      成功返回图片后缀，失败返回 false
+     */
+    public static function thumbImage(string $imagePath, string $savePath, int $width, int $height, string $mode = 'percentage'): ?string
+    {
+        if (!file_exists($imagePath)) {
+            return null;
+        }
+        try {
+            $extension = strtolower(pathinfo($imagePath, PATHINFO_EXTENSION));
+            if (str_contains($savePath, '.{*}')) {
+                $savePath = str_replace('.{*}', '.' . $extension, $savePath);
+            }
+            $image = new Image($imagePath);
+            $image->thumb($width, $height, $mode);
+            $image->saveTo($savePath);
+            return $extension;
+        } catch (\ImagickException) {
+            return null;
+        }
+    }
+
+    /**
+     * 压缩图片
+     * @param string $imagePath     图片路径
+     * @param string|null $savePath 保存路径（默认覆盖原图）
+     * @param int $quality          压缩质量（0-100）
+     * @param float $minSize        最小尺寸（单位：KB）
+     * @return bool
+     */
+    public static function compressImage(string $imagePath, string $savePath = null, int $quality = 100, float $minSize = 10): bool
+    {
+        if (Base::settingFind("system", "image_compress") === 'close') {
+            return false;
+        }
+        if (!file_exists($imagePath)) {
+            return false;
+        }
+        $imageSize = filesize($imagePath);
+        if ($minSize > 0 && $imageSize < $minSize * 1024) {
+            return false;
+        }
+        if (empty($savePath)) {
+            $savePath = $imagePath;
+        }
+        $tmpPath = $imagePath . '.compress.tmp';
+        try {
+            $image = new Image($imagePath);
+            $image->compress($quality);
+            $image->saveTo($tmpPath);
+            if (filesize($tmpPath) >= $imageSize) {
+                copy($imagePath, $savePath);
+                unlink($tmpPath);
+            } else {
+                rename($tmpPath, $savePath);
+            }
+            return true;
+        } catch (\ImagickException) {
+            return false;
+        }
+    }
+}

app/Module/RandomColor.php

@@ -0,0 +1,390 @@
+<?php
+/**
+ * RandomColor 1.0.5
+ *
+ * PHP port of David Merfield JavaScript randomColor
+ * https://github.com/davidmerfield/randomColor
+ *
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014-2022 Damien "Mistic" Sorel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace App\Module;
+
+class RandomColor
+{
+    static public $dictionary = null;
+
+    private function __construct() {}
+
+    static public function one($options = array())
+    {
+        $h = self::_pickHue($options);
+        $s = self::_pickSaturation($h, $options);
+        $v = self::_pickBrightness($h, $s, $options);
+
+        return self::format(compact('h','s','v'), @$options['format']);
+    }
+
+    static public function many($count, $options = array())
+    {
+        $colors = array();
+
+        for ($i = 0; $i < $count; $i++)
+        {
+            $colors[] = self::one($options);
+        }
+
+        return $colors;
+    }
+
+    static public function format($hsv, $format='hex')
+    {
+        switch ($format)
+        {
+            case 'hsv':
+                return $hsv;
+
+            case 'hsl':
+                return self::hsv2hsl($hsv);
+
+            case 'hslCss':
+                $hsl = self::hsv2hsl($hsv);
+                return 'hsl(' . $hsl['h'] . ',' . $hsl['s'] . '%,' . $hsl['l'] . '%)';
+
+            case 'rgb':
+                return self::hsv2rgb($hsv);
+
+            case 'rgbCss':
+                return 'rgb(' . implode(',', self::hsv2rgb($hsv)) . ')';
+
+            case 'hex':
+            default:
+                return self::hsv2hex($hsv);
+        }
+    }
+
+    static private function _pickHue($options)
+    {
+        $range = self::_getHueRange($options);
+
+        if (empty($range))
+        {
+            return 0;
+        }
+
+        $hue = self::_rand($range, $options);
+
+        // Instead of storing red as two separate ranges,
+        // we group them, using negative numbers
+        if ($hue < 0)
+        {
+            $hue = 360 + $hue;
+        }
+
+        return $hue;
+    }
+
+    static private function _pickSaturation($h, $options)
+    {
+        if (@$options['hue'] === 'monochrome')
+        {
+            return 0;
+        }
+        if (@$options['luminosity'] === 'random')
+        {
+            return self::_rand(array(0, 100), $options);
+        }
+
+        $colorInfo = self::_getColorInfo($h);
+        $range = $colorInfo['s'];
+
+        switch (@$options['luminosity'])
+        {
+            case 'bright':
+                $range[0] = 55;
+                break;
+
+            case 'dark':
+                $range[0] = $range[1] - 10;
+                break;
+
+            case 'light':
+                $range[1] = 55;
+                break;
+        }
+
+        return self::_rand($range, $options);
+    }
+
+    static private function _pickBrightness($h, $s, $options)
+    {
+        if (@$options['luminosity'] === 'random')
+        {
+            $range = array(0, 100);
+        }
+        else
+        {
+            $range = array(
+                self::_getMinimumBrightness($h, $s),
+                100
+            );
+
+            switch (@$options['luminosity'])
+            {
+                case 'dark':
+                    $range[1] = $range[0] + 20;
+                    break;
+
+                case 'light':
+                    $range[0] = round(($range[1] + $range[0]) / 2);
+                    break;
+            }
+        }
+
+        return self::_rand($range, $options);
+    }
+
+    static private function _getHueRange($options)
+    {
+        $ranges = array();
+
+        if (isset($options['hue']))
+        {
+            if (!is_array($options['hue']))
+            {
+                $options['hue'] = array($options['hue']);
+            }
+
+            foreach ($options['hue'] as $hue)
+            {
+                if ($hue === 'random')
+                {
+                    $ranges[] = array(0, 360);
+                }
+                else if (isset(self::$dictionary[$hue]))
+                {
+                    $ranges[] = self::$dictionary[$hue]['h'];
+                }
+                else if (is_numeric($hue))
+                {
+                    $hue = intval($hue);
+
+                    if ($hue <= 360 && $hue >= 0)
+                    {
+                        $ranges[] = array($hue, $hue);
+                    }
+                }
+            }
+        }
+
+        if (($l = count($ranges)) === 0)
+        {
+            return array(0, 360);
+        }
+        else if ($l === 1)
+        {
+            return $ranges[0];
+        }
+        else
+        {
+            return $ranges[self::_rand(array(0, $l-1), $options)];
+        }
+    }
+
+    static private function _getMinimumBrightness($h, $s)
+    {
+        $colorInfo = self::_getColorInfo($h);
+        $bounds = $colorInfo['bounds'];
+
+        for ($i = 0, $l = count($bounds); $i < $l - 1; $i++)
+        {
+            $s1 = $bounds[$i][0];
+            $v1 = $bounds[$i][1];
+            $s2 = $bounds[$i+1][0];
+            $v2 = $bounds[$i+1][1];
+
+            if ($s >= $s1 && $s <= $s2)
+            {
+                $m = ($v2 - $v1) / ($s2 - $s1);
+                $b = $v1 - $m * $s1;
+                return round($m * $s + $b);
+            }
+        }
+
+        return 0;
+    }
+
+    static private function _getColorInfo($h)
+    {
+        // Maps red colors to make picking hue easier
+        if ($h >= 334 && $h <= 360)
+        {
+            $h-= 360;
+        }
+
+        foreach (self::$dictionary as $color)
+        {
+            if ($color['h'] !== null && $h >= $color['h'][0] && $h <= $color['h'][1])
+            {
+                return $color;
+            }
+        }
+    }
+
+    static private function _rand($bounds, $options)
+    {
+        if (isset($options['prng']))
+        {
+            return $options['prng']($bounds[0], $bounds[1]);
+        }
+        else
+        {
+            return mt_rand($bounds[0], $bounds[1]);
+        }
+    }
+
+    static public function hsv2hex($hsv)
+    {
+        $rgb = self::hsv2rgb($hsv);
+        $hex = '#';
+
+        foreach ($rgb as $c)
+        {
+            $hex.= str_pad(dechex($c), 2, '0', STR_PAD_LEFT);
+        }
+
+        return $hex;
+    }
+
+    static public function hsv2hsl($hsv)
+    {
+        extract($hsv);
+
+        $s/= 100;
+        $v/= 100;
+        $k = (2-$s)*$v;
+
+        return array(
+            'h' => $h,
+            's' => round($s*$v / ($k < 1 ? $k : 2-$k), 4) * 100,
+            'l' => $k/2 * 100,
+        );
+    }
+
+    static public function hsv2rgb($hsv)
+    {
+        extract($hsv);
+
+        $h/= 360;
+        $s/= 100;
+        $v/= 100;
+
+        $i = floor($h * 6);
+        $f = $h * 6 - $i;
+
+        $m = $v * (1 - $s);
+        $n = $v * (1 - $s * $f);
+        $k = $v * (1 - $s * (1 - $f));
+
+        $r = 1;
+        $g = 1;
+        $b = 1;
+
+        switch ($i)
+        {
+            case 0:
+                list($r,$g,$b) = array($v,$k,$m);
+                break;
+            case 1:
+                list($r,$g,$b) = array($n,$v,$m);
+                break;
+            case 2:
+                list($r,$g,$b) = array($m,$v,$k);
+                break;
+            case 3:
+                list($r,$g,$b) = array($m,$n,$v);
+                break;
+            case 4:
+                list($r,$g,$b) = array($k,$m,$v);
+                break;
+            case 5:
+            case 6:
+                list($r,$g,$b) = array($v,$m,$n);
+                break;
+        }
+
+        return array(
+            'r' => floor($r*255),
+            'g' => floor($g*255),
+            'b' => floor($b*255),
+        );
+    }
+}
+
+/*
+ * h=hueRange
+ * s=saturationRange : bounds[0][0] ; bounds[-][0]
+ */
+RandomColor::$dictionary = array(
+    'monochrome' => array(
+        'bounds' => array(array(0,0), array(100,0)),
+        'h' => NULL,
+        's' => array(0,100)
+    ),
+    'red' => array(
+        'bounds' => array(array(20,100),array(30,92),array(40,89),array(50,85),array(60,78),array(70,70),array(80,60),array(90,55),array(100,50)),
+        'h' => array(-26,18),
+        's' => array(20,100)
+    ),
+    'orange' => array(
+        'bounds' => array(array(20,100),array(30,93),array(40,88),array(50,86),array(60,85),array(70,70),array(100,70)),
+        'h' => array(19,46),
+        's' => array(20,100)
+    ),
+    'yellow' => array(
+        'bounds' => array(array(25,100),array(40,94),array(50,89),array(60,86),array(70,84),array(80,82),array(90,80),array(100,75)),
+        'h' => array(47,62),
+        's' => array(25,100)
+    ),
+    'green' => array(
+        'bounds' => array(array(30,100),array(40,90),array(50,85),array(60,81),array(70,74),array(80,64),array(90,50),array(100,40)),
+        'h' => array(63,178),
+        's' => array(30,100)
+    ),
+    'blue' => array(
+        'bounds' => array(array(20,100),array(30,86),array(40,80),array(50,74),array(60,60),array(70,52),array(80,44),array(90,39),array(100,35)),
+        'h' => array(179,257),
+        's' => array(20,100)
+    ),
+    'purple' => array(
+        'bounds' => array(array(20,100),array(30,87),array(40,79),array(50,70),array(60,65),array(70,59),array(80,52),array(90,45),array(100,42)),
+        'h' => array(258,282),
+        's' => array(20,100)
+    ),
+    'pink' => array(
+        'bounds' => array(array(20,100),array(30,90),array(40,86),array(60,84),array(80,80),array(90,75),array(100,73)),
+        'h' => array(283,334),
+        's' => array(20,100)
+    )
+);

app/Module/TimeRange.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Module;
+
+use Carbon\Carbon;
+
+class TimeRange
+{
+    public ?Carbon $updated;
+    public ?Carbon $deleted;
+
+    /**
+     * @param $data
+     */
+    public function __construct($data)
+    {
+        if (is_array($data)) {
+            $range = $this->format($data['timerange']);
+            if ($data['updated_at'] || $data['at_after']) {
+                $range[0] = $data['updated_at'] ?: $data['at_after'];
+            }
+            if ($data['deleted_at']) {
+                $range[1] = $data['deleted_at'];
+            }
+        } else {
+            $range = $this->format($data);
+        }
+        //
+        $updated = Base::isNumber($range[0]) ? intval($range[0]) : trim($range[0]);
+        $deleted = Base::isNumber($range[1]) ? intval($range[1]) : trim($range[1]);
+        //
+        $timezone = config('app.timezone');
+        $this->updated = $updated ? Carbon::parse($updated)->setTimezone($timezone) : null;
+        $this->deleted = $deleted ? Carbon::parse($deleted)->setTimezone($timezone) : null;
+    }
+
+    /**
+     * @param $timerange
+     * - 格式1：2021-01-01 00:00:00,2021-01-01 23:59:59
+     * - 格式2：1612051200-1612137599
+     * @return array
+     */
+    private function format($timerange)
+    {
+        $search = str_contains($timerange, ":") ? ["|"] : ["|", "-"];
+        return explode(",", str_replace($search, ",", $timerange));
+    }
+
+    /**
+     * @param $data
+     * @return TimeRange
+     */
+    public static function parse($data): TimeRange
+    {
+        return new self($data);
+    }
+}

app/Observers/ProjectObserver.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Observers;
+
+use App\Models\Deleted;
+use App\Models\Project;
+use App\Models\ProjectUser;
+
+class ProjectObserver
+{
+    /**
+     * Handle the Project "created" event.
+     *
+     * @param  \App\Models\Project  $project
+     * @return void
+     */
+    public function created(Project $project)
+    {
+        //
+    }
+
+    /**
+     * Handle the Project "updated" event.
+     *
+     * @param  \App\Models\Project  $project
+     * @return void
+     */
+    public function updated(Project $project)
+    {
+        if ($project->isDirty('archived_at')) {
+            $userids = $this->userids($project);
+            if ($project->archived_at) {
+                Deleted::record('project', $project->id, $userids);
+            } else {
+                Deleted::forget('project', $project->id, $userids);
+            }
+        }
+    }
+
+    /**
+     * Handle the Project "deleted" event.
+     *
+     * @param  \App\Models\Project  $project
+     * @return void
+     */
+    public function deleted(Project $project)
+    {
+        Deleted::record('project', $project->id, $this->userids($project));
+    }
+
+    /**
+     * Handle the Project "restored" event.
+     *
+     * @param  \App\Models\Project  $project
+     * @return void
+     */
+    public function restored(Project $project)
+    {
+        Deleted::forget('project', $project->id, $this->userids($project));
+    }
+
+    /**
+     * Handle the Project "force deleted" event.
+     *
+     * @param  \App\Models\Project  $project
+     * @return void
+     */
+    public function forceDeleted(Project $project)
+    {
+        //
+    }
+
+    /**
+     * @param Project $project
+     * @return array
+     */
+    private function userids(Project $project)
+    {
+        return ProjectUser::whereProjectId($project->id)->pluck('userid')->toArray();
+    }
+}

app/Observers/ProjectTaskObserver.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Observers;
+
+use App\Models\Deleted;
+use App\Models\ProjectTask;
+use App\Models\ProjectUser;
+
+class ProjectTaskObserver
+{
+    /**
+     * Handle the ProjectTask "created" event.
+     *
+     * @param  \App\Models\ProjectTask  $projectTask
+     * @return void
+     */
+    public function created(ProjectTask $projectTask)
+    {
+        //
+    }
+
+    /**
+     * Handle the ProjectTask "updated" event.
+     *
+     * @param  \App\Models\ProjectTask  $projectTask
+     * @return void
+     */
+    public function updated(ProjectTask $projectTask)
+    {
+        if ($projectTask->isDirty('archived_at')) {
+            if ($projectTask->archived_at) {
+                Deleted::record('projectTask', $projectTask->id, $this->userids($projectTask));
+            } else {
+                Deleted::forget('projectTask', $projectTask->id, $this->userids($projectTask));
+            }
+        }
+    }
+
+    /**
+     * Handle the ProjectTask "deleted" event.
+     *
+     * @param  \App\Models\ProjectTask  $projectTask
+     * @return void
+     */
+    public function deleted(ProjectTask $projectTask)
+    {
+        Deleted::record('projectTask', $projectTask->id, $this->userids($projectTask));
+    }
+
+    /**
+     * Handle the ProjectTask "restored" event.
+     *
+     * @param  \App\Models\ProjectTask  $projectTask
+     * @return void
+     */
+    public function restored(ProjectTask $projectTask)
+    {
+        Deleted::forget('projectTask', $projectTask->id, $this->userids($projectTask));
+    }
+
+    /**
+     * Handle the ProjectTask "force deleted" event.
+     *
+     * @param  \App\Models\ProjectTask  $projectTask
+     * @return void
+     */
+    public function forceDeleted(ProjectTask $projectTask)
+    {
+        //
+    }
+
+    /**
+     * @param ProjectTask $projectTask
+     * @return array
+     */
+    private function userids(ProjectTask $projectTask)
+    {
+        return ProjectUser::whereProjectId($projectTask->project_id)->pluck('userid')->toArray();
+    }
+}

app/Observers/ProjectTaskUserObserver.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Observers;
+
+use App\Models\Deleted;
+use App\Models\ProjectTaskUser;
+use App\Models\ProjectUser;
+
+class ProjectTaskUserObserver
+{
+    /**
+     * Handle the ProjectTaskUser "created" event.
+     *
+     * @param  \App\Models\ProjectTaskUser  $projectTaskUser
+     * @return void
+     */
+    public function created(ProjectTaskUser $projectTaskUser)
+    {
+        Deleted::forget('projectTask', $projectTaskUser->task_id, $projectTaskUser->userid);
+    }
+
+    /**
+     * Handle the ProjectTaskUser "updated" event.
+     *
+     * @param  \App\Models\ProjectTaskUser  $projectTaskUser
+     * @return void
+     */
+    public function updated(ProjectTaskUser $projectTaskUser)
+    {
+        //
+    }
+
+    /**
+     * Handle the ProjectTaskUser "deleted" event.
+     *
+     * @param  \App\Models\ProjectTaskUser  $projectTaskUser
+     * @return void
+     */
+    public function deleted(ProjectTaskUser $projectTaskUser)
+    {
+        if (!ProjectUser::whereProjectId($projectTaskUser->project_id)->whereUserid($projectTaskUser->userid)->exists()) {
+            Deleted::record('projectTask', $projectTaskUser->task_id, $projectTaskUser->userid);
+        }
+    }
+
+    /**
+     * Handle the ProjectTaskUser "restored" event.
+     *
+     * @param  \App\Models\ProjectTaskUser  $projectTaskUser
+     * @return void
+     */
+    public function restored(ProjectTaskUser $projectTaskUser)
+    {
+        //
+    }
+
+    /**
+     * Handle the ProjectTaskUser "force deleted" event.
+     *
+     * @param  \App\Models\ProjectTaskUser  $projectTaskUser
+     * @return void
+     */
+    public function forceDeleted(ProjectTaskUser $projectTaskUser)
+    {
+        //
+    }
+}

app/Observers/ProjectUserObserver.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Observers;
+
+use App\Models\Deleted;
+use App\Models\ProjectUser;
+
+class ProjectUserObserver
+{
+    /**
+     * Handle the ProjectUser "created" event.
+     *
+     * @param  \App\Models\ProjectUser  $projectUser
+     * @return void
+     */
+    public function created(ProjectUser $projectUser)
+    {
+        Deleted::forget('project', $projectUser->project_id, $projectUser->userid);
+    }
+
+    /**
+     * Handle the ProjectUser "updated" event.
+     *
+     * @param  \App\Models\ProjectUser  $projectUser
+     * @return void
+     */
+    public function updated(ProjectUser $projectUser)
+    {
+        //
+    }
+
+    /**
+     * Handle the ProjectUser "deleted" event.
+     *
+     * @param  \App\Models\ProjectUser  $projectUser
+     * @return void
+     */
+    public function deleted(ProjectUser $projectUser)
+    {
+        Deleted::record('project', $projectUser->project_id, $projectUser->userid);
+    }
+
+    /**
+     * Handle the ProjectUser "restored" event.
+     *
+     * @param  \App\Models\ProjectUser  $projectUser
+     * @return void
+     */
+    public function restored(ProjectUser $projectUser)
+    {
+        //
+    }
+
+    /**
+     * Handle the ProjectUser "force deleted" event.
+     *
+     * @param  \App\Models\ProjectUser  $projectUser
+     * @return void
+     */
+    public function forceDeleted(ProjectUser $projectUser)
+    {
+        //
+    }
+}

app/Observers/WebSocketDialogObserver.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Observers;
+
+use App\Models\Deleted;
+use App\Models\WebSocketDialog;
+use App\Models\WebSocketDialogUser;
+
+class WebSocketDialogObserver
+{
+    /**
+     * Handle the WebSocketDialog "created" event.
+     *
+     * @param  \App\Models\WebSocketDialog  $webSocketDialog
+     * @return void
+     */
+    public function created(WebSocketDialog $webSocketDialog)
+    {
+        //
+    }
+
+    /**
+     * Handle the WebSocketDialog "updated" event.
+     *
+     * @param  \App\Models\WebSocketDialog  $webSocketDialog
+     * @return void
+     */
+    public function updated(WebSocketDialog $webSocketDialog)
+    {
+        //
+    }
+
+    /**
+     * Handle the WebSocketDialog "deleted" event.
+     *
+     * @param  \App\Models\WebSocketDialog  $webSocketDialog
+     * @return void
+     */
+    public function deleted(WebSocketDialog $webSocketDialog)
+    {
+        Deleted::record('dialog', $webSocketDialog->id, $this->userids($webSocketDialog));
+    }
+
+    /**
+     * Handle the WebSocketDialog "restored" event.
+     *
+     * @param  \App\Models\WebSocketDialog  $webSocketDialog
+     * @return void
+     */
+    public function restored(WebSocketDialog $webSocketDialog)
+    {
+        Deleted::forget('dialog', $webSocketDialog->id, $this->userids($webSocketDialog));
+    }
+
+    /**
+     * Handle the WebSocketDialog "force deleted" event.
+     *
+     * @param  \App\Models\WebSocketDialog  $webSocketDialog
+     * @return void
+     */
+    public function forceDeleted(WebSocketDialog $webSocketDialog)
+    {
+        //
+    }
+
+    /**
+     * @param WebSocketDialog $webSocketDialog
+     * @return array
+     */
+    private function userids(WebSocketDialog $webSocketDialog)
+    {
+        return WebSocketDialogUser::whereDialogId($webSocketDialog->id)->pluck('userid')->toArray();
+    }
+}

app/Observers/WebSocketDialogUserObserver.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Observers;
+
+use App\Models\Deleted;
+use App\Models\WebSocketDialogUser;
+use Carbon\Carbon;
+
+class WebSocketDialogUserObserver
+{
+    /**
+     * Handle the WebSocketDialogUser "created" event.
+     *
+     * @param  \App\Models\WebSocketDialogUser  $webSocketDialogUser
+     * @return void
+     */
+    public function created(WebSocketDialogUser $webSocketDialogUser)
+    {
+        if (!$webSocketDialogUser->last_at) {
+            if (in_array($webSocketDialogUser->webSocketDialog?->group_type, ['user', 'department', 'all'])) {
+                $webSocketDialogUser->last_at = Carbon::now();
+                $webSocketDialogUser->save();
+            } else {
+                $item = WebSocketDialogUser::whereDialogId($webSocketDialogUser->dialog_id)->orderByDesc('last_at')->first();
+                if ($item?->last_at) {
+                    $webSocketDialogUser->last_at = $item->last_at;
+                    $webSocketDialogUser->save();
+                }
+            }
+        }
+        Deleted::forget('dialog', $webSocketDialogUser->dialog_id, $webSocketDialogUser->userid);
+    }
+
+    /**
+     * Handle the WebSocketDialogUser "updated" event.
+     *
+     * @param  \App\Models\WebSocketDialogUser  $webSocketDialogUser
+     * @return void
+     */
+    public function updated(WebSocketDialogUser $webSocketDialogUser)
+    {
+        //
+    }
+
+    /**
+     * Handle the WebSocketDialogUser "deleted" event.
+     *
+     * @param  \App\Models\WebSocketDialogUser  $webSocketDialogUser
+     * @return void
+     */
+    public function deleted(WebSocketDialogUser $webSocketDialogUser)
+    {
+        Deleted::record('dialog', $webSocketDialogUser->dialog_id, $webSocketDialogUser->userid);
+    }
+
+    /**
+     * Handle the WebSocketDialogUser "restored" event.
+     *
+     * @param  \App\Models\WebSocketDialogUser  $webSocketDialogUser
+     * @return void
+     */
+    public function restored(WebSocketDialogUser $webSocketDialogUser)
+    {
+        //
+    }
+
+    /**
+     * Handle the WebSocketDialogUser "force deleted" event.
+     *
+     * @param  \App\Models\WebSocketDialogUser  $webSocketDialogUser
+     * @return void
+     */
+    public function forceDeleted(WebSocketDialogUser $webSocketDialogUser)
+    {
+        //
+    }
+}

app/Providers/EventServiceProvider.php

@@ -2,10 +2,21 @@
 
 namespace App\Providers;
 
+use App\Models\Project;
+use App\Models\ProjectTask;
+use App\Models\ProjectTaskUser;
+use App\Models\ProjectUser;
+use App\Models\WebSocketDialog;
+use App\Models\WebSocketDialogUser;
+use App\Observers\ProjectObserver;
+use App\Observers\ProjectTaskObserver;
+use App\Observers\ProjectTaskUserObserver;
+use App\Observers\ProjectUserObserver;
+use App\Observers\WebSocketDialogObserver;
+use App\Observers\WebSocketDialogUserObserver;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {
@@ -27,6 +38,11 @@ class EventServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        Project::observe(ProjectObserver::class);
+        ProjectTask::observe(ProjectTaskObserver::class);
+        ProjectTaskUser::observe(ProjectTaskUserObserver::class);
+        ProjectUser::observe(ProjectUserObserver::class);
+        WebSocketDialog::observe(WebSocketDialogObserver::class);
+        WebSocketDialogUser::observe(WebSocketDialogUserObserver::class);
     }
 }