perf: 发送消息未设置昵称的优化

perf: 更新icon图标库

.env.docker

@@ -1,4 +1,4 @@
-APP_NAME=Dootask
+APP_NAME=DooTask
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true

.github/workflows/electron-generic.yml

@@ -0,0 +1,85 @@
+name: Build Generic
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build-mac:
+    strategy:
+      fail-fast: false
+      matrix:
+        id: [ "com.dootask.task", "com.hitosea.task" ]
+    runs-on: macos-latest
+    environment: build
+
+    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,build
+
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16.x
+
+      - name: Build for MacOS
+        env:
+          APPID: ${{ matrix.id }}
+          PROVIDER: "generic"
+          APPLEID: ${{ secrets.APPLEID }}
+          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+          CSC_LINK: ${{ secrets.CSC_LINK }}
+          RELEASE_BODY: ${{ steps.changelog.outputs.changes }}
+        run: ./cmd electron build-mac
+
+  build-win:
+    strategy:
+      fail-fast: false
+      matrix:
+        id: [ "com.dootask.task", "com.hitosea.task" ]
+    runs-on: windows-latest
+    environment: build
+
+    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,build
+
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16.x
+
+      - name: Build for Windows
+        shell: powershell
+        env:
+          APPID: ${{ matrix.id }}
+          PROVIDER: "generic"
+          RELEASE_BODY: ${{ steps.changelog.outputs.changes }}
+        run: |
+          npm install
+          cd electron
+          npm install
+          cd ../
+          mkdir -p ./electron/public
+          cp ./electron/index.html ./electron/public/index.html
+          npx mix --production -- --env --electron
+          node ./electron/build.js build-win
+

.github/workflows/electron-github.yml

@@ -0,0 +1,97 @@
+name: Build Github
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    if: ${{ (startsWith(github.event.ref, 'refs/tags/v')) && (github.repository == 'kuaifan/dootask') }}
+    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,build
+
+      - 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-mac:
+    strategy:
+      fail-fast: false
+      matrix:
+        id: [ "com.dootask.task", "com.hitosea.task" ]
+    runs-on: macos-latest
+    environment: build
+
+    if: ${{ (startsWith(github.event.ref, 'refs/tags/v')) && (github.repository == 'kuaifan/dootask') }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16.x
+
+      - name: Build for MacOS
+        env:
+          APPID: ${{ matrix.id }}
+          PROVIDER: "github"
+          APPLEID: ${{ secrets.APPLEID }}
+          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+          CSC_LINK: ${{ secrets.CSC_LINK }}
+          GH_TOKEN: ${{ secrets.GH_PAT }}
+          EP_PRE_RELEASE: true
+        run: ./cmd electron build-mac
+
+  build-win:
+    strategy:
+      fail-fast: false
+      matrix:
+        id: [ "com.dootask.task", "com.hitosea.task" ]
+    runs-on: windows-latest
+    environment: build
+
+    if: ${{ (startsWith(github.event.ref, 'refs/tags/v')) && (github.repository == 'kuaifan/dootask') }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16.x
+
+      - name: Build for Windows
+        shell: powershell
+        env:
+          APPID: ${{ matrix.id }}
+          PROVIDER: "github"
+          GH_TOKEN: ${{ secrets.GH_PAT }}
+          EP_PRE_RELEASE: true
+        run: |
+          npm install
+          cd electron
+          npm install
+          cd ../
+          mkdir -p ./electron/public
+          cp ./electron/index.html ./electron/public/index.html
+          npx mix --production -- --env --electron
+          node ./electron/build.js build-win
+

.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 }}
-

.gitignore

@@ -19,7 +19,6 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 test.*
-composer.lock
 package-lock.json
 laravels-timer-process.pid
 .DS_Store

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "resources/drawio"]
+	path = resources/drawio
+	url = https://github.com/jgraph/drawio.git

README.md

@@ -5,10 +5,15 @@ English | **[中文文档](./README_CN.md)**
 - [Screenshot Preview](README_PREVIEW.md)
 - [Demo site](http://www.dootask.com/)
 
+**QQ Group**
+
+Group No.: `546574618`
+
 ## Setup
 
-> `Docker` & `Docker Compose v2.0+` must be installed
-
+- `Docker` & `Docker Compose v2.0+` must be installed
+- System: `Centos/Debian/Ubuntu/macOS`
+- Hardware suggestion: 2 cores and above 4G memory
 
 ### Deployment project
 
@@ -16,9 +21,9 @@ English | **[中文文档](./README_CN.md)**
 # 1、Clone the repository
 
 # Clone projects on github
-git clone https://github.com/kuaifan/dootask.git
+git clone --depth=1 https://github.com/kuaifan/dootask.git
 # Or you can use gitee
-git clone https://gitee.com/aipaw/dootask.git
+git clone --depth=1 https://gitee.com/aipaw/dootask.git
 
 # 2、Enter directory
 cd dootask
@@ -49,18 +54,28 @@ cd dootask
 ./cmd start
 ```
 
+### Development compilation
+
+```bash
+# Development mode, Mac OS only
+./cmd dev
+   
+# Production projects, macOS only
+./cmd prod  
+```
+
 ### Shortcuts for running command
 
 ```bash
 # You can do this using the following command
-./cmd artisan "your command"          // To run a artisan command
-./cmd php "your command"              // To run a php command
-./cmd nginx "your command"            // To run a nginx command
-./cmd redis "your command"            // To run a redis command
-./cmd composer "your command"         // To run a composer command
-./cmd supervisorctl "your command"    // To run a supervisorctl command
-./cmd test "your command"             // To run a phpunit command
-./cmd mysql "your command"            // To run a mysql command (backup: Backup database, recovery: Restore database)
+./cmd artisan "your command"          # To run a artisan command
+./cmd php "your command"              # To run a php command
+./cmd nginx "your command"            # To run a nginx command
+./cmd redis "your command"            # To run a redis command
+./cmd composer "your command"         # To run a composer command
+./cmd supervisorctl "your command"    # To run a supervisorctl command
+./cmd test "your command"             # To run a phpunit command
+./cmd mysql "your command"            # To run a mysql command (backup: Backup database, recovery: Restore database)
 ```
 
 ### NGINX PROXY SSL
@@ -71,7 +86,7 @@ proxy_set_header X-Forwarded-Host $http_host;
 proxy_set_header X-Forwarded-Proto $scheme;
 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-# 2、Enter directory and run command
+# 2、Running commands in a project
 ./cmd https
 ```
 
@@ -80,7 +95,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
@@ -89,16 +104,32 @@ git pull
 ./cmd uninstall
 ./cmd install
 ./cmd mysql recovery
-./cmd artisan migrate
+```
+
+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
 ```
-
-## Contact us
-
-QQ Group: 546574618

README_CN.md

@@ -5,10 +5,15 @@
 - [截图预览](README_PREVIEW.md)
 - [演示站点](http://www.dootask.com/)
 
+**QQ交流群**
+
+- QQ群号: `546574618`
+
 ## 安装程序
 
-> 必须安装 `Docker` 和 `Docker Compose v2.0+`
-
+- 必须安装：`Docker` 和 `Docker Compose v2.0+`
+- 支持环境：`Centos/Debian/Ubuntu/macOS`
+- 硬件建议：2核4G以上
 
 ### 部署项目
 
@@ -16,9 +21,9 @@
 # 1、克隆项目到您的本地或服务器
 
 # 通过github克隆项目
-git clone https://github.com/kuaifan/dootask.git
+git clone --depth=1 https://github.com/kuaifan/dootask.git
 # 或者你也可以使用gitee
-git clone https://gitee.com/aipaw/dootask.git
+git clone --depth=1 https://gitee.com/aipaw/dootask.git
 
 # 2、进入目录
 cd dootask
@@ -49,18 +54,29 @@ cd dootask
 ./cmd start
 ```
 
+### 开发编译
+
+```bash
+# 开发模式，仅限macOS
+./cmd dev
+   
+# 编译项目，仅限macOS
+./cmd prod  
+```
+
+
 ### 运行命令的快捷方式
 
 ```bash
 # 你可以使用以下命令来执行
-./cmd artisan "your command"          // 运行 artisan 命令
-./cmd php "your command"              // 运行 php 命令
-./cmd nginx "your command"            // 运行 nginx 命令
-./cmd redis "your command"            // 运行 redis 命令
-./cmd composer "your command"         // 运行 composer 命令
-./cmd supervisorctl "your command"    // 运行 supervisorctl 命令
-./cmd test "your command"             // 运行 phpunit 命令
-./cmd mysql "your command"            // 运行 mysql 命令 (backup: 备份数据库，recovery: 还原数据库)
+./cmd artisan "your command"          # 运行 artisan 命令
+./cmd php "your command"              # 运行 php 命令
+./cmd nginx "your command"            # 运行 nginx 命令
+./cmd redis "your command"            # 运行 redis 命令
+./cmd composer "your command"         # 运行 composer 命令
+./cmd supervisorctl "your command"    # 运行 supervisorctl 命令
+./cmd test "your command"             # 运行 phpunit 命令
+./cmd mysql "your command"            # 运行 mysql 命令 (backup: 备份数据库，recovery: 还原数据库)
 ```
 
 ### NGINX 代理 SSL
@@ -71,7 +87,7 @@ proxy_set_header X-Forwarded-Host $http_host;
 proxy_set_header X-Forwarded-Proto $scheme;
 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-# 2、进入项目所在目录，运行以下命令
+# 2、在项目下运行命令
 ./cmd https
 ```
 
@@ -80,7 +96,7 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 **注意：在升级之前请备份好你的数据！**
 
 ```bash
-# 方法1：进入项目所在目录，运行以下命令
+# 方法1：在项目下运行命令
 ./cmd update
 
 # （或者）方法2：如果方法1失败请使用此方法
@@ -89,16 +105,32 @@ 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
 ```
-
-## 联系我们
-
-QQ群号: 546574618

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

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Models\File;
 use App\Models\ProjectTask;
 use App\Models\ProjectTaskFile;
 use App\Models\User;
@@ -10,7 +11,10 @@ use App\Models\WebSocketDialogMsg;
 use App\Models\WebSocketDialogMsgRead;
 use App\Models\WebSocketDialogUser;
 use App\Module\Base;
+use Carbon\Carbon;
+use DB;
 use Request;
+use Response;
 
 /**
  * @apiDefine dialog
@@ -38,13 +42,14 @@ class DialogController extends AbstractController
     {
         $user = User::auth();
         //
-        $list = WebSocketDialog::select(['web_socket_dialogs.*'])
+        $list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread'])
             ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
             ->where('u.userid', $user->userid)
+            ->orderByDesc('u.top_at')
             ->orderByDesc('web_socket_dialogs.last_at')
             ->paginate(Base::getPaginate(200, 100));
         $list->transform(function (WebSocketDialog $item) use ($user) {
-            return WebSocketDialog::formatData($item, $user->userid);
+            return $item->formatData($user->userid);
         });
         //
         return Base::retSuccess('success', $list);
@@ -70,13 +75,13 @@ class DialogController extends AbstractController
         //
         $dialog_id = intval(Request::input('dialog_id'));
         //
-        $item = WebSocketDialog::select(['web_socket_dialogs.*'])
+        $item = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread'])
             ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
             ->where('web_socket_dialogs.id', $dialog_id)
             ->where('u.userid', $user->userid)
             ->first();
         if ($item) {
-            $item = WebSocketDialog::formatData($item, $user->userid);
+            $item = $item->formatData($user->userid);
         }
         //
         return Base::retSuccess('success', $item);
@@ -109,7 +114,7 @@ class DialogController extends AbstractController
         if (empty($dialog)) {
             return Base::retError('打开会话失败');
         }
-        $data = WebSocketDialog::formatData(WebSocketDialog::find($dialog->id), $user->userid);
+        $data = WebSocketDialog::find($dialog->id)?->formatData($user->userid);
         if (empty($data)) {
             return Base::retError('打开会话错误');
         }
@@ -141,42 +146,64 @@ class DialogController extends AbstractController
         //
         $dialog = WebSocketDialog::checkDialog($dialog_id);
         //
-        $list = WebSocketDialogMsg::whereDialogId($dialog_id)->orderByDesc('id')->paginate(Base::getPaginate(100, 50));
-        $list->transform(function (WebSocketDialogMsg $item) use ($user) {
-            $item->is_read = $item->userid === $user->userid || WebSocketDialogMsgRead::whereMsgId($item->id)->whereUserid($user->userid)->value('read_at');
-            return $item;
-        });
+        $list = WebSocketDialogMsg::select([
+            'web_socket_dialog_msgs.*',
+            'read.mention',
+            'read.read_at',
+        ])->leftJoin('web_socket_dialog_msg_reads as read', function ($leftJoin) use ($user) {
+            $leftJoin
+                ->on('read.userid', '=', DB::raw($user->userid))
+                ->on('read.msg_id', '=', 'web_socket_dialog_msgs.id');
+        })->where('web_socket_dialog_msgs.dialog_id', $dialog_id)->orderByDesc('web_socket_dialog_msgs.id')->paginate(Base::getPaginate(100, 50));
         //
         if ($dialog->type == 'group' && $dialog->group_type == 'task') {
             $user->task_dialog_id = $dialog->id;
             $user->save();
         }
+        //去掉标记未读
+        $isMarkDialogUser = WebSocketDialogUser::whereDialogId($dialog->id)->whereUserid($user->userid)->whereMarkUnread(1)->first();
+        if ($isMarkDialogUser) {
+            $isMarkDialogUser->mark_unread = 0;
+            $isMarkDialogUser->save();
+        }
         //
         $data = $list->toArray();
         if ($list->currentPage() === 1) {
-            $data['dialog'] = WebSocketDialog::formatData($dialog, $user->userid);
+            $data['dialog'] = $dialog->formatData($user->userid);
         }
         return Base::retSuccess('success', $data);
     }
 
     /**
-     * @api {get} api/dialog/msg/sendtext          05. 未读消息
+     * @api {get} api/dialog/msg/unread          05. 获取未读消息数量
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup dialog
-     * @apiName msg__sendtext
+     * @apiName msg__unread
+     *
+     * @apiParam {Number} [dialog_id]         对话ID，留空获取总未读消息数量
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
      */
     public function msg__unread()
     {
-        $unread = WebSocketDialogMsgRead::whereUserid(User::userid())->whereReadAt(null)->count();
+        $dialog_id = intval(Request::input('dialog_id'));
+        //
+        $builder = WebSocketDialogMsgRead::whereUserid(User::userid())->whereReadAt(null);
+        if ($dialog_id > 0) {
+            $builder->whereDialogId($dialog_id);
+        }
+        $unread = $builder->count();
         return Base::retSuccess('success', [
             'unread' => $unread,
         ]);
     }
 
     /**
-     * @api {get} api/dialog/msg/sendtext          06. 发送消息
+     * @api {post} api/dialog/msg/sendtext          06. 发送消息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -192,6 +219,7 @@ class DialogController extends AbstractController
      */
     public function msg__sendtext()
     {
+        Base::checkClientVersion('0.13.33');
         $user = User::auth();
         //
         $chat_nickname = Base::settingFind('system', 'chat_nickname');
@@ -202,22 +230,32 @@ class DialogController extends AbstractController
             }
         }
         //
-        $dialog_id = intval(Request::input('dialog_id'));
-        $text = trim(Request::input('text'));
+        $dialog_id = Base::getPostInt('dialog_id');
+        $text = trim(Base::getPostValue('text'));
         //
+        WebSocketDialog::checkDialog($dialog_id);
+        //
+        $text = WebSocketDialogMsg::formatMsg($text, $dialog_id);
         if (mb_strlen($text) < 1) {
             return Base::retError('消息内容不能为空');
         } elseif (mb_strlen($text) > 20000) {
             return Base::retError('消息内容最大不能超过20000字');
         }
+        if (mb_strlen($text) > 2000) {
+            $array = mb_str_split($text, 2000);
+        } else {
+            $array = [$text];
+        }
         //
-        WebSocketDialog::checkDialog($dialog_id);
+        $list = [];
+        foreach ($array as $item) {
+            $res = WebSocketDialogMsg::sendMsg($dialog_id, 'text', ['text' => $item], $user->userid);
+            if (Base::isSuccess($res)) {
+                $list[] = $res['data'];
+            }
+        }
         //
-        $msg = [
-            'text' => $text
-        ];
-        //
-        return WebSocketDialogMsg::sendMsg($dialog_id, 'text', $msg, $user->userid);
+        return Base::retSuccess('发送成功', $list);
     }
 
     /**
@@ -228,10 +266,11 @@ class DialogController extends AbstractController
      * @apiGroup dialog
      * @apiName msg__sendfile
      *
-     * @apiParam {Number} dialog_id         对话ID
-     * @apiParam {String} [filename]        post-文件名称
-     * @apiParam {String} [image64]         post-base64图片（二选一）
-     * @apiParam {File} [files]             post-文件对象（二选一）
+     * @apiParam {Number} dialog_id             对话ID
+     * @apiParam {Number} [image_attachment]    图片是否也存到附件
+     * @apiParam {String} [filename]            post-文件名称
+     * @apiParam {String} [image64]             post-base64图片（二选一）
+     * @apiParam {File} [files]                 post-文件对象（二选一）
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -242,10 +281,11 @@ class DialogController extends AbstractController
         $user = User::auth();
         //
         $dialog_id = Base::getPostInt('dialog_id');
+        $image_attachment = Base::getPostInt('image_attachment');
         //
         $dialog = WebSocketDialog::checkDialog($dialog_id);
         //
-        $path = "uploads/chat/" . $user->userid . "/";
+        $path = "uploads/chat/" . date("Ym") . "/" . $dialog_id . "/";
         $image64 = Base::getPostValue('image64');
         $fileName = Base::getPostValue('filename');
         if ($image64) {
@@ -257,7 +297,7 @@ class DialogController extends AbstractController
         } else {
             $data = Base::upload([
                 "file" => Request::file('files'),
-                "type" => 'file',
+                "type" => 'more',
                 "path" => $path,
                 "fileName" => $fileName,
             ]);
@@ -270,8 +310,8 @@ class DialogController extends AbstractController
             $fileData['thumb'] = Base::unFillUrl($fileData['thumb']);
             $fileData['size'] *= 1024;
             //
-            if ($dialog->type === 'group') {
-                if ($dialog->group_type === 'task') {
+            if ($dialog->type === 'group' && $dialog->group_type === 'task') {                       // 任务群组保存文件
+                if ($image_attachment || !in_array($fileData['ext'], File::imageExt)) {     // 如果是图片不保存
                     $task = ProjectTask::whereDialogId($dialog->id)->first();
                     if ($task) {
                         $file = ProjectTaskFile::createInstance([
@@ -327,4 +367,424 @@ class DialogController extends AbstractController
         $read = WebSocketDialogMsgRead::whereMsgId($msg_id)->get();
         return Base::retSuccess('success', $read ?: []);
     }
+
+    /**
+     * @api {get} api/dialog/msg/detail          09. 消息详情
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__detail
+     *
+     * @apiParam {Number} msg_id            消息ID
+     * @apiParam {String} only_update_at    仅获取update_at字段
+     * - no (默认)
+     * - yes
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function msg__detail()
+    {
+        User::auth();
+        //
+        $msg_id = intval(Request::input('msg_id'));
+        $only_update_at = Request::input('only_update_at', 'no');
+        //
+        $dialogMsg = WebSocketDialogMsg::whereId($msg_id)->first();
+        if (empty($dialogMsg)) {
+            return Base::retError("文件不存在");
+        }
+        //
+        if ($only_update_at == 'yes') {
+            return Base::retSuccess('success', [
+                'id' => $dialogMsg->id,
+                'update_at' => Carbon::parse($dialogMsg->updated_at)->toDateTimeString()
+            ]);
+        }
+        //
+        $data = $dialogMsg->toArray();
+        //
+        if ($data['type'] == 'file') {
+            $msg = Base::json2array($dialogMsg->getRawOriginal('msg'));
+            $msg = File::formatFileData($msg);
+            $data['content'] = $msg['content'];
+            $data['file_mode'] = $msg['file_mode'];
+        }
+        //
+        return Base::retSuccess('success', $data);
+    }
+
+    /**
+     * @api {get} api/dialog/msg/download          10. 文件下载
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__download
+     *
+     * @apiParam {Number} msg_id            消息ID
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function msg__download()
+    {
+        User::auth();
+        //
+        $msg_id = intval(Request::input('msg_id'));
+        //
+        $msg = WebSocketDialogMsg::whereId($msg_id)->first();
+        if (empty($msg)) {
+            abort(403, "This file not exist.");
+        }
+        if ($msg->type != 'file') {
+            abort(403, "This file not support download.");
+        }
+        $array = Base::json2array($msg->getRawOriginal('msg'));
+        //
+        return Response::download(public_path($array['path']), $array['name']);
+    }
+
+    /**
+     * @api {get} api/dialog/msg/withdraw          11. 聊天消息撤回
+     *
+     * @apiDescription 消息撤回限制24小时内，需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__withdraw
+     *
+     * @apiParam {Number} msg_id            消息ID
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function msg__withdraw()
+    {
+        $user = User::auth();
+        $msg_id = intval(Request::input("msg_id"));
+        $msg = WebSocketDialogMsg::whereId($msg_id)->whereUserid($user->userid)->first();
+        if (empty($msg)) {
+            return Base::retError("消息不存在或已被删除");
+        }
+        $msg->deleteMsg();
+        return Base::retSuccess("success");
+    }
+
+    /**
+     * @api {get} api/dialog/top          12. 会话置顶
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName top
+     *
+     * @apiParam {Number} dialog_id            会话ID
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function top()
+    {
+        $user = User::auth();
+        $dialogId = intval(Request::input('dialog_id'));
+        $dialogUser = WebSocketDialogUser::whereUserid($user->userid)->whereDialogId($dialogId)->first();
+        if (!$dialogUser) {
+            return Base::retError("会话不存在");
+        }
+        $dialogUser->top_at = $dialogUser->top_at ? null : Carbon::now();
+        $dialogUser->save();
+        return Base::retSuccess("success", [
+            'id' => $dialogUser->dialog_id,
+            'top_at' => $dialogUser->top_at?->toDateTimeString(),
+        ]);
+    }
+
+    /**
+     * @api {get} api/dialog/msg/mark          13. 消息标记操作
+     *
+     * @apiDescription  需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__mark
+     *
+     * @apiParam {Number} dialog_id             会话ID
+     * @apiParam {String} type                  类型
+     * - read
+     * - unread
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function msg__mark()
+    {
+        $user = User::auth();
+        $dialogId = intval(Request::input('dialog_id'));
+        $type = Request::input('type');
+        $dialogUser = WebSocketDialogUser::whereUserid($user->userid)->whereDialogId($dialogId)->first();
+        if (!$dialogUser) {
+            return Base::retError("会话不存在");
+        }
+        switch ($type) {
+            case 'read':
+                WebSocketDialogMsgRead::whereUserid($user->userid)
+                    ->whereReadAt(null)
+                    ->whereDialogId($dialogId)
+                    ->chunkById(100, function ($list) {
+                        WebSocketDialogMsgRead::onlyMarkRead($list);
+                    });
+                $dialogUser->mark_unread = 0;
+                $dialogUser->save();
+                break;
+
+            case 'unread':
+                $dialogUser->mark_unread = 1;
+                $dialogUser->save();
+                break;
+
+            default:
+                return Base::retError("参数错误");
+        }
+        return Base::retSuccess("success", [
+            'id' => $dialogId,
+            'mark_unread' => $dialogUser->mark_unread,
+        ]);
+    }
+
+    /**
+     * @api {get} api/dialog/group/add          14. 新增群组
+     *
+     * @apiDescription  需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName group__add
+     *
+     * @apiParam {Array} userids                群成员，格式: [userid1, userid2, userid3]
+     * @apiParam {String} chat_name             群名称
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function group__add()
+    {
+        $user = User::auth();
+        //
+        $userids = Request::input('userids');
+        $chatName = trim(Request::input('chat_name'));
+        //
+        if (!is_array($userids)) {
+            return Base::retError('请选择群成员');
+        }
+        $userids = array_merge([$user->userid], $userids);
+        $userids = array_values(array_filter(array_unique($userids)));
+        if (count($userids) < 2) {
+            return Base::retError('群成员至少2人');
+        }
+        //
+        if (empty($chatName)) {
+            $array = [];
+            foreach ($userids as $userid) {
+                $array[] = User::userid2nickname($userid);
+                if (count($array) >= 8 || strlen(implode(", ", $array)) > 100) {
+                    $array[] = "...";
+                    break;
+                }
+            }
+            $chatName = implode(", ", $array);
+        }
+        $dialog = WebSocketDialog::createGroup($chatName, $userids, 'user', $user->userid);
+        if (empty($dialog)) {
+            return Base::retError('创建群组失败');
+        }
+        $data = WebSocketDialog::find($dialog->id)?->formatData($user->userid);
+        $dialog->pushMsg("groupAdd", $data, $userids);
+        return Base::retSuccess('创建成功', $data);
+    }
+
+    /**
+     * @api {get} api/dialog/group/edit          15. 修改群组
+     *
+     * @apiDescription  需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName group__edit
+     *
+     * @apiParam {Number} dialog_id             会话ID
+     * @apiParam {String} chat_name             群名称
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function group__edit()
+    {
+        $user = User::auth();
+        //
+        $dialog_id = intval(Request::input('dialog_id'));
+        $chatName = trim(Request::input('chat_name'));
+        //
+        if (mb_strlen($chatName) < 2) {
+            return Base::retError('群名称至少2个字');
+        }
+        if (mb_strlen($chatName) > 100) {
+            return Base::retError('群名称最长限制100个字');
+        }
+        //
+        $dialog = WebSocketDialog::checkDialog($dialog_id, true);
+        //
+        $dialog->name = $chatName;
+        $dialog->save();
+        return Base::retSuccess('修改成功', [
+            'id' => $dialog->id,
+            'name' => $dialog->name,
+        ]);
+    }
+
+    /**
+     * @api {get} api/dialog/group/user          16. 获取群成员
+     *
+     * @apiDescription  需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName group__user
+     *
+     * @apiParam {Number} dialog_id            会话ID
+     * @apiParam {Number} [getuser]            获取会员详情（1: 返回会员昵称、邮箱等基本信息，0: 默认不返回）
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function group__user()
+    {
+        User::auth();
+        //
+        $dialog_id = intval(Request::input('dialog_id'));
+        $getuser = intval(Request::input('getuser', 0));
+        //
+        $dialog = WebSocketDialog::checkDialog($dialog_id);
+        //
+        $data = $dialog->dialogUser->toArray();
+        if ($getuser === 1) {
+            $array = [];
+            foreach ($data as $item) {
+                $res = User::userid2basic($item['userid']);
+                if ($res) {
+                    $array[] = array_merge($item, $res->toArray());
+                }
+            }
+            $data = $array;
+        }
+        return Base::retSuccess('success', $data);
+    }
+
+    /**
+     * @api {get} api/dialog/group/adduser          17. 添加群成员
+     *
+     * @apiDescription  需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName group__adduser
+     *
+     * @apiParam {Number} dialog_id             会话ID
+     * @apiParam {Array} userids                新增的群成员，格式: [userid1, userid2, userid3]
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function group__adduser()
+    {
+        $user = User::auth();
+        //
+        $dialog_id = intval(Request::input('dialog_id'));
+        $userids = Request::input('userids');
+        //
+        if (!is_array($userids)) {
+            return Base::retError('请选择群成员');
+        }
+        //
+        $dialog = WebSocketDialog::checkDialog($dialog_id, true);
+        //
+        $dialog->checkGroup();
+        $dialog->joinGroup($userids);
+        $dialog->pushMsg("groupJoin", $dialog->formatData($user->userid), $userids);
+        return Base::retSuccess('添加成功');
+    }
+
+    /**
+     * @api {get} api/dialog/group/deluser          18. 移出（退出）群成员
+     *
+     * @apiDescription  需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName group__adduser
+     *
+     * @apiParam {Number} dialog_id             会话ID
+     * @apiParam {Array} userids                移出的群成员，格式: [userid1, userid2, userid3]
+     * - 留空表示自己退出
+     * - 有值表示移出，仅限群主操作
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function group__deluser()
+    {
+        $user = User::auth();
+        //
+        $dialog_id = intval(Request::input('dialog_id'));
+        $userids = Request::input('userids');
+        //
+        $type = 'remove';
+        if (empty($userids)) {
+            $type = 'exit';
+            $userids = [$user->userid];
+        }
+        //
+        if (!is_array($userids)) {
+            return Base::retError('请选择群成员');
+        }
+        //
+        $dialog = WebSocketDialog::checkDialog($dialog_id, $type === 'remove');
+        //
+        $dialog->checkGroup();
+        $dialog->exitGroup($userids);
+        $dialog->pushMsg("groupExit", null, $userids);
+        return Base::retSuccess($type === 'remove' ? '移出成功' : '退出成功');
+    }
+
+    /**
+     * @api {get} api/dialog/group/disband          19. 解散群组
+     *
+     * @apiDescription  需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName group__disband
+     *
+     * @apiParam {Number} dialog_id             会话ID
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function group__disband()
+    {
+        User::auth();
+        //
+        $dialog_id = intval(Request::input('dialog_id'));
+        //
+        $dialog = WebSocketDialog::checkDialog($dialog_id, true);
+        //
+        $dialog->checkGroup();
+        $dialog->deleteDialog();
+        $dialog->pushMsg("groupDelete");
+        return Base::retSuccess('解散成功');
+    }
 }

app/Http/Controllers/Api/FileController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Api;
 
-
+use App\Exceptions\ApiException;
 use App\Models\AbstractModel;
 use App\Models\File;
 use App\Models\FileContent;
@@ -11,6 +11,7 @@ use App\Models\FileUser;
 use App\Models\User;
 use App\Module\Base;
 use App\Module\Ihttp;
+use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Request;
 
@@ -89,6 +90,10 @@ class FileController extends AbstractController
                 }
             }
         }
+        // 图片直接返回预览地址
+        foreach ($array as &$item) {
+            File::handleImageUrl($item);
+        }
         return Base::retSuccess('success', $array);
     }
 
@@ -205,22 +210,30 @@ class FileController extends AbstractController
                 'folder',
                 'document',
                 'mind',
-                'sheet',
-                'flow',
+                'drawio',
                 'word',
                 'excel',
                 'ppt',
             ])) {
                 return Base::retError('类型错误');
             }
-            $ext = '';
-            if (in_array($type, [
+            $ext = str_replace([
+                'folder',
+                'document',
+                'mind',
+                'drawio',
                 'word',
                 'excel',
                 'ppt',
-            ])) {
-                $ext = str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $type);
-            }
+            ], [
+                '',
+                'md',
+                'mind',
+                'drawio',
+                'docx',
+                'xlsx',
+                'pptx',
+            ], $type);
             //
             $userid = $user->userid;
             if ($pid > 0) {
@@ -243,7 +256,7 @@ class FileController extends AbstractController
                 'userid' => $userid,
                 'created_id' => $user->userid,
             ]);
-            $file->save();
+            $file->saveBeforePids();
             //
             $data = File::find($file->id);
             $data->pushMsg('add', $data);
@@ -293,9 +306,19 @@ class FileController extends AbstractController
             'userid' => $userid,
             'created_id' => $user->userid,
         ]);
-        $file->save();
+        $data = AbstractModel::transaction(function() use ($file) {
+            $content = FileContent::select(['content', 'text', 'size'])->whereFid($file->cid)->orderByDesc('id')->first();
+            $file->size = $content?->size ?: 0;
+            $file->saveBeforePids();
+            if ($content) {
+                $content = $content->toArray();
+                $content['fid'] = $file->id;
+                $content['userid'] = $file->userid;
+                FileContent::createInstance($content)->save();
+            }
+            return File::find($file->id);
+        });
         //
-        $data = File::find($file->id);
         $data->pushMsg('add', $data);
         return Base::retSuccess('复制成功', $data);
     }
@@ -308,7 +331,7 @@ class FileController extends AbstractController
      * @apiGroup file
      * @apiName move
      *
-     * @apiParam {Number} id            文件ID
+     * @apiParam {Numbers} ids          文件ID（格式：[id1, id2]）
      * @apiParam {Number} pid           移动到的文件夹ID
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
@@ -317,32 +340,47 @@ class FileController extends AbstractController
      */
     public function move()
     {
-        $user = User::auth();
+        User::auth();
         //
-        $id = intval(Request::input('id'));
+        $ids = Request::input('ids');
         $pid = intval(Request::input('pid'));
         //
-        $file = File::permissionFind($id, 1000);
-        //
+        if (!is_array($ids) || empty($ids)) {
+            return Base::retError('请选择移动的文件或文件夹');
+        }
+        if (count($ids) > 100) {
+            return Base::retError('一次最多只能移动100个文件或文件夹');
+        }
         if ($pid > 0) {
-            if (!File::whereUserid($user->userid)->whereId($pid)->exists()) {
-                return Base::retError('参数错误');
-            }
-            $arr = [];
-            $tid = $pid;
-            while ($tid > 0) {
-                $arr[] = $tid;
-                $tid = intval(File::whereId($tid)->value('pid'));
-            }
-            if (in_array($id, $arr)) {
-                return Base::retError('位置错误');
-            }
+            File::permissionFind($pid, 1);
         }
         //
-        $file->pid = $pid;
-        $file->save();
-        $file->pushMsg('update', $file);
-        return Base::retSuccess('操作成功', $file);
+        $files = [];
+        AbstractModel::transaction(function() use ($pid, $ids, &$files) {
+            foreach ($ids as $id) {
+                $file = File::permissionFind($id, 1000);
+                //
+                if ($pid > 0) {
+                    $arr = [];
+                    $tid = $pid;
+                    while ($tid > 0) {
+                        $arr[] = $tid;
+                        $tid = intval(File::whereId($tid)->value('pid'));
+                    }
+                    if (in_array($id, $arr)) {
+                        throw new ApiException('移动位置错误');
+                    }
+                }
+                //
+                $file->pid = $pid;
+                $file->saveBeforePids();
+                $files[] = $file;
+            }
+        });
+        foreach ($files as $file) {
+            $file->pushMsg('update', $file);
+        }
+        return Base::retSuccess('操作成功', $files);
     }
 
     /**
@@ -353,7 +391,7 @@ class FileController extends AbstractController
      * @apiGroup file
      * @apiName remove
      *
-     * @apiParam {Number} id            文件ID
+     * @apiParam {Numbers} ids          文件ID（格式：[id1, id2]）
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -363,12 +401,25 @@ class FileController extends AbstractController
     {
         User::auth();
         //
-        $id = intval(Request::input('id'));
+        $ids = Request::input('ids');
         //
-        $file = File::permissionFind($id, 1000);
+        if (!is_array($ids) || empty($ids)) {
+            return Base::retError('请选择删除的文件或文件夹');
+        }
+        if (count($ids) > 100) {
+            return Base::retError('一次最多只能删除100个文件或文件夹');
+        }
         //
-        $file->deleteFile();
-        return Base::retSuccess('删除成功', $file);
+        $files = [];
+        AbstractModel::transaction(function() use ($ids, &$files) {
+            foreach ($ids as $id) {
+                $file = File::permissionFind($id, 1000);
+                $file->deleteFile();
+                $files[] = $file;
+            }
+        });
+        //
+        return Base::retSuccess('删除成功', $files);
     }
 
     /**
@@ -380,8 +431,14 @@ class FileController extends AbstractController
      * @apiName content
      *
      * @apiParam {Number|String} id
-     * - Number 文件ID（需要登录）
-     * - String 链接码（不需要登录，用于预览）
+     * - Number: 文件ID（需要登录）
+     * - String: 链接码（不需要登录，用于预览）
+     * @apiParam {String} only_update_at        仅获取update_at字段
+     * - no (默认)
+     * - yes
+     * @apiParam {String} down                  直接下载
+     * - no: 浏览（默认）
+     * - yes: 下载（office文件直接下载）
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -390,6 +447,8 @@ class FileController extends AbstractController
     public function content()
     {
         $id = Request::input('id');
+        $down = Request::input('down', 'no');
+        $only_update_at = Request::input('only_update_at', 'no');
         //
         if (Base::isNumber($id)) {
             User::auth();
@@ -404,8 +463,15 @@ class FileController extends AbstractController
             return Base::retError('参数错误');
         }
         //
+        if ($only_update_at == 'yes') {
+            return Base::retSuccess('success', [
+                'id' => $file->id,
+                'update_at' => Carbon::parse($file->updated_at)->toDateTimeString()
+            ]);
+        }
+        //
         $content = FileContent::whereFid($file->id)->orderByDesc('id')->first();
-        return FileContent::formatContent($file->type, $content ? $content->content : []);
+        return FileContent::formatContent($file, $content?->content, $down == 'yes');
     }
 
     /**
@@ -416,7 +482,7 @@ class FileController extends AbstractController
      * @apiGroup file
      * @apiName content__save
      *
-     * @apiParam {Number} id            文件ID
+     * @apiParam {Number} id                文件ID
      * @apiParam {Object} [D]               Request Payload 提交
      * - content: 内容
      *
@@ -426,6 +492,7 @@ class FileController extends AbstractController
      */
     public function content__save()
     {
+        Base::checkClientVersion('0.9.13');
         $user = User::auth();
         //
         $id = Base::getPostInt('id');
@@ -439,12 +506,11 @@ class FileController extends AbstractController
             $isRep = false;
             preg_match_all("/<img\s*src=\"data:image\/(png|jpg|jpeg);base64,(.*?)\"/s", $data['content'], $matchs);
             foreach ($matchs[2] as $key => $text) {
-                $p = "uploads/files/document/" . $id . "/";
-                Base::makeDir(public_path($p));
-                $p.= md5($text) . "." . $matchs[1][$key];
-                $r = file_put_contents(public_path($p), base64_decode($text));
-                if ($r) {
-                    $data['content'] = str_replace($matchs[0][$key], '<img src="' . Base::fillUrl($p) . '"', $data['content']);
+                $tmpPath = "uploads/file/document/" . date("Ym") . "/" . $id . "/attached/";
+                Base::makeDir(public_path($tmpPath));
+                $tmpPath .= md5($text) . "." . $matchs[1][$key];
+                if (file_put_contents(public_path($tmpPath), base64_decode($text))) {
+                    $data['content'] = str_replace($matchs[0][$key], '<img src="' . Base::fillUrl($tmpPath) . '"', $data['content']);
                     $isRep = true;
                 }
             }
@@ -454,11 +520,41 @@ class FileController extends AbstractController
             }
         }
         //
+        switch ($file->type) {
+            case 'document':
+                $contentArray = Base::json2array($content);
+                $contentString = $contentArray['content'];
+                $file->ext = $contentArray['type'] == 'md' ? 'md' : 'text';
+                break;
+            case 'drawio':
+                $contentArray = Base::json2array($content);
+                $contentString = $contentArray['xml'];
+                $file->ext = 'drawio';
+                break;
+            case 'mind':
+                $contentString = $content;
+                $file->ext = 'mind';
+                break;
+            case 'code':
+            case 'txt':
+                $contentString = $content;
+                break;
+            default:
+                return Base::retError('参数错误');
+        }
+        $path = "uploads/file/" . $file->type . "/" . date("Ym") . "/" . $id . "/" . md5($contentString);
+        $save = public_path($path);
+        Base::makeDir(dirname($save));
+        file_put_contents($save, $contentString);
+        //
         $content = FileContent::createInstance([
             'fid' => $file->id,
-            'content' => $content,
+            'content' => [
+                'type' => $file->ext,
+                'url' => $path
+            ],
             'text' => $text,
-            'size' => strlen($content),
+            'size' => filesize($save),
             'userid' => $user->userid,
         ]);
         $content->save();
@@ -498,7 +594,7 @@ class FileController extends AbstractController
         if ($status === 2) {
             $parse = parse_url($url);
             $from = 'http://' . env('APP_IPPR') . '.3' . $parse['path'] . '?' . $parse['query'];
-            $path = 'uploads/office/' . date("Ym") . '/' . $file->id . '/' . $user->userid . '-' . $key;
+            $path = 'uploads/file/' . $file->type . '/' . date("Ym") . '/' . $file->id . '/' . $key;
             $save = public_path($path);
             Base::makeDir(dirname($save));
             $res = Ihttp::download($from, $save);
@@ -516,6 +612,7 @@ class FileController extends AbstractController
                 $content->save();
                 //
                 $file->size = $content->size;
+                $file->updated_at = Carbon::now();
                 $file->save();
                 $file->pushMsg('update', $file);
             }
@@ -543,6 +640,7 @@ class FileController extends AbstractController
         $user = User::auth();
         //
         $pid = intval(Request::input('pid'));
+        $webkitRelativePath = Request::input('webkitRelativePath');
         //
         $userid = $user->userid;
         if ($pid > 0) {
@@ -557,7 +655,37 @@ class FileController extends AbstractController
             }
         }
         //
-        $path = 'uploads/office/' . date("Ym") . '/u' . $user->userid . '/';
+        $dirs = explode("/", $webkitRelativePath);
+        while (count($dirs) > 1) {
+            $dirName = array_shift($dirs);
+            if ($dirName) {
+                $pushMsg = [];
+                AbstractModel::transaction(function () use ($dirName, $user, $userid, &$pid, &$pushMsg) {
+                    $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,
+                        ]);
+                        if ($dirRow->saveBeforePids()) {
+                            $pushMsg[] = File::find($dirRow->id);
+                        }
+                    }
+                    if (empty($dirRow)) {
+                        throw new ApiException('创建文件夹失败');
+                    }
+                    $pid = $dirRow->id;
+                });
+                foreach ($pushMsg as $tmpRow) {
+                    $tmpRow->pushMsg('add', $tmpRow);
+                }
+            }
+        }
+        //
+        $path = 'uploads/tmp/' . date("Ym") . '/';
         $data = Base::upload([
             "file" => Request::file('files'),
             "type" => 'more',
@@ -570,6 +698,9 @@ class FileController extends AbstractController
         $data = $data['data'];
         //
         $type = match ($data['ext']) {
+            'text', 'md', 'markdown' => 'document',
+            'drawio' => 'drawio',
+            'mind' => 'mind',
             'doc', 'docx' => "word",
             'xls', 'xlsx' => "excel",
             'ppt', 'pptx' => "ppt",
@@ -581,12 +712,22 @@ class FileController extends AbstractController
             'ofd' => "ofd",
             'pdf' => "pdf",
             'txt' => "txt",
-            'html', 'htm', 'asp', 'jsp', 'xml', 'json', 'properties', 'md', 'gitignore', 'log', 'java', 'py', 'c', 'cpp', 'sql', 'sh', 'bat', 'm', 'bas', 'prg', 'cmd',
-            'php', 'go', 'python', 'js', 'ftl', 'css', 'lua', 'rb', 'yaml', 'yml', 'h', 'cs', 'aspx' => "code",
+            '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' => "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 = File::createInstance([
             'pid' => $pid,
             'name' => Base::rightDelete($data['name'], '.' . $data['ext']),
@@ -596,9 +737,11 @@ class FileController extends AbstractController
             'created_id' => $user->userid,
         ]);
         // 开始创建
-        return AbstractModel::transaction(function () use ($type, $user, $data, $file) {
-            $file->save();
+        return AbstractModel::transaction(function () use ($webkitRelativePath, $type, $user, $data, $file) {
+            $file->size = $data['size'] * 1024;
+            $file->saveBeforePids();
             //
+            $data = Base::uploadMove($data, "uploads/file/" . $file->type . "/" . date("Ym") . "/" . $file->id . "/");
             $content = FileContent::createInstance([
                 'fid' => $file->id,
                 'content' => [
@@ -608,16 +751,17 @@ class FileController extends AbstractController
                     'url' => $data['path']
                 ],
                 'text' => '',
-                'size' => $data['size'] * 1024,
+                'size' => $file->size,
                 'userid' => $user->userid,
             ]);
             $content->save();
             //
-            $file->size = $content->size;
-            $file->save();
+            $tmpRow = File::find($file->id);
+            $tmpRow->pushMsg('add', $tmpRow);
             //
-            $data = File::find($file->id);
-            $data->pushMsg('add', $data);
+            $data = $tmpRow->toArray();
+            $data['full_name'] = $webkitRelativePath ?: $data['name'];
+            File::handleImageUrl($data);
             return Base::retSuccess($data['name'] . ' 上传成功', $data);
         });
     }
@@ -672,6 +816,9 @@ class FileController extends AbstractController
      * - 0：只读
      * - 1：读写
      * - -1: 删除
+     * @apiParam {Number} [force]       设置共享时是否忽略提醒
+     * - 0：如果子文件夹已存在共享则ret返回-3001（默认）
+     * - 1：忽略提醒
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -684,6 +831,7 @@ class FileController extends AbstractController
         $id = intval(Request::input('id'));
         $userids = Request::input('userids');
         $permission = intval(Request::input('permission'));
+        $force = intval(Request::input('force'));
         //
         if (!in_array($permission, [-1, 0, 1])) {
             return Base::retError('参数错误');
@@ -697,8 +845,10 @@ class FileController extends AbstractController
             return Base::retError('仅限所有者操作');
         }
         //
-        if ($file->isNnShare()) {
-            return Base::retError('已经处于共享文件夹中');
+        $share = $file->isNnShare();
+        if ($share) {
+            $typeCn = $file->type === 'folder' ? '文件夹' : '文件';
+            return Base::retError("此{$typeCn}已经处于【{$share->name}】共享文件夹中，无法重复共享");
         }
         //
         if (!is_array($userids) || empty($userids)) {
@@ -710,16 +860,18 @@ class FileController extends AbstractController
             // 取消共享
             $action = "delete";
             foreach ($userids as $userid) {
-                if (FileUser::where([
-                    'file_id' => $file->id,
-                    'userid' => $userid,
-                ])->delete()) {
+                if (FileUser::deleteFileUser($file->id, $userid)) {
                     $array[] = $userid;
                 }
             }
         } else {
             // 设置共享
             $action = "update";
+            if ($force === 0) {
+                if (File::where("pids", "like", "%,{$file->id},%")->whereShare(1)->exists()) {
+                    return Base::retError('此文件夹内已有共享文件夹', [], -3001);
+                }
+            }
             if (FileUser::whereFileId($file->id)->count() + count($userids) > 100) {
                 return Base::retError('共享人数上限100个成员');
             }
@@ -735,7 +887,7 @@ class FileController extends AbstractController
             }
         }
         //
-        $file->setShare();
+        $file->updataShare();
         $file->pushMsg($action, $action == "delete" ? null : $file, $array);
         return Base::retSuccess($action == "delete" ? "删除成功" : "设置成功", $file);
     }
@@ -765,18 +917,12 @@ class FileController extends AbstractController
         if ($file->userid == $user->userid) {
             return Base::retError('不能退出自己共享的文件');
         }
-        if (FileUser::where([
-            'file_id' => $file->id,
-            'userid' => 0,
-        ])->exists()) {
+        if (FileUser::whereFileId($file->id)->whereUserid(0)->exists()) {
             return Base::retError('无法退出共享所有人的文件或文件夹');
         }
-        FileUser::where([
-            'file_id' => $file->id,
-            'userid' => $user->userid,
-        ])->delete();
+        FileUser::deleteFileUser($file->id, $user->userid);
         //
-        $file->setShare();
+        $file->updataShare();
         return Base::retSuccess("退出成功");
     }
 
@@ -799,20 +945,21 @@ class FileController extends AbstractController
      */
     public function link()
     {
-        User::auth();
+        $user = User::auth();
         //
         $id = intval(Request::input('id'));
         $refresh = Request::input('refresh', 'no');
         //
-        $file = File::permissionFind($id, 1000);
+        $file = File::permissionFind($id);
         if ($file->type == 'folder') {
             return Base::retError('文件夹暂不支持此功能');
         }
         //
-        $fileLink = FileLink::whereFileId($file->id)->first();
+        $fileLink = FileLink::whereFileId($file->id)->whereUserid($user->userid)->first();
         if (empty($fileLink)) {
             $fileLink = FileLink::createInstance([
                 'file_id' => $file->id,
+                'userid' => $user->userid,
                 'code' => Base::generatePassword(64),
             ]);
             $fileLink->save();

app/Http/Controllers/Api/ProjectController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
 
 use App\Exceptions\ApiException;
 use App\Models\AbstractModel;
+use App\Models\File;
 use App\Models\Project;
 use App\Models\ProjectColumn;
 use App\Models\ProjectFlow;
@@ -12,13 +13,18 @@ use App\Models\ProjectInvite;
 use App\Models\ProjectLog;
 use App\Models\ProjectTask;
 use App\Models\ProjectTaskFile;
+use App\Models\ProjectTaskFlowChange;
 use App\Models\ProjectUser;
 use App\Models\User;
 use App\Models\WebSocketDialog;
 use App\Module\Base;
+use App\Module\BillExport;
 use Carbon\Carbon;
 use Illuminate\Support\Arr;
+use Madzipper;
 use Request;
+use Response;
+use Session;
 
 /**
  * @apiDefine project
@@ -203,6 +209,9 @@ class ProjectController extends AbstractController
      * @apiParam {String} name          项目名称
      * @apiParam {String} [desc]        项目介绍
      * @apiParam {String} [columns]     列表，格式：列表名称1,列表名称2
+     * @apiParam {String} [flow]        开启流程
+     * - open: 开启
+     * - close: 关闭（默认）
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -214,6 +223,7 @@ class ProjectController extends AbstractController
         // 项目名称
         $name = trim(Request::input('name', ''));
         $desc = trim(Request::input('desc', ''));
+        $flow = trim(Request::input('flow', 'close'));
         if (mb_strlen($name) < 2) {
             return Base::retError('项目名称不可以少于2个字');
         } elseif (mb_strlen($name) > 32) {
@@ -250,7 +260,7 @@ class ProjectController extends AbstractController
             'desc' => $desc,
             'userid' => $user->userid,
         ]);
-        AbstractModel::transaction(function() use ($insertColumns, $project) {
+        AbstractModel::transaction(function() use ($flow, $insertColumns, $project) {
             $project->save();
             ProjectUser::createInstance([
                 'project_id' => $project->id,
@@ -267,6 +277,10 @@ class ProjectController extends AbstractController
             }
             $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},{"id":-11,"name":"进行中","status":"progress","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0},{"id":-12,"name":"待测试","status":"test","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0},{"id":-13,"name":"已完成","status":"end","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0},{"id":-14,"name":"已取消","status":"end","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0}]'));
+            }
         });
         //
         $data = Project::find($project->id);
@@ -310,7 +324,9 @@ class ProjectController extends AbstractController
         $project = Project::userProject($project_id, true, true);
         //
         if ($project->name != $name) {
-            $project->addLog("修改项目名称：{$project->name} => {$name}");
+            $project->addLog("修改项目名称", [
+                'change' => [$project->name, $name]
+            ]);
             $project->name = $name;
         }
         if ($project->desc != $desc) {
@@ -495,7 +511,7 @@ class ProjectController extends AbstractController
         $projectInvite->save();
         //
         $projectInvite->project->syncDialogUser();
-        $projectInvite->project->addLog("会员ID：" . $user->userid . " 通过邀请链接加入项目");
+        $projectInvite->project->addLog("通过邀请链接加入项目");
         //
         $data = $projectInvite->toArray();
         $data['already'] = true;
@@ -539,7 +555,7 @@ class ProjectController extends AbstractController
                 'owner' => 1,
             ]);
             $project->syncDialogUser();
-            $project->addLog("移交项目给会员ID：" . $owner_userid);
+            $project->addLog("移交项目给", ['userid' => $owner_userid]);
         });
         //
         $project->pushMsg('detail');
@@ -592,13 +608,14 @@ class ProjectController extends AbstractController
                 if (!is_array($item['task'])) continue;
                 $index = 0;
                 foreach ($item['task'] as $task_id) {
-                    ProjectTask::whereId($task_id)->whereProjectId($project->id)->update([
+                    if (ProjectTask::whereId($task_id)->whereProjectId($project->id)->whereCompleteAt(null)->update([
                         'column_id' => $item['id'],
                         'sort' => $index
-                    ]);
-                    ProjectTask::whereParentId($task_id)->whereProjectId($project->id)->update([
-                        'column_id' => $item['id'],
-                    ]);
+                    ])) {
+                        ProjectTask::whereParentId($task_id)->whereProjectId($project->id)->update([
+                            'column_id' => $item['id'],
+                        ]);
+                    }
                     $index++;
                 }
             }
@@ -634,7 +651,7 @@ class ProjectController extends AbstractController
             $row = ProjectUser::whereProjectId($project->id)->whereUserid($user->userid)->first();
             $row?->exitProject();
             $project->syncDialogUser();
-            $project->addLog("会员ID：" . $user->userid . " 退出项目");
+            $project->addLog("退出项目");
             $project->pushMsg('delete', null, $user->userid);
         });
         return Base::retSuccess('退出成功', ['id' => $project->id]);
@@ -874,8 +891,13 @@ class ProjectController extends AbstractController
      * - yes：已完成
      * - no：未完成
      * @apiParam {String} [archived]         归档状态
+     * - all：所有
      * - yes：已归档
      * - no：未归档（默认）
+     * @apiParam {String} [deleted]          是否读取已删除
+     * - all：所有
+     * - yes：已删除
+     * - no：未删除（默认）
      * @apiParam {Object} sorts              排序方式
      * - sorts.complete_at  完成时间：asc|desc
      * - sorts.archived_at  归档时间：asc|desc
@@ -898,6 +920,7 @@ class ProjectController extends AbstractController
         $time_before = Request::input('time_before');
         $complete = Request::input('complete', 'all');
         $archived = Request::input('archived', 'no');
+        $deleted = Request::input('deleted', 'no');
         $keys = Request::input('keys');
         $sorts = Request::input('sorts');
         $keys = is_array($keys) ? $keys : [];
@@ -909,7 +932,9 @@ class ProjectController extends AbstractController
         //
         $scopeAll = false;
         if ($parent_id > 0) {
-            ProjectTask::userTask($parent_id);
+            $isArchived = str_replace(['all', 'yes', 'no'], [null, false, true], $archived);
+            $isDeleted = str_replace(['all', 'yes', 'no'], [null, false, true], $deleted);
+            ProjectTask::userTask($parent_id, $isArchived, $isDeleted);
             $scopeAll = true;
             $builder->where('project_tasks.parent_id', $parent_id);
         } elseif ($parent_id === -1) {
@@ -952,8 +977,14 @@ class ProjectController extends AbstractController
             $builder->whereNull('project_tasks.archived_at');
         }
         //
+        if ($deleted == 'all') {
+            $builder->withTrashed();
+        } elseif ($deleted == 'yes') {
+            $builder->onlyTrashed();
+        }
+        //
         foreach ($sorts as $column => $direction) {
-            if (!in_array($column, ['complete_at', 'archived_at', 'end_at'])) continue;
+            if (!in_array($column, ['complete_at', 'archived_at', 'end_at', 'deleted_at'])) continue;
             if (!in_array($direction, ['asc', 'desc'])) continue;
             $builder->orderBy('project_tasks.' . $column, $direction);
         }
@@ -964,7 +995,208 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/one          19. 获取单个任务信息
+     * @api {get} api/project/task/export          19. 导出任务（限管理员）
+     *
+     * @apiDescription 导出指定范围任务（已完成、未完成、已归档），返回下载地址，需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup project
+     * @apiName task__export
+     *
+     * @apiParam {Array} [userid]               指定会员，如：[1, 2]
+     * @apiParam {Array} [time]                 指定时间范围，如：['2020-12-12', '2020-12-30']
+     * @apiParam {String} [type]
+     * - createdTime 任务创建时间
+     * - taskTime  任务计划时间（默认）
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function task__export()
+    {
+        $user = User::auth('admin');
+        //
+        $userid = Base::arrayRetainInt(Request::input('userid'), true);
+        $time = Request::input('time');
+        $type = Request::input('type', 'taskTime');
+        if (empty($userid) || empty($time)) {
+            return Base::retError('参数错误');
+        }
+        if (count($userid) > 20) {
+            return Base::retError('导出会员限制最多20个');
+        }
+        if (!(is_array($time) && Base::isDateOrTime($time[0]) && Base::isDateOrTime($time[1]))) {
+            return Base::retError('时间选择错误');
+        }
+        if (Carbon::parse($time[1])->timestamp - Carbon::parse($time[0])->timestamp > 90 * 86400) {
+            return Base::retError('时间范围限制最大90天');
+        }
+        $headings = [];
+        $headings[] = '任务ID';
+        $headings[] = '父级任务ID';
+        $headings[] = '所属项目';
+        $headings[] = '任务标题';
+        $headings[] = '任务开始时间';
+        $headings[] = '任务结束时间';
+        $headings[] = '完成时间';
+        $headings[] = '归档时间';
+        $headings[] = '任务计划用时';
+        $headings[] = '实际完成用时';
+        $headings[] = '超时时间';
+        $headings[] = '开发用时';
+        $headings[] = '验收/测试用时';
+        $headings[] = '负责人';
+        $headings[] = '创建人';
+        $headings[] = '状态';
+        $datas = [];
+        //
+        $builder = ProjectTask::select(['project_tasks.*', 'project_task_users.userid as ownerid'])
+            ->join('project_task_users', 'project_tasks.id', '=', 'project_task_users.task_id')
+            ->where('project_task_users.owner', 1)
+            ->whereIn('project_task_users.userid', $userid)
+            ->betweenTime(Carbon::parse($time[0])->startOfDay(), Carbon::parse($time[1])->endOfDay(), $type);
+        $builder->orderByDesc('project_tasks.id')->chunk(100, function ($tasks) use (&$datas) {
+            /** @var ProjectTask $task */
+            foreach ($tasks as $task) {
+                $flowChanges = ProjectTaskFlowChange::whereTaskId($task->id)->get();
+                $testTime = 0;//验收/测试时间
+                $taskStartTime = $task->start_at ? Carbon::parse($task->start_at)->timestamp : Carbon::parse($task->created_at)->timestamp;
+                $taskCompleteTime = $task->complete_at ? Carbon::parse($task->complete_at)->timestamp : time();
+                $totalTime = $taskCompleteTime - $taskStartTime; //开发测试总用时
+                foreach ($flowChanges as $change) {
+                    if (!str_contains($change->before_flow_item_name, 'end')) {
+                        $upOne = ProjectTaskFlowChange::where('id', '<', $change->id)->whereTaskId($task->id)->orderByDesc('id')->first();
+                        if ($upOne) {
+                            if (str_contains($change->before_flow_item_name, 'test') || str_contains($change->before_flow_item_name, '测试') || strpos($change->before_flow_item_name, '验收') !== false) {
+                                $testCtime = Carbon::parse($change->created_at)->timestamp;
+                                $tTime = Carbon::parse($upOne->created_at)->timestamp;
+                                $tMinusNum = $testCtime - $tTime;
+                                $testTime += $tMinusNum;
+                            }
+                        }
+                    }
+                }
+                if (!$task->complete_at) {
+                    $lastChange = ProjectTaskFlowChange::whereTaskId($task->id)->orderByDesc('id')->first();
+                    $nowTime = time();
+                    $unFinishTime = $nowTime - Carbon::parse($lastChange->created_at)->timestamp;
+                    if (str_contains($lastChange->after_flow_item_name, 'test') || str_contains($lastChange->after_flow_item_name, '测试') || strpos($lastChange->after_flow_item_name, '验收') !== false) {
+                        $testTime += $unFinishTime;
+                    }
+                }
+                $developTime = $totalTime - $testTime;//开发时间
+                $planTime = '-';//任务计划用时
+                $overTime = '-';//超时时间
+                if ($task->end_at) {
+                    $startTime = Carbon::parse($task->start_at)->timestamp;
+                    $endTime = Carbon::parse($task->end_at)->timestamp;
+                    $planTotalTime = $endTime - $startTime;
+                    $residueTime = $planTotalTime - $totalTime;
+                    if ($residueTime < 0) {
+                        $overTime = Base::timeFormat(abs($residueTime));
+                    }
+                    $planTime = Base::timeDiff($startTime, $endTime);
+                }
+                $actualTime = $task->complete_at ? $totalTime : 0;//实际完成用时
+                $statusText = '未完成';
+                if ($task->flow_item_name) {
+                    if (str_contains($task->flow_item_name, '已取消')) {
+                        $statusText = '已取消';
+                        $actualTime = 0;
+                        $testTime = 0;
+                        $developTime = 0;
+                        $overTime = '-';
+                    } elseif (str_contains($task->flow_item_name, '已完成')) {
+                        $statusText = '已完成';
+                    }
+                } elseif ($task->complete_at) {
+                    $statusText = '已完成';
+                }
+                $datas[] = [
+                    $task->id,
+                    $task->parent_id ?: '-',
+                    Base::filterEmoji($task->project?->name) ?: '-',
+                    Base::filterEmoji($task->name),
+                    $task->start_at ?: '-',
+                    $task->end_at ?: '-',
+                    $task->complete_at ?: '-',
+                    $task->archived_at ?: '-',
+                    $planTime ?: '-',
+                    $actualTime ? Base::timeFormat($actualTime) : '-',
+                    $overTime,
+                    $developTime > 0 ? Base::timeFormat($developTime) : '-',
+                    $testTime > 0 ? Base::timeFormat($testTime) : '-',
+                    Base::filterEmoji(User::userid2nickname($task->ownerid)) . " (ID: {$task->ownerid})",
+                    Base::filterEmoji(User::userid2nickname($task->userid)) . " (ID: {$task->userid})",
+                    $statusText
+                ];
+            }
+        });
+        //
+        $fileName = User::userid2nickname($userid[0]) ?: $userid[0];
+        if (count($userid) > 1) {
+            $fileName .= "等" . count($userid) . "位成员";
+        }
+        $fileName .= '任务统计_' . Base::time() . '.xls';
+        $filePath = "temp/task/export/" . date("Ym", Base::time());
+        $res = BillExport::create()->setHeadings($headings)->setData($datas)->store($filePath . "/" . $fileName);
+        if ($res != 1) {
+            return Base::retError('导出失败，' . $fileName . '！');
+        }
+        $xlsPath = storage_path("app/" . $filePath . "/" . $fileName);
+        $zipFile = "app/" . $filePath . "/" . Base::rightDelete($fileName, '.xls') . ".zip";
+        $zipPath = storage_path($zipFile);
+        if (file_exists($zipPath)) {
+            Base::deleteDirAndFile($zipPath, true);
+        }
+        try {
+            Madzipper::make($zipPath)->add($xlsPath)->close();
+        } catch (\Exception) {
+        }
+        //
+        if (file_exists($zipPath)) {
+            $base64 = base64_encode(Base::array2string([
+                'file' => $zipFile,
+            ]));
+            Session::put('task::export:userid', $user->userid);
+            return Base::retSuccess('success', [
+                'size' => Base::twoFloat(filesize($zipPath) / 1024, true),
+                'url' => Base::fillUrl('api/project/task/down?key=' . urlencode($base64)),
+            ]);
+        } else {
+            return Base::retError('打包失败，请稍后再试...');
+        }
+    }
+
+    /**
+     * @api {get} api/project/task/down          20. 导出任务（限管理员）
+     *
+     * @apiDescription 导出指定范围任务（已完成、未完成、已归档），返回下载地址，需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup project
+     * @apiName task__down
+     *
+     * @apiParam {String} key               通过export接口得到的下载钥匙
+     *
+     * @apiSuccess {File} data     返回数据（直接下载文件）
+     */
+    public function task__down()
+    {
+        $userid = Session::get('task::export:userid');
+        if (empty($userid)) {
+            return Base::ajaxError("请求已过期，请重新导出！", [], 0, 502);
+        }
+        //
+        $array = Base::string2array(base64_decode(urldecode(Request::input('key'))));
+        $file = $array['file'];
+        if (empty($file) || !file_exists(storage_path($file))) {
+            return Base::ajaxError("文件不存在！", [], 0, 502);
+        }
+        return response()->download(storage_path($file));
+    }
+
+    /**
+     * @api {get} api/project/task/one          21. 获取单个任务信息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -972,6 +1204,10 @@ class ProjectController extends AbstractController
      * @apiName task__one
      *
      * @apiParam {Number} task_id            任务ID
+     * @apiParam {String} [archived]         归档状态
+     * - all：所有
+     * - yes：已归档
+     * - no：未归档（默认）
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -982,8 +1218,10 @@ class ProjectController extends AbstractController
         User::auth();
         //
         $task_id = intval(Request::input('task_id'));
+        $archived = Request::input('archived', 'no');
         //
-        $task = ProjectTask::userTask($task_id, true, false, ['taskUser', 'taskTag']);
+        $isArchived = str_replace(['all', 'yes', 'no'], [null, false, true], $archived);
+        $task = ProjectTask::userTask($task_id, $isArchived, true, false, ['taskUser', 'taskTag']);
         //
         $data = $task->toArray();
         $data['project_name'] = $task->project?->name;
@@ -992,7 +1230,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/content          20. 获取任务详细描述
+     * @api {get} api/project/task/content          22. 获取任务详细描述
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1011,13 +1249,16 @@ class ProjectController extends AbstractController
         //
         $task_id = intval(Request::input('task_id'));
         //
-        $task = ProjectTask::userTask($task_id);
+        $task = ProjectTask::userTask($task_id, null);
         //
-        return Base::retSuccess('success', $task->content ?: json_decode('{}'));
+        if (empty($task->content)) {
+            return Base::retSuccess('success', json_decode('{}'));
+        }
+        return Base::retSuccess('success', $task->content->getContentInfo());
     }
 
     /**
-     * @api {get} api/project/task/files          21. 获取任务文件列表
+     * @api {get} api/project/task/files          23. 获取任务文件列表
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1036,13 +1277,13 @@ class ProjectController extends AbstractController
         //
         $task_id = intval(Request::input('task_id'));
         //
-        $task = ProjectTask::userTask($task_id);
+        $task = ProjectTask::userTask($task_id, null);
         //
         return Base::retSuccess('success', $task->taskFile);
     }
 
     /**
-     * @api {get} api/project/task/filedelete          22. 删除任务文件
+     * @api {get} api/project/task/filedelete          24. 删除任务文件
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -1066,7 +1307,7 @@ class ProjectController extends AbstractController
             return Base::retError('文件不存在或已被删除');
         }
         //
-        $task = ProjectTask::userTask($file->task_id, true, true);
+        $task = ProjectTask::userTask($file->task_id, true, true, true);
         //
         $task->pushMsg('filedelete', $file);
         $file->delete();
@@ -1075,7 +1316,85 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {post} api/project/task/add          23. 添加任务
+     * @api {get} api/project/task/filedetail          25. 获取任务文件详情
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup project
+     * @apiName task__filedetail
+     *
+     * @apiParam {Number} file_id           文件ID
+     * @apiParam {String} only_update_at    仅获取update_at字段
+     * - no (默认)
+     * - yes
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function task__filedetail()
+    {
+        User::auth();
+        //
+        $file_id = intval(Request::input('file_id'));
+        $only_update_at = Request::input('only_update_at', 'no');
+        //
+        $file = ProjectTaskFile::find($file_id);
+        if (empty($file)) {
+            return Base::retError("文件不存在");
+        }
+        //
+        if ($only_update_at == 'yes') {
+            return Base::retSuccess('success', [
+                'id' => $file->id,
+                'update_at' => Carbon::parse($file->updated_at)->toDateTimeString()
+            ]);
+        }
+        //
+        $data = $file->toArray();
+        $data['path'] = $file->getRawOriginal('path');
+        //
+        ProjectTask::userTask($file->task_id, null);
+        //
+        return Base::retSuccess('success', File::formatFileData($data));
+    }
+
+    /**
+     * @api {get} api/project/task/filedown          26. 下载任务文件
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup project
+     * @apiName task__filedown
+     *
+     * @apiParam {Number} file_id            文件ID
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function task__filedown()
+    {
+        User::auth();
+        //
+        $file_id = intval(Request::input('file_id'));
+        //
+        $file = ProjectTaskFile::find($file_id);
+        if (empty($file)) {
+            abort(403, "This file not exist.");
+        }
+        //
+        try {
+            ProjectTask::userTask($file->task_id, null);
+        } catch (\Exception $e) {
+            abort(403, $e->getMessage() ?: "This file not support download.");
+        }
+        //
+        return Response::download(public_path($file->getRawOriginal('path')), $file->name);
+    }
+
+    /**
+     * @api {post} api/project/task/add          27. 添加任务
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1146,7 +1465,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/addsub          24. 添加子任务
+     * @api {get} api/project/task/addsub          28. 添加子任务
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -1167,7 +1486,10 @@ class ProjectController extends AbstractController
         $task_id = intval(Request::input('task_id'));
         $name = Request::input('name');
         //
-        $task = ProjectTask::userTask($task_id, true, true);
+        $task = ProjectTask::userTask($task_id, true, true, true);
+        if ($task->complete_at) {
+            return Base::retError('主任务已完成无法添加子任务');
+        }
         //
         $task = ProjectTask::addTask([
             'name' => $name,
@@ -1183,7 +1505,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {post} api/project/task/update          25. 修改任务、子任务
+     * @api {post} api/project/task/update          29. 修改任务、子任务
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -1216,7 +1538,7 @@ class ProjectController extends AbstractController
         parse_str(Request::getContent(), $data);
         $task_id = intval($data['task_id']);
         //
-        $task = ProjectTask::userTask($task_id, true, 2);
+        $task = ProjectTask::userTask($task_id, true, true, 2);
         // 更新任务
         $updateMarking = [];
         $task->updateTask($data, $updateMarking);
@@ -1229,73 +1551,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {post} api/project/task/upload          26. 上传文件
-     *
-     * @apiDescription 需要token身份（限：项目、任务负责人）
-     * @apiVersion 1.0.0
-     * @apiGroup project
-     * @apiName task__upload
-     *
-     * @apiParam {Number} task_id               任务ID
-     * @apiParam {String} [filename]            post-文件名称
-     * @apiParam {String} [image64]             post-base64图片（二选一）
-     * @apiParam {File} [files]                 post-文件对象（二选一）
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function task__upload()
-    {
-        $user = User::auth();
-        //
-        $task_id = Base::getPostInt('task_id');
-        //
-        $task = ProjectTask::userTask($task_id, true, true);
-        //
-        $path = "uploads/task/" . $task->id . "/";
-        $image64 = Base::getPostValue('image64');
-        $fileName = Base::getPostValue('filename');
-        if ($image64) {
-            $data = Base::image64save([
-                "image64" => $image64,
-                "path" => $path,
-                "fileName" => $fileName,
-            ]);
-        } else {
-            $data = Base::upload([
-                "file" => Request::file('files'),
-                "type" => 'file',
-                "path" => $path,
-                "fileName" => $fileName,
-            ]);
-        }
-        //
-        if (Base::isError($data)) {
-            return Base::retError($data['msg']);
-        } else {
-            $fileData = $data['data'];
-            $file = ProjectTaskFile::createInstance([
-                'project_id' => $task->project_id,
-                'task_id' => $task->id,
-                'name' => $fileData['name'],
-                'size' => $fileData['size'] * 1024,
-                'ext' => $fileData['ext'],
-                'path' => $fileData['path'],
-                'thumb' => Base::unFillUrl($fileData['thumb']),
-                'userid' => $user->userid,
-            ]);
-            $file->save();
-            //
-            $file = ProjectTaskFile::find($file->id);
-            $task->addLog("上传文件：" . $file->name);
-            $task->pushMsg('upload', $file);
-            return Base::retSuccess("上传成功", $file);
-        }
-    }
-
-    /**
-     * @api {get} api/project/task/dialog          27. 创建/获取聊天室
+     * @api {get} api/project/task/dialog          30. 创建/获取聊天室
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1342,7 +1598,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/archived          28. 归档任务
+     * @api {get} api/project/task/archived          31. 归档任务
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -1365,7 +1621,7 @@ class ProjectController extends AbstractController
         $task_id = intval(Request::input('task_id'));
         $type = Request::input('type', 'add');
         //
-        $task = ProjectTask::userTask($task_id, $type == 'add', true);
+        $task = ProjectTask::userTask($task_id, $type == 'add', true, true);
         //
         if ($task->parent_id > 0) {
             return Base::retError('子任务不支持此功能');
@@ -1376,11 +1632,15 @@ class ProjectController extends AbstractController
         } elseif ($type == 'add') {
             $task->archivedTask(Carbon::now());
         }
-        return Base::retSuccess('操作成功', ['id' => $task->id]);
+        return Base::retSuccess('操作成功', [
+            'id' => $task->id,
+            'archived_at' => $task->archived_at,
+            'archived_userid' => $task->archived_userid,
+        ]);
     }
 
     /**
-     * @api {get} api/project/task/remove          29. 删除任务
+     * @api {get} api/project/task/remove          32. 删除任务
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -1388,6 +1648,9 @@ class ProjectController extends AbstractController
      * @apiName task__remove
      *
      * @apiParam {Number} task_id               任务ID
+     * @apiParam {String} type
+     * - recovery: 还原
+     * - delete: 删除（默认）
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -1398,15 +1661,20 @@ class ProjectController extends AbstractController
         User::auth();
         //
         $task_id = intval(Request::input('task_id'));
+        $type = Request::input('type', 'delete');
         //
-        $task = ProjectTask::userTask($task_id, null, true);
-        //
-        $task->deleteTask();
-        return Base::retSuccess('删除成功', ['id' => $task->id]);
+        $task = ProjectTask::userTask($task_id, null, $type !== 'recovery', true);
+        if ($type == 'recovery') {
+            $task->recoveryTask();
+            return Base::retSuccess('操作成功', ['id' => $task->id]);
+        } else {
+            $task->deleteTask();
+            return Base::retSuccess('删除成功', ['id' => $task->id]);
+        }
     }
 
     /**
-     * @api {get} api/project/task/resetfromlog          29. 根据日志重置任务
+     * @api {get} api/project/task/resetfromlog          33. 根据日志重置任务
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -1429,26 +1697,31 @@ class ProjectController extends AbstractController
         if (empty($projectLog) || empty($projectLog->task_id)) {
             return Base::retError('记录不存在');
         }
+        //
+        $task = ProjectTask::userTask($projectLog->task_id, true, true, true);
+        //
         $record = $projectLog->record;
-        //
-        $task = ProjectTask::userTask($projectLog->task_id, null, true);
-        //
-        if ($record['type'] == 'flow') {
-            $newFlowItem = ProjectFlowItem::find(intval($record['flow_item_id']));
+        if ($record['flow'] && is_array($record['flow'])) {
+            $rawData = $record['flow'];
+            $newFlowItem = ProjectFlowItem::find(intval($rawData['flow_item_id']));
             if (empty($newFlowItem)) {
                 return Base::retError('流程不存在或已被删除');
             }
-            return AbstractModel::transaction(function() use ($record, $task, $newFlowItem) {
-                $data = array_intersect_key($record, array_flip(['complete_at', 'owner', 'assist']));
+            return AbstractModel::transaction(function() use ($rawData, $task, $newFlowItem) {
                 $currentFlowItem = $task->flow_item_id ? ProjectFlowItem::find($task->flow_item_id) : null;
-                // 更新任务
+                //
                 $task->flow_item_id = $newFlowItem->id;
                 $task->flow_item_name = $newFlowItem->name;
+                $task->addLog("重置{任务}状态", [
+                    'change' => [$currentFlowItem?->name, $newFlowItem->name]
+                ]);
+                //
                 $updateMarking = [];
-                $task->addLog("重置{任务}状态：{$currentFlowItem?->name} => {$newFlowItem->name}");
+                $data = array_intersect_key($rawData, array_flip(['complete_at', 'owner', 'assist']));
                 $task->updateTask($data, $updateMarking);
                 //
                 $data = ProjectTask::oneTask($task->id)->toArray();
+                $data["flow_item_name"] = $newFlowItem->status . "|" . $newFlowItem->name;
                 $data['update_marking'] = $updateMarking ?: json_decode('{}');
                 $task->pushMsg('update', $data);
                 //
@@ -1460,7 +1733,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/flow          29. 任务工作流信息
+     * @api {get} api/project/task/flow          34. 任务工作流信息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1479,7 +1752,7 @@ class ProjectController extends AbstractController
         //
         $task_id = intval(Request::input('task_id'));
         //
-        $projectTask = ProjectTask::select(['id', 'project_id', 'complete_at', 'flow_item_id', 'flow_item_name'])->find($task_id);
+        $projectTask = ProjectTask::select(['id', 'project_id', 'complete_at', 'flow_item_id', 'flow_item_name'])->withTrashed()->find($task_id);
         if (empty($projectTask)) {
             return Base::retError('任务不存在', [ 'task_id' => $task_id ], -4002);
         }
@@ -1542,9 +1815,9 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/flow/list          29. 工作流列表
+     * @api {get} api/project/flow/list          35. 工作流列表
      *
-     * @apiDescription 需要token身份（限：项目负责人）
+     * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup project
      * @apiName flow__list
@@ -1561,14 +1834,14 @@ class ProjectController extends AbstractController
         //
         $project_id = intval(Request::input('project_id'));
         //
-        $project = Project::userProject($project_id, true, true);
+        $project = Project::userProject($project_id, true);
         //
         $list = ProjectFlow::with(['ProjectFlowItem'])->whereProjectId($project->id)->get();
         return Base::retSuccess('success', $list);
     }
 
     /**
-     * @api {post} api/project/flow/save          29. 保存工作流
+     * @api {post} api/project/flow/save          36. 保存工作流
      *
      * @apiDescription 需要token身份（限：项目负责人）
      * @apiVersion 1.0.0
@@ -1598,87 +1871,11 @@ class ProjectController extends AbstractController
         //
         $project = Project::userProject($project_id, true, true);
         //
-        return AbstractModel::transaction(function() use ($project, $flows) {
-            $projectFlow = ProjectFlow::whereProjectId($project->id)->first();
-            if (empty($projectFlow)) {
-                $projectFlow = ProjectFlow::createInstance([
-                    'project_id' => $project->id,
-                    'name' => 'Default'
-                ]);
-                if (!$projectFlow->save()) {
-                    throw new ApiException('工作流创建失败');
-                }
-            }
-            //
-            $ids = [];
-            $idc = [];
-            $hasStart = false;
-            $hasEnd = false;
-            foreach ($flows as $item) {
-                $id = intval($item['id']);
-                $turns = Base::arrayRetainInt($item['turns'] ?: [], true);
-                $userids = Base::arrayRetainInt($item['userids'] ?: [], true);
-                $flow = ProjectFlowItem::updateInsert([
-                    'id' => $id,
-                    'project_id' => $project->id,
-                    'flow_id' => $projectFlow->id,
-                ], [
-                    'name' => trim($item['name']),
-                    'status' => trim($item['status']),
-                    'sort' => intval($item['sort']),
-                    'turns' => $turns,
-                    'userids' => $userids,
-                    'usertype' => $item['usertype'],
-                ]);
-                if ($flow) {
-                    $ids[] = $flow->id;
-                    if ($flow->id != $id) {
-                        $idc[$id] = $flow->id;
-                    }
-                    if ($flow->status == 'start') {
-                        $hasStart = true;
-                    }
-                    if ($flow->status == 'end') {
-                        $hasEnd = true;
-                    }
-                }
-            }
-            if (!$hasStart) {
-                throw new ApiException('至少需要1个开始状态');
-            }
-            if (!$hasEnd) {
-                throw new ApiException('至少需要1个结束状态');
-            }
-            ProjectFlowItem::whereFlowId($projectFlow->id)->whereNotIn('id', $ids)->chunk(100, function($list) {
-                foreach ($list as $item) {
-                    $item->deleteFlowItem();
-                }
-            });
-            //
-            $projectFlow = ProjectFlow::with(['projectFlowItem'])->whereProjectId($project->id)->find($projectFlow->id);
-            $itemIds = $projectFlow->projectFlowItem->pluck('id')->toArray();
-            foreach ($projectFlow->projectFlowItem as $item) {
-                $turns = $item->turns;
-                foreach ($idc as $oid => $nid) {
-                    if (in_array($oid, $turns)) {
-                        $turns = array_diff($turns, [$oid]);
-                        $turns[] = $nid;
-                    }
-                }
-                if (!in_array($item->id, $turns)) {
-                    $turns[] = $item->id;
-                }
-                $turns = array_values(array_filter(array_unique(array_intersect($turns, $itemIds))));
-                sort($turns);
-                $item->turns = $turns;
-                ProjectFlowItem::whereId($item->id)->update([ 'turns' => Base::array2json($turns) ]);
-            }
-            return Base::retSuccess('保存成功', $projectFlow);
-        });
+        return Base::retSuccess('保存成功', $project->addFlow($flows));
     }
 
     /**
-     * @api {get} api/project/flow/delete          29. 删除工作流
+     * @api {get} api/project/flow/delete          37. 删除工作流
      *
      * @apiDescription 需要token身份（限：项目负责人）
      * @apiVersion 1.0.0
@@ -1710,7 +1907,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/log/lists          30. 获取项目、任务日志
+     * @api {get} api/project/log/lists          38. 获取项目、任务日志
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1734,18 +1931,21 @@ class ProjectController extends AbstractController
         $project_id = intval(Request::input('project_id'));
         $task_id = intval(Request::input('task_id'));
         //
-        $builder = ProjectLog::with(['user']);
+        $builder = ProjectLog::select(["*"]);
         if ($task_id > 0) {
-            $task = ProjectTask::userTask($task_id);
+            $task = ProjectTask::userTask($task_id, null);
             $builder->whereTaskId($task->id);
         } else {
             $project = Project::userProject($project_id);
-            $builder->whereProjectId($project->id);
+            $builder->with(['projectTask:id,parent_id,name'])->whereProjectId($project->id);
         }
         //
         $list = $builder->orderByDesc('created_at')->paginate(Base::getPaginate(100, 20));
-        $list->transform(function (ProjectLog $log) {
+        $list->transform(function (ProjectLog $log) use ($task_id) {
             $timestamp = Carbon::parse($log->created_at)->timestamp;
+            if ($task_id === 0) {
+                $log->projectTask?->cancelAppend();
+            }
             $log->time = [
                 'ymd' => date(date("Y", $timestamp) == date("Y", Base::time()) ? "m-d" : "Y-m-d", $timestamp),
                 'hi' => date("h:i", $timestamp) ,
@@ -1757,4 +1957,34 @@ class ProjectController extends AbstractController
         //
         return Base::retSuccess('success', $list);
     }
+
+    /**
+     * @api {get} api/project/top          39. 项目置顶
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup project
+     * @apiName top
+     *
+     * @apiParam {Number} project_id            项目ID
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function top()
+    {
+        $user = User::auth();
+        $projectId = intval(Request::input('project_id'));
+        $projectUser = ProjectUser::whereUserid($user->userid)->whereProjectId($projectId)->first();
+        if (!$projectUser) {
+            return Base::retError("项目不存在");
+        }
+        $projectUser->top_at = $projectUser->top_at ? null : Carbon::now();
+        $projectUser->save();
+        return Base::retSuccess("success", [
+            'id' => $projectUser->project_id,
+            'top_at' => $projectUser->top_at?->toDateTimeString(),
+        ]);
+    }
 }

app/Http/Controllers/Api/ReportController.php

@@ -0,0 +1,474 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Exceptions\ApiException;
+use App\Models\AbstractModel;
+use App\Models\ProjectTask;
+use App\Models\Report;
+use App\Models\ReportReceive;
+use App\Models\User;
+use App\Module\Base;
+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;
+use Illuminate\Support\Facades\Validator;
+
+/**
+ * @apiDefine report
+ *
+ * 汇报
+ */
+class ReportController extends AbstractController
+{
+    /**
+     * @api {get} api/report/my          01. 我发送的汇报
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName my
+     *
+     * @apiParam {Object} [keys]             搜索条件
+     * - keys.type: 汇报类型，weekly:周报，daily:日报
+     * - keys.created_at: 汇报时间
+     * @apiParam {Number} [page]        当前页，默认:1
+     * @apiParam {Number} [pagesize]    每页显示数量，默认:20，最大:50
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function my(): array
+    {
+        $user = User::auth();
+        //
+        $builder = Report::with(['receivesUser'])->whereUserid($user->userid);
+        $keys = Request::input('keys');
+        if (is_array($keys)) {
+            if (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->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
+        return Base::retSuccess('success', $list);
+    }
+
+    /**
+     * @api {get} api/report/receive          02. 我接收的汇报
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName receive
+     *
+     * @apiParam {Object} [keys]             搜索条件
+     * - keys.key: 关键词
+     * - keys.type: 汇报类型，weekly:周报，daily:日报
+     * - keys.created_at: 汇报时间
+     * @apiParam {Number} [page]        当前页，默认:1
+     * @apiParam {Number} [pagesize]    每页显示数量，默认:20，最大:50
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function receive(): array
+    {
+        $user = User::auth();
+        $builder = Report::with(['receivesUser']);
+        $builder->whereHas("receivesUser", function ($query) use ($user) {
+            $query->where("report_receives.userid", $user->userid);
+        });
+        $keys = Request::input('keys');
+        if (is_array($keys)) {
+            if ($keys['key']) {
+                $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])));
+            }
+        }
+        $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");
+            }
+        }
+        return Base::retSuccess('success', $list);
+    }
+
+    /**
+     * @api {get} api/report/store          03. 保存并发送工作汇报
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName store
+     *
+     * @apiParam {Number} [id]           汇报ID
+     * @apiParam {String} [title]        汇报标题
+     * @apiParam {Array}  [type]         汇报类型，weekly:周报，daily:日报
+     * @apiParam {Number} [content]      内容
+     * @apiParam {Number} [receive]      汇报对象
+     * @apiParam {Number} [offset]       偏移量
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function store(): array
+    {
+        $input = [
+            "id" => Base::getPostValue("id", 0),
+            "title" => Base::getPostValue("title"),
+            "type" => Base::getPostValue("type"),
+            "content" => Base::getPostValue("content"),
+            "receive" => Base::getPostValue("receive"),
+            // 以当前日期为基础的周期偏移量。例如选择了上一周那么就是 -1，上一天同理。
+            "offset" => Base::getPostValue("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只能是数字',
+            'title.required' => '请填写标题',
+            '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"])) {
+            // 删除当前登录人
+            $input["receive"] = array_diff($input["receive"], [$user->userid]);
+
+            // 查询用户是否存在
+            if (count($input["receive"]) !== User::whereIn("userid", $input["receive"])->count())
+                return Base::retError("用户不存在");
+
+            foreach ($input["receive"] as $userid) {
+                $input["receive_content"][] = [
+                    "receive_time" => Carbon::now()->toDateTimeString(),
+                    "userid" => $userid,
+                    "read" => 0,
+                ];
+            }
+        }
+
+        // 在事务中运行
+        return AbstractModel::transaction(function () use ($input, $user) {
+            $id = $input["id"];
+            if ($id) {
+                // 编辑
+                $report = Report::getOne($id);
+                $report->updateInstance([
+                    "title" => $input["title"],
+                    "type" => $input["type"],
+                    "content" => htmlspecialchars($input["content"]),
+                ]);
+            } else {
+                // 生成唯一标识
+                $sign = Report::generateSign($input["type"], $input["offset"]);
+                // 检查唯一标识是否存在
+                if (empty($input["id"])) {
+                    if (Report::query()->whereSign($sign)->whereType($input["type"])->count() > 0)
+                        throw new ApiException("请勿重复提交工作汇报");
+                }
+                $report = Report::createInstance([
+                    "title" => $input["title"],
+                    "type" => $input["type"],
+                    "content" => htmlspecialchars($input["content"]),
+                    "userid" => $user->userid,
+                    "sign" => $sign,
+                ]);
+            }
+
+            $report->save();
+            if (!empty($input["receive_content"])) {
+                // 删除关联
+                $report->Receives()->delete();
+                // 保存接收人
+                $report->Receives()->createMany($input["receive_content"]);
+            }
+
+            // 推送消息
+            $userids = [];
+            foreach ($input["receive_content"] as $item) {
+                $userids[] = $item['userid'];
+            }
+            if ($userids) {
+                $params = [
+                    'ignoreFd' => Request::header('fd'),
+                    'userid' => $userids,
+                    'msg' => [
+                        'type' => 'report',
+                        'action' => 'unreadUpdate',
+                    ]
+                ];
+                Task::deliver(new PushTask($params, false));
+            }
+            //
+            return Base::retSuccess('保存成功', $report);
+        });
+    }
+
+    /**
+     * @api {get} api/report/template          04. 生成汇报模板
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName template
+     *
+     * @apiParam {Array}  [type]         汇报类型，weekly:周报，daily:日报
+     * @apiParam {Number} [offset]       偏移量
+     * @apiParam {String} [date]         时间
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function template(): array
+    {
+        $user = User::auth();
+        $type = trim(Request::input("type"));
+        $offset = abs(intval(Request::input("offset", 0)));
+        $id = intval(Request::input("offset", 0));
+        $now_dt = trim(Request::input("date")) ? Carbon::parse(Request::input("date")) : Carbon::now();
+        // 获取开始时间
+        if ($type === Report::DAILY) {
+            $start_time = Carbon::today();
+            if ($offset > 0) {
+                // 将当前时间调整为偏移量当天结束
+                $now_dt->subDays($offset)->endOfDay();
+                // 开始时间偏移量计算
+                $start_time->subDays($offset);
+            }
+            $end_time = Carbon::instance($start_time)->endOfDay();
+        } else {
+            $start_time = Carbon::now();
+            if ($offset > 0) {
+                // 将当前时间调整为偏移量当周结束
+                $now_dt->subWeeks($offset)->endOfDay();
+                // 开始时间偏移量计算
+                $start_time->subWeeks($offset);
+            }
+            $start_time->startOfWeek();
+            $end_time = Carbon::instance($start_time)->endOfWeek();
+        }
+        // 生成唯一标识
+        $sign = Report::generateSign($type, 0, Carbon::instance($start_time));
+        $one = Report::whereSign($sign)->whereType($type)->first();
+        // 如果已经提交了相关汇报
+        if ($one && $id > 0) {
+            return Base::retSuccess('success', [
+                "content" => $one->content,
+                "title" => $one->title,
+                "id" => $one->id,
+            ]);
+        }
+
+        // 已完成的任务
+        $completeContent = "";
+        $complete_task = ProjectTask::query()
+            ->whereNotNull("complete_at")
+            ->whereBetween("complete_at", [$start_time->toDateTimeString(), $end_time->toDateTimeString()])
+            ->whereHas("taskUser", function ($query) use ($user) {
+                $query->where("userid", $user->userid);
+            })
+            ->orderByDesc("id")
+            ->get();
+        if ($complete_task->isNotEmpty()) {
+            foreach ($complete_task as $task) {
+                $complete_at = Carbon::parse($task->complete_at);
+                $pre = $type == Report::WEEKLY ? ('<span>[' . Base::Lang('周' . ['日', '一', '二', '三', '四', '五', '六'][$complete_at->dayOfWeek]) . ']</span>&nbsp;') : '';
+                $completeContent .= '<li>' . $pre . $task->name . '</li>';
+            }
+        } else {
+            $completeContent = '<li>&nbsp;</li>';
+        }
+
+        // 未完成的任务
+        $unfinishedContent = "";
+        $unfinished_task = ProjectTask::query()
+            ->whereNull("complete_at")
+            ->whereNotNull("start_at")
+            ->where("end_at", "<", $end_time->toDateTimeString())
+            ->whereHas("taskUser", function ($query) use ($user) {
+                $query->where("userid", $user->userid);
+            })
+            ->orderByDesc("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>';
+            }
+        } else {
+            $unfinishedContent = '<li>&nbsp;</li>';
+        }
+        // 生成标题
+        if ($type === Report::WEEKLY) {
+            $title = $user->nickname . "的周报[" . $start_time->format("m/d") . "-" . $end_time->format("m/d") . "]";
+            $title .= "[" . $start_time->month . "月第" . $start_time->weekOfMonth . "周]";
+        } else {
+            $title = $user->nickname . "的日报[" . $start_time->format("Y/m/d") . "]";
+        }
+        $data = [
+            "time" => $start_time->toDateTimeString(),
+            "complete_task" => $complete_task,
+            "unfinished_task" => $unfinished_task,
+            "content" => '<h2>' . Base::Lang('已完成工作') . '</h2><ol>' .
+                $completeContent . '</ol><h2>' .
+                Base::Lang('未完成的工作') . '</h2><ol>' .
+                $unfinishedContent . '</ol>',
+            "title" => $title,
+        ];
+        if ($one) {
+            $data['id'] = $one->id;
+        }
+        return Base::retSuccess('success', $data);
+    }
+
+    /**
+     * @api {get} api/report/detail          05. 报告详情
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName detail
+     *
+     * @apiParam {Number} [id]           报告id
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function detail(): array
+    {
+        $user = User::auth();
+        $id = intval(trim(Request::input("id")));
+        if (empty($id))
+            return Base::retError("缺少ID参数");
+
+        $one = Report::getOne($id);
+        $one->type_val = $one->getRawOriginal("type");
+
+        // 标记为已读
+        if (!empty($one->receivesUser)) {
+            foreach ($one->receivesUser as $item) {
+                if ($item->userid === $user->userid && $item->pivot->read === 0) {
+                    $one->receivesUser()->updateExistingPivot($user->userid, [
+                        "read" => 1,
+                    ]);
+                }
+            }
+        }
+
+        return Base::retSuccess("success", $one);
+    }
+
+    /**
+     * @api {get} api/report/last_submitter          06. 获取最后一次提交的接收人
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName last_submitter
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function last_submitter(): array
+    {
+        $one = Report::getLastOne();
+        return Base::retSuccess("success", empty($one["receives"]) ? [] : $one["receives"]);
+    }
+
+    /**
+     * @api {get} api/report/unread          07. 获取未读
+     *
+     * @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);
+    }
+
+    /**
+     * @api {get} api/report/read          08. 标记汇报已读，可批量
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName read
+     *
+     * @apiParam {String} [ids]      报告id
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function read(): array
+    {
+        $user = User::auth();
+        $ids = Request::input("ids");
+        if (!is_array($ids) && !is_string($ids)) {
+            return Base::retError("请传入正确的工作汇报Id");
+        }
+
+        if (is_string($ids)) {
+            $ids = explode(",", $ids);
+        }
+
+        $data = Report::with(["receivesUser" => function (BelongsToMany $query) use ($user) {
+            $query->where("report_receives.userid", $user->userid)->where("read", 0);
+        }])->whereIn("id", $ids)->get();
+
+        if ($data->isNotEmpty()) {
+            foreach ($data as $item) {
+                (!empty($item->receivesUser) && $item->receivesUser->isNotEmpty()) && $item->receivesUser()->updateExistingPivot($user->userid, [
+                    "read" => 1,
+                ]);
+            }
+        }
+        return Base::retSuccess("success", $data);
+    }
+}

app/Http/Controllers/Api/SystemController.php

@@ -4,6 +4,8 @@ namespace App\Http\Controllers\Api;
 
 use App\Models\User;
 use App\Module\Base;
+use Guanguans\Notify\Factory;
+use Guanguans\Notify\Messages\EmailMessage;
 use Request;
 use Response;
 
@@ -25,7 +27,7 @@ class SystemController extends AbstractController
      * @apiParam {String} type
      * - get: 获取（默认）
      * - all: 获取所有（需要管理员权限）
-     * - save: 保存设置（参数：reg、reg_invite、login_code、password_policy、project_invite、chat_nickname、auto_archived、archived_day）
+     * - save: 保存设置（参数：['reg', 'reg_invite', 'login_code', 'password_policy', 'project_invite', 'chat_nickname', 'auto_archived', 'archived_day', 'start_home', 'home_footer']）
 
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -41,7 +43,18 @@ class SystemController extends AbstractController
             User::auth('admin');
             $all = Request::input();
             foreach ($all AS $key => $value) {
-                if (!in_array($key, ['reg', 'reg_invite', 'login_code', 'password_policy', 'project_invite', 'chat_nickname', 'auto_archived', 'archived_day'])) {
+                if (!in_array($key, [
+                    'reg',
+                    'reg_invite',
+                    'login_code',
+                    'password_policy',
+                    'project_invite',
+                    'chat_nickname',
+                    'auto_archived',
+                    'archived_day',
+                    'start_home',
+                    'home_footer'
+                ])) {
                     unset($all[$key]);
                 }
             }
@@ -72,12 +85,68 @@ class SystemController extends AbstractController
         $setting['chat_nickname'] = $setting['chat_nickname'] ?: 'optional';
         $setting['auto_archived'] = $setting['auto_archived'] ?: 'close';
         $setting['archived_day'] = floatval($setting['archived_day']) ?: 7;
+        $setting['start_home'] = $setting['start_home'] ?: 'close';
         //
         return Base::retSuccess('success', $setting ?: json_decode('{}'));
     }
 
     /**
-     * @api {get} api/system/demo          02. 获取演示账号
+     * @api {get} api/system/setting/email          02. 获取邮箱设置、保存邮箱设置（限管理员）
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName setting__email
+     *
+     * @apiParam {String} type
+     * - get: 获取（默认）
+     * - save: 保存设置（参数：['smtp_server', 'port', 'account', 'password', 'reg_verify', 'notice', 'task_remind_hours', 'task_remind_hours2']）
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function setting__email()
+    {
+        User::auth('admin');
+        //
+        $type = trim(Request::input('type'));
+        if ($type == 'save') {
+            if (env("SYSTEM_SETTING") == 'disabled') {
+                return Base::retError('当前环境禁止修改');
+            }
+            $all = Request::input();
+            foreach ($all as $key => $value) {
+                if (!in_array($key, [
+                    'smtp_server',
+                    'port',
+                    'account',
+                    'password',
+                    'reg_verify',
+                    'notice',
+                    'task_remind_hours',
+                    'task_remind_hours2'
+                ])) {
+                    unset($all[$key]);
+                }
+            }
+            $setting = Base::setting('emailSetting', Base::newTrim($all));
+        } else {
+            $setting = Base::setting('emailSetting');
+        }
+        //
+        $setting['smtp_server'] = $setting['smtp_server'] ?: '';
+        $setting['port'] = $setting['port'] ?: '';
+        $setting['account'] = $setting['account'] ?: '';
+        $setting['password'] = $setting['password'] ?: '';
+        $setting['reg_verify'] = $setting['reg_verify'] ?: 'close';
+        $setting['notice'] = $setting['notice'] ?: 'open';
+        $setting['task_remind_hours'] = floatval($setting['task_remind_hours']) ?: 0;
+        $setting['task_remind_hours2'] = floatval($setting['task_remind_hours2']) ?: 0;
+        //
+        return Base::retSuccess('success', $setting ?: json_decode('{}'));
+    }
+
+    /**
+     * @api {get} api/system/demo          03. 获取演示帐号
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -101,12 +170,16 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/priority          03. 获取优先级、保存优先级
+     * @api {post} api/system/priority          04. 任务优先级
      *
+     * @apiDescription 获取任务优先级、保存任务优先级
      * @apiVersion 1.0.0
      * @apiGroup system
      * @apiName priority
      *
+     * @apiParam {String} type
+     * - get: 获取（默认）
+     * - save: 保存（限管理员）
      * @apiParam {Array} list   优先级数据，格式：[{name,color,days,priority}]
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
@@ -146,7 +219,54 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/info          04. 获取终端详细信息
+     * @api {post} api/system/column/template          05. 创建项目模板
+     *
+     * @apiDescription 获取创建项目模板、保存创建项目模板
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName column__template
+     *
+     * @apiParam {String} type
+     * - get: 获取（默认）
+     * - save: 保存（限管理员）
+     * @apiParam {Array} list   优先级数据，格式：[{name,columns}]
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function column__template()
+    {
+        $type = trim(Request::input('type'));
+        if ($type == 'save') {
+            User::auth('admin');
+            $list = Base::getPostValue('list');
+            $array = [];
+            if (empty($list) || !is_array($list)) {
+                return Base::retError('参数错误');
+            }
+            foreach ($list AS $item) {
+                if (empty($item['name']) || empty($item['columns'])) {
+                    continue;
+                }
+                $array[] = [
+                    'name' => $item['name'],
+                    'columns' => array_values(array_filter(array_unique(explode(",", $item['columns']))))
+                ];
+            }
+            if (empty($array)) {
+                return Base::retError('参数为空');
+            }
+            $setting = Base::setting('columnTemplate', $array);
+        } else {
+            $setting = Base::setting('columnTemplate');
+        }
+        //
+        return Base::retSuccess('success', $setting);
+    }
+
+    /**
+     * @api {get} api/system/get/info          06. 获取终端详细信息
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -175,7 +295,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ip          05. 获取IP地址
+     * @api {get} api/system/get/ip          07. 获取IP地址
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -190,7 +310,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/cnip          06. 是否中国IP地址
+     * @api {get} api/system/get/cnip          08. 是否中国IP地址
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -207,7 +327,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ipgcj02          07. 获取IP地址经纬度
+     * @api {get} api/system/get/ipgcj02          09. 获取IP地址经纬度
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -224,7 +344,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ipinfo          08. 获取IP地址详细信息
+     * @api {get} api/system/get/ipinfo          10. 获取IP地址详细信息
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -241,7 +361,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/imgupload          09. 上传图片
+     * @api {post} api/system/imgupload          11. 上传图片
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -264,7 +384,7 @@ class SystemController extends AbstractController
         if (!$scale[0] && !$scale[1]) {
             $scale = [2160, 4160, -1];
         }
-        $path = "uploads/picture/" . User::userid() . "/" . date("Ym") . "/";
+        $path = "uploads/user/picture/" . User::userid() . "/" . date("Ym") . "/";
         $image64 = trim(Base::getPostValue('image64'));
         $fileName = trim(Base::getPostValue('filename'));
         if ($image64) {
@@ -291,7 +411,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/imgview          10. 浏览图片空间
+     * @api {get} api/system/get/imgview          12. 浏览图片空间
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -309,7 +429,7 @@ class SystemController extends AbstractController
         if (User::userid() === 0) {
             return Base::retError('身份失效，等重新登录');
         }
-        $publicPath = "uploads/picture/" . User::userid() . "/";
+        $publicPath = "uploads/user/picture/" . User::userid() . "/";
         $dirPath = public_path($publicPath);
         $dirs = $files = [];
         //
@@ -387,7 +507,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/fileupload          11. 上传文件
+     * @api {post} api/system/fileupload          13. 上传文件
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -407,7 +527,7 @@ class SystemController extends AbstractController
         if (User::userid() === 0) {
             return Base::retError('身份失效，等重新登录');
         }
-        $path = "uploads/files/" . User::userid() . "/" . date("Ym") . "/";
+        $path = "uploads/user/file/" . User::userid() . "/" . date("Ym") . "/";
         $image64 = trim(Base::getPostValue('image64'));
         $fileName = trim(Base::getPostValue('filename'));
         if ($image64) {
@@ -427,4 +547,66 @@ class SystemController extends AbstractController
         //
         return $data;
     }
+
+    /**
+     * @api {get} api/system/get/starthome          14. 启动首页设置信息
+     *
+     * @apiDescription 用于判断注册是否需要启动首页
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName get__starthome
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function get__starthome()
+    {
+        return Base::retSuccess('success', [
+            'need_start' => Base::settingFind('system', 'start_home') == 'open',
+            'home_footer' => Base::settingFind('system', 'home_footer')
+        ]);
+    }
+
+    /**
+     * @api {get} api/system/email/check          15. 邮件发送测试（限管理员）
+     *
+     * @apiDescription 测试配置邮箱是否能发送邮件
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName email__check
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function email__check()
+    {
+        User::auth('admin');
+        //
+        $all = Request::input();
+        if (!Base::isEmail($all['to'])) {
+            return Base::retError('请输入正确的收件人地址');
+        }
+        try {
+            Factory::mailer()
+                ->setDsn("smtp://{$all['account']}:{$all['password']}@{$all['smtp_server']}:{$all['port']}?verify_peer=0")
+                ->setMessage(EmailMessage::create()
+                    ->from(env('APP_NAME', 'Task') . " <{$all['account']}>")
+                    ->to($all['to'])
+                    ->subject('Mail sending test')
+                    ->html('<p>收到此电子邮件意味着您的邮箱配置正确。</p><p>Receiving this email means that your mailbox is configured correctly.</p>'))
+                ->send();
+            return Base::retSuccess('成功发送');
+        } catch (\Exception $e) {
+            // 一般是请求超时
+            if (str_contains($e->getMessage(), "Timed Out")) {
+                return Base::retError("language.TimedOut");
+            } elseif ($e->getCode() === 550) {
+                return Base::retError('邮件内容被拒绝，请检查邮箱是否开启接收功能');
+            } else {
+                return Base::retError($e->getMessage());
+            }
+        }
+    }
 }

app/Http/Controllers/Api/UsersController.php

@@ -2,7 +2,10 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Models\AbstractModel;
 use App\Models\User;
+use App\Models\UserEmailVerification;
+use App\Models\UserTransfer;
 use App\Module\Base;
 use Arr;
 use Cache;
@@ -42,6 +45,7 @@ class UsersController extends AbstractController
         $type = trim(Request::input('type'));
         $email = trim(Request::input('email'));
         $password = trim(Request::input('password'));
+        $isRegVerify = Base::settingFind('emailSetting', 'reg_verify') === 'open';
         if ($type == 'reg') {
             $setting = Base::setting('system');
             if ($setting['reg'] == 'close') {
@@ -53,6 +57,10 @@ class UsersController extends AbstractController
                 }
             }
             $user = User::reg($email, $password);
+            if ($isRegVerify) {
+                UserEmailVerification::userEmailSend($user);
+                return Base::retError('注册成功，请验证邮箱后登录', ['code' => 'email']);
+            }
         } else {
             $needCode = !Base::isError(User::needCode($email));
             if ($needCode) {
@@ -68,21 +76,25 @@ class UsersController extends AbstractController
             $retError = function ($msg) use ($email) {
                 Cache::forever("code::" . $email, "need");
                 $needCode = !Base::isError(User::needCode($email));
-                $needData = [ 'code' => $needCode ? 'need' : 'no' ];
+                $needData = ['code' => $needCode ? 'need' : 'no'];
                 return Base::retError($msg, $needData);
             };
             $user = User::whereEmail($email)->first();
             if (empty($user)) {
-                return $retError('账号或密码错误');
+                return $retError('帐号或密码错误');
             }
             if ($user->password != Base::md52($password, $user->encrypt)) {
-                return $retError('账号或密码错误');
+                return $retError('帐号或密码错误');
             }
             //
             if (in_array('disable', $user->identity)) {
                 return $retError('帐号已停用...');
             }
             Cache::forget("code::" . $email);
+            if ($isRegVerify && $user->email_verity === 0) {
+                UserEmailVerification::userEmailSend($user);
+                return Base::retError('您还没有验证邮箱，请先登录邮箱通过验证邮件验证邮箱', ['code' => 'email']);
+            }
         }
         //
         $array = [
@@ -204,7 +216,9 @@ class UsersController extends AbstractController
         $user = User::auth();
         User::token($user);
         //
-        return Base::retSuccess('success', $user);
+        $data = $user->toArray();
+        $data['nickname_original'] = $user->getRawOriginal('nickname');
+        return Base::retSuccess('success', $data);
     }
 
     /**
@@ -416,9 +430,20 @@ class UsersController extends AbstractController
      * @apiName lists
      *
      * @apiParam {Object} [keys]        搜索条件
+     * - keys.key               邮箱/昵称/职位（赋值后keys.email、keys.nickname、keys.profession失效）
      * - keys.email             邮箱
      * - keys.nickname          昵称
      * - keys.profession        职位
+     * - keys.identity          身份（如：admin、noadmin）
+     * - keys.disable           是否离职
+     *   - yes:     仅离职
+     *   - all:     全部
+     *   - 其他值:   仅在职（默认）
+     * - keys.email_verity      邮箱是否认证
+     *   - yes:     已认证
+     *   - no:      未认证
+     *   - 其他值:   全部（默认）
+     *
      * @apiParam {Number} [page]        当前页，默认:1
      * @apiParam {Number} [pagesize]    每页显示数量，默认:20，最大:50
      *
@@ -434,14 +459,26 @@ class UsersController extends AbstractController
         //
         $keys = Request::input('keys');
         if (is_array($keys)) {
-            if ($keys['email']) {
-                $builder->where("email", "like", "%{$keys['email']}%");
-            }
-            if ($keys['nickname']) {
-                $builder->where("nickname", "like", "%{$keys['nickname']}%");
-            }
-            if ($keys['profession']) {
-                $builder->where("profession", "like", "%{$keys['profession']}%");
+            if ($keys['key']) {
+                if (str_contains($keys['key'], "@")) {
+                    $builder->where("email", "like", "%{$keys['key']}%");
+                } else {
+                    $builder->where(function($query) use ($keys) {
+                        $query->where("email", "like", "%{$keys['key']}%")
+                            ->orWhere("nickname", "like", "%{$keys['key']}%")
+                            ->orWhere("profession", "like", "%{$keys['key']}%");
+                    });
+                }
+            } else {
+                if ($keys['email']) {
+                    $builder->where("email", "like", "%{$keys['email']}%");
+                }
+                if ($keys['nickname']) {
+                    $builder->where("nickname", "like", "%{$keys['nickname']}%");
+                }
+                if ($keys['profession']) {
+                    $builder->where("profession", "like", "%{$keys['profession']}%");
+                }
             }
             if ($keys['identity']) {
                 if (Base::leftExists($keys['identity'], "no")) {
@@ -450,6 +487,18 @@ class UsersController extends AbstractController
                     $builder->where("identity", "like", "%,{$keys['identity']},%");
                 }
             }
+            if ($keys['disable'] === 'yes') {
+                $builder->whereNotNull('disable_at');
+            } elseif ($keys['disable'] !== 'all') {
+                $builder->whereNull('disable_at');
+            }
+            if ($keys['email_verity'] === 'yes') {
+                $builder->whereEmailVerity(1);
+            } elseif ($keys['email_verity'] === 'no') {
+                $builder->whereEmailVerity(0);
+            }
+        } else {
+            $builder->whereNull('disable_at');
         }
         $list = $builder->orderByDesc('userid')->paginate(Base::getPaginate(50, 20));
         //
@@ -464,16 +513,18 @@ class UsersController extends AbstractController
      * @apiGroup users
      * @apiName operation
      *
-     * @apiParam {Number} userid          会员ID
-     * @apiParam {String} [type]          操作
+     * @apiParam {Number} userid                会员ID
+     * @apiParam {String} [type]                操作
      * - setadmin             设为管理员
      * - clearadmin           取消管理员
-     * - setdisable           设为禁用
-     * - cleardisable         取消禁用
+     * - setdisable           设为离职（需要参数 disable_time、transfer_userid）
+     * - cleardisable         取消离职
      * - delete               删除会员
-     * @apiParam {String} [password]      新的密码
-     * @apiParam {String} [nickname]      昵称
-     * @apiParam {String} [profession]    职位
+     * @apiParam {String} [password]            新的密码
+     * @apiParam {String} [nickname]            昵称
+     * @apiParam {String} [profession]          职位
+     * @apiParam {String} [disable_time]        离职时间
+     * @apiParam {String} [transfer_userid]     离职交接人
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -481,7 +532,7 @@ class UsersController extends AbstractController
      */
     public function operation()
     {
-        User::auth('admin');
+        $user = User::auth('admin');
         //
         $data = Request::all();
         $userid = intval($data['userid']);
@@ -494,6 +545,7 @@ class UsersController extends AbstractController
         $userInfo->checkSystem(1);
         //
         $upArray = [];
+        $transferUser = null;
         switch ($type) {
             case 'setadmin':
                 $upArray['identity'] = array_diff($userInfo->identity, ['admin']);
@@ -505,9 +557,23 @@ class UsersController extends AbstractController
                 break;
 
             case 'setdisable':
+                if ($userInfo->userid === $user->userid) {
+                    return Base::retError('不能操作自己离职');
+                }
                 $upArray['identity'] = array_diff($userInfo->identity, ['disable']);
                 $upArray['identity'][] = 'disable';
-                $upArray['disable_at'] = Carbon::now();
+                $upArray['disable_at'] = Carbon::parse($data['disable_time']);
+                $transferUserid = is_array($data['transfer_userid']) ? $data['transfer_userid'][0] : $data['transfer_userid'];
+                $transferUser = User::find(intval($transferUserid));
+                if (empty($transferUser)) {
+                    return Base::retError('请选择正确的交接人');
+                }
+                if ($transferUser->userid === $userInfo->userid) {
+                    return Base::retError('不能移交给自己');
+                }
+                if (in_array('disable', $transferUser->identity)) {
+                    return Base::retError('交接人已离职，请选择另一个交接人');
+                }
                 break;
 
             case 'cleardisable':
@@ -516,7 +582,10 @@ class UsersController extends AbstractController
                 break;
 
             case 'delete':
-                $userInfo->delete();
+                if ($userInfo->userid === $user->userid) {
+                    return Base::retError('不能删除自己');
+                }
+                $userInfo->deleteUser();
                 break;
         }
         if (isset($upArray['identity'])) {
@@ -553,10 +622,68 @@ class UsersController extends AbstractController
             }
         }
         if ($upArray) {
-            $userInfo->updateInstance($upArray);
-            $userInfo->save();
+            AbstractModel::transaction(function() use ($type, $upArray, $userInfo, $transferUser) {
+                $userInfo->updateInstance($upArray);
+                $userInfo->save();
+                if ($type === 'setdisable') {
+                    $userTransfer = UserTransfer::createInstance([
+                        'original_userid' => $userInfo->userid,
+                        'new_userid' => $transferUser->userid,
+                    ]);
+                    $userTransfer->save();
+                    $userTransfer->start();
+                }
+            });
         }
         //
         return Base::retSuccess('修改成功', $userInfo);
     }
+
+    /**
+     * @api {get} api/users/email/verification          13. 邮箱验证
+     *
+     * @apiDescription 不需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup users
+     * @apiName email__verification
+     *
+     * @apiParam {String} code           验证参数
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据（同"获取我的信息"接口）
+     */
+    public function email__verification()
+    {
+        $data = Request::input();
+        // 表单验证
+        Base::validator($data, [
+            'code.required' => '验证码不能为空',
+        ]);
+        //
+        $res = UserEmailVerification::whereCode($data['code'])->first();
+        if (empty($res)) {
+            return Base::retError('无效连接,请重新注册');
+        }
+
+        // 如果已经校验过
+        if (intval($res->status) === 1)
+            return Base::retError('链接已经使用过', ['code' => 2]);
+
+        $oldTime = Carbon::parse($res->created_at)->timestamp;
+        $time = Base::Time();
+
+        // 30分钟失效
+        if (abs($time - $oldTime) > 1800) {
+            return Base::retError("链接已失效，请重新登录/注册");
+        }
+        UserEmailVerification::whereCode($data['code'])->update([
+            'status' => 1
+        ]);
+        User::whereUserid($res->userid)->update([
+            'email_verity' => 1
+        ]);
+
+        return Base::retSuccess('绑定邮箱成功');
+    }
 }

app/Http/Controllers/IndexController.php

@@ -5,8 +5,11 @@ namespace App\Http\Controllers;
 use App\Module\Base;
 use App\Tasks\AutoArchivedTask;
 use App\Tasks\DeleteTmpTask;
+use App\Tasks\OverdueRemindEmailTask;
+use Arr;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
 use Redirect;
+use Request;
 
 
 /**
@@ -22,6 +25,10 @@ class IndexController extends InvokeController
         if ($action) {
             $app .= "__" . $action;
         }
+        if ($app === 'manifest.txt') {
+            $app = 'manifest';
+            $child = 'txt';
+        }
         if (!method_exists($this, $app)) {
             $app = method_exists($this, $method) ? $method : 'main';
         }
@@ -30,11 +37,88 @@ 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()]);
+        $hash = 'no';
+        $path = public_path('js/hash');
+        $murl = url('manifest.txt');
+        if (file_exists($path)) {
+            $hash = trim(file_get_contents(public_path('js/hash')));
+            if (strlen($hash) > 16) {
+                $hash = 'long';
+            }
+        }
+        return response()->view('main', [
+            'version' => Base::getVersion(),
+            'hash' => $hash
+        ])->header('Link', "<{$murl}>; rel=\"prefetch\"");
+    }
+
+    /**
+     * Manifest
+     * @param $child
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response|string
+     */
+    public function manifest($child = '')
+    {
+        if (empty($child)) {
+            $murl = url('manifest.txt');
+            return response($murl)->header('Link', "<{$murl}>; rel=\"prefetch\"");
+        }
+        $array = [
+            "office/web-apps/apps/api/documents/api.js?hash=" . Base::getVersion(),
+            "office/7.0.1-37/web-apps/vendor/requirejs/require.js",
+            "office/7.0.1-37/web-apps/apps/api/documents/api.js",
+            "office/7.0.1-37/sdkjs/common/AllFonts.js",
+            "office/7.0.1-37/web-apps/vendor/xregexp/xregexp-all-min.js",
+            "office/7.0.1-37/web-apps/vendor/sockjs/sockjs.min.js",
+            "office/7.0.1-37/web-apps/vendor/jszip/jszip.min.js",
+            "office/7.0.1-37/web-apps/vendor/jszip-utils/jszip-utils.min.js",
+            "office/7.0.1-37/sdkjs/common/libfont/wasm/fonts.js",
+            "office/7.0.1-37/sdkjs/common/Charts/ChartStyles.js",
+            "office/7.0.1-37/sdkjs/slide/themes//themes.js",
+
+            "office/7.0.1-37/web-apps/apps/presentationeditor/main/app.js",
+            "office/7.0.1-37/sdkjs/slide/sdk-all-min.js",
+            "office/7.0.1-37/sdkjs/slide/sdk-all.js",
+
+            "office/7.0.1-37/web-apps/apps/documenteditor/main/app.js",
+            "office/7.0.1-37/sdkjs/word/sdk-all-min.js",
+            "office/7.0.1-37/sdkjs/word/sdk-all.js",
+
+            "office/7.0.1-37/web-apps/apps/spreadsheeteditor/main/app.js",
+            "office/7.0.1-37/sdkjs/cell/sdk-all-min.js",
+            "office/7.0.1-37/sdkjs/cell/sdk-all.js",
+        ];
+        foreach ($array as &$item) {
+            $item = url($item);
+        }
+        return implode(PHP_EOL, $array);
+    }
+
+    /**
+     * 获取版本号
+     * @return array
+     */
+    public function version()
+    {
+        $url = url('');
+        $package = Base::getPackage();
+        $array = [
+            'version' => Base::getVersion(),
+            'publish' => Arr::get($package, 'app.0.publish'),
+        ];
+        if (is_array($package['app'])) {
+            foreach ($package['app'] as $item) {
+                $urls = $item['urls'] && is_array($item['urls']) ? $item['urls'] : $item['url'];
+                if (is_array($item['publish']) && Base::hostContrast($url, $urls)) {
+                    $array['publish'] = $item['publish'];
+                }
+            }
+        }
+        return $array;
     }
 
     /**
@@ -61,10 +145,69 @@ class IndexController extends InvokeController
         Task::deliver(new DeleteTmpTask('tmp', 24));
         // 自动归档任务
         Task::deliver(new AutoArchivedTask());
+        // 任务到期邮件提醒
+        Task::deliver(new OverdueRemindEmailTask());
 
         return "success";
     }
 
+    /**
+     * 桌面客户端发布
+     */
+    public function desktop__publish($name = '')
+    {
+        $latestFile = public_path("uploads/desktop/latest");
+        $genericVersion = Request::header('generic-version');
+        // 上传
+        if (preg_match("/^\d+\.\d+\.\d+$/", $genericVersion)) {
+            $latestVersion = file_exists($latestFile) ? trim(file_get_contents($latestFile)) : "0.0.1";
+            if (version_compare($genericVersion, $latestVersion) > -1) {    // 限制上传版本必须 ≥ 当前版本
+                $genericPath = "uploads/desktop/{$genericVersion}/";
+                $res = Base::upload([
+                    "file" => Request::file('file'),
+                    "type" => 'desktop',
+                    "path" => $genericPath,
+                    "fileName" => true
+                ]);
+                if (Base::isSuccess($res)) {
+                    file_put_contents($latestFile, $genericVersion);
+                }
+                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')) {
+                    continue;
+                }
+                $fileName = Base::leftDelete($file, $dirPath);
+                $files[] = [
+                    'name' => substr($fileName, 1),
+                    'time' => date("Y-m-d H:i:s", fileatime($file)),
+                    'size' => Base::readableBytes(filesize($file)),
+                    'url' => Base::fillUrl($path . $fileName),
+                ];
+            }
+            return view('desktop', ['version' => $name, 'files' => $files]);
+        }
+        // 下载
+        if ($name && file_exists($latestFile)) {
+            $genericVersion = file_get_contents($latestFile);
+            if (preg_match("/^\d+\.\d+\.\d+$/", $genericVersion)) {
+                $filePath = public_path("uploads/desktop/{$genericVersion}/{$name}");
+                if (file_exists($filePath)) {
+                    return response()->download($filePath);
+                }
+            }
+        }
+        return abort(404);
+    }
+
     /**
      * 提取所有中文
      * @return array|string

app/Http/Middleware/VerifyCsrfToken.php

@@ -21,6 +21,9 @@ class VerifyCsrfToken extends Middleware
         // 保存任务优先级
         'api/system/priority/',
 
+        // 保存创建项目列表模板
+        'api/system/column/template/',
+
         // 添加任务
         'api/project/task/add/',
 
@@ -30,8 +33,8 @@ class VerifyCsrfToken extends Middleware
         // 修改任务
         'api/project/task/update/',
 
-        // 上传任务问题
-        'api/project/task/upload/',
+        // 聊天发文本
+        'api/dialog/msg/sendtext/',
 
         // 聊天发文件
         'api/dialog/msg/sendfile/',
@@ -44,5 +47,11 @@ class VerifyCsrfToken extends Middleware
 
         // 保存文件内容（上传）
         'api/file/content/upload/',
+
+        // 保存汇报
+        'api/report/store/',
+
+        // 发布桌面端
+        'desktop/publish/',
     ];
 }

app/Models/AbstractModel.php

@@ -10,13 +10,15 @@ 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()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel query()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Model|object|static|null cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Model|object|static|null cancelHidden()
  * @method static \Illuminate\Database\Eloquent\Builder|static with($relations)
  * @method static \Illuminate\Database\Query\Builder|static select($columns = [])
  * @method static \Illuminate\Database\Query\Builder|static whereNotIn($column, $values, $boolean = 'and')
@@ -62,6 +64,24 @@ class AbstractModel extends Model
         return $this->$key;
     }
 
+    /**
+     * 取消附加值
+     * @return static
+     */
+    protected function scopeCancelAppend()
+    {
+        return $this->setAppends([]);
+    }
+
+    /**
+     * 取消隐藏值
+     * @return static
+     */
+    protected function scopeCancelHidden()
+    {
+        return $this->setHidden([]);
+    }
+
     /**
      * 为数组 / JSON 序列化准备日期。
      * @param DateTimeInterface $date
@@ -133,9 +153,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)) {
@@ -145,8 +166,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;

app/Models/File.php

@@ -13,6 +13,7 @@ use Request;
  * App\Models\File
  *
  * @property int $id
+ * @property string|null $pids 上级ID递归
  * @property int|null $pid 上级ID
  * @property int|null $cid 复制ID
  * @property string|null $name 名称
@@ -37,6 +38,7 @@ 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 whereShare($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereSize($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereType($value)
@@ -50,15 +52,55 @@ 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'
+    ];
+
+    /**
+     * office文件
+     */
+    const officeExt = [
+        'doc', 'docx',
+        'xls', 'xlsx',
+        'ppt', 'pptx',
+    ];
+
+    /**
+     * 图片文件
+     */
+    const imageExt = [
+        'jpg', 'jpeg', 'png', 'gif', 'bmp'
+    ];
+
+    /**
+     * 本地媒体文件
+     */
+    const localExt = [
+        'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw',
+        'tif', 'tiff',
+        'mp3', 'wav', 'mp4', 'flv',
+        'avi', 'mov', 'wmv', 'mkv', '3gp', 'rm',
+    ];
+
     /**
      * 是否有访问权限
      * @param $userid
-     * @return int -1:没有权限，0:访问权限，1:读写权限，1000:所有者
+     * @return int -1:没有权限，0:访问权限，1:读写权限，1000:所有者或创建者
      */
     public function getPermission($userid)
     {
-        if ($userid == $this->userid) {
-            // ① 自己的文件夹
+        if ($userid == $this->userid || $userid == $this->created_id) {
+            // ① 自己的文件夹 或 自己创建的文件夹
             return 1000;
         }
         $row = $this->getShareInfo();
@@ -100,7 +142,7 @@ class File extends AbstractModel
 
     /**
      * 是否处于共享文件夹内（不含自身）
-     * @return bool
+     * @return File|false
      */
     public function isNnShare()
     {
@@ -111,7 +153,7 @@ class File extends AbstractModel
                 break;
             }
             if ($row->share) {
-                return true;
+                return $row;
             }
             $pid = $row->pid;
         }
@@ -123,7 +165,7 @@ class File extends AbstractModel
      * @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;
@@ -132,10 +174,13 @@ class File extends AbstractModel
             AbstractModel::transaction(function () use ($share) {
                 $this->share = $share;
                 $this->save();
+                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 +188,40 @@ class File extends AbstractModel
         return true;
     }
 
+    /**
+     * 保存前更新pids
+     * @return bool
+     */
+    public function saveBeforePids()
+    {
+        $pid = $this->pid;
+        $array = [];
+        while ($pid > 0) {
+            $array[] = $pid;
+            $pid = intval(self::whereId($pid)->value('pid'));
+        }
+        $opids = $this->pids;
+        if ($array) {
+            $array = array_values(array_reverse($array));
+            $this->pids = ',' . implode(',', $array) . ',';
+        } else {
+            $this->pids = '';
+        }
+        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->saveBeforePids();
+                }
+            });
+        }
+        return true;
+    }
+
     /**
      * 遍历删除文件(夹)
      * @return bool
@@ -152,8 +231,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()) {
@@ -181,15 +259,15 @@ 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());
+            $builder = WebSocket::select(['userid']);
+            if ($action == 'content') {
+                $builder->wherePath("/single/file/{$this->id}");
+            } elseif ($this->pid > 0) {
+                $builder->wherePath("/manage/file/{$this->pid}");
+            } else {
+                $builder->wherePath("/manage/file");
             }
+            $userid = array_merge($userid, $builder->pluck('userid')->toArray());
             $userid = array_values(array_filter(array_unique($userid)));
         }
         if (empty($userid)) {
@@ -214,10 +292,25 @@ class File extends AbstractModel
         Task::deliver($task);
     }
 
+    /**
+     * 处理返回图片地址
+     * @param $item
+     * @return void
+     */
+    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']);
+            }
+        }
+    }
+
     /**
      * 获取文件并检测权限
      * @param $id
-     * @param int $limit 要求权限: 0-访问权限、1-读写权限、1000-所有者
+     * @param int $limit 要求权限: 0-访问权限、1-读写权限、1000-所有者或创建者
      * @param $permission
      * @return File
      */
@@ -231,12 +324,143 @@ class File extends AbstractModel
         $permission = $file->getPermission(User::userid());
         if ($permission < $limit) {
             $msg = match ($limit) {
-                1000 => '仅限所有者操作',
-                1 => '没有读写权限',
-                default => '没有访问权限',
+                1000 => '仅限所有者或创建者操作',
+                1 => '没有修改写入权限',
+                default => '没有查看访问权限',
             };
             throw new ApiException($msg);
         }
         return $file;
     }
+
+    /**
+     * 格式化内容数据
+     * @param array $data [path, size, ext, name]
+     * @return array
+     */
+    public static function formatFileData(array $data)
+    {
+        $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'] = file_get_contents($publicPath) ?: 'Content deleted';
+                    $data['file_mode'] = 'code';
+                }
+                elseif (in_array($fileExt, File::officeExt))
+                {
+                    // office预览
+                    $data['content'] = '';
+                    $data['file_mode'] = 'office';
+                }
+                else
+                {
+                    // 其他预览
+                    if (in_array($fileExt, File::localExt)) {
+                        $url = Base::fillUrl($filePath);
+                    } else {
+                        $url = 'http://' . env('APP_IPPR') . '.3/' . $filePath;
+                    }
+                    if ($fileExt != 'pdf') {
+                        $fileDotExt = ".{$fileExt}";
+                        $fileName = Base::rightDelete($data['name'], $fileDotExt) . $fileDotExt;
+                        $url = Base::urlAddparameter($url, [
+                            'fullfilename' => $fileName
+                        ]);
+                    }
+                    $data['content'] = [
+                        'preview' => true,
+                        'url' => base64_encode($url),
+                    ];
+                    $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->saveBeforePids();
+
+        // 移交文件
+        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->saveBeforePids();
+            }
+        });
+
+        // 移交文件权限
+        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();
+                }
+            }
+        });
+    }
 }

app/Models/FileContent.php

@@ -41,43 +41,53 @@ class FileContent extends AbstractModel
     use SoftDeletes;
 
     /**
-     * 获取格式内容
-     * @param $type
+     * 获取格式内容（或下载）
+     * @param File $file
      * @param $content
+     * @param $download
      * @return array|\Symfony\Component\HttpFoundation\BinaryFileResponse
      */
-    public static function formatContent($type, $content)
+    public static function formatContent($file, $content, $download = false)
     {
-        $content = Base::json2array($content);
-        if (in_array($type, ['word', 'excel', 'ppt'])) {
+        $name = $file->ext ? "{$file->name}.{$file->ext}" : null;
+        $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'], $type)));
+                return Response::download(resource_path('assets/statics/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $file->type)), $name);
             }
-            return Response::download(public_path($content['url']));
+            return Response::download(public_path($content['url']), $name);
         }
         if (empty($content)) {
-            $content = match ($type) {
+            $content = match ($file->type) {
                 'document' => [
-                    "type" => "md",
+                    "type" => $file->ext,
                     "content" => "",
                 ],
-                'sheet' => [
-                    [
-                        "name" => "Sheet1",
-                        "config" => json_decode('{}'),
-                    ]
-                ],
                 default => json_decode('{}'),
             };
+            if ($download) {
+                abort(403, "This file is empty.");
+            }
         } else {
-            $content['preview'] = false;
-            if ($content['ext'] && !in_array($content['ext'], ['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx'])) {
-                $url = 'http://' . env('APP_IPPR') . '.3/' . $content['url'];
-                if (in_array($type, ['picture', 'image', 'tif', 'media'])) {
-                    $url = Base::fillUrl($content['url']);
+            $path = $content['url'];
+            if ($file->ext) {
+                $res = File::formatFileData([
+                    'path' => $path,
+                    'ext' => $file->ext,
+                    'size' => $file->size,
+                    'name' => $file->name,
+                ]);
+                $content = $res['content'];
+            } else {
+                $content['preview'] = false;
+            }
+            if ($download) {
+                $filePath = public_path($path);
+                if (isset($filePath)) {
+                    return Response::download($filePath, $name);
+                } else {
+                    abort(403, "This file not support download.");
                 }
-                $content['url'] = base64_encode($url);
-                $content['preview'] = true;
             }
         }
         return Base::retSuccess('success', [ 'content' => $content ]);

app/Models/FileLink.php

@@ -6,9 +6,10 @@ namespace App\Models;
  * 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
@@ -21,6 +22,7 @@ namespace App\Models;
  * @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

app/Models/FileUser.php

@@ -25,4 +25,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/Project.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Exceptions\ApiException;
+use App\Module\Base;
 use App\Tasks\PushTask;
 use Carbon\Carbon;
 use DB;
@@ -112,6 +113,7 @@ class Project extends AbstractModel
             ->select([
                 'projects.*',
                 'project_users.owner',
+                'project_users.top_at',
             ])
             ->leftJoin('project_users', function ($leftJoin) use ($userid) {
                 $leftJoin
@@ -135,6 +137,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);
@@ -211,7 +214,7 @@ class Project extends AbstractModel
      */
     public function relationUserids()
     {
-        return $this->projectUser->pluck('userid')->toArray();
+        return ProjectUser::whereProjectId($this->id)->orderBy('id')->pluck('userid')->toArray();
     }
 
     /**
@@ -285,18 +288,23 @@ class Project extends AbstractModel
     /**
      * 添加项目日志
      * @param string $detail
+     * @param array $record
      * @param int $userid
      * @return ProjectLog
      */
-    public function addLog($detail, $userid = 0)
+    public function addLog($detail, $record = [], $userid = 0)
     {
-        $log = ProjectLog::createInstance([
+        $array = [
             'project_id' => $this->id,
             'column_id' => 0,
             'task_id' => 0,
             'userid' => $userid ?: User::userid(),
             'detail' => $detail,
-        ]);
+        ];
+        if ($record) {
+            $array['record'] = $record;
+        }
+        $log = ProjectLog::createInstance($array);
         $log->save();
         return $log;
     }
@@ -345,6 +353,114 @@ class Project extends AbstractModel
         }
     }
 
+    /**
+     * 添加工作流
+     * @param $flows
+     * @return mixed
+     */
+    public function addFlow($flows)
+    {
+        return AbstractModel::transaction(function() use ($flows) {
+            $projectFlow = ProjectFlow::whereProjectId($this->id)->first();
+            if (empty($projectFlow)) {
+                $projectFlow = ProjectFlow::createInstance([
+                    'project_id' => $this->id,
+                    'name' => 'Default'
+                ]);
+                if (!$projectFlow->save()) {
+                    throw new ApiException('工作流创建失败');
+                }
+            }
+            //
+            $ids = [];
+            $idc = [];
+            $hasStart = false;
+            $hasEnd = false;
+            $upTaskList = [];
+            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']);
+                if ($usertype == 'replace' && empty($userids)) {
+                    throw new ApiException("状态[{$item['name']}]设置错误，设置流转模式时必须填写状态负责人");
+                }
+                if ($usertype == 'merge' && empty($userids)) {
+                    throw new ApiException("状态[{$item['name']}]设置错误，设置剔除模式时必须填写状态负责人");
+                }
+                if ($userlimit && empty($userids)) {
+                    throw new ApiException("状态[{$item['name']}]设置错误，设置限制负责人时必须填写状态负责人");
+                }
+                $flow = ProjectFlowItem::updateInsert([
+                    'id' => $id,
+                    'project_id' => $this->id,
+                    'flow_id' => $projectFlow->id,
+                ], [
+                    'name' => trim($item['name']),
+                    'status' => trim($item['status']),
+                    'sort' => intval($item['sort']),
+                    'turns' => $turns,
+                    'userids' => $userids,
+                    'usertype' => trim($item['usertype']),
+                    'userlimit' => $userlimit,
+                ], [], $isInsert);
+                if ($flow) {
+                    $ids[] = $flow->id;
+                    if ($flow->id != $id) {
+                        $idc[$id] = $flow->id;
+                    }
+                    if ($flow->status == 'start') {
+                        $hasStart = true;
+                    }
+                    if ($flow->status == 'end') {
+                        $hasEnd = true;
+                    }
+                    if (!$isInsert) {
+                        $upTaskList[$flow->id] = $flow->status . "|" . $flow->name;
+                    }
+                }
+            }
+            if (!$hasStart) {
+                throw new ApiException('至少需要1个开始状态');
+            }
+            if (!$hasEnd) {
+                throw new ApiException('至少需要1个结束状态');
+            }
+            ProjectFlowItem::whereFlowId($projectFlow->id)->whereNotIn('id', $ids)->chunk(100, function($list) {
+                foreach ($list as $item) {
+                    $item->deleteFlowItem();
+                }
+            });
+            //
+            foreach ($upTaskList as $id => $value) {
+                ProjectTask::whereFlowItemId($id)->update([
+                    'flow_item_name' => $value
+                ]);
+            }
+            //
+            $projectFlow = ProjectFlow::with(['projectFlowItem'])->whereProjectId($this->id)->find($projectFlow->id);
+            $itemIds = $projectFlow->projectFlowItem->pluck('id')->toArray();
+            foreach ($projectFlow->projectFlowItem as $item) {
+                $turns = $item->turns;
+                foreach ($idc as $oid => $nid) {
+                    if (in_array($oid, $turns)) {
+                        $turns = array_diff($turns, [$oid]);
+                        $turns[] = $nid;
+                    }
+                }
+                if (!in_array($item->id, $turns)) {
+                    $turns[] = $item->id;
+                }
+                $turns = array_values(array_filter(array_unique(array_intersect($turns, $itemIds))));
+                sort($turns);
+                $item->turns = $turns;
+                ProjectFlowItem::whereId($item->id)->update([ 'turns' => Base::array2json($turns) ]);
+            }
+            return $projectFlow;
+        });
+    }
+
     /**
      * 获取项目信息（用于判断会员是否存在项目内）
      * @param int $project_id

app/Models/ProjectFlowItem.php

@@ -13,8 +13,9 @@ 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 $sort 排序
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
@@ -32,6 +33,7 @@ use App\Module\Base;
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereTurns($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereUserids($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereUserlimit($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereUsertype($value)
  * @mixin \Eloquent
  */

app/Models/ProjectLog.php

@@ -10,12 +10,13 @@ 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 string|null $record 记录数据
+ * @property array $record 记录数据
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\ProjectTask|null $projectTask
  * @property-read \App\Models\User|null $user
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog newQuery()
@@ -54,4 +55,12 @@ class ProjectLog extends AbstractModel
         return $this->hasOne(User::class, 'userid', 'userid');
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function projectTask(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(ProjectTask::class, 'id', 'task_id');
+    }
+
 }

app/Models/ProjectTask.php

@@ -7,10 +7,12 @@ use App\Module\Base;
 use App\Tasks\PushTask;
 use Arr;
 use Carbon\Carbon;
+use Config;
 use DB;
 use Exception;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Mail;
 use Request;
 
 /**
@@ -40,6 +42,7 @@ use Request;
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property int|null $deleted_userid 删除会员
  * @property-read \App\Models\ProjectTaskContent|null $content
  * @property-read int $file_num
  * @property-read int $msg_num
@@ -58,7 +61,7 @@ use Request;
  * @property-read int|null $task_user_count
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask allData($userid = null)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask authData($userid = null, $owner = null)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask betweenTime($start, $end)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask betweenTime($start, $end, $type = 'taskTime')
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask newQuery()
  * @method static \Illuminate\Database\Query\Builder|ProjectTask onlyTrashed()
@@ -71,6 +74,7 @@ use Request;
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask whereCompleteAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask whereDeletedUserid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask whereDesc($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask whereDialogId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask whereEndAt($value)
@@ -112,7 +116,7 @@ class ProjectTask extends AbstractModel
     public function getFileNumAttribute()
     {
         if (!isset($this->appendattrs['file_num'])) {
-            $this->appendattrs['file_num'] = ProjectTaskFile::whereTaskId($this->id)->count();
+            $this->appendattrs['file_num'] = $this->parent_id > 0 ? 0 : ProjectTaskFile::whereTaskId($this->id)->count();
         }
         return $this->appendattrs['file_num'];
     }
@@ -235,7 +239,7 @@ class ProjectTask extends AbstractModel
      */
     public function content(): \Illuminate\Database\Eloquent\Relations\HasOne
     {
-        return $this->hasOne(ProjectTaskContent::class, 'task_id', 'id');
+        return $this->hasOne(ProjectTaskContent::class, 'task_id', 'id')->orderByDesc('id');
     }
 
     /**
@@ -243,7 +247,7 @@ class ProjectTask extends AbstractModel
      */
     public function taskFile(): \Illuminate\Database\Eloquent\Relations\HasMany
     {
-        return $this->hasMany(ProjectTaskFile::class, 'task_id', 'id')->orderBy('id');
+        return $this->hasMany(ProjectTaskFile::class, 'task_id', 'id')->orderByDesc('id')->limit(50);
     }
 
     /**
@@ -312,18 +316,33 @@ class ProjectTask extends AbstractModel
      * @param $query
      * @param $start
      * @param $end
+     * @param $type
      * @return mixed
      */
-    public function scopeBetweenTime($query, $start, $end)
+    public function scopeBetweenTime($query, $start, $end, $type = 'taskTime')
     {
-        $query->where(function ($q1) use ($start, $end) {
-            $q1->where(function ($q2) use ($start) {
-                $q2->where('project_tasks.start_at', '<=', $start)->where('project_tasks.end_at', '>=', $start);
-            })->orWhere(function ($q2) use ($end) {
-                $q2->where('project_tasks.start_at', '<=', $end)->where('project_tasks.end_at', '>=', $end);
-            })->orWhere(function ($q2) use ($start, $end) {
-                $q2->where('project_tasks.start_at', '>', $start)->where('project_tasks.end_at', '<', $end);
-            });
+        $query->where(function ($q1) use ($start, $end, $type) {
+            switch ($type) {
+                case 'createdTime':
+                    $q1->where(function ($q2) use ($start) {
+                        $q2->where('project_tasks.created_at', '>=', $start);
+                    })->orWhere(function ($q2) use ($end) {
+                        $q2->where('project_tasks.created_at', '<=', $end);
+                    })->orWhere(function ($q2) use ($start, $end) {
+                        $q2->where('project_tasks.created_at', '>', $start)->where('project_tasks.created_at', '<', $end);
+                    });
+                    break;
+
+                default:
+                    $q1->where(function ($q2) use ($start) {
+                        $q2->where('project_tasks.start_at', '<=', $start)->where('project_tasks.end_at', '>=', $start);
+                    })->orWhere(function ($q2) use ($end) {
+                        $q2->where('project_tasks.start_at', '<=', $end)->where('project_tasks.end_at', '>=', $end);
+                    })->orWhere(function ($q2) use ($start, $end) {
+                        $q2->where('project_tasks.start_at', '>', $start)->where('project_tasks.end_at', '<', $end);
+                    });
+                    break;
+            }
         });
         return $query;
     }
@@ -342,11 +361,13 @@ class ProjectTask extends AbstractModel
         $content    = $data['content'];
         $times      = $data['times'];
         $owner      = $data['owner'];
+        $add_assist = intval($data['add_assist']);
         $subtasks   = $data['subtasks'];
         $p_level    = intval($data['p_level']);
         $p_name     = $data['p_name'];
         $p_color    = $data['p_color'];
         $top        = intval($data['top']);
+        $userid     = User::userid();
         //
         if (ProjectTask::whereProjectId($project_id)
                 ->whereNull('project_tasks.complete_at')
@@ -411,8 +432,13 @@ class ProjectTask extends AbstractModel
             $tmpArray[] = $uid;
         }
         $owner = $tmpArray;
+        // 协助人员
+        $assist = [];
+        if (!in_array($userid, $owner) && $add_assist) {
+            $assist = [$userid];
+        }
         // 创建人
-        $task->userid = User::userid();
+        $task->userid = $userid;
         // 排序位置
         if ($top) {
             $task->sort = intval(self::whereColumnId($task->column_id)->orderBy('sort')->value('sort')) - 1;
@@ -434,7 +460,7 @@ class ProjectTask extends AbstractModel
             }
         }
         //
-        return AbstractModel::transaction(function() use ($times, $subtasks, $content, $owner, $task) {
+        return AbstractModel::transaction(function() use ($assist, $times, $subtasks, $content, $owner, $task) {
             $task->save();
             $owner = array_values(array_unique($owner));
             foreach ($owner as $uid) {
@@ -446,11 +472,23 @@ class ProjectTask extends AbstractModel
                     'owner' => 1,
                 ])->save();
             }
+            $assist = array_values(array_unique(array_diff($assist, $owner)));
+            foreach ($assist as $uid) {
+                ProjectTaskUser::createInstance([
+                    'project_id' => $task->project_id,
+                    'task_id' => $task->id,
+                    'task_pid' => $task->parent_id ?: $task->id,
+                    'userid' => $uid,
+                    'owner' => 0,
+                ])->save();
+            }
             if ($content) {
                 ProjectTaskContent::createInstance([
                     'project_id' => $task->project_id,
                     'task_id' => $task->id,
-                    'content' => $content,
+                    'content' => [
+                        'url' => ProjectTaskContent::saveContent($task->id, $content)
+                    ],
                 ])->save();
             }
             if ($task->parent_id == 0 && $subtasks && is_array($subtasks)) {
@@ -472,7 +510,7 @@ class ProjectTask extends AbstractModel
                     self::addTask($subtask);
                 }
             }
-            $task->addLog("创建{任务}：" . $task->name);
+            $task->addLog("创建{任务}");
             return $task;
         });
     }
@@ -490,13 +528,20 @@ class ProjectTask extends AbstractModel
     public function updateTask($data, &$updateMarking = [])
     {
         AbstractModel::transaction(function () use ($data, &$updateMarking) {
+            // 判断版本
+            Base::checkClientVersion('0.6.0');
+            // 主任务
+            $mainTask = $this->parent_id > 0 ? self::find($this->parent_id) : null;
             // 工作流
             if (Arr::exists($data, 'flow_item_id')) {
+                $isProjectOwner = $this->useridInTheProject(User::userid()) === 2;
+                if (!$isProjectOwner && !$this->isOwner()) {
+                    throw new ApiException('仅限项目或任务负责人修改任务状态');
+                }
                 if ($this->flow_item_id == $data['flow_item_id']) {
                     throw new ApiException('任务状态未发生改变');
                 }
-                $recordData = [
-                    'type' => 'flow',
+                $flowData = [
                     'flow_item_id' => $this->flow_item_id,
                     'flow_item_name' => $this->flow_item_name,
                 ];
@@ -508,33 +553,44 @@ class ProjectTask extends AbstractModel
                 if ($this->flow_item_id) {
                     // 判断符合流转
                     $currentFlowItem = ProjectFlowItem::find($this->flow_item_id);
-                    if ($currentFlowItem && !in_array($currentFlowItem->id, $newFlowItem->turns)) {
-                        throw new ApiException("当前状态[{$currentFlowItem->name}]不可流转到[{$newFlowItem->name}]");
+                    if ($currentFlowItem) {
+                        if (!in_array($newFlowItem->id, $currentFlowItem->turns)) {
+                            throw new ApiException("当前状态[{$currentFlowItem->name}]不可流转到[{$newFlowItem->name}]");
+                        }
+                        if ($currentFlowItem->userlimit) {
+                            if (!$isProjectOwner && !in_array(User::userid(), $currentFlowItem->userids)) {
+                                throw new ApiException("当前状态[{$currentFlowItem->name}]仅限状态负责人或项目负责人修改");
+                            }
+                        }
                     }
                 }
                 if ($newFlowItem->status == 'end') {
                     // 判断自动完成
                     if (!$this->complete_at) {
-                        $recordData['complete_at'] = $this->complete_at;
+                        $flowData['complete_at'] = $this->complete_at;
                         $data['complete_at'] = date("Y-m-d H:i");
                     }
                 } else {
                     // 判断自动打开
                     if ($this->complete_at) {
-                        $recordData['complete_at'] = $this->complete_at;
+                        $flowData['complete_at'] = $this->complete_at;
                         $data['complete_at'] = false;
                     }
                 }
                 if ($newFlowItem->userids) {
                     // 判断自动添加负责人
-                    $recordData['owner'] = $data['owner'] = $this->taskUser->where('owner', 1)->pluck('userid')->toArray();
-                    if ($newFlowItem->usertype == "replace") {
-                        // 流转模式
+                    $flowData['owner'] = $data['owner'] = $this->taskUser->where('owner', 1)->pluck('userid')->toArray();
+                    if (in_array($newFlowItem->usertype, ["replace", "merge"])) {
+                        // 流转模式、剔除模式
                         if ($this->parent_id === 0) {
-                            $recordData['assist'] = $data['assist'] = $this->taskUser->where('owner', 0)->pluck('userid')->toArray();
+                            $flowData['assist'] = $data['assist'] = $this->taskUser->where('owner', 0)->pluck('userid')->toArray();
                             $data['assist'] = array_merge($data['assist'], $data['owner']);
                         }
                         $data['owner'] = $newFlowItem->userids;
+                        // 判断剔除模式：保留操作状态的人员
+                        if ($newFlowItem->usertype == "merge") {
+                            $data['owner'][] = User::userid();
+                        }
                     } else {
                         // 添加模式
                         $data['owner'] = array_merge($data['owner'], $newFlowItem->userids);
@@ -546,10 +602,25 @@ class ProjectTask extends AbstractModel
                 }
                 $this->flow_item_id = $newFlowItem->id;
                 $this->flow_item_name = $newFlowItem->status . "|" . $newFlowItem->name;
-                $this->addLog("修改{任务}状态：{$currentFlowItem?->name} => {$newFlowItem->name}", 0, $recordData);
+                $this->addLog("修改{任务}状态", [
+                    'flow' => $flowData,
+                    'change' => [$currentFlowItem?->name, $newFlowItem->name]
+                ]);
+                ProjectTaskFlowChange::createInstance([
+                    'task_id' => $this->id,
+                    'userid' => User::userid(),
+                    'before_flow_item_id' => $flowData['flow_item_id'],
+                    'before_flow_item_name' => $flowData['flow_item_name'],
+                    'after_flow_item_id' => $this->flow_item_id,
+                    'after_flow_item_name' => $this->flow_item_name,
+                ])->save();
             }
             // 状态
             if (Arr::exists($data, 'complete_at')) {
+                // 子任务：主任务已完成时无法修改
+                if ($mainTask?->complete_at) {
+                    throw new ApiException('主任务已完成，无法修改子任务状态');
+                }
                 if (Base::isDate($data['complete_at'])) {
                     // 标记已完成
                     if ($this->complete_at) {
@@ -564,7 +635,6 @@ class ProjectTask extends AbstractModel
                     $this->completeTask(null);
                 }
                 $updateMarking['is_update_project'] = true;
-                return;
             }
             // 标题
             if (Arr::exists($data, 'name') && $this->name != $data['name']) {
@@ -573,7 +643,9 @@ class ProjectTask extends AbstractModel
                 } elseif (mb_strlen($data['name']) > 255) {
                     throw new ApiException('任务描述最多只能设置255个字');
                 }
-                $this->addLog("修改{任务}标题：{$this->name} => {$data['name']}");
+                $this->addLog("修改{任务}标题", [
+                    'change' => [$this->name, $data['name']]
+                ]);
                 $this->name = $data['name'];
             }
             // 负责人
@@ -605,12 +677,12 @@ class ProjectTask extends AbstractModel
                     if ($count == 0 && count($array) == 1 && $array[0] == User::userid()) {
                         $this->addLog("认领{任务}");
                     } else {
-                        $this->addLog("修改{任务}负责人：" . implode(",", $array));
+                        $this->addLog("修改{任务}负责人", ['userid' => $array]);
                     }
                 }
                 $rows = ProjectTaskUser::whereTaskId($this->id)->whereOwner(1)->whereNotIn('userid', $array)->get();
                 if ($rows->isNotEmpty()) {
-                    $this->addLog("删除{任务}负责人：" . $rows->implode('userid', ','));
+                    $this->addLog("删除{任务}负责人", ['userid' => $rows->implode('userid', ',')]);
                     foreach ($rows as $row) {
                         $row->delete();
                     }
@@ -621,6 +693,7 @@ class ProjectTask extends AbstractModel
             // 计划时间（原则：子任务时间在主任务时间内）
             if (Arr::exists($data, 'times')) {
                 $oldAt = [Carbon::parse($this->start_at), Carbon::parse($this->end_at)];
+                $oldStringAt = $this->start_at ? ($oldAt[0]->toDateTimeString() . '~' . $oldAt[1]->toDateTimeString()) : '';
                 $this->start_at = null;
                 $this->end_at = null;
                 $times = $data['times'];
@@ -630,7 +703,6 @@ class ProjectTask extends AbstractModel
                     $end_at = Carbon::parse($end);
                     if ($this->parent_id > 0) {
                         // 判断同步主任务时间（子任务时间 超出 主任务）
-                        $mainTask = self::find($this->parent_id);
                         if ($mainTask) {
                             $isUp = false;
                             if ($start_at->lt(Carbon::parse($mainTask->start_at))) {
@@ -653,7 +725,6 @@ class ProjectTask extends AbstractModel
                 } else {
                     if ($this->parent_id > 0) {
                         // 清空子任务时间（子任务时间等于主任务时间）
-                        $mainTask = self::find($this->parent_id);
                         $this->start_at = $mainTask->start_at;
                         $this->end_at = $mainTask->end_at;
                     }
@@ -666,14 +737,18 @@ class ProjectTask extends AbstractModel
                             $start_at = Carbon::parse($subTask->start_at);
                             $end_at = Carbon::parse($subTask->end_at);
                             $isUp = false;
-                            if ($start_at->eq($oldAt[0]) || $start_at->lt(Carbon::parse($this->start_at))) {
+                            if (empty($subTask->start_at) || $start_at->eq($oldAt[0]) || $start_at->lt(Carbon::parse($this->start_at))) {
                                 $subTask->start_at = $this->start_at;
                                 $isUp = true;
                             }
-                            if ($end_at->eq($oldAt[1]) || $end_at->gt(Carbon::parse($this->end_at))) {
+                            if (empty($subTask->end_at) || $end_at->eq($oldAt[1]) || $end_at->gt(Carbon::parse($this->end_at))) {
                                 $subTask->end_at = $this->end_at;
                                 $isUp = true;
                             }
+                            if ($subTask->start_at && Carbon::parse($subTask->start_at)->gt($subTask->end_at)) {
+                                $subTask->start_at = $this->start_at;
+                                $isUp = true;
+                            }
                             if ($isUp) {
                                 $updateMarking['is_update_subtask'] = true;
                                 $subTask->addLog("同步修改{任务}时间");
@@ -682,7 +757,13 @@ class ProjectTask extends AbstractModel
                         }
                     });
                 }
-                $this->addLog("修改{任务}时间");
+                $newStringAt = $this->start_at ? ($this->start_at->toDateTimeString() . '~' . $this->end_at->toDateTimeString()) : '';
+                $this->addLog("修改{任务}时间", [
+                    'change' => [$oldStringAt, $newStringAt]
+                ]);
+
+                //修改计划时间需要重置任务邮件提醒日志
+                ProjectTaskMailLog::whereTaskId($this->id)->delete();
             }
             // 以下紧顶级任务可修改
             if ($this->parent_id === 0) {
@@ -708,11 +789,11 @@ class ProjectTask extends AbstractModel
                         $array[] = $uid;
                     }
                     if ($array) {
-                        $this->addLog("修改{任务}协助人员：" . implode(",", $array));
+                        $this->addLog("修改{任务}协助人员", ['userid' => $array]);
                     }
                     $rows = ProjectTaskUser::whereTaskId($this->id)->whereOwner(0)->whereNotIn('userid', $array)->get();
                     if ($rows->isNotEmpty()) {
-                        $this->addLog("删除{任务}协助人员：" . $rows->implode('userid', ','));
+                        $this->addLog("删除{任务}协助人员", ['userid' => $rows->implode('userid', ',')]);
                         foreach ($rows as $row) {
                             $row->delete();
                         }
@@ -721,7 +802,9 @@ class ProjectTask extends AbstractModel
                 }
                 // 背景色
                 if (Arr::exists($data, 'color') && $this->color != $data['color']) {
-                    $this->addLog("修改{任务}背景色：{$this->color} => {$data['color']}");
+                    $this->addLog("修改{任务}背景色", [
+                        'change' => [$this->color, $data['color']]
+                    ]);
                     $this->color = $data['color'];
                 }
                 // 列表
@@ -731,23 +814,27 @@ class ProjectTask extends AbstractModel
                     if (empty($column)) {
                         throw new ApiException('请选择正确的列表');
                     }
-                    $this->addLog("修改{任务}列表：{$oldName} => {$column->name}");
+                    $this->addLog("修改{任务}列表", [
+                        'change' => [$oldName, $column->name]
+                    ]);
                     $this->column_id = $column->id;
                 }
                 // 内容
                 if (Arr::exists($data, 'content')) {
-                    ProjectTaskContent::updateInsert([
+                    ProjectTaskContent::createInstance([
                         'project_id' => $this->project_id,
                         'task_id' => $this->id,
-                    ], [
-                        'content' => $data['content'],
-                    ]);
+                        'content' => [
+                            'url' => ProjectTaskContent::saveContent($this->id, $data['content'])
+                        ],
+                    ])->save();
                     $this->desc = Base::getHtml($data['content'], 100);
                     $this->addLog("修改{任务}详细描述");
                     $updateMarking['is_update_content'] = true;
                 }
                 // 优先级
                 $p = false;
+                $oldPName = $this->p_name;
                 if (Arr::exists($data, 'p_level') && $this->p_level != $data['p_level']) {
                     $this->p_level = intval($data['p_level']);
                     $p = true;
@@ -761,7 +848,9 @@ class ProjectTask extends AbstractModel
                     $p = true;
                 }
                 if ($p) {
-                    $this->addLog("修改{任务}优先级");
+                    $this->addLog("修改{任务}优先级", [
+                        'change' => [$oldPName, $this->p_name]
+                    ]);
                 }
             }
             $this->save();
@@ -778,9 +867,7 @@ class ProjectTask extends AbstractModel
     {
         if ($this->parent_id > 0) {
             $task = self::find($this->parent_id);
-            if ($task) {
-                $task->syncDialogUser();
-            }
+            $task?->syncDialogUser();
             return;
         }
         if (empty($this->dialog_id)) {
@@ -804,7 +891,7 @@ class ProjectTask extends AbstractModel
      */
     public function relationUserids()
     {
-        $userids = $this->taskUser->pluck('userid')->toArray();
+        $userids = ProjectTaskUser::whereTaskId($this->id)->orderByDesc('owner')->orderByDesc('id')->pluck('userid')->toArray();
         $items = ProjectTask::with(['taskUser'])->where('parent_id', $this->id)->whereNull('archived_at')->get();
         foreach ($items as $item) {
             $userids = array_merge($userids, $item->taskUser->pluck('userid')->toArray());
@@ -840,6 +927,62 @@ class ProjectTask extends AbstractModel
         return $user->owner ? 2 : 1;
     }
 
+    /**
+     * 权限版本
+     * @param int $level 1-负责人，2-协助人/负责人，3-创建人/协助人/负责人
+     * @return bool
+     */
+    public function permission($level = 1)
+    {
+        if ($level >= 3 && $this->isCreater()) {
+            return true;
+        }
+        if ($level >= 2 && $this->isAssister()) {
+            return true;
+        }
+        return $this->isOwner();
+    }
+
+    /**
+     * 判断是否创建者
+     * @return bool
+     */
+    public function isCreater()
+    {
+        return $this->userid == User::userid();
+    }
+
+    /**
+     * 判断是否协助人员
+     * @return bool
+     */
+    public function isAssister()
+    {
+        $row = $this;
+        while ($row->parent_id > 0) {
+            $row = self::find($row->parent_id);
+        }
+        return ProjectTaskUser::whereTaskId($row->id)->whereUserid(User::userid())->whereOwner(0)->exists();
+    }
+
+    /**
+     * 判断是否负责人（或者是主任务的负责人）
+     * @return bool
+     */
+    public function isOwner()
+    {
+        if ($this->owner) {
+            return true;
+        }
+        if ($this->parent_id > 0) {
+            $mainTask = self::allData()->find($this->parent_id);
+            if ($mainTask->owner) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * 是否有负责人
      * @return bool
@@ -852,24 +995,6 @@ class ProjectTask extends AbstractModel
         return $this->appendattrs['has_owner'];
     }
 
-    /**
-     * 是否负责人
-     * @param bool $isParent 是父级任务的负责人也算
-     * @return bool
-     */
-    public function isOwner($isParent = true) {
-        if ($this->owner) {
-            return true;
-        }
-        if ($isParent && $this->parent_id > 0) {
-            $parentTask = self::find($this->parent_id);
-            if ($parentTask?->owner) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     /**
      * 标记已完成、未完成
      * @param Carbon|null $complete_at 完成时间
@@ -881,7 +1006,7 @@ class ProjectTask extends AbstractModel
             if ($complete_at === null) {
                 // 标记未完成
                 $this->complete_at = null;
-                $this->addLog("{任务}标记未完成：" . $this->name);
+                $this->addLog("标记{任务}未完成");
             } else {
                 // 标记已完成
                 if ($this->parent_id == 0) {
@@ -893,7 +1018,7 @@ class ProjectTask extends AbstractModel
                     throw new ApiException('请先领取任务');
                 }
                 $this->complete_at = $complete_at;
-                $this->addLog("{任务}标记已完成：" . $this->name);
+                $this->addLog("标记{任务}已完成");
             }
             $this->save();
         });
@@ -907,29 +1032,42 @@ class ProjectTask extends AbstractModel
      */
     public function archivedTask($archived_at, $isAuto = false)
     {
+        if (!$this->complete_at) {
+            $flowItems = ProjectFlowItem::whereProjectId($this->project_id)->whereStatus('end')->pluck('name');
+            if ($flowItems) {
+                $flowItems = implode(",", array_values(array_unique($flowItems->toArray())));
+            }
+            if (empty($flowItems)) {
+                $flowItems = "已完成";
+            }
+            throw new ApiException('仅限【' . $flowItems . '】状态的任务归档');
+        }
         AbstractModel::transaction(function () use ($isAuto, $archived_at) {
             if ($archived_at === null) {
                 // 取消归档
                 $this->archived_at = null;
                 $this->archived_userid = User::userid();
                 $this->archived_follow = 0;
-                $this->addLog("任务取消归档：" . $this->name);
-                $this->pushMsg('add', ProjectTask::oneTask($this->id));
+                $this->addLog("任务取消归档");
             } else {
                 // 归档任务
                 if ($isAuto === true) {
-                    $logText = "自动任务归档：" . $this->name;
+                    $logText = "自动任务归档";
                     $userid = 0;
                 } else {
-                    $logText = "任务归档：" . $this->name;
+                    $logText = "任务归档";
                     $userid = User::userid();
                 }
                 $this->archived_at = $archived_at;
                 $this->archived_userid = $userid;
                 $this->archived_follow = 0;
-                $this->addLog($logText, $userid);
-                $this->pushMsg('archived');
+                $this->addLog($logText, [], $userid);
             }
+            $this->pushMsg('update', [
+                'id' => $this->id,
+                'archived_at' => $this->archived_at,
+                'archived_userid' => $this->archived_userid,
+            ]);
             self::whereParentId($this->id)->update([
                 'archived_at' => $this->archived_at,
                 'archived_userid' => $this->archived_userid,
@@ -953,7 +1091,9 @@ class ProjectTask extends AbstractModel
                 $dialog?->deleteDialog();
             }
             self::whereParentId($this->id)->delete();
-            $this->addLog("删除{任务}：" . $this->name);
+            $this->deleted_userid = User::userid();
+            $this->save();
+            $this->addLog("删除{任务}");
             $this->delete();
         });
         if ($pushMsg) {
@@ -962,16 +1102,38 @@ class ProjectTask extends AbstractModel
         return true;
     }
 
+    /**
+     * 还原任务
+     * @param bool $pushMsg 是否推送
+     * @return bool
+     */
+    public function recoveryTask($pushMsg = true)
+    {
+        AbstractModel::transaction(function () {
+            if ($this->dialog_id) {
+                $dialog = WebSocketDialog::withTrashed()->find($this->dialog_id);
+                $dialog?->recoveryDialog();
+            }
+            self::whereParentId($this->id)->withTrashed()->restore();
+            $this->addLog("还原{任务}");
+            $this->restore();
+        });
+        if ($pushMsg) {
+            $this->pushMsg('restore');
+        }
+        return true;
+    }
+
     /**
      * 添加任务日志
      * @param string $detail
+     * @param array $record
      * @param int $userid
-     * @param $record
      * @return ProjectLog
      */
-    public function addLog($detail, $userid = 0, $record = null)
+    public function addLog($detail, $record = [], $userid = 0)
     {
-        $detail = str_replace("{任务}", $this->parent_id > 0 ? "子任务" : "任务", $detail);
+        $detail = str_replace("{任务}", $this->parent_id ? "子任务" : "任务", $detail);
         $array = [
             'project_id' => $this->project_id,
             'column_id' => $this->column_id,
@@ -979,6 +1141,9 @@ class ProjectTask extends AbstractModel
             'userid' => $userid ?: User::userid(),
             'detail' => $detail,
         ];
+        if ($this->parent_id) {
+            $record['subtitle'] = $this->name;
+        }
         if ($record) {
             $array['record'] = $record;
         }
@@ -1052,27 +1217,34 @@ class ProjectTask extends AbstractModel
     /**
      * 获取任务（会员有任务权限 或 会员存在项目内）
      * @param int $task_id
-     * @param bool $archived true:仅限未归档, false:不限制, null:不限制
-     * @param int|bool $mustOwner 0|false:不限制, 1|true:限制任务或项目负责人, 2:已有负责人才限制任务或项目负责人
+     * @param bool $archived true:仅限未归档, false:仅限已归档, null:不限制
+     * @param bool $trashed true:仅限未删除, false:仅限已删除, null:不限制
+     * @param int|bool $permission 0|false:不限制, 1|true:限制项目负责人、任务负责人、协助人员及任务创建者, 2:已有负责人才限制true (子任务时如果是主任务负责人也可以)
      * @param array $with
      * @return self
      */
-    public static function userTask($task_id, $archived = true, $mustOwner = 0, $with = [])
+    public static function userTask($task_id, $archived = true, $trashed = true, $permission = false, $with = [])
     {
-        $task = self::with($with)->allData()->where("project_tasks.id", intval($task_id))->first();
+        $builder = self::with($with)->allData()->where("project_tasks.id", intval($task_id));
+        if ($trashed === false) {
+            $builder->onlyTrashed();
+        } elseif ($trashed === null) {
+            $builder->withTrashed();
+        }
+        $task = $builder->first();
         //
         if (empty($task)) {
-            throw new ApiException('任务不存在', [ 'task_id' => $task_id ], -4002);
+            throw new ApiException('任务不存在', ['task_id' => $task_id], -4002);
         }
         if ($archived === true && $task->archived_at != null) {
-            throw new ApiException('任务已归档', [ 'task_id' => $task_id ], -4002);
+            throw new ApiException('任务已归档', ['task_id' => $task_id]);
         }
         if ($archived === false && $task->archived_at == null) {
-            throw new ApiException('任务未归档', [ 'task_id' => $task_id ]);
+            throw new ApiException('任务未归档', ['task_id' => $task_id]);
         }
         //
         try {
-            $project = Project::userProject($task->project_id, $archived);
+            $project = Project::userProject($task->project_id);
         } catch (Exception $e) {
             if ($task->owner === null) {
                 throw new ApiException($e->getMessage(), [ 'task_id' => $task_id ], -4002);
@@ -1083,11 +1255,11 @@ class ProjectTask extends AbstractModel
             }
         }
         //
-        if ($mustOwner === 2) {
-            $mustOwner = $task->hasOwner() ? 1 : 0;
+        if ($permission === 2) {
+            $permission = $task->hasOwner() ? 1 : 0;
         }
-        if (($mustOwner === 1 || $mustOwner === true) && !$task->owner && !$project->owner) {
-            throw new ApiException('仅限项目或任务负责人操作');
+        if (($permission === 1 || $permission === true) && !$project->owner && !$task->permission(3)) {
+            throw new ApiException('仅限项目负责人、任务负责人、协助人员或任务创建者操作');
         }
         //
         return $task;

app/Models/ProjectTaskContent.php

@@ -2,6 +2,8 @@
 
 namespace App\Models;
 
+use App\Module\Base;
+
 /**
  * App\Models\ProjectTaskContent
  *
@@ -28,4 +30,54 @@ class ProjectTaskContent extends AbstractModel
         '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)
+    {
+        $path = 'uploads/task/content/' . date("Ym") . '/' . $task_id . '/';
+        //
+        preg_match_all("/<img\s*src=\"data:image\/(png|jpg|jpeg);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 (file_put_contents(public_path($tmpPath), base64_decode($text))) {
+                $content = str_replace($matchs[0][$key], '<img src="{{RemoteURL}}' . $tmpPath . '"', $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));
+        file_put_contents($publicPath, $content);
+        //
+        return $filePath;
+    }
 }

app/Models/ProjectTaskFlowChange.php

@@ -0,0 +1,34 @@
+<?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|ProjectTaskFlowChange newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange query()
+ * @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/ProjectTaskMailLog.php

@@ -0,0 +1,45 @@
+<?php
+
+
+namespace App\Models;
+
+
+
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * App\Models\ProjectTaskMailLog
+ *
+ * @property int $id
+ * @property int|null $userid 用户id
+ * @property int|null $task_id 任务id
+ * @property string|null $email 电子邮箱
+ * @property int|null $type 提醒类型：1第一次任务提醒，2第二次任务超期提醒
+ * @property int|null $is_send 邮件发送是否成功：0否，1是
+ * @property string|null $send_error 邮件发送错误详情
+ * @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|ProjectTaskMailLog newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog newQuery()
+ * @method static \Illuminate\Database\Query\Builder|ProjectTaskMailLog onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog query()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereEmail($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereIsSend($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereSendError($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereTaskId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereUserid($value)
+ * @method static \Illuminate\Database\Query\Builder|ProjectTaskMailLog withTrashed()
+ * @method static \Illuminate\Database\Query\Builder|ProjectTaskMailLog withoutTrashed()
+ * @mixin \Eloquent
+ */
+class ProjectTaskMailLog extends AbstractModel
+{
+    use SoftDeletes;
+
+}

app/Models/ProjectTaskUser.php

@@ -13,6 +13,7 @@ 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|ProjectTaskUser newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser query()
@@ -29,4 +30,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 ($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' => [$newUserid]]);
+                    if (!in_array($item->task_pid, $tastIds)) {
+                        $tastIds[] = $item->task_pid;
+                        $item->projectTask->syncDialogUser();
+                    }
+                }
+            }
+        });
+    }
 }

app/Models/ProjectUser.php

@@ -11,6 +11,7 @@ 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
@@ -21,6 +22,7 @@ use App\Module\Base;
  * @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 +38,36 @@ 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 ($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) {
+                    $item->project->addLog("移交项目身份给", ['userid' => $newUserid]);
+                    $item->project->syncDialogUser();
+                }
+            }
+        });
+    }
+
     /**
      * 退出项目
      */
@@ -45,15 +77,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

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

app/Models/ReportReceive.php

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

app/Models/User.php

@@ -28,7 +28,8 @@ 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 \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @method static \Database\Factories\UserFactory factory(...$parameters)
@@ -41,6 +42,7 @@ use Carbon\Carbon;
  * @method static \Illuminate\Database\Eloquent\Builder|User whereCreatedIp($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)
@@ -62,7 +64,6 @@ class User extends AbstractModel
     protected $primaryKey = 'userid';
 
     protected $hidden = [
-        'disable_at',
         'updated_at',
     ];
 
@@ -167,6 +168,16 @@ class User extends AbstractModel
         }
     }
 
+    /**
+     * 删除会员
+     * @return bool|null
+     */
+    public function deleteUser()
+    {
+        UserEmailVerification::whereEmail($this->email)->delete();
+        return $this->delete();
+    }
+
     /** ***************************************************************************************** */
     /** ***************************************************************************************** */
     /** ***************************************************************************************** */
@@ -181,10 +192,16 @@ 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) {
+            $isRegVerify = Base::settingFind('emailSetting', 'reg_verify') === 'open';
+            $user = self::whereUserid(User::email2userid($email))->first();
+            if ($isRegVerify && $user->email_verity === 0) {
+                UserEmailVerification::userEmailSend($user);
+                throw new ApiException('您的帐号已注册过，请验证邮箱', ['code' => 'email']);
+            }
             throw new ApiException('邮箱地址已存在');
         }
         //密码

app/Models/UserEmailVerification.php

@@ -0,0 +1,80 @@
+<?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 \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @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|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 whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereUserid($value)
+ * @mixin \Eloquent
+ */
+class UserEmailVerification extends AbstractModel
+{
+
+    /**
+     * 发验证邮箱
+     * @param User $user
+     */
+    public static function userEmailSend(User $user)
+    {
+        $res = self::whereUserid($user->userid)->where('created_at', '>', Carbon::now()->subMinutes(30))->first();
+        if ($res) return;
+        //删除
+        self::whereUserid($user->userid)->delete();
+        $userEmailVerification = self::createInstance([
+            'userid' => $user->userid,
+            'email' => $user->email,
+            'code' => Base::generatePassword(64),
+            'status' => 0,
+        ]);
+        $userEmailVerification->save();
+
+        $setting = Base::setting('emailSetting');
+        $url = Base::fillUrl('single/valid/email') . '?code=' . $userEmailVerification->code;
+        try {
+            if (!Base::isEmail($user->email)) {
+                throw new \Exception("User email '{$user->email}' address error");
+            }
+            $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>";
+            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($user->email)
+                    ->subject($subject)
+                    ->html($content))
+                ->send();
+        } catch (\Exception $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());
+            }
+        }
+    }
+}

app/Models/UserTransfer.php

@@ -0,0 +1,45 @@
+<?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|UserTransfer newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer query()
+ * @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()
+    {
+        // 移交项目身份
+        ProjectUser::transfer($this->original_userid, $this->new_userid);
+        // 移交任务身份
+        ProjectTaskUser::transfer($this->original_userid, $this->new_userid);
+        // 移交文件
+        File::transfer($this->original_userid, $this->new_userid);
+    }
+}

app/Models/WebSocketDialog.php

@@ -3,7 +3,9 @@
 namespace App\Models;
 
 use App\Exceptions\ApiException;
+use App\Tasks\PushTask;
 use Carbon\Carbon;
+use Hhxsv5\LaravelS\Swoole\Task\Task;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
@@ -14,6 +16,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string|null $group_type 聊天室类型
  * @property string|null $name 对话名称
  * @property string|null $last_at 最后消息时间
+ * @property int|null $owner_id 群主用户ID
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
@@ -29,6 +32,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @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 whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereOwnerId($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()
@@ -47,6 +51,93 @@ class WebSocketDialog extends AbstractModel
         return $this->hasMany(WebSocketDialogUser::class, 'dialog_id', 'id');
     }
 
+    /**
+     * 格式化对话
+     * @param int $userid   会员ID
+     * @return $this
+     */
+    public function formatData($userid)
+    {
+        // 最后消息
+        $last_msg = WebSocketDialogMsg::whereDialogId($this->id)->orderByDesc('id')->first();
+        $this->last_msg = $last_msg;
+        // 未读信息
+        $unreadBuilder = WebSocketDialogMsgRead::whereDialogId($this->id)->whereUserid($userid)->whereReadAt(null);
+        $this->unread = $unreadBuilder->count();
+        $this->mention = $unreadBuilder->whereMention(1)->count();
+        $this->mark_unread = $this->mark_unread ?? WebSocketDialogUser::whereDialogId($this->id)->whereUserid($userid)->value('mark_unread');
+        // 对话人数
+        $builder = WebSocketDialogUser::whereDialogId($this->id);
+        $this->people = $builder->count();
+        // 对方信息
+        $this->dialog_user = null;
+        $this->group_info = null;
+        $this->top_at = $this->top_at ?? WebSocketDialogUser::whereDialogId($this->id)->whereUserid($userid)->value('top_at');
+        switch ($this->type) {
+            case "user":
+                $dialog_user = $builder->where('userid', '!=', $userid)->first();
+                $this->name = User::userid2nickname($dialog_user->userid);
+                $this->dialog_user = $dialog_user;
+                break;
+            case "group":
+                if ($this->group_type === 'project') {
+                    $this->group_info = Project::withTrashed()->select(['id', 'name', 'archived_at', 'deleted_at'])->whereDialogId($this->id)->first()?->cancelAppend()->cancelHidden();
+                    $this->name = $this->group_info ? $this->group_info->name : '';
+                } elseif ($this->group_type === 'task') {
+                    $this->group_info = ProjectTask::withTrashed()->select(['id', 'name', 'complete_at', 'archived_at', 'deleted_at'])->whereDialogId($this->id)->first()?->cancelAppend()->cancelHidden();
+                    $this->name = $this->group_info ? $this->group_info->name : '';
+                }
+                break;
+        }
+        return $this;
+    }
+
+    /**
+     * 加入聊天室
+     * @param int|array $userid     加入的会员ID或会员ID组
+     * @return bool
+     */
+    public function joinGroup($userid)
+    {
+        AbstractModel::transaction(function () use ($userid) {
+            foreach (is_array($userid) ? $userid : [$userid] as $value) {
+                if ($value > 0) {
+                    WebSocketDialogUser::updateInsert([
+                        'dialog_id' => $this->id,
+                        'userid' => $value,
+                    ]);
+                }
+            }
+        });
+        return true;
+    }
+
+    /**
+     * 退出聊天室
+     * @param int|array $userid     加入的会员ID或会员ID组
+     * @return bool
+     */
+    public function exitGroup($userid)
+    {
+        $builder = WebSocketDialogUser::whereDialogId($this->id);
+        if (is_array($userid)) {
+            $builder->whereIn('userid', $userid);
+        } else {
+            $builder->whereUserid($userid);
+        }
+        $builder->chunkById(100, function($list) {
+            /** @var WebSocketDialogUser $item */
+            foreach ($list as $item) {
+                if ($item->userid == $this->owner_id) {
+                    // 群主不可退出
+                    continue;
+                }
+                $item->delete();
+            }
+        });
+        return true;
+    }
+
     /**
      * 删除会话
      * @return bool
@@ -54,20 +145,76 @@ 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();
         });
         return true;
     }
 
+    /**
+     * 还原会话
+     * @return bool
+     */
+    public function recoveryDialog()
+    {
+        $this->restore();
+        return true;
+    }
+
+    /**
+     * 检查群组类型
+     * @return void
+     */
+    public function checkGroup($groupType = 'user')
+    {
+        if ($this->type !== 'group') {
+            throw new ApiException('仅限群组操作');
+        }
+        if ($this->group_type !== $groupType) {
+            throw new ApiException('操作的群组类型错误');
+        }
+    }
+
+    /**
+     * 推送消息
+     * @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 $checkOwner 是否校验群组身份
      * @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,6 +222,10 @@ class WebSocketDialog extends AbstractModel
         }
         //
         $userid = User::userid();
+        if ($checkOwner === true && $dialog->owner_id != $userid) {
+            throw new ApiException('仅限群主操作');
+        }
+        //
         if ($dialog->type === 'group' && $dialog->group_type === 'task') {
             // 任务群对话校验是否在项目内
             $project_id = intval(ProjectTask::whereDialogId($dialog->id)->value('project_id'));
@@ -85,48 +236,7 @@ class WebSocketDialog extends AbstractModel
             }
         }
         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'])->whereDialogId($dialog->id)->first();
-                    $dialog->name = $dialog->group_info ? $dialog->group_info->name : '';
-                } elseif ($dialog->group_type === 'task') {
-                    $dialog->group_info = ProjectTask::withTrashed()->select(['id', 'name'])->whereDialogId($dialog->id)->first();
-                    $dialog->name = $dialog->group_info ? $dialog->group_info->name : '';
-                }
-                break;
+            throw new ApiException('不在成员列表内', ['dialog_id' => $dialog_id], -4003);
         }
         return $dialog;
     }
@@ -134,17 +244,20 @@ 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,
+                'last_at' => $group_type === 'user' ? Carbon::now() : null,
             ]);
             $dialog->save();
             foreach (is_array($userid) ? $userid : [$userid] as $value) {
@@ -159,47 +272,6 @@ 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

app/Models/WebSocketDialogMsg.php

@@ -8,6 +8,7 @@ use App\Tasks\PushTask;
 use App\Tasks\WebSocketDialogMsgTask;
 use Carbon\Carbon;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * App\Models\WebSocketDialogMsg
@@ -21,11 +22,15 @@ use Hhxsv5\LaravelS\Swoole\Task\Task;
  * @property int|null $send 发送数量
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
  * @property-read int|mixed $percentage
+ * @property-read \App\Models\WebSocketDialog|null $webSocketDialog
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg newQuery()
+ * @method static \Illuminate\Database\Query\Builder|WebSocketDialogMsg onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg query()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereDialogId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereMsg($value)
@@ -34,10 +39,14 @@ use Hhxsv5\LaravelS\Swoole\Task\Task;
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereUserid($value)
+ * @method static \Illuminate\Database\Query\Builder|WebSocketDialogMsg withTrashed()
+ * @method static \Illuminate\Database\Query\Builder|WebSocketDialogMsg withoutTrashed()
  * @mixin \Eloquent
  */
 class WebSocketDialogMsg extends AbstractModel
 {
+    use SoftDeletes;
+
     protected $appends = [
         'percentage',
     ];
@@ -46,6 +55,14 @@ class WebSocketDialogMsg extends AbstractModel
         'updated_at',
     ];
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function webSocketDialog(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(WebSocketDialog::class, 'id', 'dialog_id');
+    }
+
     /**
      * 阅读占比
      * @return int|mixed
@@ -53,11 +70,7 @@ class WebSocketDialogMsg extends AbstractModel
     public function getPercentageAttribute()
     {
         if (!isset($this->appendattrs['percentage'])) {
-            if ($this->read > $this->send || empty($this->send)) {
-                $this->appendattrs['percentage'] = 100;
-            } else {
-                $this->appendattrs['percentage'] = intval($this->read / $this->send * 100);
-            }
+            $this->generatePercentage();
         }
         return $this->appendattrs['percentage'];
     }
@@ -81,6 +94,22 @@ class WebSocketDialogMsg extends AbstractModel
         return $value;
     }
 
+    /**
+     * 获取占比
+     * @param bool|int $increment 是否新增阅读数
+     * @return int
+     */
+    public function generatePercentage($increment = false) {
+        if ($increment) {
+            $this->increment('read', is_bool($increment) ? 1 : $increment);
+        }
+        if ($this->read > $this->send || empty($this->send)) {
+            return $this->appendattrs['percentage'] = 100;
+        } else {
+            return $this->appendattrs['percentage'] = intval($this->read / $this->send * 100);
+        }
+    }
+
     /**
      * 标记已送达 同时 告诉发送人已送达
      * @param $userid
@@ -110,13 +139,17 @@ class WebSocketDialogMsg extends AbstractModel
             if (!$msgRead->read_at) {
                 $msgRead->read_at = Carbon::now();
                 $msgRead->save();
-                $this->increment('read');
+                $this->generatePercentage(true);
                 PushTask::push([
                     'userid' => $this->userid,
                     'msg' => [
                         'type' => 'dialog',
-                        'mode' => 'update',
-                        'data' => $this->toArray(),
+                        'mode' => 'readed',
+                        'data' => [
+                            'id' => $this->id,
+                            'read' => $this->read,
+                            'percentage' => $this->percentage,
+                        ],
                     ]
                 ]);
             }
@@ -124,6 +157,93 @@ class WebSocketDialogMsg extends AbstractModel
         return true;
     }
 
+    /**
+     * 删除消息
+     * @return void
+     */
+    public function deleteMsg()
+    {
+        $send_dt = Carbon::parse($this->created_at)->addDay();
+        if ($send_dt->lt(Carbon::now())) {
+            throw new ApiException('已超过24小时，此消息不能撤回');
+        }
+        AbstractModel::transaction(function() {
+            $deleteRead = WebSocketDialogMsgRead::whereMsgId($this->id)->whereNull('read_at')->delete();    // 未阅读记录不需要软删除，直接删除即可
+            $this->delete();
+            //
+            $last_msg = null;
+            if ($this->webSocketDialog) {
+                $last_msg = WebSocketDialogMsg::whereDialogId($this->dialog_id)->orderByDesc('id')->first();
+                $this->webSocketDialog->last_at = $last_msg->created_at;
+                $this->webSocketDialog->save();
+            }
+            //
+            $dialog = WebSocketDialog::find($this->dialog_id);
+            if ($dialog) {
+                $userids = $dialog->dialogUser->pluck('userid')->toArray();
+                PushTask::push([
+                    'userid' => $userids,
+                    'msg' => [
+                        'type' => 'dialog',
+                        'mode' => 'delete',
+                        'data' => [
+                            'id' => $this->id,
+                            'dialog_id' => $this->dialog_id,
+                            'last_msg' => $last_msg,
+                            'update_read' => $deleteRead ? 1 : 0
+                        ],
+                    ]
+                ]);
+            }
+        });
+    }
+
+    /**
+     * 处理文本消息内容，用于发送前
+     * @param $text
+     * @param $dialog_id
+     * @return mixed|string|string[]
+     */
+    public static function formatMsg($text, $dialog_id)
+    {
+        // 图片 [:IMAGE:className:width:height:src:alt:]
+        preg_match_all("/<img\s*src=\"data:image\/(png|jpg|jpeg);base64,(.*?)\"(.*?)>(<\/img>)*/s", $text, $matchs);
+        foreach ($matchs[2] as $key => $base64) {
+            $tmpPath = "uploads/chat/" . date("Ym") . "/" . $dialog_id . "/";
+            Base::makeDir(public_path($tmpPath));
+            $tmpPath .= md5s($base64) . "." . $matchs[1][$key];
+            if (file_put_contents(public_path($tmpPath), base64_decode($base64))) {
+                $imagesize = getimagesize(public_path($tmpPath));
+                $text = str_replace($matchs[0][$key], "[:IMAGE:browse:{$imagesize[0]}:{$imagesize[1]}:{$tmpPath}::]", $text);
+            }
+        }
+        // 表情图片
+        preg_match_all("/<img class=\"emoticon\"(.*?)>/s", $text, $matchs);
+        foreach ($matchs[1] as $key => $str) {
+            preg_match("/data-asset=\"(.*?)\"/", $str, $matchAsset);
+            preg_match("/data-name=\"(.*?)\"/", $str, $matchName);
+            if (file_exists(public_path($matchAsset[1]))) {
+                $imagesize = getimagesize(public_path($matchAsset[1]));
+                $text = str_replace($matchs[0][$key], "[:IMAGE:emoticon:{$imagesize[0]}:{$imagesize[1]}:{$matchAsset[1]}:{$matchName[1]}:]", $text);
+            }
+        }
+        // @成员、#任务
+        preg_match_all("/<span class=\"mention\"(.*?)>.*?<\/span>.*?<\/span>.*?<\/span>/s", $text, $matchs);
+        foreach ($matchs[1] as $key => $str) {
+            preg_match("/data-denotation-char=\"(.*?)\"/", $str, $matchChar);
+            preg_match("/data-id=\"(.*?)\"/", $str, $matchId);
+            preg_match("/data-value=\"(.*?)\"/", $str, $matchValye);
+            $text = str_replace($matchs[0][$key], "[:{$matchChar[1]}:{$matchId[1]}:{$matchValye[1]}:]", $text);
+        }
+        // 过滤标签
+        $text = strip_tags($text, '<blockquote> <strong> <pre> <ol> <ul> <li> <em> <p> <s> <u>');
+        $text = preg_replace("/\<(blockquote|strong|pre|ol|ul|li|em|p|s|u).*?\>/i", "<$1>", $text);
+        $text = preg_replace("/\[:IMAGE:(.*?):(.*?):(.*?):(.*?):(.*?):\]/i", "<img class=\"$1\" width=\"$2\" height=\"$3\" src=\"{{RemoteURL}}$4\" alt=\"$5\"/>", $text);
+        $text = preg_replace("/\[:@:(.*?):(.*?):\]/i", "<span class=\"mention user\" data-id=\"$1\">@$2</span>", $text);
+        $text = preg_replace("/\[:#:(.*?):(.*?):\]/i", "<span class=\"mention task\" data-id=\"$1\">#$2</span>", $text);
+        return preg_replace("/^(<p><\/p>)+|(<p><\/p>)+$/i", "", $text);
+    }
+
     /**
      * 发送消息
      * @param int $dialog_id    会话ID（即 聊天室ID）

app/Models/WebSocketDialogMsgRead.php

@@ -2,6 +2,8 @@
 
 namespace App\Models;
 
+use Carbon\Carbon;
+
 /**
  * App\Models\WebSocketDialogMsgRead
  *
@@ -9,14 +11,17 @@ namespace App\Models;
  * @property int|null $dialog_id 对话ID
  * @property int|null $msg_id 消息ID
  * @property int|null $userid 发送会员ID
+ * @property int|null $mention 是否提及（被@）
  * @property int|null $after 在阅读之后才添加的记录
  * @property string|null $read_at 阅读时间
+ * @property-read \App\Models\WebSocketDialogMsg|null $webSocketDialogMsg
  * @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|WebSocketDialogMsgRead whereAfter($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereDialogId($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 whereUserid($value)
@@ -29,4 +34,38 @@ 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 $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/WebSocketDialogUser.php

@@ -8,6 +8,8 @@ namespace App\Models;
  * @property int $id
  * @property int|null $dialog_id 对话ID
  * @property int|null $userid 会员ID
+ * @property string|null $top_at 置顶时间
+ * @property int|null $mark_unread 是否标记为未读：0否，1是
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser newModelQuery()
@@ -16,6 +18,8 @@ namespace App\Models;
  * @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 whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereMarkUnread($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

app/Module/Base.php

@@ -2,6 +2,7 @@
 
 namespace App\Module;
 
+use App\Exceptions\ApiException;
 use App\Models\Setting;
 use App\Models\Tmp;
 use Cache;
@@ -11,6 +12,7 @@ use Illuminate\Support\Facades\Config;
 use Redirect;
 use Request;
 use Storage;
+use Validator;
 
 class Base
 {
@@ -58,20 +60,55 @@ class Base
         ])->save();
     }
 
+    /**
+     * 获取package配置文件
+     * @return array
+     */
+    public static function getPackage()
+    {
+        return Cache::remember("Base::package", now()->addSeconds(10), function () {
+            $file = base_path('package.json');
+            if (file_exists($file)) {
+                $package = json_decode(file_get_contents($file), true);
+                return is_array($package) ? $package : [];
+            }
+            return [];
+        });
+    }
+
     /**
      * 获取版本号
      * @return string
      */
     public static function getVersion()
     {
-        return Cache::remember("Base::version", now()->addSeconds(10), function () {
-            $file = base_path('package.json');
-            if (file_exists($file)) {
-                $packageArray = json_decode(file_get_contents($file), true);
-                return $packageArray['version'] ?? '1.0.0';
-            }
-            return '1.0.0';
-        });
+        $package = self::getPackage();
+        return $package['version'] ?? '1.0.0';
+    }
+
+    /**
+     * 获取客户端版本号
+     * @return string
+     */
+    public static function getClientVersion()
+    {
+        global $_A;
+        if (!isset($_A["__static_client_version"])) {
+            $_A["__static_client_version"] = Request::header('version') ?: '0.0.1';
+        }
+        return $_A["__static_client_version"];
+    }
+
+    /**
+     * 检查客户端版本
+     * @param string $min 最小版本
+     * @return void
+     */
+    public static function checkClientVersion($min)
+    {
+        if (version_compare(Base::getClientVersion(), $min, '<')) {
+            throw new ApiException('当前版本 (v' . Base::getClientVersion() . ') 过低');
+        }
     }
 
     /**
@@ -316,19 +353,15 @@ class Base
     {
         if (strtolower($charset) == 'utf-8') {
             if (Base::getStrlen($string) <= $length) return $string;
-            $strcut = str_replace(array('&amp;', '&quot;', '&lt;', '&gt;'), array('&', '"', '<', '>'), $string);
-            $strcut = Base::utf8Substr($strcut, $length, $start);
-            $strcut = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $strcut);
+            $strcut = Base::utf8Substr($string, $length, $start);
             return $strcut . $dot;
         } else {
             $length = $length * 2;
             if (strlen($string) <= $length) return $string;
-            $string = str_replace(array('&amp;', '&quot;', '&lt;', '&gt;'), array('&', '"', '<', '>'), $string);
             $strcut = '';
             for ($i = 0; $i < $length; $i++) {
                 $strcut .= ord($string[$i]) > 127 ? $string[$i] . $string[++$i] : $string[$i];
             }
-            $strcut = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $strcut);
         }
         return $strcut . $dot;
     }
@@ -684,24 +717,20 @@ class Base
     /**
      * 判断两个地址域名是否相同
      * @param string $var1
-     * @param string $var2
+     * @param string|array $var2
      * @return bool
      */
     public static function hostContrast($var1, $var2)
     {
         $arr1 = parse_url($var1);
-        $arr2 = parse_url($var2);
+        $host1 = $arr1['host'] ?? $var1;
         //
-        $host1 = $var1;
-        if (isset($arr1['host'])) {
-            $host1 = $arr1['host'];
+        $host2 = [];
+        foreach (is_array($var2) ? $var2 : [$var2] as $url) {
+            $arr2 = parse_url($url);
+            $host2[] = $arr2['host'] ?? $url;
         }
-        //
-        $host2 = $var2;
-        if (isset($arr2['host'])) {
-            $host2 = $arr2['host'];
-        }
-        return $host1 == $host2;
+        return in_array($host1, $host2);
     }
 
     /**
@@ -725,6 +754,7 @@ class Base
      */
     public static function fillUrl($str = '')
     {
+        global $_A;
         if (is_array($str)) {
             foreach ($str as $key => $item) {
                 $str[$key] = Base::fillUrl($item);
@@ -743,9 +773,12 @@ class Base
         ) {
             return $str;
         } else {
+            if ($_A['__fill_url_remote_url'] === true) {
+                return "{{RemoteURL}}" . $str;
+            }
             try {
                 return url($str);
-            } catch (\Throwable $e) {
+            } catch (\Throwable) {
                 return self::getSchemeAndHost() . "/" . $str;
             }
         }
@@ -766,7 +799,7 @@ class Base
         }
         try {
             $find = url('');
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             $find = self::getSchemeAndHost();
         }
         return Base::leftDelete($str, $find . '/');
@@ -782,6 +815,31 @@ class Base
         return $scheme.($_SERVER['HTTP_HOST'] ?? '');
     }
 
+    /**
+     * 地址后拼接参数
+     * @param $url
+     * @param $parames
+     * @return mixed|string
+     */
+    public static function urlAddparameter($url, $parames)
+    {
+        if ($parames && is_array($parames)) {
+            $array = [];
+            foreach ($parames as $key => $val) {
+                $array[] = $key . "=" . $val;
+            }
+            if ($array) {
+                $query = implode("&", $array);
+                if (str_contains($url, "?")) {
+                    $url .= "&" . $query;
+                } else {
+                    $url .= "?" . $query;
+                }
+            }
+        }
+        return $url;
+    }
+
     /**
      * 格式化内容图片地址
      * @param $content
@@ -934,13 +992,16 @@ class Base
 
     /**
      * 检测邮箱格式
-     * @param string $str 需要检测的字符串
-     * @return int
+     * @param $str
+     * @return bool
      */
-    public static function isMail($str)
+    public static function isEmail($str)
     {
-        $RegExp = '/^[a-z0-9][a-z\.0-9-_]+@[a-z0-9_-]+(?:\.[a-z]{0,3}\.[a-z]{0,2}|\.[a-z]{0,3}|\.[a-z]{0,2})$/i';
-        return preg_match($RegExp, $str);
+        if (filter_var($str, FILTER_VALIDATE_EMAIL)) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     /**
@@ -1156,11 +1217,12 @@ class Base
 
     /**
      * 获取或设置
-     * @param $setname //配置名称
-     * @param bool $array //保存内容
+     * @param $setname          // 配置名称
+     * @param bool $array       // 保存内容
+     * @param false $isUpdate   // 保存内容为更新模式，默认否
      * @return array
      */
-    public static function setting($setname, $array = false)
+    public static function setting($setname, $array = false, $isUpdate = false)
     {
         global $_A;
         if (empty($setname)) {
@@ -1171,15 +1233,19 @@ class Base
         }
         $setting = [];
         $row = Setting::whereName($setname)->first();
-        if (!empty($row)) {
+        if ($row) {
             $setting = Base::string2array($row->setting);
         } else {
             $row = Setting::createInstance(['name' => $setname]);
             $row->save();
         }
         if ($array !== false) {
-            $setting = $array;
-            $row->updateInstance(['setting' => $array]);
+            if ($isUpdate && is_array($array)) {
+                $setting = array_merge($setting, $array);
+            } else {
+                $setting = $array;
+            }
+            $row->updateInstance(['setting' => $setting]);
             $row->save();
         }
         $_A["__static_setting_" . $setname] = $setting;
@@ -1562,7 +1628,7 @@ class Base
     }
 
     /**
-     * 用户名、邮箱、手机账号、银行卡号中间字符串以*隐藏
+     * 用户名、邮箱、手机帐号、银行卡号中间字符串以*隐藏
      * @param $str
      * @return string
      */
@@ -1661,24 +1727,46 @@ class Base
      */
     public static function timeDiff($s, $e)
     {
-        $d = $e - $s;
-        if ($d > 86400) {
-            $day = floor($d / 86400);
-            $hour = ceil(($d - ($day * 86400)) / 3600);
-            if ($hour > 0) {
-                return $day . '天' . $hour . '小时';
-            } else {
-                return $day . '天';
-            }
-        } elseif ($d > 3600) {
-            return ceil($d / 3600) . '小时';
-        } elseif ($d > 60) {
-            return ceil($d / 60) . '分钟';
-        } elseif ($d > 1) {
-            return '1分钟内';
-        } else {
-            return '0秒';
+        $time = $e - $s;
+        $days = 0;
+        if ($time >= 86400) { // 如果大于1天
+            $days = (int)($time / 86400);
+            $time = $time % 86400; // 计算天后剩余的毫秒数
         }
+        $hours = 0;
+        if ($time >= 3600) { // 如果大于1小时
+            $hours = (int)($time / 3600);
+            $time = $time % 3600; // 计算小时后剩余的毫秒数
+        }
+        $minutes = ceil($time / 60); // 剩下的毫秒数都算作分
+        $daysStr = $days > 0 ? $days . '天' : '';
+        $hoursStr = ($hours > 0 || ($days > 0 && $minutes > 0)) ? $hours . '时' : '';
+        $minuteStr = ($minutes > 0) ? $minutes . '分' : '';
+        return $daysStr . $hoursStr . $minuteStr;
+    }
+
+    /**
+     * 时间秒数格式化
+     * @param int $time 时间秒数
+     * @return string
+     */
+    public static function timeFormat($time)
+    {
+        $days = 0;
+        if ($time >= 86400) { // 如果大于1天
+            $days = (int)($time / 86400);
+            $time = $time % 86400; // 计算天后剩余的毫秒数
+        }
+        $hours = 0;
+        if ($time >= 3600) { // 如果大于1小时
+            $hours = (int)($time / 3600);
+            $time = $time % 3600; // 计算小时后剩余的毫秒数
+        }
+        $minutes = ceil($time / 60); // 剩下的毫秒数都算作分
+        $daysStr = $days > 0 ? $days . '天' : '';
+        $hoursStr = ($hours > 0 || ($days > 0 && $minutes > 0)) ? $hours . '时' : '';
+        $minuteStr = ($minutes > 0) ? $minutes . '分' : '';
+        return $daysStr . $hoursStr . $minuteStr;
     }
 
     /**
@@ -2219,7 +2307,7 @@ class Base
                     $type = ['zip'];
                     break;
                 case 'file':
-                    $type = ['jpg', 'jpeg', 'png', 'gif', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'esp', 'pdf', 'rar', 'zip', 'gz'];
+                    $type = ['jpg', 'jpeg', 'png', 'gif', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'esp', 'pdf', 'rar', 'zip', 'gz', 'ai', 'avi', 'bmp', 'cdr', 'eps', 'mov', 'mp3', 'mp4', 'pr', 'psd', 'svg', 'tif'];
                     break;
                 case 'firmware':
                     $type = ['img', 'tar', 'bin'];
@@ -2227,8 +2315,14 @@ class Base
                 case 'md':
                     $type = ['md'];
                     break;
+                case 'desktop':
+                    $type = ['yml', 'yaml', 'dmg', 'pkg', 'blockmap', 'zip', 'exe', 'msi'];
+                    break;
                 case 'more':
                     $type = [
+                        'text', 'md', 'markdown',
+                        'drawio',
+                        'mind',
                         'docx', 'wps', 'doc', 'xls', 'xlsx', 'ppt', 'pptx',
                         'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw',
                         'rar', 'zip', 'jar', '7-zip', 'tar', 'gzip', '7z',
@@ -2237,10 +2331,17 @@ class Base
                         'ofd',
                         'pdf',
                         'txt',
-                        'html', 'htm', 'asp', 'jsp', 'xml', 'json', 'properties', 'md', 'gitignore', 'log', 'java', 'py', 'c', 'cpp', 'sql', 'sh', 'bat', 'm', 'bas', 'prg', 'cmd',
-                        'php', 'go', 'python', 'js', 'ftl', 'css', 'lua', 'rb', 'yaml', 'yml', 'h', 'cs', 'aspx',
+                        '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',
                         'mp3', 'wav', 'mp4', 'flv',
                         'avi', 'mov', 'wmv', 'mkv', '3gp', 'rm',
+                        'xmind',
+                        'rp',
                     ];
                     break;
                 default:
@@ -2259,7 +2360,9 @@ class Base
                 $fileSize = 0;
             }
             $scaleName = "";
-            if ($param['fileName']) {
+            if ($param['fileName'] === true) {
+                $fileName = $file->getClientOriginalName();
+            } elseif ($param['fileName']) {
                 $fileName = $param['fileName'];
             } else {
                 if ($param['scale'] && is_array($param['scale'])) {
@@ -2362,6 +2465,37 @@ class Base
         }
     }
 
+    /**
+     * 上传文件移动
+     * @param array $uploadResult
+     * @param string $newPath "/" 结尾
+     * @return array
+     */
+    public static function uploadMove($uploadResult, $newPath)
+    {
+        if (str_ends_with($newPath, "/") && file_exists($uploadResult['file'])) {
+            Base::makeDir(public_path($newPath));
+            $oldPath = dirname($uploadResult['path']) . "/";
+            $newFile = str_replace($oldPath, $newPath, $uploadResult['file']);
+            if (rename($uploadResult['file'], $newFile)) {
+                $oldUrl = $uploadResult['url'];
+                $uploadResult['file'] = $newFile;
+                $uploadResult['path'] = str_replace($oldPath, $newPath, $uploadResult['path']);
+                $uploadResult['url'] = str_replace($oldPath, $newPath, $uploadResult['url']);
+                if ($uploadResult['thumb'] == $oldUrl) {
+                    $uploadResult['thumb'] = $uploadResult['url'];
+                } elseif ($uploadResult['thumb']) {
+                    $oldThumb = substr($uploadResult['thumb'], strpos($uploadResult['thumb'], $newPath));
+                    $newThumb = str_replace($oldPath, $newPath, $oldThumb);
+                    if (file_exists(public_path($oldThumb)) && rename(public_path($oldThumb), public_path($newThumb))) {
+                        $uploadResult['thumb'] = str_replace($oldPath, $newPath, $uploadResult['thumb']);
+                    }
+                }
+            }
+        }
+        return $uploadResult;
+    }
+
     /**
      * 生成缩略图
      * @param string $src_img 源图绝对完整地址{带文件名及后缀名}
@@ -2633,16 +2767,19 @@ class Base
     /**
      * 遍历获取文件
      * @param $dir
+     * @param bool $subdirectory    是否遍历子目录
      * @return array
      */
-    public static function readDir($dir)
+    public static function readDir($dir, $subdirectory = true)
     {
         $files = array();
         $dir_list = scandir($dir);
         foreach ($dir_list as $file) {
             if ($file != '..' && $file != '.') {
                 if (is_dir($dir . '/' . $file)) {
-                    $files = array_merge($files, self::readDir($dir . '/' . $file));
+                    if ($subdirectory) {
+                        $files = array_merge($files, self::readDir($dir . '/' . $file, $subdirectory));
+                    }
                 } else {
                     $files[] = $dir . "/" . $file;
                 }
@@ -2871,4 +3008,54 @@ class Base
         $matrix = array_unique($matrix, SORT_REGULAR);
         return array_merge($matrix);
     }
+
+    /**
+     * 字节转格式
+     * @param $bytes
+     * @return string
+     */
+    public static function readableBytes($bytes)
+    {
+        $i = floor(log($bytes) / log(1024));
+        $sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+        return sprintf('%.02F', $bytes / pow(1024, $i)) * 1 . ' ' . $sizes[$i];
+    }
+
+    /**
+     * 去除emoji表情
+     * @param $str
+     * @return string|string[]|null
+     */
+    public static function filterEmoji($str)
+    {
+        return preg_replace_callback(
+            '/./u',
+            function (array $match) {
+                return strlen($match[0]) >= 4 ? '' : $match[0];
+            },
+            $str);
+    }
+
+    /**
+     * 统一验证器
+     * @param $data
+     * @param $messages
+     */
+    public static function validator($data, $messages) {
+        $rules = [];
+        foreach ($messages as $key => $item) {
+            $keys = explode(".", $key);
+            if (isset($keys[1])) {
+                if (isset($rules[$keys[0]])) {
+                    $rules[$keys[0]] = $rules[$keys[0]] . '|' . $keys[1];
+                } else {
+                    $rules[$keys[0]] = $keys[1];
+                }
+            }
+        }
+        $validator = Validator::make($data, $rules, $messages);
+        if ($validator->fails()) {
+            throw new ApiException($validator->errors()->first());
+        }
+    }
 }

app/Module/BillExport.php

@@ -0,0 +1,144 @@
+<?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
+{
+    public $title;
+    public $headings = [];
+    public $data = [];
+    public $typeLists = [];
+    public $typeNumber = 0;
+
+    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 store($fileName = '') {
+        if (empty($fileName)) {
+            $fileName = date("YmdHis") . '.xls';
+        }
+        try {
+            return Excel::store($this, $fileName);
+        } catch (Exception $e) {
+            return "导出错误：" . $e->getMessage();
+        } catch (\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 $e) {
+            return "导出错误：" . $e->getMessage();
+        } catch (\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) {
+                $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/Services/WebSocketService.php

@@ -127,9 +127,11 @@ class WebSocketService implements WebSocketHandlerInterface
             case 'readMsg':
                 $ids = is_array($data['id']) ? $data['id'] : [$data['id']];
                 $userid = $this->getUserid($frame->fd);
-                $list = WebSocketDialogMsg::whereIn('id', $ids)->get();
-                $list->transform(function(WebSocketDialogMsg $item) use ($userid) {
-                    $item->readSuccess($userid);
+                WebSocketDialogMsg::whereIn('id', $ids)->chunkById(20, function($list) use ($userid) {
+                    /** @var WebSocketDialogMsg $item */
+                    foreach ($list as $item) {
+                        $item->readSuccess($userid);
+                    }
                 });
                 return;
 
@@ -143,10 +145,10 @@ class WebSocketService implements WebSocketHandlerInterface
                     $pathOld = $row->path;
                     $row->path = $pathNew;
                     $row->save();
-                    if (preg_match("/^file\/content\/\d+$/", $pathOld)) {
+                    if (preg_match("/^\/single\/file\/\d+$/", $pathOld)) {
                         $this->pushPath($pathOld);
                     }
-                    if (preg_match("/^file\/content\/\d+$/", $pathNew)) {
+                    if (preg_match("/^\/single\/file\/\d+$/", $pathNew)) {
                         $this->pushPath($pathNew);
                     }
                 }
@@ -204,7 +206,19 @@ class WebSocketService implements WebSocketHandlerInterface
      */
     private function deleteUser($fd)
     {
-        WebSocket::whereFd($fd)->delete();
+        $array = [];
+        WebSocket::whereFd($fd)->chunk(10, function($list) use (&$array) {
+            /** @var WebSocket $item */
+            foreach ($list as $item) {
+                $item->delete();
+                if ($item->path && str_starts_with($item->path, "/single/file/")) {
+                    $array[$item->path] = $item->path;
+                }
+            }
+        });
+        foreach ($array as $path) {
+            $this->pushPath($path);
+        }
     }
 
     /**

app/Tasks/OverdueRemindEmailTask.php

@@ -0,0 +1,116 @@
+<?php
+
+namespace App\Tasks;
+
+use App\Models\ProjectTask;
+use App\Models\ProjectTaskMailLog;
+use App\Models\User;
+use App\Module\Base;
+use Carbon\Carbon;
+use Guanguans\Notify\Factory;
+use Guanguans\Notify\Messages\EmailMessage;
+
+@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
+
+class OverdueRemindEmailTask extends AbstractTask
+{
+    public function __construct()
+    {
+        //
+    }
+
+    public function start()
+    {
+        $setting = Base::setting('emailSetting');
+        if ($setting['notice'] === 'open') {
+            $hours = floatval($setting['task_remind_hours']);
+            $hours2 = floatval($setting['task_remind_hours2']);
+            if ($hours > 0) {
+                ProjectTask::whereNull('complete_at')
+                    ->whereNull('archived_at')
+                    ->whereBetween("end_at", [
+                        Carbon::now()->addMinutes($hours * 60),
+                        Carbon::now()->addMinutes($hours * 60 + 10)
+                    ])->chunkById(100, function ($tasks) {
+                        /** @var ProjectTask $task */
+                        foreach ($tasks as $task) {
+                            $this->overdueBeforeAfterEmail($task, true);
+                        }
+                    });
+            }
+            if ($hours2 > 0) {
+                ProjectTask::whereNull('complete_at')
+                    ->whereNull('archived_at')
+                    ->whereBetween("end_at", [
+                        Carbon::now()->subMinutes($hours2 * 60 + 10),
+                        Carbon::now()->subMinutes($hours2 * 60)
+                    ])->chunkById(100, function ($tasks) {
+                        /** @var ProjectTask $task */
+                        foreach ($tasks as $task) {
+                            $this->overdueBeforeAfterEmail($task, false);
+                        }
+                    });
+            }
+        }
+    }
+
+    /**
+     * 过期前、超期后提醒
+     * @param ProjectTask $task
+     * @param $isBefore
+     * @return void
+     */
+    private function overdueBeforeAfterEmail(ProjectTask $task, $isBefore)
+    {
+        $userids = $task->taskUser->where('owner', 1)->pluck('userid')->toArray();
+        if (empty($userids)) {
+            return;
+        }
+        $users = User::whereIn('userid', $userids)->get();
+        if (empty($users)) {
+            return;
+        }
+
+        $setting = Base::setting('emailSetting');
+        $hours = floatval($setting['task_remind_hours']);
+        $hours2 = floatval($setting['task_remind_hours2']);
+
+        /** @var User $user */
+        foreach ($users as $user) {
+            $data = [
+                'type' => $isBefore ? 1 : 2,
+                'userid' => $user->userid,
+                'task_id' => $task->id,
+            ];
+            $emailLog = ProjectTaskMailLog::where($data)->first();
+            if ($emailLog) {
+                continue;
+            }
+            try {
+                if (!Base::isEmail($user->email)) {
+                    throw new \Exception("User email '{$user->email}' address error");
+                }
+                if ($isBefore) {
+                    $subject = env('APP_NAME') . " 任务提醒";
+                    $content = "<p>{$user->nickname} 您好：</p><p>您有一个任务【{$task->name}】还有{$hours}小时即将超时，请及时处理。</p>";
+                } else {
+                    $subject = env('APP_NAME') . " 任务过期提醒";
+                    $content = "<p>{$user->nickname} 您好：</p><p>您的任务【{$task->name}】已经超时{$hours2}小时，请及时处理。</p>";
+                }
+                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($user->email)
+                        ->subject($subject)
+                        ->html($content))
+                    ->send();
+                $data['is_send'] = 1;
+            } catch (\Exception $e) {
+                $data['send_error'] = $e->getMessage();
+            }
+            $data['email'] = $user->email;
+            ProjectTaskMailLog::createInstance($data)->save();
+        }
+    }
+}

app/Tasks/WebSocketDialogMsgTask.php

@@ -33,6 +33,11 @@ class WebSocketDialogMsgTask extends AbstractTask
 
     public function start()
     {
+        global $_A;
+        $_A = [
+            '__fill_url_remote_url' => true,
+        ];
+        //
         $msg = WebSocketDialogMsg::find($this->id);
         if (empty($msg)) {
             return;
@@ -43,30 +48,38 @@ class WebSocketDialogMsgTask extends AbstractTask
         }
 
         // 推送目标①：群成员
+        $array = [];
         $userids = $dialog->dialogUser->pluck('userid')->toArray();
         foreach ($userids AS $userid) {
             if ($userid == $msg->userid) {
                 continue;
             }
+            $mention = preg_match("/<span class=\"mention user\" data-id=\"[0|{$userid}]\">/", $msg->type === 'text' ? $msg->msg['text'] : '');
             WebSocketDialogMsgRead::createInstance([
                 'dialog_id' => $msg->dialog_id,
                 'msg_id' => $msg->id,
                 'userid' => $userid,
+                'mention' => $mention,
             ])->saveOrIgnore();
+            $array[$userid] = $mention;
         }
         // 更新已发送数量
         $msg->send = WebSocketDialogMsgRead::whereMsgId($msg->id)->count();
         $msg->save();
         // 开始推送消息
-        PushTask::push([
-            'userid' => $userids,
-            'ignoreFd' => $this->ignoreFd,
-            'msg' => [
-                'type' => 'dialog',
-                'mode' => 'add',
-                'data' => $msg->toArray(),
-            ]
-        ]);
+        foreach ($array as $userid => $mention) {
+            PushTask::push([
+                'userid' => $userid,
+                'ignoreFd' => $this->ignoreFd,
+                'msg' => [
+                    'type' => 'dialog',
+                    'mode' => 'add',
+                    'data' => array_merge($msg->toArray(), [
+                        'mention' => $mention,
+                    ]),
+                ]
+            ]);
+        }
 
         // 推送目标②：正在打开这个任务会话的会员
         if ($dialog->type == 'group' && $dialog->group_type == 'task') {

cmd

@@ -13,6 +13,7 @@ Error="${Red}[错误]${Font}"
 
 cur_path="$(pwd)"
 cur_arg=$@
+COMPOSE="docker-compose"
 
 judge() {
     if [[ 0 -eq $? ]]; then
@@ -31,6 +32,15 @@ rand() {
     echo $(($num%$max+$min))
 }
 
+rand_string() {
+    local lan=$1
+    if [[ `uname` == 'Linux' ]]; then
+        echo "$(date +%s%N | md5sum | cut -c 1-${lan})"
+    else
+        echo "$(docker run -it --rm alpine sh -c "date +%s%N | md5sum | cut -c 1-${lan}")"
+    fi
+}
+
 supervisorctl_restart() {
     local RES=`run_exec php "supervisorctl update $1"`
     if [ -z "$RES" ]; then
@@ -46,15 +56,24 @@ check_docker() {
         echo -e "${Error} ${RedBG} 未安装 Docker！${Font}"
         exit 1
     fi
-    docker-compose --version &> /dev/null
+    docker-compose version &> /dev/null
     if [ $? -ne  0 ]; then
-        echo -e "${Error} ${RedBG} 未安装 Docker-compose！${Font}"
+        docker compose version &> /dev/null
+        if [ $? -ne  0 ]; then
+            echo -e "${Error} ${RedBG} 未安装 Docker-compose！${Font}"
+            exit 1
+        fi
+        COMPOSE="docker compose"
+    fi
+    if [[ -n `$COMPOSE version | grep -E "\sv*1"` ]]; then
+        $COMPOSE version
+        echo -e "${Error} ${RedBG} Docker-compose 版本过低，请升级至v2+！${Font}"
         exit 1
     fi
 }
 
 check_node() {
-    npm --version > /dev/null
+    npm --version &> /dev/null
     if [ $? -ne  0 ]; then
         echo -e "${Error} ${RedBG} 未安装nodejs！${Font}"
         exit 1
@@ -62,7 +81,7 @@ check_node() {
 }
 
 docker_name() {
-    echo `docker-compose ps | awk '{print $1}' | grep "\-$1\-"`
+    echo `$COMPOSE ps | awk '{print $1}' | grep "\-$1\-"`
 }
 
 run_compile() {
@@ -77,6 +96,7 @@ run_compile() {
     if [ "$type" = "prod" ]; then
         rm -rf "./public/js/build"
         npx mix --production
+        echo "$(rand_string 16)" > ./public/js/hash
     else
         npx mix watch --hot
     fi
@@ -106,6 +126,10 @@ run_electron() {
     if [ "$argv" != "dev" ] && [ "$argv" != "--nobuild" ]; then
         npx mix --production -- --env --electron
     fi
+    if [ "$argv" == "dev" ]; then
+        run_exec php "php bin/run --mode=$argv"
+        supervisorctl_restart php
+    fi
     node ./electron/build.js $argv
 }
 
@@ -117,11 +141,7 @@ run_exec() {
         echo -e "${Error} ${RedBG} 没有找到 $container 容器! ${Font}"
         exit 1
     fi
-    if [ "$container" = "mariadb" ] || [ "$container" = "nginx" ] || [ "$container" = "redis" ]; then
-        docker exec -it "$name" /bin/sh -c "$cmd"
-    else
-        docker exec -it "$name" /bin/bash -c "$cmd"
-    fi
+    docker exec -it "$name" /bin/sh -c "$cmd"
 }
 
 run_mysql() {
@@ -178,8 +198,11 @@ env_set() {
     if [ -z "$exist" ]; then
         echo "$key=$val" >> $cur_path/.env
     else
-        command="sed -i '/^$key=/c\\$key=$val' /www/.env"
-        docker run -it --rm -v ${cur_path}:/www alpine sh -c "$command"
+        if [[ `uname` == 'Linux' ]]; then
+            sed -i "/^${key}=/c\\${key}=${val}" ${cur_path}/.env
+        else
+            docker run -it --rm -v ${cur_path}:/www alpine sh -c "sed -i "/^${key}=/c\\${key}=${val}" /www/.env"
+        fi
         if [ $? -ne  0 ]; then
             echo -e "${Error} ${RedBG} 设置env参数失败！${Font}"
             exit 1
@@ -192,10 +215,10 @@ env_init() {
         cp .env.docker .env
     fi
     if [ -z "$(env_get DB_ROOT_PASSWORD)" ]; then
-        env_set DB_ROOT_PASSWORD "$(docker run -it --rm alpine sh -c "date +%s%N | md5sum | cut -c 1-16")"
+        env_set DB_ROOT_PASSWORD "$(rand_string 16)"
     fi
     if [ -z "$(env_get APP_ID)" ]; then
-        env_set APP_ID "$(docker run -it --rm alpine sh -c "date +%s%N | md5sum | cut -c 1-6")"
+        env_set APP_ID "$(rand_string 6)"
     fi
     if [ -z "$(env_get APP_IPPR)" ]; then
         env_set APP_IPPR "10.$(rand 50 100).$(rand 100 200)"
@@ -207,16 +230,28 @@ arg_get() {
     local value=""
     for var in $cur_arg; do
         if [[ "$find" == "y" ]]; then
-            value=$var
+            if [[ ! $var =~ "--" ]]; then
+                value=$var
+            fi
             break
         fi
         if [[ "--$1" == "$var" ]] || [[ "-$1" == "$var" ]]; then
             find="y"
+            value="yes"
         fi
     done
     echo $value
 }
 
+is_arm() {
+    local get_arch=`arch`
+    if [[ $get_arch =~ "aarch" ]] || [[ $get_arch =~ "arm" ]]; then
+        echo "yes"
+    else
+        echo "no"
+    fi
+}
+
 ####################################################################################
 ####################################################################################
 ####################################################################################
@@ -229,17 +264,25 @@ fi
 if [ $# -gt 0 ]; then
     if [[ "$1" == "init" ]] || [[ "$1" == "install" ]]; then
         shift 1
+        # 判断架构
+        if [[ "$(is_arm)" == "yes" ]] && [[ -z "$(arg_get force)" ]]; then
+            echo -e "${Error} ${RedBG}暂不支持arm架构，强制安装请使用：./cmd install --force${Font}"
+            exit 1
+        fi
         # 初始化文件
-        rm -rf composer.lock
-        rm -rf package-lock.json
+        if [[ -n "$(arg_get relock)" ]]; then
+            rm -rf node_modules
+            rm -rf package-lock.json
+            rm -rf vendor
+            rm -rf composer.lock
+        fi
         mkdir -p "${cur_path}/docker/log/supervisor"
         mkdir -p "${cur_path}/docker/mysql/data"
         chmod -R 775 "${cur_path}/docker/log/supervisor"
         chmod -R 775 "${cur_path}/docker/mysql/data"
         # 启动容器
         [[ "$(arg_get port)" -gt 0 ]] && env_set APP_PORT "$(arg_get port)"
-        docker-compose up -d
-        docker-compose restart php
+        $COMPOSE up php -d
         # 安装composer依赖
         run_exec php "composer install"
         if [ ! -f "${cur_path}/vendor/autoload.php" ]; then
@@ -254,21 +297,25 @@ if [ $# -gt 0 ]; then
         [[ -z "$(env_get APP_KEY)" ]] && run_exec php "php artisan key:generate"
         run_exec php "php bin/run --mode=prod"
         # 检查数据库
-        remaining=10
+        remaining=20
         while [ ! -f "${cur_path}/docker/mysql/data/$(env_get DB_DATABASE)/db.opt" ]; do
             ((remaining=$remaining-1))
             if [ $remaining -lt 0 ]; then
-                echo -e "${Error} ${RedBG} 数据库安装失败! ${Font}"
+                echo -e "${Error} ${RedBG} 数据库初始化失败! ${Font}"
                 exit 1
             fi
             chmod -R 775 "${cur_path}/docker/mysql/data"
             sleep 3
         done
         run_exec php "php artisan migrate --seed"
+        if [ ! -f "${cur_path}/docker/mysql/data/$(env_get DB_DATABASE)/$(env_get DB_PREFIX)migrations.ibd" ]; then
+            echo -e "${Error} ${RedBG} 数据库安装失败! ${Font}"
+            exit 1
+        fi
         # 设置初始化密码
         res=`run_exec mariadb "sh /etc/mysql/repassword.sh"`
-        docker-compose stop
-        docker-compose start
+        $COMPOSE up -d
+        supervisorctl_restart php
         echo -e "${OK} ${GreenBG} 安装完成 ${Font}"
         echo -e "地址: http://${GreenBG}127.0.0.1:$(env_get APP_PORT)${Font}"
         echo -e "$res"
@@ -281,7 +328,7 @@ if [ $# -gt 0 ]; then
         run_exec php "composer update"
         run_exec php "php artisan migrate"
         supervisorctl_restart php
-        docker-compose up -d
+        $COMPOSE up -d
     elif [[ "$1" == "uninstall" ]]; then
         shift 1
         read -rp "确定要卸载（含：删除容器、数据库、日志）吗？(y/n): " uninstall
@@ -295,20 +342,20 @@ if [ $# -gt 0 ]; then
             exit 2
             ;;
         esac
-        docker-compose down
+        $COMPOSE down
         rm -rf "./docker/mysql/data"
         rm -rf "./docker/log/supervisor"
         find "./storage/logs" -name "*.log" | xargs rm -rf
         echo -e "${OK} ${GreenBG} 卸载完成 ${Font}"
     elif [[ "$1" == "reinstall" ]]; then
         shift 1
-        ./cmd uninstall
+        ./cmd uninstall $@
         sleep 3
-        ./cmd install
+        ./cmd install $@
     elif [[ "$1" == "port" ]]; then
         shift 1
         env_set APP_PORT "$1"
-        docker-compose up -d
+        $COMPOSE up -d
         echo -e "${OK} ${GreenBG} 修改成功 ${Font}"
         echo -e "地址: http://${GreenBG}127.0.0.1:$(env_get APP_PORT)${Font}"
     elif [[ "$1" == "repassword" ]]; then
@@ -367,10 +414,10 @@ if [ $# -gt 0 ]; then
     elif [[ "$1" == "composer" ]]; then
         shift 1
         e="composer $@" && run_exec php "$e"
-    elif [[ "$1" == "super" ]]; then
+    elif [[ "$1" == "service" ]]; then
         shift 1
-        supervisorctl_restart "$@"
-    elif [[ "$1" == "supervisorctl" ]]; then
+        e="service $@" && run_exec php "$e"
+    elif [[ "$1" == "super" ]] || [[ "$1" == "supervisorctl" ]]; then
         shift 1
         e="supervisorctl $@" && run_exec php "$e"
     elif [[ "$1" == "models" ]]; then
@@ -381,11 +428,11 @@ if [ $# -gt 0 ]; then
         e="./vendor/bin/phpunit $@" && run_exec php "$e"
     elif [[ "$1" == "restart" ]]; then
         shift 1
-        docker-compose stop "$@"
-        docker-compose start "$@"
+        $COMPOSE stop "$@"
+        $COMPOSE start "$@"
     else
-        docker-compose "$@"
+        $COMPOSE "$@"
     fi
 else
-    docker-compose ps
+    $COMPOSE ps
 fi

composer.json

@@ -16,6 +16,7 @@
         "ext-simplexml": "*",
         "fideloper/proxy": "^4.4.1",
         "fruitcake/laravel-cors": "^2.0.4",
+        "guanguans/notify": "^1.20",
         "guzzlehttp/guzzle": "^7.3.0",
         "laravel/framework": "^v8.48.1",
         "laravel/tinker": "^v2.6.1",

config/laravels.php

@@ -300,9 +300,9 @@ return [
         'log_level'          => 4,
         'log_file'           => storage_path(sprintf('logs/swoole-%s.log', date('Y-m'))),
         'document_root'      => base_path('public'),
-        'buffer_output_size' => 200 * 1024 * 1024,
-        'socket_buffer_size' => 256 * 1024 * 1024,
-        'package_max_length' => 200 * 1024 * 1024,
+        'buffer_output_size' => 512 * 1024 * 1024,
+        'socket_buffer_size' => 512 * 1024 * 1024,
+        'package_max_length' => 512 * 1024 * 1024,
         'reload_async'       => true,
         'max_wait_time'      => 60,
         'enable_reuse_port'  => true,

database/migrations/2021_06_25_182631_create_project_logs_table.php

@@ -17,7 +17,7 @@ class CreateProjectLogsTable extends Migration
             $table->bigIncrements('id');
             $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID');
             $table->bigInteger('column_id')->nullable()->default(0)->comment('列表ID');
-            $table->bigInteger('task_id')->nullable()->default(0)->comment('项目ID');
+            $table->bigInteger('task_id')->nullable()->default(0)->comment('任务ID');
             $table->bigInteger('userid')->nullable()->default(0)->comment('会员ID');
             $table->string('detail', 500)->nullable()->default('')->comment('详细信息');
             $table->timestamps();

database/migrations/2021_12_29_170103_create_file_links_table.php

@@ -15,7 +15,7 @@ class CreateFileLinksTable extends Migration
     {
         Schema::create('file_links', function (Blueprint $table) {
             $table->bigIncrements('id');
-            $table->bigInteger('file_id')->nullable()->default(0)->comment('项目ID');
+            $table->bigInteger('file_id')->nullable()->default(0)->comment('文件ID');
             $table->integer('num')->nullable()->default(0)->comment('累计访问');
             $table->string('code')->nullable()->default('')->comment('链接码');
             $table->timestamps();

database/migrations/2021_12_30_155338_create_reports_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateReportsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if ( Schema::hasTable('reports') )
+            return;
+
+        Schema::create('reports', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+            $table->string("title")->default("")->comment("标题");
+            $table->enum("type", ["weekly", "daily"])->default("daily")->comment("汇报类型");
+            $table->unsignedBigInteger("userid")->default(0);
+            $table->longText("content")->nullable();
+            $table->index(["userid", "created_at"], "default");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('reports');
+    }
+}

database/migrations/2021_12_30_162019_create_report_receives_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateReportReceivesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if ( Schema::hasTable('report_receives') )
+            return;
+
+        Schema::create('report_receives', function (Blueprint $table) {
+            $table->bigIncrements("id");
+            $table->unsignedInteger("rid")->default(0);
+            $table->timestamp("receive_time")->nullable()->comment("接收时间");
+            $table->unsignedBigInteger("userid")->default(0)->comment("接收人");
+            $table->unsignedTinyInteger("read")->default(0)->comment("是否已读");
+            $table->index(["userid", "receive_time"], "default");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('report_receives');
+    }
+}

database/migrations/2022_01_04_111739_add_report_sign.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddReportSign extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('reports', function (Blueprint $table) {
+            $table->string("sign")->default("")->comment("汇报唯一标识");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('reports', function (Blueprint $table) {
+            $table->dropColumn("sign");
+        });
+    }
+}

database/migrations/2022_01_08_171816_create_project_flow_items_table.php

@@ -20,7 +20,7 @@ class CreateProjectFlowItemsTable extends Migration
             $table->string('name', 50)->nullable()->default('')->comment('名称');
             $table->string('status', 20)->nullable()->default('')->comment('状态');
             $table->string('turns')->nullable()->default('')->comment('可流转');
-            $table->string('userids')->nullable()->default('')->comment('自动负责人ID');
+            $table->string('userids')->nullable()->default('')->comment('状态负责人ID');
             $table->integer('sort')->nullable()->comment('排序');
             $table->timestamps();
         });

database/migrations/2022_01_12_153411_project_flow_items_add_userlimit.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ProjectFlowItemsAddUserlimit extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('project_flow_items', function (Blueprint $table) {
+            if (!Schema::hasColumn('project_flow_items', 'userlimit')) {
+                $table->tinyInteger('userlimit')->nullable()->default(0)->after('usertype')->comment('限制负责人');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('project_flow_items', function (Blueprint $table) {
+            $table->dropColumn("userlimit");
+        });
+    }
+}

database/migrations/2022_01_29_125829_web_socket_dialog_msgs_add_deletes.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class WebSocketDialogMsgsAddDeletes extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('web_socket_dialog_msgs', function (Blueprint $table) {
+            if (!Schema::hasColumn('web_socket_dialog_msgs', 'deleted_at')) {
+                $table->softDeletes();
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('web_socket_dialog_msgs', function (Blueprint $table) {
+            $table->dropSoftDeletes();
+        });
+    }
+}

database/migrations/2022_02_08_211051_insert_setting_column_template.php

@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class InsertSettingColumnTemplate extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $array = \App\Module\Base::setting('columnTemplate');
+        if (empty($array)) {
+            \App\Module\Base::setting('columnTemplate', [
+                [
+                    'name' => '软件开发',
+                    'columns' => ['产品规划', '前端开发', '后端开发', '测试', '发布', '其他'],
+                ],
+                [
+                    'name' => '产品开发',
+                    'columns' => ['产品计划', '正在设计', '正在研发', '测试', '准备发布', '发布成功'],
+                ],
+            ]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+
+    }
+}

database/migrations/2022_02_18_095253_web_socket_dialog_users_add_top_at.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class WebSocketDialogUsersAddTopAt extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('web_socket_dialog_users', function (Blueprint $table) {
+            if (!Schema::hasColumn('web_socket_dialog_users', 'top_at')) {
+                $table->timestamp('top_at')->nullable()->after('userid')->comment('置顶时间');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('web_socket_dialog_users', function (Blueprint $table) {
+            $table->dropColumn("top_at");
+        });
+    }
+}

database/migrations/2022_02_20_171030_files_update_type.php

@@ -0,0 +1,30 @@
+<?php
+
+use App\Models\File;
+use Illuminate\Database\Migrations\Migration;
+
+class FilesUpdateType extends Migration
+{
+    /**
+     * 更改流程图文件类型
+     * @return void
+     */
+    public function up()
+    {
+        File::whereType('flow')->update([
+            'type' => 'drawio'
+        ]);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        File::whereType('drawio')->update([
+            'type' => 'flow'
+        ]);
+    }
+}

database/migrations/2022_02_21_203230_files_update_ext.php

@@ -0,0 +1,75 @@
+<?php
+
+@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
+
+use App\Models\File;
+use App\Models\FileContent;
+use App\Module\Base;
+use Carbon\Carbon;
+use Illuminate\Database\Migrations\Migration;
+
+class FilesUpdateExt extends Migration
+{
+    /**
+     * 更新后缀
+     * @return void
+     */
+    public function up()
+    {
+        File::whereIn('type', ['mind', 'drawio', 'document'])->where('ext', '')->orderBy('id')->chunk(100, function($files) {
+            /** @var File $file */
+            foreach ($files as $file) {
+                $fileContent = FileContent::whereFid($file->id)->orderByDesc('id')->first();
+                $contentArray = Base::json2array($fileContent?->content);
+                $contentString = '';
+                //
+                switch ($file->type) {
+                    case 'document':
+                        $file->ext = $contentArray['type'] ?: 'md';
+                        $contentString = $contentArray['content'];
+                        break;
+                    case 'drawio':
+                        $file->ext = 'drawio';
+                        $contentString = $contentArray['xml'];
+                        break;
+                    case 'mind':
+                        $file->ext = 'mind';
+                        $contentString = $fileContent?->content;
+                        break;
+                }
+                $file->save();
+                //
+                $path = 'uploads/file/' . $file->type . '/' . date("Ym", Carbon::parse($file->created_at)->timestamp) . '/' . $file->id . '/' . md5($contentString);
+                $save = public_path($path);
+                Base::makeDir(dirname($save));
+                file_put_contents($save, $contentString);
+                $content = [
+                    'type' => $file->ext,
+                    'url' => $path
+                ];
+                //
+                $content = FileContent::createInstance([
+                    'fid' => $file->id,
+                    'content' => $content,
+                    'text' => $fileContent?->text,
+                    'size' => $file->size,
+                    'userid' => $file->userid,
+                ]);
+                $content->save();
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        File::whereIn('ext', ['mind', 'drawio', 'md'])->update([
+            'ext' => ''
+        ]);
+        // ... 退回去意义不大，文件内容不做回滚操作
+    }
+}

database/migrations/2022_02_22_142148_project_users_add_top_at.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ProjectUsersAddTopAt extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('project_users', function (Blueprint $table) {
+            if (!Schema::hasColumn('project_users', 'top_at')) {
+                $table->timestamp('top_at')->nullable()->after('owner')->comment('置顶时间');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('project_users', function (Blueprint $table) {
+            $table->dropColumn("top_at");
+        });
+    }
+}

database/migrations/2022_02_27_112217_create_project_task_flow_changes_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateProjectTaskFlowChangesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('project_task_flow_changes', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('task_id')->nullable()->default(0)->comment('任务ID');
+            $table->bigInteger('userid')->nullable()->default(0)->comment('会员ID');
+            $table->bigInteger('before_item_id')->nullable()->default(0)->comment('（变化前）工作流状态ID');
+            $table->string('before_item_name', 50)->nullable()->default('')->comment('（变化前）工作流状态名称');
+            $table->bigInteger('after_item_id')->nullable()->default(0)->comment('（变化后）工作流状态ID');
+            $table->string('after_item_name', 50)->nullable()->default('')->comment('（变化后）工作流状态名称');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('project_task_flow_changes');
+    }
+}

database/migrations/2022_02_27_210444_rename_pre_project_task_flow_changes_item.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class RenamePreProjectTaskFlowChangesItem extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('project_task_flow_changes', function (Blueprint $table) {
+            if (Schema::hasColumn('project_task_flow_changes', 'before_item_id')) {
+                $table->renameColumn('before_item_id', 'before_flow_item_id');
+                $table->renameColumn('before_item_name', 'before_flow_item_name');
+                $table->renameColumn('after_item_id', 'after_flow_item_id');
+                $table->renameColumn('after_item_name', 'after_flow_item_name');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('project_task_flow_changes', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/migrations/2022_03_02_161123_add_is_email_verity_to_users.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddIsEmailVerityToUsers extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            if (!Schema::hasColumn('users', 'is_email_verity')) {
+                $table->boolean('is_email_verity')->default(0)->nullable()->after('disable_at')->comment('邮箱是否已验证');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn("is_email_verity");
+        });
+    }
+}

database/migrations/2022_03_02_172504_create_user_email_verifications_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateUserEmailVerificationsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('user_email_verifications', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger('userid')->nullable()->default(0)->comment('用户id');
+            $table->string('code')->nullable()->default('')->comment('验证参数');
+            $table->string('email')->nullable()->default('')->comment('电子邮箱');
+            $table->integer('status')->nullable()->default(0)->comment('0-未验证，1-已验证');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('user_email_verifications');
+    }
+}

database/migrations/2022_03_03_154459_create_project_task_mail_logs_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateProjectTaskMailLogsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('project_task_mail_logs', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger('userid')->nullable()->default(0)->comment('用户id');
+            $table->integer('task_id')->nullable()->default(0)->comment('任务id');
+            $table->string('email')->nullable()->default('')->comment('电子邮箱');
+            $table->tinyInteger('type')->nullable()->default(0)->comment('提醒类型：1第一次任务提醒，2第二次任务超期提醒');
+            $table->tinyInteger('is_send')->nullable()->default(0)->comment('邮件发送是否成功：0否，1是');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('project_task_mail_logs');
+    }
+}

database/migrations/2022_03_04_154630_project_task_contents_update_content.php

@@ -0,0 +1,40 @@
+<?php
+
+@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
+
+use App\Models\ProjectTaskContent;
+use App\Module\Base;
+use Illuminate\Database\Migrations\Migration;
+
+class ProjectTaskContentsUpdateContent extends Migration
+{
+    /**
+     * 任务详细描述保存至文件
+     * @return void
+     */
+    public function up()
+    {
+        ProjectTaskContent::orderBy('id')->chunk(100, function($items) {
+            /** @var ProjectTaskContent $item */
+            foreach ($items as $item) {
+                $content = Base::json2array($item->content);
+                if (!isset($content['url'])) {
+                    $item->content = Base::array2json([
+                        'url' => ProjectTaskContent::saveContent($item->task_id, $item->content)
+                    ]);
+                    $item->save();
+                }
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // ... 退回去意义不大，文件内容不做回滚操作
+    }
+}

database/migrations/2022_03_08_124155_add_web_socket_dialog_users_add_is_mark_unread.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddWebSocketDialogUsersAddIsMarkUnread extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('web_socket_dialog_users', function (Blueprint $table) {
+            if (!Schema::hasColumn('web_socket_dialog_users', 'is_mark_unread')) {
+                $table->boolean('is_mark_unread')->default(0)->nullable()->after('top_at')->comment('是否标记为未读：0否，1是');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('web_socket_dialog_users', function (Blueprint $table) {
+            $table->dropColumn("is_mark_unread");
+        });
+    }
+}

database/migrations/2022_03_09_100139_add_project_task_mail_logs_add_deletes.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddProjectTaskMailLogsAddDeletes extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('project_task_mail_logs', function (Blueprint $table) {
+            if (!Schema::hasColumn('project_task_mail_logs', 'deleted_at')) {
+                $table->softDeletes();
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('project_task_mail_logs', function (Blueprint $table) {
+            $table->dropSoftDeletes();
+        });
+    }
+}

database/migrations/2022_03_09_143604_add_project_tasks_deleted_userid.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddProjectTasksDeletedUserid extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('project_tasks', function (Blueprint $table) {
+            if (!Schema::hasColumn('project_tasks', 'deleted_userid')) {
+                $table->bigInteger('deleted_userid')->nullable()->default(0)->after('deleted_at')->comment('删除会员');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('project_tasks', function (Blueprint $table) {
+            $table->dropColumn("deleted_userid");
+        });
+    }
+}

database/migrations/2022_03_17_211814_rename_pre_users_is_email_verity.php

@@ -0,0 +1,46 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class RenamePreUsersIsEmailVerity extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $isAdd = false;
+        Schema::table('users', function (Blueprint $table) use (&$isAdd) {
+            if (Schema::hasColumn('users', 'is_email_verity')) {
+                $isAdd = true;
+                $table->renameColumn('is_email_verity', 'email_verity');
+            }
+        });
+        if ($isAdd) {
+            \App\Models\User::where("identity", "like", "%,admin,%")->chunkById(100, function ($lists) {
+                foreach ($lists as $item) {
+                    if (!$item->email_verity) {
+                        $item->email_verity = 1;
+                        $item->save();
+                    }
+                }
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/migrations/2022_03_17_213014_rename_pre_web_socket_dialog_users_is_mark_unread.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class RenamePreWebSocketDialogUsersIsMarkUnread extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('web_socket_dialog_users', function (Blueprint $table) {
+            if (Schema::hasColumn('web_socket_dialog_users', 'is_mark_unread')) {
+                $table->renameColumn('is_mark_unread', 'mark_unread');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('web_socket_dialog_users', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/migrations/2022_03_30_070029_add_files_pids.php

@@ -0,0 +1,51 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddFilesPids extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $isAdd = false;
+        Schema::table('files', function (Blueprint $table) use (&$isAdd) {
+            if (!Schema::hasColumn('files', 'pids')) {
+                $isAdd = true;
+                $table->string('pids', 255)->nullable()->default('')->after('pid')->comment('上级ID递归');
+            }
+        });
+        if ($isAdd) {
+            // 更新数据
+            \App\Models\File::where('pid', '>', 0)->chunkById(100, function ($lists) {
+                /** @var \App\Models\File $item */
+                foreach ($lists as $item) {
+                    $item->saveBeforePids();
+                }
+            });
+            \App\Models\File::whereShare(0)->chunkById(100, function ($lists) {
+                /** @var \App\Models\File $item */
+                foreach ($lists as $item) {
+                    \App\Models\FileUser::whereFileId($item->id)->delete();
+                }
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('files', function (Blueprint $table) {
+            $table->dropColumn("pids");
+        });
+    }
+}

database/migrations/2022_03_31_093754_add_file_links_userid.php

@@ -0,0 +1,46 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddFileLinksUserid extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $isAdd = false;
+        Schema::table('file_links', function (Blueprint $table) use (&$isAdd) {
+            if (!Schema::hasColumn('file_links', 'userid')) {
+                $isAdd = true;
+                $table->bigInteger('userid')->nullable()->default(0)->after('code')->comment('会员ID');
+            }
+        });
+        if ($isAdd) {
+            // 更新数据
+            \App\Models\FileLink::chunkById(100, function ($lists) {
+                /** @var \App\Models\FileLink $item */
+                foreach ($lists as $item) {
+                    $item->userid = intval(\App\Models\File::whereId($item->file_id)->value('userid'));
+                    $item->save();
+                }
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('file_links', function (Blueprint $table) {
+            $table->dropColumn("userid");
+        });
+    }
+}

database/migrations/2022_04_07_082526_add_project_task_mail_logs_send_error.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddProjectTaskMailLogsSendError extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('project_task_mail_logs', function (Blueprint $table) {
+            if (!Schema::hasColumn('project_task_mail_logs', 'send_error')) {
+                $table->text('send_error')->nullable()->after('is_send')->comment('邮件发送错误详情');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('project_task_mail_logs', function (Blueprint $table) {
+            $table->dropColumn("send_error");
+        });
+    }
+}

database/migrations/2022_04_12_152136_users_change_disable_at.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+class UsersChangeDisableAt extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $pre = DB::connection()->getTablePrefix();
+        DB::statement("ALTER TABLE `{$pre}users` MODIFY COLUMN `disable_at` timestamp NULL DEFAULT NULL COMMENT '禁用时间（离职时间）' AFTER `created_ip`");
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+
+    }
+}

database/migrations/2022_04_13_195604_create_user_transfers_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateUserTransfersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('user_transfers', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger('original_userid')->nullable()->default(0)->comment('原作者');
+            $table->bigInteger('new_userid')->nullable()->default(0)->comment('交接人');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('user_transfers');
+    }
+}

database/migrations/2022_04_14_103139_add_web_socket_dialogs_owner_id.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddWebSocketDialogsOwnerId extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('web_socket_dialogs', function (Blueprint $table) {
+            if (!Schema::hasColumn('web_socket_dialogs', 'owner_id')) {
+                $table->bigInteger('owner_id')->nullable()->default(0)->after('last_at')->comment('群主用户ID');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('web_socket_dialogs', function (Blueprint $table) {
+            $table->dropColumn("owner_id");
+        });
+    }
+}

database/migrations/2022_04_16_073635_add_web_socket_dialog_msg_reads_mention.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddWebSocketDialogMsgReadsMention extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('web_socket_dialog_msg_reads', function (Blueprint $table) {
+            if (!Schema::hasColumn('web_socket_dialog_msg_reads', 'mention')) {
+                $table->boolean('mention')->default(0)->after('userid')->nullable()->comment('是否提及（被@）');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('web_socket_dialog_msg_reads', function (Blueprint $table) {
+            $table->dropColumn("mention");
+        });
+    }
+}

database/seeders/DatabaseSeeder.php

@@ -18,6 +18,8 @@ class DatabaseSeeder extends Seeder
         $this->call(FilesTableSeeder::class);
         $this->call(FileUsersTableSeeder::class);
         $this->call(ProjectColumnsTableSeeder::class);
+        $this->call(ProjectFlowItemsTableSeeder::class);
+        $this->call(ProjectFlowsTableSeeder::class);
         $this->call(ProjectLogsTableSeeder::class);
         $this->call(ProjectTaskContentsTableSeeder::class);
         $this->call(ProjectTaskUsersTableSeeder::class);

database/seeders/FileContentsTableSeeder.php

@@ -599,7 +599,5 @@ curl -O https://task.hitosea.com/uploads/files/3/202105/ba786dfc2f4c2fe916880474
                 'deleted_at' => NULL,
             ),
         ));
-
-
     }
 }

database/seeders/FilesTableSeeder.php

@@ -2,6 +2,10 @@
 
 namespace Database\Seeders;
 
+use App\Models\File;
+use App\Models\FileContent;
+use App\Module\Base;
+use Carbon\Carbon;
 use Illuminate\Database\Seeder;
 
 class FilesTableSeeder extends Seeder
@@ -203,7 +207,7 @@ class FilesTableSeeder extends Seeder
                 'pid' => 0,
                 'cid' => 0,
                 'name' => '流程图',
-                'type' => 'flow',
+                'type' => 'drawio',
                 'ext' => '',
                 'size' => 5418,
                 'userid' => 1,
@@ -280,5 +284,54 @@ class FilesTableSeeder extends Seeder
         ));
 
 
+        File::whereIn('type', ['mind', 'drawio', 'document'])->where('ext', '')->orderBy('id')->chunk(100, function($files) {
+            /** @var File $file */
+            foreach ($files as $file) {
+                $fileContent = FileContent::whereFid($file->id)->orderByDesc('id')->first();
+                $contentArray = Base::json2array($fileContent?->content);
+                $contentString = '';
+                //
+                switch ($file->type) {
+                    case 'document':
+                        $file->ext = $contentArray['type'] ?: 'md';
+                        $contentString = $contentArray['content'];
+                        break;
+                    case 'drawio':
+                        $file->ext = 'drawio';
+                        $contentString = $contentArray['xml'];
+                        break;
+                    case 'mind':
+                        $file->ext = 'mind';
+                        $contentString = $fileContent?->content;
+                        break;
+                }
+                $file->save();
+                //
+                $path = 'uploads/file/' . $file->type . '/' . date("Ym", Carbon::parse($file->created_at)->timestamp) . '/' . $file->id . '/' . md5($contentString);
+                $save = public_path($path);
+                Base::makeDir(dirname($save));
+                file_put_contents($save, $contentString);
+                $content = [
+                    'type' => $file->ext,
+                    'url' => $path
+                ];
+                //
+                $content = FileContent::createInstance([
+                    'fid' => $file->id,
+                    'content' => $content,
+                    'text' => $fileContent?->text,
+                    'size' => $file->size,
+                    'userid' => $file->userid,
+                ]);
+                $content->save();
+            }
+        });
+
+        File::where('pid', '>', 0)->chunkById(100, function ($lists) {
+            /** @var File $item */
+            foreach ($lists as $item) {
+                $item->saveBeforePids();
+            }
+        });
     }
 }

database/seeders/ProjectFlowItemsTableSeeder.php

@@ -0,0 +1,478 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Seeder;
+
+class ProjectFlowItemsTableSeeder extends Seeder
+{
+
+    /**
+     * Auto generated seed file
+     *
+     * @return void
+     */
+    public function run()
+    {
+
+
+        if (\DB::table('project_flow_items')->count() > 0) {
+            return;
+        }
+
+        \DB::table('project_flow_items')->insert(array (
+            0 =>
+            array (
+                'id' => 1,
+                'project_id' => 2,
+                'flow_id' => 1,
+                'name' => '待处理',
+                'status' => 'start',
+                'turns' => '[1,2,3,4,26]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 0,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            1 =>
+            array (
+                'id' => 2,
+                'project_id' => 2,
+                'flow_id' => 1,
+                'name' => '进行中',
+                'status' => 'progress',
+                'turns' => '[1,2,3,4,26]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 1,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            2 =>
+            array (
+                'id' => 3,
+                'project_id' => 2,
+                'flow_id' => 1,
+                'name' => '已完成',
+                'status' => 'end',
+                'turns' => '[1,2,3,4,26]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 3,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            3 =>
+            array (
+                'id' => 4,
+                'project_id' => 2,
+                'flow_id' => 1,
+                'name' => '已取消',
+                'status' => 'end',
+                'turns' => '[1,2,3,4,26]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 4,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            4 =>
+            array (
+                'id' => 5,
+                'project_id' => 3,
+                'flow_id' => 2,
+                'name' => '待处理',
+                'status' => 'start',
+                'turns' => '[5,6,7,8,27]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 0,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            5 =>
+            array (
+                'id' => 6,
+                'project_id' => 3,
+                'flow_id' => 2,
+                'name' => '进行中',
+                'status' => 'progress',
+                'turns' => '[5,6,7,8,27]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 1,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            6 =>
+            array (
+                'id' => 7,
+                'project_id' => 3,
+                'flow_id' => 2,
+                'name' => '已完成',
+                'status' => 'end',
+                'turns' => '[5,6,7,8,27]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 3,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            7 =>
+            array (
+                'id' => 8,
+                'project_id' => 3,
+                'flow_id' => 2,
+                'name' => '已取消',
+                'status' => 'end',
+                'turns' => '[5,6,7,8,27]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 4,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            8 =>
+            array (
+                'id' => 9,
+                'project_id' => 4,
+                'flow_id' => 3,
+                'name' => '待处理',
+                'status' => 'start',
+                'turns' => '[9,10,11,12,28]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 0,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            9 =>
+            array (
+                'id' => 10,
+                'project_id' => 4,
+                'flow_id' => 3,
+                'name' => '进行中',
+                'status' => 'progress',
+                'turns' => '[9,10,11,12,28]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 1,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            10 =>
+            array (
+                'id' => 11,
+                'project_id' => 4,
+                'flow_id' => 3,
+                'name' => '已完成',
+                'status' => 'end',
+                'turns' => '[9,10,11,12,28]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 3,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            11 =>
+            array (
+                'id' => 12,
+                'project_id' => 4,
+                'flow_id' => 3,
+                'name' => '已取消',
+                'status' => 'end',
+                'turns' => '[9,10,11,12,28]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 4,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            12 =>
+            array (
+                'id' => 13,
+                'project_id' => 5,
+                'flow_id' => 4,
+                'name' => '待处理',
+                'status' => 'start',
+                'turns' => '[13,14,15,16,29]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 0,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            13 =>
+            array (
+                'id' => 14,
+                'project_id' => 5,
+                'flow_id' => 4,
+                'name' => '进行中',
+                'status' => 'progress',
+                'turns' => '[13,14,15,16,29]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 1,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            14 =>
+            array (
+                'id' => 15,
+                'project_id' => 5,
+                'flow_id' => 4,
+                'name' => '已完成',
+                'status' => 'end',
+                'turns' => '[13,14,15,16,29]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 3,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            15 =>
+            array (
+                'id' => 16,
+                'project_id' => 5,
+                'flow_id' => 4,
+                'name' => '已取消',
+                'status' => 'end',
+                'turns' => '[13,14,15,16,29]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 4,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            16 =>
+            array (
+                'id' => 17,
+                'project_id' => 6,
+                'flow_id' => 5,
+                'name' => '待处理',
+                'status' => 'start',
+                'turns' => '[17,18,19,20,30]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 0,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            17 =>
+            array (
+                'id' => 18,
+                'project_id' => 6,
+                'flow_id' => 5,
+                'name' => '进行中',
+                'status' => 'progress',
+                'turns' => '[17,18,19,20,30]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 1,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            18 =>
+            array (
+                'id' => 19,
+                'project_id' => 6,
+                'flow_id' => 5,
+                'name' => '已完成',
+                'status' => 'end',
+                'turns' => '[17,18,19,20,30]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 3,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            19 =>
+            array (
+                'id' => 20,
+                'project_id' => 6,
+                'flow_id' => 5,
+                'name' => '已取消',
+                'status' => 'end',
+                'turns' => '[17,18,19,20,30]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 4,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            20 =>
+            array (
+                'id' => 21,
+                'project_id' => 7,
+                'flow_id' => 6,
+                'name' => '待处理',
+                'status' => 'start',
+                'turns' => '[21,22,23,24,25]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 0,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            21 =>
+            array (
+                'id' => 22,
+                'project_id' => 7,
+                'flow_id' => 6,
+                'name' => '进行中',
+                'status' => 'progress',
+                'turns' => '[21,22,23,24,25]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 1,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            22 =>
+            array (
+                'id' => 23,
+                'project_id' => 7,
+                'flow_id' => 6,
+                'name' => '已完成',
+                'status' => 'end',
+                'turns' => '[21,22,23,24,25]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 3,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            23 =>
+            array (
+                'id' => 24,
+                'project_id' => 7,
+                'flow_id' => 6,
+                'name' => '已取消',
+                'status' => 'end',
+                'turns' => '[21,22,23,24,25]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 4,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            24 =>
+            array (
+                'id' => 25,
+                'project_id' => 7,
+                'flow_id' => 6,
+                'name' => '待测试',
+                'status' => 'test',
+                'turns' => '[21,22,23,24,25]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 2,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            25 =>
+            array (
+                'id' => 26,
+                'project_id' => 2,
+                'flow_id' => 1,
+                'name' => '待测试',
+                'status' => 'test',
+                'turns' => '[1,2,3,4,26]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 2,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            26 =>
+            array (
+                'id' => 27,
+                'project_id' => 3,
+                'flow_id' => 2,
+                'name' => '待测试',
+                'status' => 'test',
+                'turns' => '[5,6,7,8,27]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 2,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            27 =>
+            array (
+                'id' => 28,
+                'project_id' => 4,
+                'flow_id' => 3,
+                'name' => '待测试',
+                'status' => 'test',
+                'turns' => '[9,10,11,12,28]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 2,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            28 =>
+            array (
+                'id' => 29,
+                'project_id' => 5,
+                'flow_id' => 4,
+                'name' => '待测试',
+                'status' => 'test',
+                'turns' => '[13,14,15,16,29]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 2,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            29 =>
+            array (
+                'id' => 30,
+                'project_id' => 6,
+                'flow_id' => 5,
+                'name' => '待测试',
+                'status' => 'test',
+                'turns' => '[17,18,19,20,30]',
+                'userids' => '[]',
+                'usertype' => 'add',
+                'userlimit' => 0,
+                'sort' => 2,
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+        ));
+
+
+    }
+}

database/seeders/ProjectFlowsTableSeeder.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Seeder;
+
+class ProjectFlowsTableSeeder extends Seeder
+{
+
+    /**
+     * Auto generated seed file
+     *
+     * @return void
+     */
+    public function run()
+    {
+
+
+        if (\DB::table('project_flows')->count() > 0) {
+            return;
+        }
+
+        \DB::table('project_flows')->insert(array (
+            0 =>
+            array (
+                'id' => 1,
+                'project_id' => 2,
+                'name' => 'Default',
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            1 =>
+            array (
+                'id' => 2,
+                'project_id' => 3,
+                'name' => 'Default',
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            2 =>
+            array (
+                'id' => 3,
+                'project_id' => 4,
+                'name' => 'Default',
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            3 =>
+            array (
+                'id' => 4,
+                'project_id' => 5,
+                'name' => 'Default',
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            4 =>
+            array (
+                'id' => 5,
+                'project_id' => 6,
+                'name' => 'Default',
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+            5 =>
+            array (
+                'id' => 6,
+                'project_id' => 7,
+                'name' => 'Default',
+                'created_at' => seeders_at('2021-07-01 12:27:12'),
+                'updated_at' => seeders_at('2021-07-01 12:27:12'),
+            ),
+        ));
+
+
+    }
+}

database/seeders/ProjectLogsTableSeeder.php

@@ -296,7 +296,7 @@ class ProjectLogsTableSeeder extends Seeder
                 'column_id' => 6,
                 'task_id' => 8,
                 'userid' => 1,
-                'detail' => '任务标记已完成：官网项目一期',
+                'detail' => '标记任务已完成：官网项目一期',
                 'created_at' => seeders_at('2021-07-01 10:53:47'),
                 'updated_at' => seeders_at('2021-07-01 10:53:47'),
             ),
@@ -2998,7 +2998,7 @@ class ProjectLogsTableSeeder extends Seeder
                 'column_id' => 27,
                 'task_id' => 77,
                 'userid' => 1,
-                'detail' => '任务标记已完成：🚴 里程碑 1 需求评审完成，资源准备到位',
+                'detail' => '标记任务已完成：🚴 里程碑 1 需求评审完成，资源准备到位',
                 'created_at' => seeders_at('2021-07-01 15:39:46'),
                 'updated_at' => seeders_at('2021-07-01 15:39:46'),
             ),
@@ -3229,7 +3229,7 @@ class ProjectLogsTableSeeder extends Seeder
                 'column_id' => 32,
                 'task_id' => 85,
                 'userid' => 1,
-                'detail' => '子任务标记已完成：首页',
+                'detail' => '子标记任务已完成：首页',
                 'created_at' => seeders_at('2021-07-01 16:17:30'),
                 'updated_at' => seeders_at('2021-07-01 16:17:30'),
             ),
@@ -3240,7 +3240,7 @@ class ProjectLogsTableSeeder extends Seeder
                 'column_id' => 32,
                 'task_id' => 85,
                 'userid' => 1,
-                'detail' => '子任务标记已完成：公司介绍',
+                'detail' => '子标记任务已完成：公司介绍',
                 'created_at' => seeders_at('2021-07-01 16:17:31'),
                 'updated_at' => seeders_at('2021-07-01 16:17:31'),
             ),
@@ -3251,7 +3251,7 @@ class ProjectLogsTableSeeder extends Seeder
                 'column_id' => 32,
                 'task_id' => 85,
                 'userid' => 1,
-                'detail' => '子任务标记已完成：新闻动态',
+                'detail' => '子标记任务已完成：新闻动态',
                 'created_at' => seeders_at('2021-07-01 16:17:32'),
                 'updated_at' => seeders_at('2021-07-01 16:17:32'),
             ),
@@ -3262,7 +3262,7 @@ class ProjectLogsTableSeeder extends Seeder
                 'column_id' => 32,
                 'task_id' => 85,
                 'userid' => 1,
-                'detail' => '子任务标记已完成：产品介绍',
+                'detail' => '子标记任务已完成：产品介绍',
                 'created_at' => seeders_at('2021-07-01 16:17:34'),
                 'updated_at' => seeders_at('2021-07-01 16:17:34'),
             ),
@@ -3273,7 +3273,7 @@ class ProjectLogsTableSeeder extends Seeder
                 'column_id' => 32,
                 'task_id' => 85,
                 'userid' => 1,
-                'detail' => '子任务标记已完成：案例展示',
+                'detail' => '子标记任务已完成：案例展示',
                 'created_at' => seeders_at('2021-07-01 16:17:35'),
                 'updated_at' => seeders_at('2021-07-01 16:17:35'),
             ),
@@ -3284,7 +3284,7 @@ class ProjectLogsTableSeeder extends Seeder
                 'column_id' => 32,
                 'task_id' => 85,
                 'userid' => 1,
-                'detail' => '子任务标记已完成：联系我们',
+                'detail' => '子标记任务已完成：联系我们',
                 'created_at' => seeders_at('2021-07-01 16:17:36'),
                 'updated_at' => seeders_at('2021-07-01 16:17:36'),
             ),
@@ -3295,7 +3295,7 @@ class ProjectLogsTableSeeder extends Seeder
                 'column_id' => 32,
                 'task_id' => 85,
                 'userid' => 1,
-                'detail' => '任务标记已完成：产品官网设计',
+                'detail' => '标记任务已完成：产品官网设计',
                 'created_at' => seeders_at('2021-07-01 16:17:37'),
                 'updated_at' => seeders_at('2021-07-01 16:17:37'),
             ),
@@ -3306,7 +3306,7 @@ class ProjectLogsTableSeeder extends Seeder
                 'column_id' => 32,
                 'task_id' => 85,
                 'userid' => 1,
-                'detail' => '子任务标记未完成：联系我们',
+                'detail' => '标记子任务未完成：联系我们',
                 'created_at' => seeders_at('2021-07-01 16:17:41'),
                 'updated_at' => seeders_at('2021-07-01 16:17:41'),
             ),
@@ -3317,7 +3317,7 @@ class ProjectLogsTableSeeder extends Seeder
                 'column_id' => 32,
                 'task_id' => 85,
                 'userid' => 1,
-                'detail' => '任务标记未完成：产品官网设计',
+                'detail' => '标记任务未完成：产品官网设计',
                 'created_at' => seeders_at('2021-07-01 16:17:44'),
                 'updated_at' => seeders_at('2021-07-01 16:17:44'),
             ),

database/seeders/ProjectTaskContentsTableSeeder.php

@@ -2,6 +2,8 @@
 
 namespace Database\Seeders;
 
+use App\Models\ProjectTaskContent;
+use App\Module\Base;
 use Illuminate\Database\Seeder;
 
 class ProjectTaskContentsTableSeeder extends Seeder
@@ -302,6 +304,17 @@ class ProjectTaskContentsTableSeeder extends Seeder
             ),
         ));
 
-
+        ProjectTaskContent::orderBy('id')->chunk(100, function($items) {
+            /** @var ProjectTaskContent $item */
+            foreach ($items as $item) {
+                $content = Base::json2array($item->content);
+                if (!isset($content['url'])) {
+                    $item->content = Base::array2json([
+                        'url' => ProjectTaskContent::saveContent($item->task_id, $item->content)
+                    ]);
+                    $item->save();
+                }
+            }
+        });
     }
 }

database/seeders/ProjectTasksTableSeeder.php

@@ -28,6 +28,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 2,
                 'column_id' => 2,
                 'dialog_id' => 0,
+                'flow_item_id' => 1,
+                'flow_item_name' => 'start|待处理',
                 'name' => '说明：将进度分成多级
 每张卡片为一个项目任务，标签表示任务状况
 通过将卡片拖至不同的进度列表下，来表示各项目进度',
@@ -54,6 +56,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 2,
                 'column_id' => 2,
                 'dialog_id' => 0,
+                'flow_item_id' => 1,
+                'flow_item_name' => 'start|待处理',
                 'name' => '官网项目',
                 'color' => '',
                 'desc' => '',
@@ -78,6 +82,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 2,
                 'column_id' => 2,
                 'dialog_id' => 0,
+                'flow_item_id' => 1,
+                'flow_item_name' => 'start|待处理',
                 'name' => '新增职位需求',
                 'color' => '',
                 'desc' => '',
@@ -102,6 +108,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 2,
                 'column_id' => 2,
                 'dialog_id' => 0,
+                'flow_item_id' => 1,
+                'flow_item_name' => 'start|待处理',
                 'name' => '更新公司简介',
                 'color' => '',
                 'desc' => '',
@@ -126,6 +134,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 2,
                 'column_id' => 3,
                 'dialog_id' => 0,
+                'flow_item_id' => 1,
+                'flow_item_name' => 'start|待处理',
                 'name' => '官网项目四期',
                 'color' => '',
                 'desc' => '',
@@ -150,6 +160,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 2,
                 'column_id' => 4,
                 'dialog_id' => 16,
+                'flow_item_id' => 1,
+                'flow_item_name' => 'start|待处理',
                 'name' => '官网项目三期',
                 'color' => '',
                 'desc' => '',
@@ -174,6 +186,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 2,
                 'column_id' => 5,
                 'dialog_id' => 0,
+                'flow_item_id' => 1,
+                'flow_item_name' => 'start|待处理',
                 'name' => '官网项目二期',
                 'color' => '',
                 'desc' => '',
@@ -198,6 +212,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 2,
                 'column_id' => 6,
                 'dialog_id' => 0,
+                'flow_item_id' => 3,
+                'flow_item_name' => 'end|已完成',
                 'name' => '官网项目一期',
                 'color' => '',
                 'desc' => '',
@@ -222,6 +238,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 7,
                 'dialog_id' => 18,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => '免费高品质的Sketch资源',
                 'color' => '',
                 'desc' => 'https://sketchrepo.com/',
@@ -246,6 +264,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 7,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => '免费高品质的PSD资源',
                 'color' => '',
                 'desc' => 'https://psdrepo.com/',
@@ -270,6 +290,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 7,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => '免费高清灵感图片网（偏文艺）',
                 'color' => '',
                 'desc' => 'https://magdeleine.co/',
@@ -294,6 +316,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 7,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => '每天发现充满灵感且美丽的图片',
                 'color' => '',
                 'desc' => 'https://weheartit.com/',
@@ -318,6 +342,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 8,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => '花瓣网：设计师寻找灵感的天堂',
                 'color' => '',
                 'desc' => 'https://huaban.com/',
@@ -342,6 +368,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 8,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'WallHaven：高清壁纸图片搜索引擎',
                 'color' => '',
                 'desc' => 'https://wallhaven.typepad.com/',
@@ -366,6 +394,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 8,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'Pexels：免费高品质图片 可商用',
                 'color' => '',
                 'desc' => 'https://www.pexels.com/',
@@ -390,6 +420,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 9,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'Retinize：iOS切图神器',
                 'color' => '',
                 'desc' => 'http://retinize.it/',
@@ -414,6 +446,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 9,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'GuideGuide：一款PS参考线插件',
                 'color' => '',
                 'desc' => 'https://guideguide.me/photoshop/',
@@ -438,6 +472,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 9,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'Assistor PS：一个功能强大的PS辅助工具',
                 'color' => '',
                 'desc' => 'http://wit-web.azurewebsites.net/assistor/download',
@@ -462,6 +498,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 10,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'Fontello：图标字体生成器',
                 'color' => '',
                 'desc' => 'http://fontello.com/',
@@ -486,6 +524,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 10,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'inconfont: 免费提供高度可辨识符号图标',
                 'color' => '',
                 'desc' => 'https://www.iconfont.cn/',
@@ -510,6 +550,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 10,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'The Noun Project：免费提供高度可辨识符号图标',
                 'color' => '',
                 'desc' => 'https://thenounproject.com/',
@@ -534,6 +576,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 10,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'EasyIcon：免费图标搜索和下载平台',
                 'color' => '',
                 'desc' => 'https://www.easyicon.net/',
@@ -558,6 +602,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 10,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'Icon Deposit：一个奇妙的图标下载站',
                 'color' => '',
                 'desc' => 'https://www.icondeposit.com/',
@@ -582,6 +628,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 10,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'iConify：Mac平台的苹果应用图标自动化生成工具',
                 'color' => '',
                 'desc' => 'https://iconify.net/',
@@ -606,6 +654,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 11,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'Logaster：教你在线几分钟内搞定专业的LOGO',
                 'color' => '',
                 'desc' => '设计https://www.logaster.cn/',
@@ -630,6 +680,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 11,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'LogoLounge：国际知名的LOGO设计权威网站',
                 'color' => '',
                 'desc' => 'https://www.logolounge.com/',
@@ -654,6 +706,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 11,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'LogoMoose：一个优秀的logo素材站点',
                 'color' => '',
                 'desc' => 'https://www.logomoose.com/',
@@ -678,6 +732,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 11,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'LOGOED：一个展示Logo设计的博客',
                 'color' => '',
                 'desc' => 'http://www.logoed.co.uk/page/2/',
@@ -702,6 +758,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 11,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'Logo of the Day：汇集世界各地优秀LOGO作品的站点',
                 'color' => '',
                 'desc' => 'https://logooftheday.com/',
@@ -726,6 +784,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 2,
                 'column_id' => 5,
                 'dialog_id' => 0,
+                'flow_item_id' => 1,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'asdasdad1111',
                 'color' => '',
                 'desc' => '7777777',
@@ -750,6 +810,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 2,
                 'column_id' => 5,
                 'dialog_id' => 0,
+                'flow_item_id' => 1,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'hjhjhjjh',
                 'color' => '',
                 'desc' => '',
@@ -774,6 +836,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 11,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'Logo of the Day：汇集世界各地优秀LOGO作品的站点',
                 'color' => '',
                 'desc' => '',
@@ -798,6 +862,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 11,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'LogoDesignLove：Logo设计技巧分享网',
                 'color' => '',
                 'desc' => 'LogoDesignLove：Logo设计技巧分享网',
@@ -822,6 +888,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 11,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'LogoDesignLove：Logo设计技巧分享网',
                 'color' => '',
                 'desc' => '',
@@ -846,6 +914,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 12,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'Coolors：自动生成配色色板的小工具',
                 'color' => '',
                 'desc' => 'https://coolors.co/',
@@ -870,6 +940,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 12,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'Material Palette：Material Design专用在线配色工具',
                 'color' => '',
                 'desc' => 'https://www.materialpalette.com/',
@@ -894,6 +966,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 12,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'Web安全色：WEB设计、开发中常用的安全颜色',
                 'color' => '',
                 'desc' => 'https://www.bootcss.com/p/websafecolors/',
@@ -918,6 +992,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 12,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'ColorZilla：火狐浏览器网页取色器插件',
                 'color' => '',
                 'desc' => 'https://www.colorzilla.com/',
@@ -942,6 +1018,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 12,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'Color Palette Generator：图片配色工具',
                 'color' => '',
                 'desc' => '',
@@ -966,6 +1044,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 12,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'inconfont: 免费提供高度可辨识符号图标',
                 'color' => '',
                 'desc' => 'https://www.iconfont.cn/',
@@ -990,6 +1070,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 12,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'inconfont: 免费提供高度可辨识符号图标https://www.iconfont.cn/',
                 'color' => '',
                 'desc' => 'https://www.iconfont.cn/',
@@ -1014,6 +1096,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 3,
                 'column_id' => 12,
                 'dialog_id' => 0,
+                'flow_item_id' => 5,
+                'flow_item_name' => 'start|待处理',
                 'name' => 'https://www.iconfont.cn/',
                 'color' => '',
                 'desc' => '',
@@ -1038,6 +1122,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 13,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '将收集箱的事务进行判断。要立即执行：进入Q2列表。非立即执行：判断——1.不做（删掉）、2.稍晚再做（进入「稍后做」）、3.可做可不做的任务或可能有用的资源（进入「Mark」列表）',
                 'color' => '',
                 'desc' => '',
@@ -1062,6 +1148,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 13,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '2分钟内能做完贴上2分钟标签（进入「2分钟速战」列表）。2分钟以上做完的事务进入Q3',
                 'color' => '',
                 'desc' => '',
@@ -1086,6 +1174,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 13,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '判断能否一步做完，能进入Q4，不能打上多步标签（进入「项目清单」）；或将多步骤任务分解成多个一步做完任务，进入Q4。',
                 'color' => '',
                 'desc' => '',
@@ -1110,6 +1200,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 13,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '如果自己做，打上自己做标签（进入「执行清单」）；如果别人做，打上别人做标签（进入「等待清单」）。',
                 'color' => '',
                 'desc' => '',
@@ -1134,6 +1226,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 2,
                 'column_id' => 2,
                 'dialog_id' => 0,
+                'flow_item_id' => 1,
+                'flow_item_name' => 'start|待处理',
                 'name' => '❓❗ 说明：将进度分成多级
 
 每张卡片为一个项目任务，标签表示任务状况
@@ -1162,6 +1256,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 13,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '每天晚上复查整套流程',
                 'color' => '',
                 'desc' => '',
@@ -1186,6 +1282,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 13,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '1.检查「收集箱」是否清空。',
                 'color' => '',
                 'desc' => '',
@@ -1210,6 +1308,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 13,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '2.检查「Mark」是否有条目需要执行，转化成行动或项目。',
                 'color' => '',
                 'desc' => '',
@@ -1234,6 +1334,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 13,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '3.检查「项目清单」了解项目进度。',
                 'color' => '',
                 'desc' => '',
@@ -1258,6 +1360,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 13,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '4.检查「等待清单」是否有条目需要转化成行动，也就是催促。',
                 'color' => '',
                 'desc' => '',
@@ -1282,6 +1386,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 13,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '5.检查各清单是否有已完成，完成的、已作废的卡片，立刻删除。',
                 'color' => '',
                 'desc' => '',
@@ -1306,6 +1412,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 14,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '任何事务或信息，先以最简单的方式记录到“收集箱”。然后判断，贴上标签后，拖动到相应列表里',
                 'color' => '',
                 'desc' => '',
@@ -1330,6 +1438,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 15,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '优先级1：立即去做的事',
                 'color' => '',
                 'desc' => '',
@@ -1354,6 +1464,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 14,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '任何事务或信息，先以最简单的方式记录到“收集箱”。然后判断，贴上标签后，拖动到相应列表里',
                 'color' => '',
                 'desc' => '',
@@ -1378,6 +1490,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 16,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '优先级2：主要的执行清单',
                 'color' => '',
                 'desc' => '',
@@ -1402,6 +1516,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 17,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '优先级3：存放需要多步骤做的事，持续追踪',
                 'color' => '',
                 'desc' => '',
@@ -1426,6 +1542,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 17,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '可以为这个多步骤项目单独建一个项目，并把项目的链接放到卡片的详情页里，点击就能跳转进去。',
                 'color' => '',
                 'desc' => '',
@@ -1450,6 +1568,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 17,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '活动策划',
                 'color' => '',
                 'desc' => '',
@@ -1474,6 +1594,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 16,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '填问卷',
                 'color' => '',
                 'desc' => '',
@@ -1498,6 +1620,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 18,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '存放等待协同的事',
                 'color' => '',
                 'desc' => '',
@@ -1522,6 +1646,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 18,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '设计稿反馈',
                 'color' => '',
                 'desc' => '',
@@ -1546,6 +1672,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 18,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '存放等待协同的事',
                 'color' => '',
                 'desc' => '',
@@ -1570,6 +1698,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 19,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '存放稍后做的任务',
                 'color' => '',
                 'desc' => '',
@@ -1594,6 +1724,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 19,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '阅实习生简历',
                 'color' => '',
                 'desc' => '',
@@ -1618,6 +1750,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 20,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '存放可做可不做的任务，以及各种可能用到的资源',
                 'color' => '',
                 'desc' => '',
@@ -1642,6 +1776,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 4,
                 'column_id' => 20,
                 'dialog_id' => 0,
+                'flow_item_id' => 9,
+                'flow_item_name' => 'start|待处理',
                 'name' => '团建KTV',
                 'color' => '',
                 'desc' => '',
@@ -1666,6 +1802,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 5,
                 'column_id' => 21,
                 'dialog_id' => 0,
+                'flow_item_id' => 13,
+                'flow_item_name' => 'start|待处理',
                 'name' => '产品新需求',
                 'color' => '',
                 'desc' => '',
@@ -1690,6 +1828,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 5,
                 'column_id' => 22,
                 'dialog_id' => 0,
+                'flow_item_id' => 13,
+                'flow_item_name' => 'start|待处理',
                 'name' => '需要调研的需求',
                 'color' => '',
                 'desc' => '',
@@ -1714,6 +1854,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 5,
                 'column_id' => 23,
                 'dialog_id' => 17,
+                'flow_item_id' => 13,
+                'flow_item_name' => 'start|待处理',
                 'name' => '进入交互设计的需求',
                 'color' => '',
                 'desc' => '',
@@ -1738,6 +1880,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 5,
                 'column_id' => 25,
                 'dialog_id' => 0,
+                'flow_item_id' => 13,
+                'flow_item_name' => 'start|待处理',
                 'name' => '设计稿（放入设计稿）',
                 'color' => '',
                 'desc' => '',
@@ -1762,6 +1906,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 5,
                 'column_id' => 25,
                 'dialog_id' => 0,
+                'flow_item_id' => 13,
+                'flow_item_name' => 'start|待处理',
                 'name' => '提测（放入提测时间规划表）',
                 'color' => '',
                 'desc' => '',
@@ -1786,6 +1932,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 5,
                 'column_id' => 25,
                 'dialog_id' => 0,
+                'flow_item_id' => 13,
+                'flow_item_name' => 'start|待处理',
                 'name' => '发布流程（放入发布流程，应用文案等）',
                 'color' => '',
                 'desc' => '',
@@ -1810,6 +1958,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 5,
                 'column_id' => 25,
                 'dialog_id' => 0,
+                'flow_item_id' => 13,
+                'flow_item_name' => 'start|待处理',
                 'name' => '-----上线需求-----（将左边列表中的需求拖动至下方，表示本版本上线需求）',
                 'color' => '',
                 'desc' => '',
@@ -1834,6 +1984,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 6,
                 'column_id' => 26,
                 'dialog_id' => 0,
+                'flow_item_id' => 17,
+                'flow_item_name' => 'start|待处理',
                 'name' => '将小组一年工作目标拆解，设置出里程碑时间节点。并指派相关责任人。用标签来展示进行状况',
                 'color' => '',
                 'desc' => '',
@@ -1858,6 +2010,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 6,
                 'column_id' => 27,
                 'dialog_id' => 0,
+                'flow_item_id' => 19,
+                'flow_item_name' => 'end|已完成',
                 'name' => '🚴 里程碑 1 需求评审完成，资源准备到位',
                 'color' => '',
                 'desc' => '',
@@ -1882,6 +2036,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 6,
                 'column_id' => 27,
                 'dialog_id' => 0,
+                'flow_item_id' => 17,
+                'flow_item_name' => 'start|待处理',
                 'name' => '🚴 里程碑 2 设计完成，进行评审',
                 'color' => '',
                 'desc' => '',
@@ -1906,6 +2062,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 6,
                 'column_id' => 28,
                 'dialog_id' => 0,
+                'flow_item_id' => 17,
+                'flow_item_name' => 'start|待处理',
                 'name' => '🚴 里程碑 3 产品开发完成，开始提测',
                 'color' => '',
                 'desc' => '',
@@ -1930,6 +2088,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 6,
                 'column_id' => 28,
                 'dialog_id' => 0,
+                'flow_item_id' => 17,
+                'flow_item_name' => 'start|待处理',
                 'name' => '🚴 里程碑 4 测试完成准备线上发布',
                 'color' => '',
                 'desc' => '',
@@ -1954,6 +2114,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 6,
                 'column_id' => 28,
                 'dialog_id' => 0,
+                'flow_item_id' => 17,
+                'flow_item_name' => 'start|待处理',
                 'name' => '测试1',
                 'color' => '',
                 'desc' => '',
@@ -1978,6 +2140,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 6,
                 'column_id' => 28,
                 'dialog_id' => 0,
+                'flow_item_id' => 17,
+                'flow_item_name' => 'start|待处理',
                 'name' => '测试2',
                 'color' => '',
                 'desc' => '',
@@ -2002,6 +2166,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 6,
                 'column_id' => 28,
                 'dialog_id' => 0,
+                'flow_item_id' => 17,
+                'flow_item_name' => 'start|待处理',
                 'name' => '测试3',
                 'color' => '',
                 'desc' => '',
@@ -2026,6 +2192,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 6,
                 'column_id' => 29,
                 'dialog_id' => 0,
+                'flow_item_id' => 17,
+                'flow_item_name' => 'start|待处理',
                 'name' => '🚴 里程碑 5 市场发布',
                 'color' => '',
                 'desc' => '',
@@ -2050,6 +2218,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 7,
                 'column_id' => 32,
                 'dialog_id' => 0,
+                'flow_item_id' => 21,
+                'flow_item_name' => 'start|待处理',
                 'name' => '产品官网设计',
                 'color' => '',
                 'desc' => '',
@@ -2074,6 +2244,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 7,
                 'column_id' => 32,
                 'dialog_id' => 0,
+                'flow_item_id' => 23,
+                'flow_item_name' => 'end|已完成',
                 'name' => '首页',
                 'color' => '',
                 'desc' => '',
@@ -2098,6 +2270,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 7,
                 'column_id' => 32,
                 'dialog_id' => 0,
+                'flow_item_id' => 23,
+                'flow_item_name' => 'end|已完成',
                 'name' => '公司介绍',
                 'color' => '',
                 'desc' => '',
@@ -2122,6 +2296,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 7,
                 'column_id' => 32,
                 'dialog_id' => 0,
+                'flow_item_id' => 23,
+                'flow_item_name' => 'end|已完成',
                 'name' => '新闻动态',
                 'color' => '',
                 'desc' => '',
@@ -2146,6 +2322,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 7,
                 'column_id' => 32,
                 'dialog_id' => 0,
+                'flow_item_id' => 23,
+                'flow_item_name' => 'end|已完成',
                 'name' => '产品介绍',
                 'color' => '',
                 'desc' => '',
@@ -2170,6 +2348,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 7,
                 'column_id' => 32,
                 'dialog_id' => 0,
+                'flow_item_id' => 23,
+                'flow_item_name' => 'end|已完成',
                 'name' => '案例展示',
                 'color' => '',
                 'desc' => '',
@@ -2194,6 +2374,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 7,
                 'column_id' => 32,
                 'dialog_id' => 0,
+                'flow_item_id' => 21,
+                'flow_item_name' => 'start|待处理',
                 'name' => '联系我们',
                 'color' => '',
                 'desc' => '',
@@ -2218,6 +2400,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 7,
                 'column_id' => 32,
                 'dialog_id' => 0,
+                'flow_item_id' => 21,
+                'flow_item_name' => 'start|待处理',
                 'name' => '官网新增一级栏目，“招聘信息”',
                 'color' => '',
                 'desc' => '',
@@ -2242,6 +2426,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 7,
                 'column_id' => 33,
                 'dialog_id' => 0,
+                'flow_item_id' => 21,
+                'flow_item_name' => 'start|待处理',
                 'name' => '产品官网',
                 'color' => '',
                 'desc' => '',
@@ -2266,6 +2452,8 @@ class ProjectTasksTableSeeder extends Seeder
                 'project_id' => 5,
                 'column_id' => 24,
                 'dialog_id' => 0,
+                'flow_item_id' => 13,
+                'flow_item_name' => 'start|待处理',
                 'name' => '版本的确定',
                 'color' => '',
                 'desc' => '',

database/seeders/SettingsTableSeeder.php

@@ -16,14 +16,13 @@ class SettingsTableSeeder extends Seeder
     {
 
 
-        if (\DB::table('settings')->count() > 0) {
+        if (\DB::table('settings')->where('name', 'system')->count() > 0) {
             return;
         }
 
         \DB::table('settings')->insert(array (
             0 =>
             array (
-                'id' => 1,
                 'name' => 'system',
                 'desc' => '',
                 'setting' => '{"reg":"open","project_invite":"open","login_code":"auto"}',
@@ -32,7 +31,6 @@ class SettingsTableSeeder extends Seeder
             ),
             1 =>
             array (
-                'id' => 2,
                 'name' => 'priority',
                 'desc' => '',
                 'setting' => '[{"name":"\\u91cd\\u8981\\u4e14\\u7d27\\u6025","color":"#ED4014","days":1,"priority":1},{"name":"\\u91cd\\u8981\\u4e0d\\u7d27\\u6025","color":"#F16B62","days":3,"priority":2},{"name":"\\u7d27\\u6025\\u4e0d\\u91cd\\u8981","color":"#19C919","days":5,"priority":3},{"name":"\\u4e0d\\u91cd\\u8981\\u4e0d\\u7d27\\u6025","color":"#2D8CF0","days":0,"priority":4}]',

database/seeders/UsersTableSeeder.php

@@ -39,6 +39,7 @@ class UsersTableSeeder extends Seeder
                 'line_ip' => '127.0.0.1',
                 'line_at' => seeders_at('2021-07-01 17:43:48'),
                 'task_dialog_id' => 18,
+                'email_verity' => 1,
                 'created_ip' => '',
                 'disable_at' => null,
                 'created_at' => seeders_at('2021-07-01 11:01:14'),
@@ -62,6 +63,7 @@ class UsersTableSeeder extends Seeder
                 'line_ip' => '127.0.0.1',
                 'line_at' => seeders_at('2021-07-01 16:57:40'),
                 'task_dialog_id' => 16,
+                'email_verity' => 1,
                 'created_ip' => '',
                 'disable_at' => null,
                 'created_at' => seeders_at('2021-07-01 11:01:14'),

docker-compose.yml

@@ -4,8 +4,8 @@ services:
   php:
     container_name: "dootask-php-${APP_ID}"
     image: "kuaifan/php:swoole-8.0"
+    shm_size: "1024m"
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
       - ./docker/crontab/crontab.conf:/etc/supervisor/conf.d/crontab.conf
       - ./docker/php/php.conf:/etc/supervisor/conf.d/php.conf
       - ./docker/php/php.ini:/usr/local/etc/php/php.ini
@@ -45,6 +45,8 @@ services:
       - php
       - office
       - fileview
+      - drawio-webapp
+      - drawio-export
     restart: unless-stopped
 
   redis:
@@ -80,13 +82,16 @@ services:
 
   office:
     container_name: "dootask-office-${APP_ID}"
-    image: "onlyoffice/documentserver:6.4.2.6"
+    image: "onlyoffice/documentserver:7.0.1.37"
     volumes:
       - ./docker/office/data:/var/www/onlyoffice/Data
       - ./docker/office/logs:/var/log/onlyoffice
       - ./docker/office/resources/documenteditor/css/app.css:/var/www/onlyoffice/documentserver/web-apps/apps/documenteditor/main/resources/css/app.css
       - ./docker/office/resources/presentationeditor/css/app.css:/var/www/onlyoffice/documentserver/web-apps/apps/presentationeditor/main/resources/css/app.css
       - ./docker/office/resources/spreadsheeteditor/css/app.css:/var/www/onlyoffice/documentserver/web-apps/apps/spreadsheeteditor/main/resources/css/app.css
+      - ./docker/office/resources/documenteditor/mobile/css/app.css:/var/www/onlyoffice/documentserver/web-apps/apps/documenteditor/mobile/css/app.css
+      - ./docker/office/resources/presentationeditor/mobile/css/app.css:/var/www/onlyoffice/documentserver/web-apps/apps/presentationeditor/mobile/css/app.css
+      - ./docker/office/resources/spreadsheeteditor/mobile/css/app.css:/var/www/onlyoffice/documentserver/web-apps/apps/spreadsheeteditor/mobile/css/app.css
     environment:
       TZ: "Asia/Shanghai"
     networks:
@@ -96,7 +101,7 @@ services:
 
   fileview:
     container_name: "dootask-fileview-${APP_ID}"
-    image: "kuaifan/fileview:4.1.0-SNAPSHOT"
+    image: "kuaifan/fileview:4.1.0-SNAPSHOT-RC4"
     environment:
       TZ: "Asia/Shanghai"
       KK_CONTEXT_PATH: "/fileview"
@@ -105,6 +110,36 @@ services:
         ipv4_address: "${APP_IPPR}.7"
     restart: unless-stopped
 
+  drawio-webapp:
+    container_name: "dootask-drawio-webapp-${APP_ID}"
+    image: "jgraph/drawio:16.6.1"
+    volumes:
+      - ./docker/drawio/webapp/index.html:/usr/local/tomcat/webapps/draw/index.html
+      - ./docker/drawio/webapp/stencils:/usr/local/tomcat/webapps/draw/stencils
+      - ./docker/drawio/webapp/js/app.min.js:/usr/local/tomcat/webapps/draw/js/app.min.js
+      - ./docker/drawio/webapp/js/croppie/croppie.min.css:/usr/local/tomcat/webapps/draw/js/croppie/croppie.min.css
+      - ./docker/drawio/webapp/js/diagramly/ElectronApp.js:/usr/local/tomcat/webapps/draw/js/diagramly/ElectronApp.js
+    networks:
+      extnetwork:
+        ipv4_address: "${APP_IPPR}.8"
+    environment:
+      TZ: "Asia/Shanghai"
+    depends_on:
+      - drawio-export
+    restart: unless-stopped
+
+  drawio-export:
+    container_name: "dootask-drawio-export-${APP_ID}"
+    image: "jgraph/export-server"
+    networks:
+      extnetwork:
+        ipv4_address: "${APP_IPPR}.9"
+    environment:
+      TZ: "Asia/Shanghai"
+    volumes:
+      - ./docker/drawio/export/fonts:/usr/share/fonts/drawio
+    restart: unless-stopped
+
 networks:
   extnetwork:
     name: "dootask-networks-${APP_ID}"

docker/drawio/export/fonts/.gitignore

@@ -0,0 +1 @@
+

docker/drawio/webapp/README.md

@@ -0,0 +1,17 @@
+# Change
+
+## js/diagramly/ElectronApp.js
+
+- 隐藏文件中的无用菜单
+
+## js/app.min.js
+
+- 隐藏帮助菜单
+- 取消未保存关闭窗口提示
+- `EmbedFile.prototype.getTitle=...` 改 `EmbedFile.prototype.getTitle=function(){return this.desc.title||(urlParams.title?decodeURIComponent(urlParams.title):"")}`
+- `c.insertTemplateEnabled&&!c.isOffline()&&this.addMenuItems(b,["insertTemplate"],d)` 改 `c.insertTemplateEnabled&&this.addMenuItems(b,["insertTemplate"],d)`
+- `390:270` 改 `390:285`
+
+## index.html
+
+- 隐藏加载中的提示

docker/drawio/webapp/index.html

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

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

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