no message

.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

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

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

@@ -0,0 +1,34 @@
+name: Build
+
+on:
+  push:
+    branches: [ build ]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    environment: build
+
+    strategy:
+      matrix:
+        os: [macos-11]
+        platform: [
+            build-mac,
+            build-mac-arm,
+            build-win
+        ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+
+      - name: Build
+        env:
+          GH_TOKEN: ${{ secrets.GH_PAT }}
+        run: ./cmd electron ${{ matrix.platform }}
+

.gitignore

@@ -8,7 +8,6 @@
 /vendor
 /build
 /tmp
-/CHANGELOG.md
 ._*
 .env
 .idea
@@ -20,6 +19,7 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 test.*
+composer.lock
 package-lock.json
 laravels-timer-process.pid
 .DS_Store

.gitmodules

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

README.md

@@ -5,15 +5,10 @@ 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
-- System: `Centos/Debian/Ubuntu/macOS`
-- Hardware suggestion: 2 cores and above 4G memory
+> `Docker` & `Docker Compose` must be installed
+
 
 ### Deployment project
 
@@ -21,14 +16,14 @@ Group No.: `546574618`
 # 1、Clone the repository
 
 # Clone projects on github
-git clone --depth=1 https://github.com/kuaifan/dootask.git
-# Or you can use gitee
-git clone --depth=1 https://gitee.com/aipaw/dootask.git
+git clone https://github.com/kuaifan/dootask.git
+# or you can use gitee
+git clone https://gitee.com/aipaw/dootask.git
 
-# 2、Enter directory
+# 2、enter directory
 cd dootask
 
-# 3、Installation（Custom port installation: ./cmd install --port 2222）
+# 3、Build project
 ./cmd install
 ```
 
@@ -42,17 +37,8 @@ cd dootask
 ### Change port
 
 ```bash
-./cmd port 2222
-```
-
-### Change App Url
-
-```bash
-# This URL only affects the email reply.
-./cmd url {Your domain url}
-
-# example:
-./cmd url https://domain.com
+./cmd php bin/run --port=2222
+./cmd up -d
 ```
 
 ### Stop server
@@ -64,28 +50,18 @@ 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
@@ -96,7 +72,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、Running commands in a project
+# 2、Enter directory and run command
 ./cmd https
 ```
 
@@ -105,7 +81,7 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 **Note: Please back up your data before upgrading!**
 
 ```bash
-# Method 1: Running commands in a project
+# Method 1: enter directory and run command
 ./cmd update
 
 # Or method 2: use this method if method 1 fails
@@ -116,30 +92,9 @@ git pull
 ./cmd mysql recovery
 ```
 
-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
-# Running commands in a project
+# Enter directory and run command
 ./cmd uninstall
 ```

README_CN.md

@@ -5,15 +5,10 @@
 - [截图预览](README_PREVIEW.md)
 - [演示站点](http://www.dootask.com/)
 
-**QQ交流群**
-
-- QQ群号: `546574618`
-
 ## 安装程序
 
-- 必须安装：`Docker` 和 `Docker Compose v2.0+`
-- 支持环境：`Centos/Debian/Ubuntu/macOS`
-- 硬件建议：2核4G以上
+> 必须安装 `Docker` 和 `Docker Compose`
+
 
 ### 部署项目
 
@@ -21,14 +16,14 @@
 # 1、克隆项目到您的本地或服务器
 
 # 通过github克隆项目
-git clone --depth=1 https://github.com/kuaifan/dootask.git
+git clone https://github.com/kuaifan/dootask.git
 # 或者你也可以使用gitee
-git clone --depth=1 https://gitee.com/aipaw/dootask.git
+git clone https://gitee.com/aipaw/dootask.git
 
 # 2、进入目录
 cd dootask
 
-# 3、一键安装项目（自定义端口安装 ./cmd install --port 2222）
+# 3、一键构建项目
 ./cmd install
 ```
 
@@ -42,17 +37,8 @@ cd dootask
 ### 更换端口
 
 ```bash
-./cmd port 2222
-```
-
-### 更换URL
-
-```bash
-# 此地址仅影响邮件回复功能
-./cmd url {域名地址}
-
-# 例如:
-./cmd url https://domain.com
+./cmd php bin/run --port=2222
+./cmd up -d
 ```
 
 ### 停止服务
@@ -64,29 +50,18 @@ 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
@@ -97,7 +72,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
 ```
 
@@ -106,7 +81,7 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 **注意：在升级之前请备份好你的数据！**
 
 ```bash
-# 方法1：在项目下运行命令
+# 方法1：进入项目所在目录，运行以下命令
 ./cmd update
 
 # （或者）方法2：如果方法1失败请使用此方法
@@ -117,30 +92,9 @@ git pull
 ./cmd mysql recovery
 ```
 
-如果升级后出现502请运行 `./cmd restart` 重启服务即可。
-
-## 迁移项目
-
-在新项目安装好之后按照以下步骤完成项目迁移：
-
-1、备份原数据库
-
-```bash
-# 在旧的项目下运行命令
-./cmd mysql backup
-```
-
-2、将`数据库备份文件`及`public/uploads`目录拷贝至新项目
-
-3、还原数据库至新项目
-```bash
-# 在新的项目下运行命令
-./cmd mysql recovery
-```
-
 ## 卸载项目
 
 ```bash
-# 在项目下运行命令
+# 进入项目所在目录，运行以下命令
 ./cmd uninstall
 ```

README_PUBLISH.md

@@ -1,28 +0,0 @@
-# 发布说明
-
-## 发布前
-
-1. 添加环境变量 `APPLEID`、`APPLEIDPASS`、`CSC_LINK`
-2. 发布GitHub还需要添加 `GH_PAT`
-
-## 通过 GitHub Actions 发布
-
-1. 执行 `./cmd prod` 编译
-2. 执行 `node ./version.js` 制作版本
-3. 执行 `git commit` 相关操作
-4. 制作标签
-5. 推送标签
-
-## 本地发布
-
-1. 执行 `./cmd prod` 编译
-2. 执行 `node ./version.js` 制作版本
-3. 执行 `git commit` 相关操作
-4. 制作标签
-5. 执行 `./cmd electron` 相关操作
-
-
-## 编译App
-
-1. 执行 `./cmd appbuild` 或 `./cmd appbuild setting` 编译
-2. 进入 `resources/mobile` eeui框架内打包Android或iOS应用

app/Helpers/Function.php

@@ -10,15 +10,8 @@ if (!function_exists('asset_main')) {
 if (!function_exists('seeders_at')) {
     function seeders_at($data)
     {
-        $diff = time() - strtotime("2021-07-02");
+        $diff = time() - strtotime("2021-07-01");
         $time = strtotime($data) + $diff;
         return date("Y-m-d H:i:s", $time);
     }
 }
-
-if (!function_exists('md5s')) {
-    function md5s($val, $len = 16)
-    {
-        return substr(md5($val), 32 - $len);
-    }
-}

app/Http/Controllers/Api/ReportController.php

@@ -1,474 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Exceptions\ApiException;
-use App\Models\AbstractModel;
-use App\Models\ProjectTask;
-use App\Models\Report;
-use App\Models\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,10 +4,8 @@ namespace App\Http\Controllers\Api;
 
 use App\Models\User;
 use App\Module\Base;
-use Arr;
-use Guanguans\Notify\Factory;
-use Guanguans\Notify\Messages\EmailMessage;
 use Request;
+use Response;
 
 /**
  * @apiDefine system
@@ -26,8 +24,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', 'start_home', 'home_footer']）
+     * - save: 保存设置（参数：reg、login_code、password_policy、chat_nickname）
 
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -43,206 +40,25 @@ 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',
-                    'start_home',
-                    'home_footer'
-                ])) {
+                if (!in_array($key, ['reg', 'login_code', 'password_policy', 'chat_nickname'])) {
                     unset($all[$key]);
                 }
             }
-            $all['archived_day'] = floatval($all['archived_day']);
-            if ($all['auto_archived'] == 'open') {
-                if ($all['archived_day'] <= 0) {
-                    return Base::retError('自动归档时间不可小于1天！');
-                } elseif ($all['archived_day'] > 100) {
-                    return Base::retError('自动归档时间不可大于100天！');
-                }
-            }
             $setting = Base::setting('system', Base::newTrim($all));
         } else {
             $setting = Base::setting('system');
         }
         //
-        if ($type == 'all' || $type == 'save') {
-            User::auth('admin');
-            $setting['reg_invite'] = $setting['reg_invite'] ?: Base::generatePassword(8);
-        } else {
-            if (isset($setting['reg_invite'])) unset($setting['reg_invite']);
-        }
-        //
         $setting['reg'] = $setting['reg'] ?: 'open';
         $setting['login_code'] = $setting['login_code'] ?: 'auto';
         $setting['password_policy'] = $setting['password_policy'] ?: 'simple';
-        $setting['project_invite'] = $setting['project_invite'] ?: 'open';
         $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/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_start_minute', 'task_remind_hours', 'task_remind_hours2', 'notice_msg', 'msg_unread_user_minute', 'msg_unread_group_minute']）
-     * @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_start_minute',
-                    'task_remind_hours',
-                    'task_remind_hours2',
-                    'notice_msg',
-                    'msg_unread_user_minute',
-                    'msg_unread_group_minute'
-                ])) {
-                    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'] ?: 'close';
-        $setting['task_start_minute'] = intval($setting['task_start_minute'] ?? -1);
-        $setting['task_remind_hours'] = floatval($setting['task_remind_hours'] ?? -1);
-        $setting['task_remind_hours2'] = floatval($setting['task_remind_hours2'] ?? -1);
-        $setting['notice_msg'] = $setting['notice_msg'] ?: 'close';
-        $setting['msg_unread_user_minute'] = intval($setting['msg_unread_user_minute'] ?? -1);
-        $setting['msg_unread_group_minute'] = intval($setting['msg_unread_group_minute'] ?? -1);
-        //
-        return Base::retSuccess('success', $setting ?: json_decode('{}'));
-    }
-
-    /**
-     * @api {get} api/system/setting/meeting          03. 获取会议设置、保存会议设置（限管理员）
-     *
-     * @apiVersion 1.0.0
-     * @apiGroup system
-     * @apiName setting__meeting
-     *
-     * @apiParam {String} type
-     * - get: 获取（默认）
-     * - save: 保存设置（参数：['open', 'appid', 'app_certificate']）
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function setting__meeting()
-    {
-        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, [
-                    'open',
-                    'appid',
-                    'app_certificate',
-                ])) {
-                    unset($all[$key]);
-                }
-            }
-            $setting = Base::setting('meetingSetting', Base::newTrim($all));
-        } else {
-            $setting = Base::setting('meetingSetting');
-        }
-        //
-        $setting['open'] = $setting['open'] ?: 'close';
-        //
-        return Base::retSuccess('success', $setting ?: json_decode('{}'));
-    }
-
-    /**
-     * @api {get} api/system/setting/apppush          04. 获取APP推送设置、保存APP推送设置（限管理员）
-     *
-     * @apiVersion 1.0.0
-     * @apiGroup system
-     * @apiName setting__apppush
-     *
-     * @apiParam {String} type
-     * - get: 获取（默认）
-     * - save: 保存设置（参数：['push', 'ios_key', 'ios_secret', 'android_key', 'android_secret']）
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function setting__apppush()
-    {
-        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, [
-                    'push',
-                    'ios_key',
-                    'ios_secret',
-                    'android_key',
-                    'android_secret'
-                ])) {
-                    unset($all[$key]);
-                }
-            }
-            $setting = Base::setting('appPushSetting', Base::newTrim($all));
-        } else {
-            $setting = Base::setting('appPushSetting');
-        }
-        //
-        $setting['push'] = $setting['push'] ?: 'close';
-        //
-        return Base::retSuccess('success', $setting ?: json_decode('{}'));
-    }
-
-    /**
-     * @api {get} api/system/demo          05. 获取演示帐号
+     * @api {get} api/system/demo          02. 获取演示账号
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -266,16 +82,12 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/priority          06. 任务优先级
+     * @api {post} api/system/priority          03. 获取优先级、保存优先级
      *
-     * @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错误）
@@ -293,7 +105,7 @@ class SystemController extends AbstractController
                 return Base::retError('参数错误');
             }
             foreach ($list AS $item) {
-                if (empty($item['name']) || empty($item['color']) || empty($item['priority'])) {
+                if (empty($item['name']) || empty($item['color']) || empty($item['days']) || empty($item['priority'])) {
                     continue;
                 }
                 $array[] = [
@@ -315,54 +127,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/column/template          07. 创建项目模板
-     *
-     * @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          08. 获取终端详细信息
+     * @api {get} api/system/get/info          04. 获取终端详细信息
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -391,7 +156,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ip          09. 获取IP地址
+     * @api {get} api/system/get/ip          05. 获取IP地址
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -406,7 +171,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/cnip          10. 是否中国IP地址
+     * @api {get} api/system/get/cnip          06. 是否中国IP地址
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -423,7 +188,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ipgcj02          11. 获取IP地址经纬度
+     * @api {get} api/system/get/ipgcj02          07. 获取IP地址经纬度
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -440,7 +205,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ipinfo          12. 获取IP地址详细信息
+     * @api {get} api/system/get/ipinfo          08. 获取IP地址详细信息
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -457,22 +222,98 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/imgupload          13. 上传图片
+     * @api {get} api/system/get/appinfo          09. 获取应用下载信息
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName get__appinfo
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function get__appinfo() {
+        $array = [
+            'name' => '',
+            'version' => '',
+            'list' => [],
+        ];
+        //
+        $files = [
+            base_path("package.json"),
+            base_path("electron/package.json")
+        ];
+        $dist = base_path("electron/dist");
+        foreach ($files as $file) {
+            if (file_exists($file)) {
+                $packageArray = json_decode(file_get_contents($file), true);
+                $array['name'] = $packageArray['name'] ?? 'No app';
+                $array['version'] = $packageArray['version'] ?? '';
+                //
+                $list = [
+                    [
+                        'icon' => 'logo-apple',
+                        'name' => 'macOS Intel',
+                        'file' => "{$array['name']}-{$array['version']}.dmg"
+                    ],
+                    [
+                        'icon' => 'logo-apple',
+                        'name' => 'macOS M1',
+                        'file' => "{$array['name']}-{$array['version']}-arm64.dmg"
+                    ],
+                    [
+                        'icon' => 'logo-windows',
+                        'name' => 'Windows x64',
+                        'file' => "{$array['name']} Setup {$array['version']}.exe"
+                    ]
+                ];
+                foreach ($list as $item) {
+                    if (file_exists("{$dist}/{$item['file']}")) {
+                        $item['url'] = Base::fillUrl('api/system/get/appdown?file=' . urlencode($item['file']));
+                        $item['size'] = filesize("{$dist}/{$item['file']}");
+                        $array['list'][] = $item;
+                    }
+                }
+            }
+            if (count($array['list']) > 0) {
+                break;
+            }
+        }
+        //
+        if (count($array['list']) == 0) {
+            return Base::retError('No file');
+        }
+        return Base::retSuccess('success', $array);
+    }
+
+    /**
+     * @api {get} api/system/get/appdown          10. 下载应用
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName get__appdown
+     *
+     * @apiParam {String} file        文件名称
+     */
+    public function get__appdown() {
+        $file = Request::input("file");
+        $path = base_path("electron/dist/" . $file);
+        if (!file_exists($path)) {
+            return Base::ajaxError("No file");
+        }
+        return Response::download($path);
+    }
+
+    /**
+     * @api {post} api/system/imgupload          11. 上传图片
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup system
      * @apiName imgupload
      *
-     * @apiParam {File} image               post-图片对象
-     * @apiParam {String} [image64]         post-图片base64（与'image'二选一）
-     * @apiParam {String} filename          post-文件名
-     * @apiParam {Number} [width]           压缩图片宽（默认0）
-     * @apiParam {Number} [height]          压缩图片高（默认0）
-     * @apiParam {String} [whcut]           压缩方式
-     * - 1：裁切（默认，宽、高非0有效）
-     * - 0：缩放
-     * - -1或'auto'：保持等比裁切
+     * @apiParam {String} image64         图片base64
+     * @apiParam {String} filename        文件名
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -483,14 +324,11 @@ class SystemController extends AbstractController
         if (User::userid() === 0) {
             return Base::retError('身份失效，等重新登录');
         }
-        $width = intval(Request::input('width'));
-        $height = intval(Request::input('height'));
-        $whcut = intval(Request::input('whcut', 1));
-        $scale = [2160, 4160, -1];
-        if ($width > 0 || $height > 0) {
-            $scale = [$width, $height, $whcut];
+        $scale = [intval(Request::input('width')), intval(Request::input('height'))];
+        if (!$scale[0] && !$scale[1]) {
+            $scale = [2160, 4160, -1];
         }
-        $path = "uploads/user/picture/" . User::userid() . "/" . date("Ym") . "/";
+        $path = "uploads/picture/" . User::userid() . "/" . date("Ym") . "/";
         $image64 = trim(Base::getPostValue('image64'));
         $fileName = trim(Base::getPostValue('filename'));
         if ($image64) {
@@ -517,7 +355,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/imgview          14. 浏览图片空间
+     * @api {get} api/system/get/imgview          12. 浏览图片空间
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -535,7 +373,7 @@ class SystemController extends AbstractController
         if (User::userid() === 0) {
             return Base::retError('身份失效，等重新登录');
         }
-        $publicPath = "uploads/user/picture/" . User::userid() . "/";
+        $publicPath = "uploads/picture/" . User::userid() . "/";
         $dirPath = public_path($publicPath);
         $dirs = $files = [];
         //
@@ -613,7 +451,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/fileupload          15. 上传文件
+     * @api {post} api/system/fileupload          13. 上传文件
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -633,7 +471,7 @@ class SystemController extends AbstractController
         if (User::userid() === 0) {
             return Base::retError('身份失效，等重新登录');
         }
-        $path = "uploads/user/file/" . User::userid() . "/" . date("Ym") . "/";
+        $path = "uploads/files/" . User::userid() . "/" . date("Ym") . "/";
         $image64 = trim(Base::getPostValue('image64'));
         $fileName = trim(Base::getPostValue('filename'));
         if ($image64) {
@@ -653,95 +491,4 @@ class SystemController extends AbstractController
         //
         return $data;
     }
-
-    /**
-     * @api {get} api/system/get/starthome          16. 启动首页设置信息
-     *
-     * @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          17. 邮件发送测试（限管理员）
-     *
-     * @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 (\Throwable $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());
-            }
-        }
-    }
-
-    /**
-     * @api {get} api/system/version          18. 获取版本号
-     *
-     * @apiVersion 1.0.0
-     * @apiGroup system
-     * @apiName version
-     *
-     * @apiSuccess {String} version
-     * @apiSuccess {String} publish
-     */
-    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;
-    }
 }

app/Http/Controllers/Api/UsersController.php

@@ -2,17 +2,7 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Models\AbstractModel;
-use App\Models\Meeting;
-use App\Models\Project;
-use App\Models\UmengAlias;
 use App\Models\User;
-use App\Models\UserEmailVerification;
-use App\Models\UserTransfer;
-use App\Models\WebSocket;
-use App\Models\WebSocketDialog;
-use App\Models\WebSocketDialogMsg;
-use App\Module\AgoraIO\AgoraTokenGenerator;
 use App\Module\Base;
 use Arr;
 use Cache;
@@ -41,7 +31,7 @@ class UsersController extends AbstractController
      * @apiParam {String} email          邮箱
      * @apiParam {String} password       密码
      * @apiParam {String} [code]         登录验证码
-     * @apiParam {String} [invite]       注册邀请码
+     * @apiParam {String} [key]          登陆验证码key
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -52,56 +42,49 @@ 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') {
                 return Base::retError('未开放注册');
-            } elseif ($setting['reg'] == 'invite') {
-                $invite = trim(Request::input('invite'));
-                if (empty($invite) || $invite != $setting['reg_invite']) {
-                    return Base::retError('请输入正确的邀请码');
-                }
             }
             $user = User::reg($email, $password);
-            if ($isRegVerify) {
-                UserEmailVerification::userEmailSend($user);
-                return Base::retError('注册成功，请验证邮箱后登录', ['code' => 'email']);
-            }
         } else {
             $needCode = !Base::isError(User::needCode($email));
             if ($needCode) {
                 $code = trim(Request::input('code'));
+                $key = trim(Request::input('key'));
                 if (empty($code)) {
                     return Base::retError('请输入验证码', ['code' => 'need']);
                 }
-                if (!Captcha::check($code)) {
-                    return Base::retError('请输入正确的验证码', ['code' => 'need']);
+                if (empty($key)) {
+                    if (!Captcha::check($code)) {
+                        return Base::retError('请输入正确的验证码', ['code' => 'need']);
+                    }
+                } else {
+                    if (!Captcha::check_api($code, $key)) {
+                        return Base::retError('请输入正确的验证码', ['code' => 'need']);
+                    }
                 }
             }
             //
             $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 = [
@@ -114,15 +97,6 @@ class UsersController extends AbstractController
         $user->updateInstance($array);
         $user->save();
         User::token($user);
-        //
-        if (!Project::withTrashed()->whereUserid($user->userid)->wherePersonal(1)->exists()) {
-            Project::createProject([
-                'name' => Base::Lang('个人项目'),
-                'desc' => Base::Lang('注册时系统自动创建项目，你可以自由删除。'),
-                'personal' => 1,
-            ], $user->userid);
-        }
-        //
         return Base::retSuccess($type == 'reg' ? "注册成功" : "登录成功", $user);
     }
 
@@ -153,6 +127,8 @@ class UsersController extends AbstractController
      * @apiGroup users
      * @apiName login__codeimg
      *
+     * @apiParam {String} email       用户名
+     *
      * @apiSuccess {Image} data     返回数据（直接输出图片）
      */
     public function login__codeimg()
@@ -179,26 +155,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/reg/needinvite          05. 是否需要邀请码
-     *
-     * @apiDescription 用于判断注册是否需要邀请码
-     * @apiVersion 1.0.0
-     * @apiGroup users
-     * @apiName reg__needinvite
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function reg__needinvite()
-    {
-        return Base::retSuccess('success', [
-            'need' => Base::settingFind('system', 'reg') == 'invite'
-        ]);
-    }
-
-    /**
-     * @api {get} api/users/info          06. 获取我的信息
+     * @api {get} api/users/info          05. 获取我的信息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -230,13 +187,11 @@ class UsersController extends AbstractController
         $user = User::auth();
         User::token($user);
         //
-        $data = $user->toArray();
-        $data['nickname_original'] = $user->getRawOriginal('nickname');
-        return Base::retSuccess('success', $data);
+        return Base::retSuccess('success', $user);
     }
 
     /**
-     * @api {get} api/users/editdata          07. 修改自己的资料
+     * @api {get} api/users/editdata          06. 修改自己的资料
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -256,31 +211,31 @@ class UsersController extends AbstractController
         $user = User::auth();
         $data = Request::all();
         $user->checkSystem(1);
-        // 头像
+        //头像
         if (Arr::exists($data, 'userimg')) {
             $userimg = Request::input('userimg');
-            $user->userimg = $userimg ? Base::unFillUrl(is_array($userimg) ? $userimg[0]['path'] : $userimg) : '';
-            if (str_contains($user->userimg, 'avatar/')) {
+            if ($userimg) {
+                $userimg = is_array($userimg) ? $userimg[0]['path'] : $userimg;
+                $user->userimg = Base::unFillUrl($userimg);
+            } else {
                 $user->userimg = '';
             }
         }
-        // 昵称
+        //昵称
         if (Arr::exists($data, 'nickname')) {
             $nickname = trim(Request::input('nickname'));
-            if ($nickname && mb_strlen($nickname) < 2) {
+            if (mb_strlen($nickname) < 2) {
                 return Base::retError('昵称不可以少于2个字');
             } elseif (mb_strlen($nickname) > 20) {
                 return Base::retError('昵称最多只能设置20个字');
-            } elseif ($nickname != $user->nickname) {
+            } else {
                 $user->nickname = $nickname;
-                $user->az = Base::getFirstCharter($nickname);
-                $user->pinyin = Base::cn2pinyin($nickname);
             }
         }
-        // 职位/职称
+        //职位/职称
         if (Arr::exists($data, 'profession')) {
             $profession = trim(Request::input('profession'));
-            if ($profession && mb_strlen($profession) < 2) {
+            if (mb_strlen($profession) < 2) {
                 return Base::retError('职位/职称不可以少于2个字');
             } elseif (mb_strlen($profession) > 20) {
                 return Base::retError('职位/职称最多只能设置20个字');
@@ -291,15 +246,12 @@ class UsersController extends AbstractController
         //
         $user->save();
         User::token($user);
-        //
-        if (empty($user->userimg)) {
-            $user->userimg = $user->getUserimgAttribute(null);
-        }
+        User::AZUpdate($user->userid);
         return Base::retSuccess('修改成功', $user);
     }
 
     /**
-     * @api {get} api/users/editpass          08. 修改自己的密码
+     * @api {get} api/users/editpass          07. 修改自己的密码
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -339,7 +291,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/search          09. 搜索会员列表
+     * @api {get} api/users/search          08. 搜索会员列表
      *
      * @apiDescription 搜索会员列表
      * @apiVersion 1.0.0
@@ -347,16 +299,11 @@ class UsersController extends AbstractController
      * @apiName searchinfo
      *
      * @apiParam {Object} keys          搜索条件
-     * - keys.key                           昵称、邮箱关键字
-     * - keys.disable                       0-排除禁止（默认），1-含禁止，2-仅禁止
+     * - keys.key                           昵称、邮箱
      * - keys.project_id                    在指定项目ID
      * - keys.no_project_id                 不在指定项目ID
      * @apiParam {Object} sorts         排序方式
-     * - sorts.az                           按字母：asc|desc
-     * @apiParam {Number} updated_time  在这个时间戳之后更新的
-     * @apiParam {Number} state         获取在线状态
-     * - 0: 不获取（默认）
-     * - 1: 获取会员在线状态，返回数据多一个online值
+     * - sorts.az                           字母
      *
      * @apiParam {Number} [take]        获取数量，10-100
      * @apiParam {Number} [page]        当前页，默认:1（赋值分页模式，take参数无效）
@@ -368,41 +315,32 @@ class UsersController extends AbstractController
      */
     public function search()
     {
-        $builder = User::select(['userid', 'email', 'nickname', 'profession', 'userimg', 'az', 'pinyin', 'line_at', 'disable_at']);
+        $builder = User::select(['userid', 'email', 'nickname', 'profession', 'userimg', 'az']);
         //
         $keys = Request::input('keys');
         $sorts = Request::input('sorts');
-        $updatedTime = intval(Request::input('updated_time'));
-        $state = intval(Request::input('state', 0));
-        $keys = is_array($keys) ? $keys : [];
-        $sorts = is_array($sorts) ? $sorts : [];
-        //
-        if ($keys['key']) {
-            $builder->where(function($query) use ($keys) {
-                $query->where("email", "like", "%{$keys['key']}%")
-                    ->orWhere("nickname", "like", "%{$keys['key']}%");
-            });
+        if (is_array($keys)) {
+            if ($keys['key']) {
+                $builder->where(function($query) use ($keys) {
+                    $query->where("email", "like", "%{$keys['key']}%")
+                        ->orWhere("nickname", "like", "%{$keys['key']}%");
+                });
+            }
+            if (intval($keys['project_id']) > 0) {
+                $builder->whereIn('userid', function ($query) use ($keys) {
+                    $query->select('userid')->from('project_users')->where('project_id', $keys['project_id']);
+                });
+            }
+            if (intval($keys['no_project_id']) > 0) {
+                $builder->whereNotIn('userid', function ($query) use ($keys) {
+                    $query->select('userid')->from('project_users')->where('project_id', $keys['no_project_id']);
+                });
+            }
         }
-        if (intval($keys['disable']) == 0) {
-            $builder->whereNull("disable_at");
-        } elseif (intval($keys['disable']) == 2) {
-            $builder->whereNotNull("disable_at");
-        }
-        if ($updatedTime > 0) {
-            $builder->where("updated_at", ">=", Carbon::createFromTimestamp($updatedTime));
-        }
-        if (intval($keys['project_id']) > 0) {
-            $builder->whereIn('userid', function ($query) use ($keys) {
-                $query->select('userid')->from('project_users')->where('project_id', $keys['project_id']);
-            });
-        }
-        if (intval($keys['no_project_id']) > 0) {
-            $builder->whereNotIn('userid', function ($query) use ($keys) {
-                $query->select('userid')->from('project_users')->where('project_id', $keys['no_project_id']);
-            });
-        }
-        if (in_array($sorts['az'], ['asc', 'desc'])) {
-            $builder->orderBy('az', $sorts['az']);
+        if (is_array($sorts)) {
+            if (in_array($sorts['az'], ['asc', 'desc'])) {
+                $builder->orderBy('az', $sorts['az']);
+            }
         }
         //
         if (Request::exists('page')) {
@@ -410,18 +348,11 @@ class UsersController extends AbstractController
         } else {
             $list = $builder->orderBy('userid')->take(Base::getPaginate(100, 10, 'take'))->get();
         }
-        //
-        if ($state === 1) {
-            $list->transform(function (User $userInfo) {
-                $userInfo->online = $userInfo->getOnlineStatus();
-                return $userInfo;
-            });
-        }
         return Base::retSuccess('success', $list);
     }
 
     /**
-     * @api {get} api/users/basic          10. 获取指定会员基础信息
+     * @api {get} api/users/basic          09. 获取指定会员基础信息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -455,34 +386,14 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/lists          11. 会员列表（限管理员）
-     *
-     * @apiDescription 需要token身份
-     * @apiVersion 1.0.0
-     * @apiGroup users
-     * @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
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
      */
     public function lists()
     {
@@ -492,26 +403,14 @@ class UsersController extends AbstractController
         //
         $keys = Request::input('keys');
         if (is_array($keys)) {
-            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['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")) {
@@ -520,18 +419,6 @@ 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));
         //
@@ -539,34 +426,22 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/operation          12. 操作会员（限管理员）
+     * 操作会员（限管理员）
      *
-     * @apiDescription 需要token身份
-     * @apiVersion 1.0.0
-     * @apiGroup users
-     * @apiName operation
-     *
-     * @apiParam {Number} userid                会员ID
-     * @apiParam {String} [type]                操作
+     * @apiParam {Number} userid          会员ID
+     * @apiParam {String} [type]          操作
      * - setadmin             设为管理员
      * - clearadmin           取消管理员
-     * - setdisable           设为离职（需要参数 disable_time、transfer_userid）
-     * - cleardisable         取消离职
+     * - setdisable           设为禁用
+     * - cleardisable         取消禁用
      * - delete               删除会员
-     * @apiParam {String} [email]               邮箱地址
-     * @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     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
+     * @apiParam {String} [password]      新的密码
+     * @apiParam {String} [nickname]      昵称
+     * @apiParam {String} [profession]    职位
      */
     public function operation()
     {
-        $user = User::auth('admin');
+        User::auth('admin');
         //
         $data = Request::all();
         $userid = intval($data['userid']);
@@ -579,7 +454,6 @@ class UsersController extends AbstractController
         $userInfo->checkSystem(1);
         //
         $upArray = [];
-        $transferUser = null;
         switch ($type) {
             case 'setadmin':
                 $upArray['identity'] = array_diff($userInfo->identity, ['admin']);
@@ -591,48 +465,21 @@ 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::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':
                 $upArray['identity'] = array_diff($userInfo->identity, ['disable']);
-                $upArray['disable_at'] = null;
                 break;
 
             case 'delete':
-                if ($userInfo->userid === $user->userid) {
-                    return Base::retError('不能删除自己');
-                }
-                $userInfo->deleteUser();
+                $userInfo->delete();
                 break;
         }
         if (isset($upArray['identity'])) {
             $upArray['identity'] = "," . implode(",", $upArray['identity']) . ",";
         }
-        // 邮箱
-        if (Arr::exists($data, 'email')) {
-            $email = trim($data['email']);
-            if (User::whereEmail($email)->where('userid', '!=', $userInfo->userid)->exists()) {
-                return Base::retError('邮箱地址已存在');
-            }
-            $upArray['email'] = $email;
-        }
         // 密码
         if (Arr::exists($data, 'password')) {
             $password = trim($data['password']);
@@ -644,20 +491,18 @@ class UsersController extends AbstractController
         // 昵称
         if (Arr::exists($data, 'nickname')) {
             $nickname = trim($data['nickname']);
-            if ($nickname && mb_strlen($nickname) < 2) {
+            if (mb_strlen($nickname) < 2) {
                 return Base::retError('昵称不可以少于2个字');
             } elseif (mb_strlen($nickname) > 20) {
                 return Base::retError('昵称最多只能设置20个字');
             } else {
                 $upArray['nickname'] = $nickname;
-                $upArray['az'] = Base::getFirstCharter($nickname);
-                $upArray['pinyin'] = Base::cn2pinyin($nickname);
             }
         }
         // 职位/职称
         if (Arr::exists($data, 'profession')) {
             $profession = trim($data['profession']);
-            if ($profession && mb_strlen($profession) < 2) {
+            if (mb_strlen($profession) < 2) {
                 return Base::retError('职位/职称不可以少于2个字');
             } elseif (mb_strlen($profession) > 20) {
                 return Base::retError('职位/职称最多只能设置20个字');
@@ -666,280 +511,10 @@ class UsersController extends AbstractController
             }
         }
         if ($upArray) {
-            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();
-                }
-            });
+            $userInfo->updateInstance($upArray);
+            $userInfo->save();
         }
         //
         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('绑定邮箱成功');
-    }
-
-    /**
-     * @api {get} api/users/umeng/alias          14. 设置友盟别名
-     *
-     * @apiDescription 需要token身份
-     * @apiVersion 1.0.0
-     * @apiGroup users
-     * @apiName umeng__alias
-     *
-     * @apiParam {String} alias           别名
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据（同"获取我的信息"接口）
-     */
-    public function umeng__alias()
-    {
-        $data = Request::input();
-        // 表单验证
-        Base::validator($data, [
-            'alias.required' => '别名不能为空',
-            'alias.between:2,20' => '别名的长度在2-20个字符',
-        ]);
-        //
-        $agent = strtolower(Request::server('HTTP_USER_AGENT'));
-        if (str_contains($agent, 'android')) {
-            $platform = 'android';
-        } elseif (str_contains($agent, 'iphone') || str_contains($agent, 'ipad')) {
-            $platform = 'ios';
-        } else {
-            return Base::retError('设备类型错误');
-        }
-        //
-        $user = User::auth();
-        $inArray = [
-            'userid' => $user->userid,
-            'alias' => $data['alias'],
-            'platform' => $platform,
-        ];
-        if (UmengAlias::where($inArray)->exists()) {
-            return Base::retSuccess('别名已存在');
-        }
-        $row = UmengAlias::createInstance($inArray);
-        if ($row->save()) {
-            return Base::retSuccess('添加成功');
-        } else {
-            return Base::retError('添加错误');
-        }
-    }
-
-    /**
-     * @api {get} api/users/ws/exist          15. websocket是否存在
-     *
-     * @apiDescription 查询websocket连接是否存在
-     * @apiVersion 1.0.0
-     * @apiGroup users
-     * @apiName ws__exist
-     *
-     * @apiSuccess {Number} ret     返回状态码（1存在、0不存在）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据（同"获取我的信息"接口）
-     */
-    public function ws__exist()
-    {
-        $fd = Request::header('fd');
-        if (empty($fd)) {
-            return Base::retError('empty');
-        }
-        if (WebSocket::whereFd($fd)->exists()) {
-            return Base::retSuccess('success');
-        } else {
-            return Base::retError('not exist');
-        }
-    }
-
-    /**
-     * @api {get} api/users/meeting/open          16. 【会议】创建会议、加入会议
-     *
-     * @apiDescription  需要token身份
-     * @apiVersion 1.0.0
-     * @apiGroup users
-     * @apiName meeting__open
-     *
-     * @apiParam {String} type                      类型
-     * - create: 创建会议，有效参数：name、userids
-     * - join: 加入会议，有效参数：meetingid (必填)
-     * @apiParam {String} [meetingid]               频道ID（不是数字）
-     * @apiParam {String} [name]                    会话ID
-     * @apiParam {Array} [userids]                  邀请成员
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function meeting__open()
-    {
-        $user = User::auth();
-        //
-        $type = trim(Request::input('type'));
-        $meetingid = trim(Request::input('meetingid'));
-        $name = trim(Request::input('name'));
-        $userids = Request::input('userids');
-        $isCreate = false;
-        // 创建、加入
-        if ($type === 'join') {
-            $meeting = Meeting::whereMeetingid($meetingid)->first();
-            if (empty($meeting)) {
-                return Base::retError('频道ID不存在');
-            }
-        } elseif ($type === 'create') {
-            $meetingid = strtoupper(Base::generatePassword(11, 1));
-            $name = $name ?: "{$user->nickname} 发起的会议";
-            $channel = "DooTask:" . substr(md5($meetingid . env("APP_KEY")), 16);
-            $meeting = Meeting::createInstance([
-                'meetingid' => $meetingid,
-                'name' => $name,
-                'channel' => $channel,
-                'userid' => $user->userid
-            ]);
-            $meeting->save();
-            $isCreate = true;
-        } else {
-            return Base::retError('参数错误');
-        }
-        $data = $meeting->toArray();
-        // 创建令牌
-        $meetingSetting = Base::setting('meetingSetting');
-        if ($meetingSetting['open'] !== 'open') {
-            return Base::retError('会议功能未开启，请联系管理员开启');
-        }
-        if (empty($meetingSetting['appid']) || empty($meetingSetting['app_certificate'])) {
-            return Base::retError('会议功能配置错误，请联系管理员');
-        }
-        $uid = $user->userid . '_' . Request::header('fd');
-        try {
-            $service = new AgoraTokenGenerator($meetingSetting['appid'], $meetingSetting['app_certificate'], $meeting->channel, $uid);
-        } catch (\Exception $e) {
-            return Base::retError($e->getMessage());
-        }
-        $token = $service->buildToken();
-        if (empty($token)) {
-            return Base::retError('会议令牌创建失败');
-        }
-        // 发送给邀请人
-        $msgs = [];
-        if ($isCreate) {
-            foreach ($userids as $userid) {
-                if (!User::whereUserid($userid)->exists()) {
-                    continue;
-                }
-                $dialog = WebSocketDialog::checkUserDialog($user->userid, $userid);
-                if ($dialog) {
-                    $res = WebSocketDialogMsg::sendMsg($dialog->id, 0, 'meeting', $data, $user->userid);
-                    if (Base::isSuccess($res)) {
-                        $msgs[] = $res['data'];
-                    }
-                }
-            }
-        }
-        //
-        $data['appid'] = $meetingSetting['appid'];
-        $data['uid'] = $uid;
-        $data['token'] = $token;
-        $data['msgs'] = $msgs;
-        return Base::retSuccess('success', $data);
-    }
-
-    /**
-     * @api {get} api/users/meeting/invitation          17. 【会议】发送邀请
-     *
-     * @apiDescription  需要token身份
-     * @apiVersion 1.0.0
-     * @apiGroup users
-     * @apiName meeting__invitation
-     *
-     * @apiParam {String} meetingid               频道ID（不是数字）
-     * @apiParam {Array} userids                  邀请成员
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function meeting__invitation()
-    {
-        $user = User::auth();
-        //
-        $meetingid = trim(Request::input('meetingid'));
-        $userids = Request::input('userids');
-        //
-        $meeting = Meeting::whereMeetingid($meetingid)->first();
-        if (empty($meeting)) {
-            return Base::retError('频道ID不存在');
-        }
-        $data = $meeting->toArray();
-        // 发送给邀请人
-        $msgs = [];
-        foreach ($userids as $userid) {
-            if (!User::whereUserid($userid)->exists()) {
-                continue;
-            }
-            $dialog = WebSocketDialog::checkUserDialog($user->userid, $userid);
-            if ($dialog) {
-                $res = WebSocketDialogMsg::sendMsg($dialog->id, 0, 'meeting', $data, $user->userid);
-                if (Base::isSuccess($res)) {
-                    $msgs[] = $res['data'];
-                }
-            }
-        }
-        //
-        $data['msgs'] = $msgs;
-        return Base::retSuccess('发送邀请成功', $data);
-    }
 }

app/Http/Controllers/Api/apidoc.php

@@ -4,7 +4,7 @@
  * 给apidoc项目增加顺序编号
  */
 
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
+error_reporting(E_ALL & ~E_NOTICE);
 
 $path = dirname(__FILE__). '/';
 $lists = scandir($path);

app/Http/Controllers/IndexController.php

@@ -2,20 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\File;
 use App\Module\Base;
-use App\Module\Ihttp;
-use App\Module\RandomColor;
-use App\Tasks\AutoArchivedTask;
 use App\Tasks\DeleteTmpTask;
-use App\Tasks\EmailNoticeTask;
-use App\Tasks\LoopTask;
-use Arr;
-use Cache;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
-use LasseRafn\InitialAvatarGenerator\InitialAvatar;
 use Redirect;
-use Request;
 
 
 /**
@@ -31,10 +21,6 @@ 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';
         }
@@ -43,113 +29,11 @@ class IndexController extends InvokeController
 
     /**
      * 首页
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function main()
     {
-        $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.1.1-23/web-apps/vendor/requirejs/require.js",
-            "office/7.1.1-23/web-apps/apps/api/documents/api.js",
-            "office/7.1.1-23/sdkjs/common/AllFonts.js",
-            "office/7.1.1-23/web-apps/vendor/xregexp/xregexp-all-min.js",
-            "office/7.1.1-23/web-apps/vendor/sockjs/sockjs.min.js",
-            "office/7.1.1-23/web-apps/vendor/jszip/jszip.min.js",
-            "office/7.1.1-23/web-apps/vendor/jszip-utils/jszip-utils.min.js",
-            "office/7.1.1-23/sdkjs/common/libfont/wasm/fonts.js",
-            "office/7.1.1-23/sdkjs/common/Charts/ChartStyles.js",
-            "office/7.1.1-23/sdkjs/slide/themes//themes.js",
-
-            "office/7.1.1-23/web-apps/apps/presentationeditor/main/app.js",
-            "office/7.1.1-23/sdkjs/slide/sdk-all-min.js",
-            "office/7.1.1-23/sdkjs/slide/sdk-all.js",
-
-            "office/7.1.1-23/web-apps/apps/documenteditor/main/app.js",
-            "office/7.1.1-23/sdkjs/word/sdk-all-min.js",
-            "office/7.1.1-23/sdkjs/word/sdk-all.js",
-
-            "office/7.1.1-23/web-apps/apps/spreadsheeteditor/main/app.js",
-            "office/7.1.1-23/sdkjs/cell/sdk-all-min.js",
-            "office/7.1.1-23/sdkjs/cell/sdk-all.js",
-        ];
-        foreach ($array as &$item) {
-            $item = url($item);
-        }
-        return implode(PHP_EOL, $array);
-    }
-
-    /**
-     * 获取版本号
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function version()
-    {
-        return Redirect::to(Base::fillUrl('api/system/version'), 301);
-    }
-
-    /**
-     * 头像
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
-     */
-    public function avatar()
-    {
-        $name = Request::input('name', 'H');
-        $size = Request::input('size', 128);
-        $color = Request::input('color');
-        $background = Request::input('background');
-        //
-        if (preg_match('/^[\x{4e00}-\x{9fa5}]+$/u', $name)) {
-            $name = mb_substr($name, mb_strlen($name) - 2);
-        }
-        if (empty($color)) {
-            $color = '#ffffff';
-            $cacheKey = "avatarBackgroundColor::" . md5($name);
-            $background = Cache::rememberForever($cacheKey, function() {
-                return RandomColor::one(['luminosity' => 'dark']);
-            });
-        }
-        //
-        $avatar = new InitialAvatar();
-        $content = $avatar->name($name)
-            ->size($size)
-            ->color($color)
-            ->background($background)
-            ->fontSize(0.35)
-            ->autoFont()
-            ->generate()
-            ->stream('png', 100);
-        //
-        return response($content)
-            ->header('Pragma', 'public')
-            ->header('Cache-Control', 'max-age=1814400')
-            ->header('Content-type', 'image/png')
-            ->header('Expires', gmdate('D, d M Y H:i:s \G\M\T', time() + 1814400));
+        return view('main', ['version' => Base::getVersion()]);
     }
 
     /**
@@ -171,151 +55,13 @@ class IndexController extends InvokeController
             // 限制内网访问
             return "Forbidden Access";
         }
-        // 自动归档
-        Task::deliver(new AutoArchivedTask());
-        // 邮件通知
-        Task::deliver(new EmailNoticeTask());
         // 删除过期的临时表数据
         Task::deliver(new DeleteTmpTask('wg_tmp_msgs', 1));
         Task::deliver(new DeleteTmpTask('tmp', 24));
-        // 周期任务
-        Task::deliver(new LoopTask());
 
         return "success";
     }
 
-    /**
-     * 桌面客户端发布
-     */
-    public function desktop__publish($name = '')
-    {
-        $genericVersion = Request::header('generic-version');
-        $latestFile = public_path("uploads/desktop/latest");
-        $latestVersion = file_exists($latestFile) ? trim(file_get_contents($latestFile)) : "0.0.1";
-        if (strtolower($name) === 'latest') {
-            $name = $latestVersion;
-        }
-        // 上传
-        if (preg_match("/^\d+\.\d+\.\d+$/", $genericVersion)) {
-            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') || str_ends_with($file, '.yaml')) {
-                    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);
-    }
-
-    /**
-     * Drawio 图标搜索
-     * @return array|mixed
-     */
-    public function drawio__iconsearch()
-    {
-        $query = Request::input('q');
-        $page = Request::input('p');
-        $size = Request::input('c');
-        $url = "https://app.diagrams.net/iconSearch?q={$query}&p={$page}&c={$size}";
-        $result = Cache::remember("drawioIconsearch::" . md5($url), now()->addDays(15), function () use ($url) {
-            return Ihttp::ihttp_get($url);
-        });
-        if (Base::isSuccess($result)) {
-            return $result['data'];
-        }
-        return [
-            'icons' => [],
-            'total_count' => 0
-        ];
-    }
-
-    /**
-     * 预览文件
-     * @return array|mixed
-     */
-    public function online__preview()
-    {
-        $key = trim(Request::input('key'));
-        //
-        $data = parse_url($key);
-        $path = Arr::get($data, 'path');
-        $file = public_path($path);
-        //
-        if (file_exists($file)) {
-            parse_str($data['query'], $query);
-            $name = Arr::get($query, 'name');
-            $ext = strtolower(Arr::get($query, 'ext'));
-            $userAgent = strtolower(Request::server('HTTP_USER_AGENT'));
-            if ($ext === 'pdf'
-                && (str_contains($userAgent, 'electron') || str_contains($userAgent, 'chrome'))) {
-                return response()->download($file, $name, [], 'inline');
-            }
-            //
-            if (in_array($ext, File::localExt)) {
-                $url = Base::fillUrl($path);
-            } else {
-                $url = 'http://' . env('APP_IPPR') . '.3/' . $path;
-            }
-            if ($ext !== 'pdf') {
-                $url = Base::urlAddparameter($url, [
-                    'fullfilename' => $name . '.' . $ext
-                ]);
-            }
-            $toUrl = Base::fillUrl("fileview/onlinePreview?url=" . urlencode(base64_encode($url)));
-            return Redirect::to($toUrl, 301);
-        }
-        return abort(404);
-    }
-
-    /**
-     * 设置语言和皮肤
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
-     */
-    public function setting__theme_language()
-    {
-        return view('setting', [
-            'theme' => Request::input('theme'),
-            'language' => Request::input('language')
-        ]);
-    }
-
     /**
      * 提取所有中文
      * @return array|string

app/Http/Middleware/VerifyCsrfToken.php

@@ -21,23 +21,14 @@ class VerifyCsrfToken extends Middleware
         // 保存任务优先级
         'api/system/priority/',
 
-        // 保存创建项目列表模板
-        'api/system/column/template/',
-
         // 添加任务
         'api/project/task/add/',
 
-        // 保存工作流
-        'api/project/flow/save/',
-
         // 修改任务
         'api/project/task/update/',
 
-        // 聊天发文本
-        'api/dialog/msg/sendtext/',
-
-        // 聊天发语音
-        'api/dialog/msg/sendrecord/',
+        // 上传任务问题
+        'api/project/task/upload/',
 
         // 聊天发文件
         'api/dialog/msg/sendfile/',
@@ -50,11 +41,5 @@ class VerifyCsrfToken extends Middleware
 
         // 保存文件内容（上传）
         'api/file/content/upload/',
-
-        // 保存汇报
-        'api/report/store/',
-
-        // 发布桌面端
-        'desktop/publish/',
     ];
 }

app/Models/AbstractModel.php

@@ -10,15 +10,13 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
 /**
- * App\Models\AbstractModel
+ * App\Model\AbstractModel
  *
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel query()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
- * @method static \Illuminate\Database\Eloquent\Model|object|static|null cancelAppend()
- * @method static \Illuminate\Database\Eloquent\Model|object|static|null cancelHidden()
  * @method static \Illuminate\Database\Eloquent\Builder|static with($relations)
  * @method static \Illuminate\Database\Query\Builder|static select($columns = [])
  * @method static \Illuminate\Database\Query\Builder|static whereNotIn($column, $values, $boolean = 'and')
@@ -46,7 +44,7 @@ class AbstractModel extends Model
     {
         try {
             return $this->save();
-        } catch (\Throwable) {
+        } catch (\Exception $e) {
             return false;
         }
     }
@@ -64,24 +62,6 @@ class AbstractModel extends Model
         return $this->$key;
     }
 
-    /**
-     * 取消附加值
-     * @return static
-     */
-    protected function scopeCancelAppend()
-    {
-        return $this->setAppends([]);
-    }
-
-    /**
-     * 取消隐藏值
-     * @return static
-     */
-    protected function scopeCancelHidden()
-    {
-        return $this->setHidden([]);
-    }
-
     /**
      * 为数组 / JSON 序列化准备日期。
      * @param DateTimeInterface $date
@@ -153,23 +133,16 @@ 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 = [], &$isInsert = true)
+    public static function updateInsert($where, $update = [], $insert = [])
     {
         $row = static::where($where)->first();
         if (empty($row)) {
             $row = new static;
-            $array = array_merge($where, $insert ?: $update);
-            if (isset($array[$row->primaryKey])) {
-                unset($array[$row->primaryKey]);
-            }
-            $row->updateInstance($array);
-            $isInsert = true;
+            $row->updateInstance(array_merge($where, $insert ?: $update));
         } elseif ($update) {
             $row->updateInstance($update);
-            $isInsert = false;
         }
         if (!$row->save()) {
             return null;

app/Models/File.php

@@ -13,7 +13,6 @@ 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 名称
@@ -38,7 +37,6 @@ 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)
@@ -53,68 +51,43 @@ class File extends AbstractModel
     use SoftDeletes;
 
     /**
-     * 文件文件
+     * 是否有访问权限（没有时抛出异常）
+     * @param $userid
      */
-    const codeExt = [
-        'txt',
-        'htaccess', 'htgroups', 'htpasswd', 'conf', 'bat', 'cmd', 'cpp', 'c', 'cc', 'cxx', 'h', 'hh', 'hpp', 'ino', 'cs', 'css',
-        'dockerfile', 'go', 'golang', 'html', 'htm', 'xhtml', 'vue', 'we', 'wpy', 'java', 'js', 'jsm', 'jsx', 'json', 'jsp', 'less', 'lua', 'makefile', 'gnumakefile',
-        'ocamlmakefile', 'make', 'mysql', 'nginx', 'ini', 'cfg', 'prefs', 'm', 'mm', 'pl', 'pm', 'p6', 'pl6', 'pm6', 'pgsql', 'php',
-        'inc', 'phtml', 'shtml', 'php3', 'php4', 'php5', 'phps', 'phpt', 'aw', 'ctp', 'module', 'ps1', 'py', 'r', 'rb', 'ru', 'gemspec', 'rake', 'guardfile', 'rakefile',
-        'gemfile', 'rs', 'sass', 'scss', 'sh', 'bash', 'bashrc', 'sql', 'sqlserver', 'swift', 'ts', 'typescript', 'str', 'vbs', 'vb', 'v', 'vh', 'sv', 'svh', 'xml',
-        'rdf', 'rss', 'wsdl', 'xslt', 'atom', 'mathml', 'mml', 'xul', 'xbl', 'xaml', 'yaml', 'yml',
-        'asp', 'properties', 'gitignore', 'log', 'bas', 'prg', 'python', 'ftl', 'aspx', 'plist'
-    ];
-
-    /**
-     * office文件
-     */
-    const officeExt = [
-        'doc', 'docx',
-        'xls', 'xlsx',
-        'ppt', 'pptx',
-    ];
-
-    /**
-     * 图片文件
-     */
-    const imageExt = [
-        'jpg', 'jpeg', 'png', 'gif', 'bmp'
-    ];
-
-    /**
-     * 本地媒体文件
-     */
-    const localExt = [
-        'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw',
-        'tif', 'tiff',
-        'mp3', 'wav', 'mp4', 'flv',
-        'avi', 'mov', 'wmv', 'mkv', '3gp', 'rm',
-    ];
+    public function exceAllow($userid)
+    {
+        if (!$this->chackAllow($userid)) {
+            throw new ApiException('没有访问权限');
+        }
+    }
 
     /**
      * 是否有访问权限
+     *  ① 自己的文件夹
+     *  ② 共享所有人的文件夹
+     *  ③ 在指定共享人员内
      * @param $userid
-     * @return int -1:没有权限，0:访问权限，1:读写权限，1000:所有者或创建者
+     * @return bool
      */
-    public function getPermission($userid)
+    public function chackAllow($userid)
     {
-        if ($userid == $this->userid || $userid == $this->created_id) {
-            // ① 自己的文件夹 或 自己创建的文件夹
-            return 1000;
+        if ($userid == $this->userid) {
+            // ① 自己的文件夹
+            return true;
         }
         $row = $this->getShareInfo();
         if ($row) {
-            $fileUser = FileUser::whereFileId($row->id)->where(function ($query) use ($userid) {
-                $query->where('userid', 0);
-                $query->orWhere('userid', $userid);
-            })->orderByDesc('permission')->first();
-            if ($fileUser) {
-                // ② 在指定共享成员内
-                return $fileUser->permission;
+            if ($row->share == 1) {
+                // ② 共享所有人的文件夹
+                return true;
+            } elseif ($row->share == 2) {
+                // ③ 在指定共享人员内
+                if (FileUser::whereFileId($row->id)->whereUserid($userid)->exists()) {
+                    return true;
+                }
             }
         }
-        return -1;
+        return false;
     }
 
     /**
@@ -123,7 +96,7 @@ class File extends AbstractModel
      */
     public function getShareInfo()
     {
-        if ($this->share) {
+        if ($this->share > 0) {
             return $this;
         }
         $pid = $this->pid;
@@ -132,7 +105,7 @@ class File extends AbstractModel
             if (empty($row)) {
                 break;
             }
-            if ($row->share) {
+            if ($row->share > 0) {
                 return $row;
             }
             $pid = $row->pid;
@@ -142,7 +115,7 @@ class File extends AbstractModel
 
     /**
      * 是否处于共享文件夹内（不含自身）
-     * @return File|false
+     * @return bool
      */
     public function isNnShare()
     {
@@ -152,107 +125,31 @@ class File extends AbstractModel
             if (empty($row)) {
                 break;
             }
-            if ($row->share) {
-                return $row;
+            if ($row->share > 0) {
+                return true;
             }
             $pid = $row->pid;
         }
         return false;
     }
 
-    /**
-     * 目录内是否存在共享文件或文件夹
-     * @return bool
-     */
-    public function isSubShare()
-    {
-        return $this->type == 'folder' && File::where("pids", "like", "%,{$this->id},%")->whereShare(1)->exists();
-    }
-
     /**
      * 设置/关闭 共享（同时遍历取消里面的共享）
      * @param $share
      * @return bool
      */
-    public function updataShare($share = null)
+    public function setShare($share)
     {
-        if ($share === null) {
-            $share = FileUser::whereFileId($this->id)->count() == 0 ? 0 : 1;
-        }
-        if ($this->share != $share) {
-            AbstractModel::transaction(function () use ($share) {
-                $this->share = $share;
-                $this->save();
-                if ($share === 0) {
-                    FileUser::deleteFileAll($this->id, $this->userid);
+        AbstractModel::transaction(function () use ($share) {
+            $this->share = $share;
+            $this->save();
+            $list = self::wherePid($this->id)->get();
+            if ($list->isNotEmpty()) {
+                foreach ($list as $item) {
+                    $item->setShare(0);
                 }
-                $list = self::wherePid($this->id)->get();
-                if ($list->isNotEmpty()) {
-                    foreach ($list as $item) {
-                        $item->updataShare(0);
-                    }
-                }
-            });
-        }
-        return true;
-    }
-
-    /**
-     * 处理重名
-     * @return void
-     */
-    public function handleDuplicateName()
-    {
-        $builder = self::wherePid($this->pid)->whereUserid($this->userid)->whereExt($this->ext);
-        $exist = $builder->clone()->whereName($this->name)->exists();
-        if (!$exist) {
-            return;    // 未重名，不需要处理
-        }
-        // 发现重名，自动重命名
-        $nextNum = 2;
-        if (preg_match("/(.*?)(\s+\(\d+\))*$/", $this->name)) {
-            $preName = preg_replace("/(.*?)(\s+\(\d+\))*$/", "$1", $this->name);
-            $nextNum = $builder->clone()->where("name", "LIKE", "{$preName}%")->count() + 1;
-        }
-        $newName = "{$this->name} ({$nextNum})";
-        if ($builder->clone()->whereName($newName)->exists()) {
-            $nextNum = rand(100, 9999);
-            $newName = "{$this->name} ({$nextNum})";
-        }
-        $this->name = $newName;
-    }
-
-    /**
-     * 保存前更新pids
-     * @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;
     }
 
@@ -265,7 +162,6 @@ class File extends AbstractModel
         AbstractModel::transaction(function () {
             $this->delete();
             $this->pushMsg('delete');
-            FileUser::deleteFileAll($this->id);
             FileContent::whereFid($this->id)->delete();
             $list = self::wherePid($this->id)->get();
             if ($list->isNotEmpty()) {
@@ -291,7 +187,19 @@ class File extends AbstractModel
             ];
         }
         //
-        $userid = $this->pushUserid($action, $userid);
+        if ($userid === null) {
+            $userid = [$this->userid];
+            if ($this->share == 1) {
+                $builder = WebSocket::select(['userid']);
+                if ($action == 'content') {
+                    $builder->wherePath('file/content/' . $this->id);
+                }
+                $userid = array_merge($userid, $builder->pluck('userid')->toArray());
+            } elseif ($this->share == 2) {
+                $userid = array_merge($userid, FileUser::whereFileId($this->id)->pluck('userid')->toArray());
+            }
+            $userid = array_values(array_filter(array_unique($userid)));
+        }
         if (empty($userid)) {
             return;
         }
@@ -314,216 +222,19 @@ class File extends AbstractModel
         Task::deliver($task);
     }
 
-    /**
-     * 获取推送会员
-     * @param $action
-     * @param $userid
-     * @return array|int[]|mixed|null[]
-     */
-    public function pushUserid($action, $userid = null) {
-        $wherePath = "/manage/file";
-        if ($userid === null) {
-            $array = [$this->userid];
-            if ($action == 'add' && $this->pid == 0) {
-                return $array;
-            }
-            if ($action == 'content') {
-                $wherePath = "/single/file/{$this->id}";
-            } elseif ($this->pid > 0) {
-                $wherePath = "/manage/file/{$this->pid}";
-            } else {
-                $tmpArray = FileUser::whereFileId($this->id)->pluck('userid')->toArray();
-                if (empty($tmpArray)) {
-                    return $array;
-                }
-                if (!in_array(0, $tmpArray)) {
-                    return $tmpArray;
-                }
-            }
-            $tmpArray = WebSocket::wherePath($wherePath)->pluck('userid')->toArray();
-            if (empty($tmpArray)) {
-                return $array;
-            }
-            $array = array_values(array_filter(array_unique(array_merge($array, $tmpArray))));
-        } else {
-            $array = is_array($userid) ? $userid : [$userid];
-            if (in_array(0, $array)) {
-                return WebSocket::wherePath($wherePath)->pluck('userid')->toArray();
-            }
-        }
-        return $array;
-    }
-
-
-    /**
-     * 处理返回图片地址
-     * @param array $item
-     * @return array
-     */
-    public static function handleImageUrl($item)
-    {
-        if (in_array($item['ext'], self::imageExt) ) {
-            $content = Base::json2array(FileContent::whereFid($item['id'])->orderByDesc('id')->value('content'));
-            if ($content) {
-                $item['image_url'] = Base::fillUrl($content['url']);
-                $item['image_width'] = intval($content['width']);
-                $item['image_height'] = intval($content['height']);
-            }
-        }
-        return $item;
-    }
-
     /**
      * 获取文件并检测权限
      * @param $id
-     * @param int $limit 要求权限: 0-访问权限、1-读写权限、1000-所有者或创建者
-     * @param $permission
+     * @param null $noExistTis
      * @return File
      */
-    public static function permissionFind($id, $limit = 0, &$permission = -1)
+    public static function allowFind($id, $noExistTis = null)
     {
         $file = File::find($id);
         if (empty($file)) {
-            throw new ApiException('文件不存在或已被删除');
-        }
-        //
-        $permission = $file->getPermission(User::userid());
-        if ($permission < $limit) {
-            $msg = match ($limit) {
-                1000 => '仅限所有者或创建者操作',
-                1 => '没有修改写入权限',
-                default => '没有查看访问权限',
-            };
-            throw new ApiException($msg);
+            throw new ApiException($noExistTis ?: '文件不存在或已被删除');
         }
+        $file->exceAllow(User::userid());
         return $file;
     }
-
-    /**
-     * 格式化内容数据
-     * @param array $data [path, size, ext, name]
-     * @return array
-     */
-    public static function formatFileData(array $data)
-    {
-        $fileName = $data['name'];
-        $filePath = $data['path'];
-        $fileSize = $data['size'];
-        $fileExt = $data['ext'];
-        $publicPath = public_path($filePath);
-        //
-        switch ($fileExt) {
-            case 'md':
-            case 'text':
-                // 文本
-                $data['content'] = [
-                    'type' => $fileExt,
-                    'content' => file_get_contents($publicPath) ?: 'Content deleted',
-                ];
-                $data['file_mode'] = $fileExt;
-                break;
-
-            case 'drawio':
-                // 图表
-                $data['content'] = [
-                    'xml' => file_get_contents($publicPath)
-                ];
-                $data['file_mode'] = $fileExt;
-                break;
-
-            case 'mind':
-                // 思维导图
-                $data['content'] = Base::json2array(file_get_contents($publicPath));
-                $data['file_mode'] = $fileExt;
-                break;
-
-            default:
-                if (in_array($fileExt, self::codeExt) && $fileSize < 2 * 1024 * 1024)
-                {
-                    // 文本预览，限制2M内的文件
-                    $data['content'] = [
-                        'content' => file_get_contents($publicPath) ?: 'Content deleted',
-                    ];
-                    $data['file_mode'] = 'code';
-                }
-                elseif (in_array($fileExt, File::officeExt))
-                {
-                    // office预览
-                    $data['content'] = json_decode('{}');
-                    $data['file_mode'] = 'office';
-                }
-                else
-                {
-                    // 其他预览
-                    $name = Base::rightDelete($fileName, ".{$fileExt}") . ".{$fileExt}";
-                    $data['content'] = [
-                        'preview' => true,
-                        'name' => $name,
-                        'key' => urlencode(Base::urlAddparameter($filePath, [
-                            'name' => $name,
-                            'ext' => $fileExt
-                        ])),
-                    ];
-                    $data['file_mode'] = 'preview';
-                }
-                break;
-        }
-        return $data;
-    }
-
-    /**
-     * 移交文件
-     * @param $originalUserid
-     * @param $newUserid
-     * @return void
-     */
-    public static function transfer($originalUserid, $newUserid)
-    {
-        if (!self::whereUserid($originalUserid)->exists()) {
-            return;
-        }
-
-        // 创建一个文件夹存放移交的文件
-        $name = User::userid2nickname($originalUserid) ?: ('ID:' . $originalUserid);
-        $file = File::createInstance([
-            'pid' => 0,
-            'name' => "【{$name}】移交的文件",
-            'type' => "folder",
-            'ext' => "",
-            'userid' => $newUserid,
-            'created_id' => 0,
-        ]);
-        $file->handleDuplicateName();
-        $file->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

@@ -8,8 +8,9 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Response;
 
 /**
- * App\Models\FileContent
+ * Class FileContent
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $fid 文件ID
  * @property string|null $content 内容
@@ -41,93 +42,43 @@ class FileContent extends AbstractModel
     use SoftDeletes;
 
     /**
-     * 转预览地址
-     * @param array $array
-     * @return string
-     */
-    public static function toPreviewUrl($array)
-    {
-        $fileExt = $array['ext'];
-        $fileName = $array['name'];
-        $filePath = $array['path'];
-        $name = Base::rightDelete($fileName, ".{$fileExt}") . ".{$fileExt}";
-        $key = urlencode(Base::urlAddparameter($filePath, [
-            'name' => $name,
-            'ext' => $fileExt
-        ]));
-        return Base::fillUrl("online/preview/{$name}?key={$key}");
-    }
-
-    /**
-     * 转预览地址
-     * @param File $file
+     * 获取格式内容
+     * @param $type
      * @param $content
-     * @return string
-     */
-    public static function formatPreview($file, $content)
-    {
-        $content = Base::json2array($content ?: []);
-        $filePath = $content['url'];
-        if (in_array($file->type, ['word', 'excel', 'ppt'])) {
-            if (empty($content)) {
-                $filePath = 'assets/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $file->type);
-            }
-        }
-        return self::toPreviewUrl([
-            'ext' => $file->ext,
-            'name' => $file->name,
-            'path' => $filePath,
-        ]);
-    }
-
-    /**
-     * 获取格式内容（或下载）
-     * @param File $file
-     * @param $content
-     * @param $download
      * @return array|\Symfony\Component\HttpFoundation\BinaryFileResponse
      */
-    public static function formatContent($file, $content, $download = false)
+    public static function formatContent($type, $content)
     {
-        $name = $file->ext ? "{$file->name}.{$file->ext}" : null;
-        $content = Base::json2array($content ?: []);
-        if (in_array($file->type, ['word', 'excel', 'ppt'])) {
+        $content = Base::json2array($content);
+        if (in_array($type, ['word', 'excel', 'ppt'])) {
             if (empty($content)) {
-                return Response::download(public_path('assets/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $file->type)), $name);
+                return Response::download(resource_path('assets/statics/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $type)));
             }
-            return Response::download(public_path($content['url']), $name);
+            return Response::download(public_path($content['url']));
         }
         if (empty($content)) {
-            $content = match ($file->type) {
+            $content = match ($type) {
                 'document' => [
-                    "type" => $file->ext,
+                    "type" => "md",
                     "content" => "",
                 ],
+                'sheet' => [
+                    [
+                        "name" => "Sheet1",
+                        "config" => json_decode('{}'),
+                    ]
+                ],
                 default => json_decode('{}'),
             };
-            if ($download) {
-                abort(403, "This file is empty.");
-            }
         } else {
-            $path = $content['url'];
-            if ($file->ext) {
-                $res = File::formatFileData([
-                    'path' => $path,
-                    'ext' => $file->ext,
-                    'size' => $file->size,
-                    'name' => $file->name,
-                ]);
-                $content = $res['content'];
-            } else {
-                $content['preview'] = false;
-            }
-            if ($download) {
-                $filePath = public_path($path);
-                if (isset($filePath)) {
-                    return Response::download($filePath, $name);
-                } else {
-                    abort(403, "This file not support download.");
+            $content['preview'] = false;
+            if ($content['ext'] && !in_array($content['ext'], ['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx'])) {
+                $url = 'http://' . env('APP_IPPR') . '.3/' . $content['url'];
+                if ($type == 'image') {
+                    $url = Base::fillUrl($content['url']);
                 }
+                $content['url'] = base64_encode($url);
+                $content['preview'] = true;
             }
         }
         return Base::retSuccess('success', [ 'content' => $content ]);

app/Models/FileLink.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Models;
-
-/**
- * App\Models\FileLink
- *
- * @property int $id
- * @property int|null $file_id 文件ID
- * @property int|null $num 累计访问
- * @property string|null $code 链接码
- * @property int|null $userid 会员ID
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read \App\Models\File|null $file
- * @method static \Illuminate\Database\Eloquent\Builder|FileLink newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|FileLink newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|FileLink query()
- * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereCode($value)
- * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereFileId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereNum($value)
- * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereUserid($value)
- * @mixin \Eloquent
- */
-class FileLink extends AbstractModel
-{
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
-    public function file(): \Illuminate\Database\Eloquent\Relations\HasOne
-    {
-        return $this->hasOne(File::class, 'id', 'file_id');
-    }
-}

app/Models/FileUser.php

@@ -4,12 +4,12 @@ namespace App\Models;
 
 
 /**
- * App\Models\FileUser
+ * Class FileUser
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $file_id 项目ID
  * @property int|null $userid 成员ID
- * @property int|null $permission 权限：0只读，1读写
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser newModelQuery()
@@ -18,41 +18,10 @@ namespace App\Models;
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereFileId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|FileUser wherePermission($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereUserid($value)
  * @mixin \Eloquent
  */
 class FileUser extends AbstractModel
 {
-    /**
-     * 删除所有共享成员（同时删除成员分享的链接）
-     * @param $file_id
-     * @param int $retain_link_userid       保留指定会员的链接
-     * @return mixed
-     */
-    public static function deleteFileAll($file_id, $retain_link_userid = 0)
-    {
-        return AbstractModel::transaction(function() use ($retain_link_userid, $file_id) {
-            if ($retain_link_userid > 0) {
-                FileLink::whereFileId($file_id)->where('userid', '!=', $retain_link_userid)->delete();
-            } else {
-                FileLink::whereFileId($file_id)->delete();
-            }
-            FileUser::whereFileId($file_id)->delete();
-        });
-    }
-    /**
-     * 删除指定共享成员（同时删除成员分享的链接）
-     * @param $file_id
-     * @param $userid
-     * @return mixed
-     */
-    public static function deleteFileUser($file_id, $userid)
-    {
-        return AbstractModel::transaction(function() use ($userid, $file_id) {
-            FileLink::whereFileId($file_id)->whereUserid($userid)->delete();
-            return self::whereFileId($file_id)->whereUserid($userid)->delete();
-        });
-    }
 }

app/Models/Meeting.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Models;
-
-/**
- * App\Models\Meeting
- *
- * @property int $id
- * @property string|null $meetingid 会议ID，不是数字
- * @property string|null $name 会议主题
- * @property string|null $channel 频道
- * @property int|null $userid 创建人
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property \Illuminate\Support\Carbon|null $end_at
- * @property \Illuminate\Support\Carbon|null $deleted_at
- * @method static \Illuminate\Database\Eloquent\Builder|Meeting newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|Meeting newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|Meeting query()
- * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereChannel($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereEndAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereMeetingid($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereUserid($value)
- * @mixin \Eloquent
- */
-class Meeting extends AbstractModel
-{
-
-}

app/Models/Project.php

@@ -3,39 +3,40 @@
 namespace App\Models;
 
 use App\Exceptions\ApiException;
-use App\Module\Base;
 use App\Tasks\PushTask;
-use Arr;
 use Carbon\Carbon;
-use DB;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Request;
 
 /**
- * App\Models\Project
+ * Class Project
  *
+ * @package App\Models
  * @property int $id
  * @property string|null $name 名称
  * @property string|null $desc 描述、备注
  * @property int|null $userid 创建人
- * @property int|null $personal 是否个人项目
- * @property string|null $user_simple 成员总数|1,2,3
- * @property int|null $dialog_id 聊天会话ID
+ * @property int|mixed $dialog_id 聊天会话ID
  * @property string|null $archived_at 归档时间
  * @property int|null $archived_userid 归档会员
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
  * @property-read int $owner_userid
+ * @property-read int $task_complete
+ * @property-read int $task_my_complete
+ * @property-read int $task_my_num
+ * @property-read int $task_my_percent
+ * @property-read int $task_num
+ * @property-read int $task_percent
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectColumn[] $projectColumn
  * @property-read int|null $project_column_count
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectLog[] $projectLog
  * @property-read int|null $project_log_count
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectUser[] $projectUser
  * @property-read int|null $project_user_count
- * @method static \Illuminate\Database\Eloquent\Builder|Project allData($userid = null)
- * @method static \Illuminate\Database\Eloquent\Builder|Project authData($userid = null, $owner = null)
+ * @method static \Illuminate\Database\Eloquent\Builder|Project authData($userid = null)
  * @method static \Illuminate\Database\Eloquent\Builder|Project newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Project newQuery()
  * @method static \Illuminate\Database\Query\Builder|Project onlyTrashed()
@@ -48,9 +49,7 @@ use Request;
  * @method static \Illuminate\Database\Eloquent\Builder|Project whereDialogId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Project whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Project whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Project wherePersonal($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Project whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Project whereUserSimple($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Project whereUserid($value)
  * @method static \Illuminate\Database\Query\Builder|Project withTrashed()
  * @method static \Illuminate\Database\Query\Builder|Project withoutTrashed()
@@ -60,14 +59,99 @@ class Project extends AbstractModel
 {
     use SoftDeletes;
 
-    protected $hidden = [
-        'deleted_at',
+    const projectSelect = [
+        'projects.*',
+        'project_users.owner',
     ];
 
     protected $appends = [
+        'task_num',
+        'task_complete',
+        'task_percent',
+        'task_my_num',
+        'task_my_complete',
+        'task_my_percent',
         'owner_userid',
     ];
 
+    /**
+     * 生成任务数据
+     */
+    private function generateTaskData()
+    {
+        if (!isset($this->appendattrs['task_num'])) {
+            $builder = ProjectTask::whereProjectId($this->id)->whereParentId(0)->whereNull('archived_at');
+            $this->appendattrs['task_num'] = $builder->count();
+            $this->appendattrs['task_complete'] = $builder->whereNotNull('complete_at')->count();
+            $this->appendattrs['task_percent'] = $this->appendattrs['task_num'] ? intval($this->appendattrs['task_complete'] / $this->appendattrs['task_num'] * 100) : 0;
+            //
+            $builder = ProjectTask::whereProjectId($this->id)->whereParentId(0)->authData(User::userid())->whereNull('archived_at');
+            $this->appendattrs['task_my_num'] = $builder->count();
+            $this->appendattrs['task_my_complete'] = $builder->whereNotNull('complete_at')->count();
+            $this->appendattrs['task_my_percent'] = $this->appendattrs['task_my_num'] ? intval($this->appendattrs['task_my_complete'] / $this->appendattrs['task_my_num'] * 100) : 0;
+        }
+    }
+
+    /**
+     * 任务数量
+     * @return int
+     */
+    public function getTaskNumAttribute()
+    {
+        $this->generateTaskData();
+        return $this->appendattrs['task_num'];
+    }
+
+    /**
+     * 任务完成数量
+     * @return int
+     */
+    public function getTaskCompleteAttribute()
+    {
+        $this->generateTaskData();
+        return $this->appendattrs['task_complete'];
+    }
+
+    /**
+     * 任务完成率
+     * @return int
+     */
+    public function getTaskPercentAttribute()
+    {
+        $this->generateTaskData();
+        return $this->appendattrs['task_percent'];
+    }
+
+    /**
+     * 任务数量（我的）
+     * @return int
+     */
+    public function getTaskMyNumAttribute()
+    {
+        $this->generateTaskData();
+        return $this->appendattrs['task_my_num'];
+    }
+
+    /**
+     * 任务完成数量（我的）
+     * @return int
+     */
+    public function getTaskMyCompleteAttribute()
+    {
+        $this->generateTaskData();
+        return $this->appendattrs['task_my_complete'];
+    }
+
+    /**
+     * 任务完成率（我的）
+     * @return int
+     */
+    public function getTaskMyPercentAttribute()
+    {
+        $this->generateTaskData();
+        return $this->appendattrs['task_my_percent'];
+    }
+
     /**
      * 负责人会员ID
      * @return int
@@ -75,7 +159,7 @@ class Project extends AbstractModel
     public function getOwnerUseridAttribute()
     {
         if (!isset($this->appendattrs['owner_userid'])) {
-            $ownerUser = ProjectUser::whereProjectId($this->id)->whereOwner(1)->first();
+            $ownerUser = $this->projectUser->where('owner', 1)->first();
             $this->appendattrs['owner_userid'] = $ownerUser ? $ownerUser->userid : 0;
         }
         return $this->appendattrs['owner_userid'];
@@ -106,73 +190,19 @@ class Project extends AbstractModel
     }
 
     /**
-     * 查询所有项目（与正常查询多返回owner字段）
+     * 查询自己的项目
      * @param self $query
      * @param null $userid
      * @return self
      */
-    public function scopeAllData($query, $userid = null)
+    public function scopeAuthData($query, $userid = null)
     {
         $userid = $userid ?: User::userid();
-        $query
-            ->select([
-                'projects.*',
-                'project_users.owner',
-                'project_users.top_at',
-            ])
-            ->leftJoin('project_users', function ($leftJoin) use ($userid) {
-                $leftJoin
-                    ->on('project_users.userid', '=', DB::raw($userid))
-                    ->on('projects.id', '=', 'project_users.project_id');
-            });
-        return $query;
-    }
-
-    /**
-     * 查询自己负责或参与的项目
-     * @param self $query
-     * @param null $userid
-     * @param null $owner
-     * @return self
-     */
-    public function scopeAuthData($query, $userid = null, $owner = null)
-    {
-        $userid = $userid ?: User::userid();
-        $query
-            ->select([
-                'projects.*',
-                'project_users.owner',
-                'project_users.top_at',
-            ])
-            ->join('project_users', 'projects.id', '=', 'project_users.project_id')
+        $query->join('project_users', 'projects.id', '=', 'project_users.project_id')
             ->where('project_users.userid', $userid);
-        if ($owner !== null) {
-            $query->where('project_users.owner', $owner);
-        }
         return $query;
     }
 
-    /**
-     * 获取任务统计数据
-     * @param $userid
-     * @return array
-     */
-    public function getTaskStatistics($userid)
-    {
-        $array = [];
-        $builder = ProjectTask::whereProjectId($this->id)->whereNull('archived_at');
-        $array['task_num'] = $builder->count();
-        $array['task_complete'] = $builder->whereNotNull('complete_at')->count();
-        $array['task_percent'] = $array['task_num'] ? intval($array['task_complete'] / $array['task_num'] * 100) : 0;
-        //
-        $builder = ProjectTask::authData($userid, 1)->where('project_tasks.project_id', $this->id)->whereNull('project_tasks.archived_at');
-        $array['task_my_num'] = $builder->count();
-        $array['task_my_complete'] = $builder->whereNotNull('project_tasks.complete_at')->count();
-        $array['task_my_percent'] = $array['task_my_num'] ? intval($array['task_my_complete'] / $array['task_my_num'] * 100) : 0;
-        //
-        return $array;
-    }
-
     /**
      * 加入项目
      * @param int $userid   加入的会员ID
@@ -207,11 +237,9 @@ class Project extends AbstractModel
                 WebSocketDialogUser::updateInsert([
                     'dialog_id' => $this->dialog_id,
                     'userid' => $userid,
-                ], [
-                    'important' => 1
                 ]);
             }
-            WebSocketDialogUser::whereDialogId($this->dialog_id)->whereNotIn('userid', $userids)->whereImportant(1)->delete();
+            WebSocketDialogUser::whereDialogId($this->dialog_id)->whereNotIn('userid', $userids)->delete();
         });
     }
 
@@ -221,7 +249,7 @@ class Project extends AbstractModel
      */
     public function relationUserids()
     {
-        return ProjectUser::whereProjectId($this->id)->orderBy('id')->pluck('userid')->toArray();
+        return $this->projectUser->pluck('userid')->toArray();
     }
 
     /**
@@ -249,7 +277,6 @@ class Project extends AbstractModel
             if ($archived_at === null) {
                 // 取消归档
                 $this->archived_at = null;
-                $this->archived_userid = User::userid();
                 $this->addLog("项目取消归档");
                 $this->pushMsg('add', $this);
                 ProjectTask::whereProjectId($this->id)->whereArchivedFollow(1)->update([
@@ -295,23 +322,18 @@ class Project extends AbstractModel
     /**
      * 添加项目日志
      * @param string $detail
-     * @param array $record
      * @param int $userid
      * @return ProjectLog
      */
-    public function addLog($detail, $record = [], $userid = 0)
+    public function addLog($detail, $userid = 0)
     {
-        $array = [
+        $log = ProjectLog::createInstance([
             'project_id' => $this->id,
             'column_id' => 0,
             'task_id' => 0,
             'userid' => $userid ?: User::userid(),
             'detail' => $detail,
-        ];
-        if ($record) {
-            $array['record'] = $record;
-        }
-        $log = ProjectLog::createInstance($array);
+        ]);
         $log->save();
         return $log;
     }
@@ -319,267 +341,45 @@ class Project extends AbstractModel
     /**
      * 推送消息
      * @param string $action
-     * @param array|self $data      发送内容，默认为[id=>项目ID]
-     * @param array $userid         指定会员，默认为项目所有成员
+     * @param array $data       发送内容，默认为[id=>项目ID]
+     * @param array $userid     指定会员，默认为项目所有成员
      */
     public function pushMsg($action, $data = null, $userid = null)
     {
         if ($data === null) {
             $data = ['id' => $this->id];
-        } elseif ($data instanceof self) {
-            $data = $data->toArray();
         }
-        //
-        $array = [$userid, []];
         if ($userid === null) {
-            $array[0] = $this->relationUserids();
-        } elseif (!is_array($userid)) {
-            $array[0] = [$userid];
+            $userid = $this->relationUserids();
         }
-        //
-        if (isset($data['owner'])) {
-            $owners = ProjectUser::whereProjectId($data['id'])->whereOwner(1)->pluck('userid')->toArray();
-            $array = [array_intersect($array[0], $owners), array_diff($array[0], $owners)];
-        }
-        //
-        foreach ($array as $index => $item) {
-            if ($index > 0) {
-                $data['owner'] = 0;
-            }
-            $params = [
-                'ignoreFd' => Request::header('fd'),
-                'userid' => array_values($item),
-                'msg' => [
-                    'type' => 'project',
-                    'action' => $action,
-                    'data' => $data,
-                ]
-            ];
-            $task = new PushTask($params, false);
-            Task::deliver($task);
-        }
-    }
-
-    /**
-     * 添加工作流
-     * @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 $params
-     * - name   项目名称
-     * - desc
-     * - flow
-     * - personal
-     * - columns
-     * @return array
-     */
-    public static function createProject($params, $userid)
-    {
-        $name = trim(Arr::get($params, 'name', ''));
-        $desc = trim(Arr::get($params, 'desc', ''));
-        $flow = trim(Arr::get($params, 'flow', 'close'));
-        $isPersonal = intval(Arr::get($params, 'personal'));
-        if (mb_strlen($name) < 2) {
-            return Base::retError('项目名称不可以少于2个字');
-        } elseif (mb_strlen($name) > 32) {
-            return Base::retError('项目名称最多只能设置32个字');
-        }
-        if (mb_strlen($desc) > 255) {
-            return Base::retError('项目介绍最多只能设置255个字');
-        }
-        // 列表
-        $columns = explode(",", Arr::get($params, 'columns'));
-        $insertColumns = [];
-        $sort = 0;
-        foreach ($columns AS $column) {
-            $column = trim($column);
-            if ($column) {
-                $insertColumns[] = [
-                    'name' => $column,
-                    'sort' => $sort++,
-                ];
-            }
-        }
-        if (empty($insertColumns)) {
-            $insertColumns[] = [
-                'name' => 'Default',
-                'sort' => 0,
-            ];
-        }
-        if (count($insertColumns) > 30) {
-            return Base::retError('项目列表最多不能超过30个');
-        }
-        // 开始创建
-        $project = Project::createInstance([
-            'name' => $name,
-            'desc' => $desc,
+        $params = [
+            'ignoreFd' => Request::header('fd'),
             'userid' => $userid,
-        ]);
-        if ($isPersonal) {
-            if (Project::whereUserid($userid)->wherePersonal(1)->exists()) {
-                return Base::retError('个人项目已存在，无须重复创建');
-            }
-            $project->personal = 1;
-        }
-        AbstractModel::transaction(function() use ($flow, $insertColumns, $project) {
-            $project->save();
-            ProjectUser::createInstance([
-                'project_id' => $project->id,
-                'userid' => $project->userid,
-                'owner' => 1,
-            ])->save();
-            foreach ($insertColumns AS $column) {
-                $column['project_id'] = $project->id;
-                ProjectColumn::createInstance($column)->save();
-            }
-            $dialog = WebSocketDialog::createGroup(null, $project->userid, 'project');
-            if (empty($dialog)) {
-                throw new ApiException('创建项目聊天室失败');
-            }
-            $project->dialog_id = $dialog->id;
-            $project->save();
-            //
-            if ($flow == 'open') {
-                $project->addFlow(Base::json2array('[{"id":-10,"name":"待处理","status":"start","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0},{"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);
-        $data->addLog("创建项目");
-        $data->pushMsg('add', $data);
-        return Base::retSuccess('添加成功', $data);
+            'msg' => [
+                'type' => 'project',
+                'action' => $action,
+                'data' => $data,
+            ]
+        ];
+        $task = new PushTask($params, false);
+        Task::deliver($task);
     }
 
     /**
-     * 获取项目信息（用于判断会员是否存在项目内）
+     * 根据用户获取项目信息（用于判断会员是否存在项目内）
      * @param int $project_id
-     * @param null|bool $archived true:仅限未归档, false:仅限已归档, null:不限制
-     * @param null|bool $mustOwner true:仅限项目负责人, false:仅限非项目负责人, null:不限制
+     * @param bool $ignoreArchived 排除已归档
      * @return self
      */
-    public static function userProject($project_id, $archived = true, $mustOwner = null)
+    public static function userProject($project_id, $ignoreArchived = true)
     {
-        $project = self::authData()->where('projects.id', intval($project_id))->first();
+        $project = self::select(self::projectSelect)->authData()->where('projects.id', intval($project_id))->first();
         if (empty($project)) {
             throw new ApiException('项目不存在或不在成员列表内', [ 'project_id' => $project_id ], -4001);
         }
-        if ($archived === true && $project->archived_at != null) {
+        if ($ignoreArchived && $project->archived_at != null) {
             throw new ApiException('项目已归档', [ 'project_id' => $project_id ], -4001);
         }
-        if ($archived === false && $project->archived_at == null) {
-            throw new ApiException('项目未归档', [ 'project_id' => $project_id ]);
-        }
-        if ($mustOwner === true && !$project->owner) {
-            throw new ApiException('仅限项目负责人操作', [ 'project_id' => $project_id ]);
-        }
-        if ($mustOwner === false && $project->owner) {
-            throw new ApiException('禁止项目负责人操作', [ 'project_id' => $project_id ]);
-        }
         return $project;
     }
 }

app/Models/ProjectColumn.php

@@ -9,8 +9,9 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Request;
 
 /**
- * App\Models\ProjectColumn
+ * Class ProjectColumn
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property string|null $name 列表名称

app/Models/ProjectFlow.php

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

app/Models/ProjectFlowItem.php

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

app/Models/ProjectInvite.php

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

app/Models/ProjectLog.php

@@ -2,21 +2,18 @@
 
 namespace App\Models;
 
-use App\Module\Base;
-
 /**
- * App\Models\ProjectLog
+ * Class ProjectLog
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $column_id 列表ID
- * @property int|null $task_id 任务ID
+ * @property int|null $task_id 项目ID
  * @property int|null $userid 会员ID
  * @property string|null $detail 详细信息
- * @property array $record 记录数据
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read \App\Models\ProjectTask|null $projectTask
  * @property-read \App\Models\User|null $user
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog newQuery()
@@ -26,7 +23,6 @@ use App\Module\Base;
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereDetail($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereProjectId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereRecord($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereTaskId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereUserid($value)
@@ -35,18 +31,6 @@ use App\Module\Base;
 class ProjectLog extends AbstractModel
 {
 
-    /**
-     * @param $value
-     * @return array
-     */
-    public function getRecordAttribute($value)
-    {
-        if (is_array($value)) {
-            return $value;
-        }
-        return Base::json2array($value);
-    }
-
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
      */
@@ -55,12 +39,4 @@ class ProjectLog extends AbstractModel
         return $this->hasOne(User::class, 'userid', 'userid');
     }
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
-    public function projectTask(): \Illuminate\Database\Eloquent\Relations\HasOne
-    {
-        return $this->hasOne(ProjectTask::class, 'id', 'task_id');
-    }
-
 }

app/Models/ProjectTaskContent.php

@@ -2,11 +2,10 @@
 
 namespace App\Models;
 
-use App\Module\Base;
-
 /**
- * App\Models\ProjectTaskContent
+ * Class ProjectTaskContent
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $task_id 任务ID
@@ -30,55 +29,4 @@ 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))) {
-                $paramet = getimagesize(public_path($tmpPath));
-                $content = str_replace($matchs[0][$key], '<img src="{{RemoteURL}}' . $tmpPath . '" original-width="' . $paramet[0] . '" original-height="' . $paramet[1] . '"', $content);
-            }
-        }
-        $pattern = '/<img(.*?)src=("|\')https*:\/\/(.*?)\/(uploads\/task\/content\/(.*?))\2/is';
-        $content = preg_replace($pattern, '<img$1src=$2{{RemoteURL}}$4$2', $content);
-        //
-        $filePath = $path . md5($content);
-        $publicPath = public_path($filePath);
-        Base::makeDir(dirname($publicPath));
-        file_put_contents($publicPath, $content);
-        //
-        return $filePath;
-    }
 }

app/Models/ProjectTaskFile.php

@@ -3,25 +3,23 @@
 namespace App\Models;
 
 use App\Module\Base;
-use Cache;
 
 /**
- * App\Models\ProjectTaskFile
+ * Class ProjectTaskFile
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $task_id 任务ID
  * @property string|null $name 文件名称
  * @property int|null $size 文件大小(B)
  * @property string|null $ext 文件格式
- * @property string $path 文件地址
- * @property string $thumb 缩略图
+ * @property string|null $path 文件地址
+ * @property string|null $thumb 缩略图
  * @property int|null $userid 上传用户ID
  * @property int|null $download 下载次数
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read int $height
- * @property-read int $width
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFile newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFile newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFile query()
@@ -41,11 +39,6 @@ use Cache;
  */
 class ProjectTaskFile extends AbstractModel
 {
-    protected $appends = [
-        'width',
-        'height',
-    ];
-
     /**
      * 地址
      * @param $value
@@ -65,50 +58,4 @@ class ProjectTaskFile extends AbstractModel
     {
         return Base::fillUrl($value ?: Base::extIcon($this->ext));
     }
-
-    /**
-     * 宽
-     * @return int
-     */
-    public function getWidthAttribute()
-    {
-        $this->generateSizeData();
-        return $this->appendattrs['width'];
-    }
-
-    /**
-     * 高
-     * @return int
-     */
-    public function getHeightAttribute()
-    {
-        $this->generateSizeData();
-        return $this->appendattrs['height'];
-    }
-
-    /**
-     * 生成尺寸数据
-     */
-    private function generateSizeData()
-    {
-        if (!isset($this->appendattrs['width'])) {
-            $width = -1;
-            $height = -1;
-            if (in_array($this->ext, ['jpg', 'jpeg', 'gif', 'png'])) {
-                $path = public_path($this->getRawOriginal('path'));
-                [$width, $height] = Cache::remember("File::size-" . md5($path), now()->addDays(7), function () use ($path) {
-                    $width = -1;
-                    $height = -1;
-                    if (file_exists($path)) {
-                        $paramet = getimagesize($path);
-                        $width = $paramet[0];
-                        $height = $paramet[1];
-                    }
-                    return [$width, $height];
-                });
-            }
-            $this->appendattrs['width'] = $width;
-            $this->appendattrs['height'] = $height;
-        }
-    }
 }

app/Models/ProjectTaskFlowChange.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Models;
-
-/**
- * App\Models\ProjectTaskFlowChange
- *
- * @property int $id
- * @property int|null $task_id 任务ID
- * @property int|null $userid 会员ID
- * @property int|null $before_flow_item_id （变化前）工作流状态ID
- * @property string|null $before_flow_item_name （变化前）工作流状态名称
- * @property int|null $after_flow_item_id （变化后）工作流状态ID
- * @property string|null $after_flow_item_name （变化后）工作流状态名称
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @method static \Illuminate\Database\Eloquent\Builder|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

@@ -1,45 +0,0 @@
-<?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 提醒类型：0 任务开始提醒，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/ProjectTaskTag.php

@@ -3,8 +3,9 @@
 namespace App\Models;
 
 /**
- * App\Models\ProjectTaskTag
+ * Class ProjectTaskTag
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $task_id 任务ID

app/Models/ProjectTaskUser.php

@@ -3,8 +3,9 @@
 namespace App\Models;
 
 /**
- * App\Models\ProjectTaskUser
+ * Class ProjectTaskUser
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $task_id 任务ID
@@ -13,7 +14,6 @@ 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()
@@ -30,45 +30,4 @@ namespace App\Models;
 class ProjectTaskUser extends AbstractModel
 {
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
-    public function projectTask(): \Illuminate\Database\Eloquent\Relations\HasOne
-    {
-        return $this->hasOne(ProjectTask::class, 'id', 'task_id');
-    }
-
-    /**
-     * 移交任务身份
-     * @param $originalUserid
-     * @param $newUserid
-     * @return void
-     */
-    public static function transfer($originalUserid, $newUserid)
-    {
-        self::whereUserid($originalUserid)->chunk(100, function ($list) use ($originalUserid, $newUserid) {
-            $tastIds = [];
-            /** @var self $item */
-            foreach ($list as $item) {
-                $row = self::whereTaskId($item->task_id)->whereUserid($newUserid)->first();
-                if ($row) {
-                    // 已存在则删除原数据，判断改变已存在的数据
-                    $row->owner = max($row->owner, $item->owner);
-                    $row->save();
-                    $item->delete();
-                } else {
-                    // 不存在则改变原数据
-                    $item->userid = $newUserid;
-                    $item->save();
-                }
-                if ($item->projectTask) {
-                    $item->projectTask->addLog("移交{任务}身份", ['userid' => [$originalUserid, ' => ',$newUserid]]);
-                    if (!in_array($item->task_pid, $tastIds)) {
-                        $tastIds[] = $item->task_pid;
-                        $item->projectTask->syncDialogUser();
-                    }
-                }
-            }
-        });
-    }
 }

app/Models/ProjectUser.php

@@ -5,13 +5,13 @@ namespace App\Models;
 use App\Module\Base;
 
 /**
- * App\Models\ProjectUser
+ * Class ProjectUser
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $userid 成员ID
  * @property int|null $owner 是否负责人
- * @property 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
@@ -22,7 +22,6 @@ 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
@@ -38,59 +37,17 @@ class ProjectUser extends AbstractModel
         return $this->hasOne(Project::class, 'id', 'project_id');
     }
 
-    /**
-     * 移交项目身份
-     * @param $originalUserid
-     * @param $newUserid
-     * @return void
-     */
-    public static function transfer($originalUserid, $newUserid)
-    {
-        self::whereUserid($originalUserid)->chunkById(100, function ($list) use ($originalUserid, $newUserid) {
-            /** @var self $item */
-            foreach ($list as $item) {
-                $row = self::whereProjectId($item->project_id)->whereUserid($newUserid)->first();
-                if ($row) {
-                    // 已存在则删除原数据，判断改变已存在的数据
-                    $row->owner = max($row->owner, $item->owner);
-                    $row->save();
-                    $item->delete();
-                } else {
-                    // 不存在则改变原数据
-                    $item->userid = $newUserid;
-                    $item->save();
-                }
-                if ($item->project) {
-                    if ($item->project->personal) {
-                        $name = User::userid2nickname($originalUserid) ?: ('ID:' . $originalUserid);
-                        $item->project->name = "【{$name}】{$item->project->name}";
-                        $item->project->save();
-                    }
-                    $item->project->addLog("移交项目身份", ['userid' => [$originalUserid, ' => ', $newUserid]]);
-                    $item->project->syncDialogUser();
-                }
-            }
-        });
-    }
-
     /**
      * 退出项目
      */
     public function exitProject()
     {
-        ProjectTaskUser::whereProjectId($this->project_id)
-            ->whereUserid($this->userid)
-            ->chunk(100, function ($list) {
-                $tastIds = [];
-                /** @var ProjectTaskUser $item */
-                foreach ($list as $item) {
-                    $item->delete();
-                    if (!in_array($item->task_pid, $tastIds)) {
-                        $tastIds[] = $item->task_pid;
-                        $item->projectTask?->syncDialogUser();
-                    }
-                }
-            });
+        $tasks = ProjectTask::whereProjectId($this->project_id)->authData($this->userid)->get();
+        foreach ($tasks as $task) {
+            if (ProjectTaskUser::whereTaskId($task->id)->whereUserid($this->userid)->delete()) {
+                $task->syncDialogUser();
+            }
+        }
         $this->delete();
     }
 }

app/Models/Report.php

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

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * App\Models\ReportReceive
- *
- * @property int $id
- * @property int $rid
- * @property 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/Setting.php

@@ -3,8 +3,9 @@
 namespace App\Models;
 
 /**
- * App\Models\Setting
+ * Class Setting
  *
+ * @package App\Models
  * @property int $id
  * @property string|null $name
  * @property string|null $desc 参数描述、备注

app/Models/Tmp.php

@@ -3,8 +3,9 @@
 namespace App\Models;
 
 /**
- * App\Models\Tmp
+ * Class Tmp
  *
+ * @package App\Models
  * @property int $id
  * @property string|null $name
  * @property string|null $value

app/Models/UmengAlias.php

@@ -1,169 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Module\Base;
-use Carbon\Carbon;
-use Hedeqiang\UMeng\Android;
-use Hedeqiang\UMeng\IOS;
-
-/**
- * App\Models\UmengAlias
- *
- * @property int $id
- * @property int|null $userid 会员ID
- * @property string|null $alias 别名
- * @property string|null $platform 平台类型
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias query()
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereAlias($value)
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias wherePlatform($value)
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUserid($value)
- * @mixin \Eloquent
- */
-class UmengAlias extends AbstractModel
-{
-    protected $table = 'umeng_alias';
-
-    /**
-     * 获取推送配置
-     * @return array|false
-     */
-    public static function getPushConfig()
-    {
-        $setting = Base::setting('appPushSetting');
-        if ($setting['push'] !== 'open') {
-            return false;
-        }
-        $config = [];
-        if ($setting['ios_key']) {
-            $config['iOS'] = [
-                'appKey' => $setting['ios_key'],
-                'appMasterSecret' => $setting['ios_secret'],
-                'production_mode' => true,
-            ];
-        }
-        if ($setting['android_key']) {
-            $config['Android'] = [
-                'appKey' => $setting['android_key'],
-                'appMasterSecret' => $setting['android_secret'],
-                'production_mode' => true,
-            ];
-        }
-        return $config;
-    }
-
-    /**
-     * 推送消息
-     * @param string $alias
-     * @param string $platform
-     * @param array $array [title, subtitle, body, description, extra, seconds, badge]
-     * @return array|false
-     */
-    public static function pushMsgToAlias($alias, $platform, $array)
-    {
-        $config = self::getPushConfig();
-        if ($config === false) {
-            return false;
-        }
-        //
-        $title = $array['title'] ?: '';                                         // 标题
-        $subtitle = $array['subtitle'] ?: '';                                   // 副标题（iOS）
-        $body = $array['body'] ?: '';                                           // 通知内容
-        $description = $array['description'] ?: 'no description';               // 描述
-        $extra = is_array($array['extra']) ? $array['extra'] : [];              // 额外参数
-        $seconds = intval($array['seconds']) ?: 86400;                          // 有效时间（单位：秒）
-        $badge = intval($array['badge']) ?: 0;                                  // 角标数（iOS）
-        //
-        switch ($platform) {
-            case 'ios':
-                if (!isset($config['iOS'])) {
-                    return false;
-                }
-                $ios = new IOS($config);
-                return $ios->send([
-                    'description' => $description,
-                    'payload' => array_merge([
-                        'aps' => [
-                            'alert' => [
-                                'title' => $title,
-                                'subtitle' => $subtitle,
-                                'body' => $body,
-                            ],
-                            'sound' => 'default',
-                            'badge' => $badge,
-                        ],
-                    ], $extra),
-                    'type' => 'customizedcast',
-                    'alias_type' => 'userid',
-                    'alias' => $alias,
-                    'policy' => [
-                        'expire_time' => Carbon::now()->addSeconds($seconds)->toDateTimeString(),
-                    ],
-                ]);
-
-            case 'android':
-                if (!isset($config['Android'])) {
-                    return false;
-                }
-                $android = new Android($config);
-                return $android->send([
-                    'description' => $description,
-                    'payload' => array_merge([
-                        'display_type' => 'notification',
-                        'body' => [
-                            'ticker' => $title,
-                            'text' => $body,
-                            'title' => $title,
-                            'after_open' => 'go_app',
-                            'play_sound' => true,
-                        ],
-                    ], $extra),
-                    'type' => 'customizedcast',
-                    'alias_type' => 'userid',
-                    'alias' => $alias,
-                    'policy' => [
-                        'expire_time' => Carbon::now()->addSeconds($seconds)->toDateTimeString(),
-                    ],
-                    'channel_properties' => [
-                        'channel_activity' => 'app.eeui.umeng.activity.MfrMessageActivity',
-                        'huawei_channel_importance' => 'NORMAL'
-                    ],
-                ]);
-
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * 推送给指定会员
-     * @param array|int $userid
-     * @param array $array
-     * @return void
-     */
-    public static function pushMsgToUserid($userid, $array)
-    {
-        $builder = self::select(['id', 'platform', 'alias']);
-        if (is_array($userid)) {
-            $builder->whereIn('userid', $userid);
-        } elseif (Base::isNumber($userid)) {
-            $builder->whereUserid($userid);
-        }
-        $builder
-            ->orderByDesc('id')
-            ->chunkById(100, function ($rows) use ($array) {
-                $lists = $rows->groupBy('platform');
-                foreach ($lists as $platform => $list) {
-                    $alias = $list->pluck('alias')->implode(',');
-                    self::pushMsgToAlias($alias, $platform, $array);
-                }
-            });
-    }
-}

app/Models/User.php

@@ -9,12 +9,12 @@ use Cache;
 use Carbon\Carbon;
 
 /**
- * App\Models\User
+ * Class User
  *
+ * @package App\Models
  * @property int $userid
  * @property array $identity 身份
  * @property string|null $az A-Z
- * @property string|null $pinyin 拼音（主要用于搜索）
  * @property string|null $email 邮箱
  * @property string $nickname 昵称
  * @property string|null $profession 职位/职称
@@ -29,11 +29,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 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)
  * @method static \Illuminate\Database\Eloquent\Builder|User newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|User newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|User query()
@@ -41,9 +38,7 @@ use Carbon\Carbon;
  * @method static \Illuminate\Database\Eloquent\Builder|User whereChangepass($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereCreatedIp($value)
- * @method static \Illuminate\Database\Eloquent\Builder|User 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)
@@ -53,7 +48,6 @@ use Carbon\Carbon;
  * @method static \Illuminate\Database\Eloquent\Builder|User whereLoginNum($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereNickname($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User wherePassword($value)
- * @method static \Illuminate\Database\Eloquent\Builder|User wherePinyin($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereProfession($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereTaskDialogId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereUpdatedAt($value)
@@ -69,8 +63,6 @@ class User extends AbstractModel
         'updated_at',
     ];
 
-    protected $defaultAvatarMode = 'auto'; // auto自动生成，system系统默认
-
     /**
      * 更新数据校验
      * @param array $param
@@ -101,17 +93,11 @@ class User extends AbstractModel
      */
     public function getUserimgAttribute($value)
     {
-        if ($value && !str_contains($value, 'avatar/')) {
+        if ($value) {
             return Base::fillUrl($value);
         }
-        if ($this->defaultAvatarMode === 'auto') {
-            // 自动生成头像
-            return url("avatar?name=" . urlencode($this->nickname));
-        } else {
-            // 系统默认头像
-            $name = ($this->userid - 1) % 21 + 1;
-            return url("images/avatar/default_{$name}.png");
-        }
+        $name = ($this->userid - 1) % 21 + 1;
+        return url("images/avatar/default_{$name}.png");
     }
 
     /**
@@ -178,16 +164,6 @@ class User extends AbstractModel
         }
     }
 
-    /**
-     * 删除会员
-     * @return bool|null
-     */
-    public function deleteUser()
-    {
-        UserEmailVerification::whereEmail($this->email)->delete();
-        return $this->delete();
-    }
-
     /** ***************************************************************************************** */
     /** ***************************************************************************************** */
     /** ***************************************************************************************** */
@@ -202,16 +178,10 @@ class User extends AbstractModel
     public static function reg($email, $password, $other = [])
     {
         //邮箱
-        if (!Base::isEmail($email)) {
+        if (!Base::isMail($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('邮箱地址已存在');
         }
         //密码
@@ -228,9 +198,8 @@ class User extends AbstractModel
             $inArray = array_merge($inArray, $other);
         }
         $user = User::createInstance($inArray);
-        $user->az = Base::getFirstCharter($user->nickname);
-        $user->pinyin = Base::cn2pinyin($user->nickname);
         $user->save();
+        User::AZUpdate($user->userid);
         return $user->find($user->userid);
     }
 
@@ -430,7 +399,7 @@ class User extends AbstractModel
         if (isset($_A["__static_userid2basic_" . $userid])) {
             return $_A["__static_userid2basic_" . $userid];
         }
-        $fields = ['userid', 'email', 'nickname', 'profession', 'userimg', 'az', 'pinyin', 'line_at', 'disable_at'];
+        $fields = ['userid', 'email', 'nickname', 'profession', 'userimg'];
         $userInfo = self::whereUserid($userid)->select($fields)->first();
         if ($userInfo) {
             $userInfo->online = $userInfo->getOnlineStatus();
@@ -450,6 +419,19 @@ class User extends AbstractModel
         return $basic ? $basic->nickname : '';
     }
 
+    /**
+     * 更新首字母
+     * @param $userid
+     */
+    public static function AZUpdate($userid)
+    {
+        $row = self::whereUserid($userid)->first();
+        if ($row) {
+            $row->az = Base::getFirstCharter($row->nickname);
+            $row->save();
+        }
+    }
+
     /**
      * 是否需要验证码
      * @param $email

app/Models/UserEmailVerification.php

@@ -1,80 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Exceptions\ApiException;
-use App\Module\Base;
-use Carbon\Carbon;
-use Guanguans\Notify\Factory;
-use Guanguans\Notify\Messages\EmailMessage;
-
-/**
- * App\Models\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 (\Throwable $e) {
-            if (str_contains($e->getMessage(), "Timed Out")) {
-                throw new ApiException("language.TimedOut");
-            } elseif ($e->getCode() === 550) {
-                throw new ApiException('邮件内容被拒绝，请检查邮箱是否开启接收功能');
-            } else {
-                throw new ApiException($e->getMessage());
-            }
-        }
-    }
-}

app/Models/UserTransfer.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Exceptions\ApiException;
-use App\Module\Base;
-use Carbon\Carbon;
-use Guanguans\Notify\Factory;
-use Guanguans\Notify\Messages\EmailMessage;
-
-/**
- * App\Models\UserTransfer
- *
- * @property int $id
- * @property int|null $original_userid 原作者
- * @property int|null $new_userid 交接人
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @method static \Illuminate\Database\Eloquent\Builder|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/WebSocket.php

@@ -4,13 +4,14 @@ namespace App\Models;
 
 
 /**
- * App\Models\WebSocket
+ * Class WebSocket
  *
+ * @package App\Models
  * @property int $id
  * @property string $key
  * @property string|null $fd
- * @property string|null $path
  * @property int|null $userid
+ * @property string|null $path
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocket newModelQuery()

app/Models/WebSocketDialog.php

@@ -3,20 +3,18 @@
 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;
 
 /**
- * App\Models\WebSocketDialog
+ * Class WebSocketDialog
  *
+ * @package App\Models
  * @property int $id
  * @property string|null $type 对话类型
  * @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
@@ -32,7 +30,6 @@ 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()
@@ -51,159 +48,6 @@ class WebSocketDialog extends AbstractModel
         return $this->hasMany(WebSocketDialogUser::class, 'dialog_id', 'id');
     }
 
-    /**
-     * 格式化对话
-     * @param int $userid   会员ID
-     * @param bool $hasData
-     * @return $this
-     */
-    public function formatData($userid, $hasData = false)
-    {
-        if (isset($this->search_msg_id)) {
-            // 最后消息 (搜索预览消息)
-            $this->last_msg = WebSocketDialogMsg::whereDialogId($this->id)->find($this->search_msg_id);
-            $this->last_at = $this->last_msg?->created_at;
-        } else {
-            // 最后消息
-            $this->last_msg = WebSocketDialogMsg::whereDialogId($this->id)->orderByDesc('id')->first();
-            // 未读信息
-            $unreadBuilder = WebSocketDialogMsgRead::whereDialogId($this->id)->whereUserid($userid)->whereReadAt(null);
-            $this->unread = $unreadBuilder->count();
-            $this->mention = 0;
-            $this->last_umid = 0;
-            if ($this->unread > 0) {
-                $this->mention = $unreadBuilder->clone()->whereMention(1)->count();
-                $this->last_umid = intval($unreadBuilder->clone()->orderByDesc('msg_id')->value('msg_id'));
-            }
-            $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 = WebSocketDialogUser::whereDialogId($this->id)->where('userid', '!=', $userid)->first();
-                if ($dialog_user->userid === 0) {
-                    $dialog_user->userid = $userid;
-                }
-                $basic = User::userid2basic($dialog_user->userid);
-                if ($basic) {
-                    $this->name = $basic->nickname;
-                } else {
-                    $this->name = 'non-existent';
-                    $this->dialog_delete = 1;
-                }
-                $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();
-                    if ($this->group_info) {
-                        $this->name = $this->group_info->name;
-                    } else {
-                        $this->name = '[Delete]';
-                        $this->dialog_delete = 1;
-                    }
-                } 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();
-                    if ($this->group_info) {
-                        $this->name = $this->group_info->name;
-                    } else {
-                        $this->name = '[Delete]';
-                        $this->dialog_delete = 1;
-                    }
-                }
-                break;
-        }
-        if ($hasData === true) {
-            $msgBuilder = WebSocketDialogMsg::whereDialogId($this->id);
-            $this->has_tag = $msgBuilder->clone()->whereMtype('tag')->exists();
-            $this->has_image = $msgBuilder->clone()->whereMtype('image')->exists();
-            $this->has_file = $msgBuilder->clone()->whereMtype('file')->exists();
-            $this->has_link = $msgBuilder->clone()->whereLink(1)->exists();
-        }
-        return $this;
-    }
-
-    /**
-     * 加入聊天室
-     * @param int|array $userid     加入的会员ID或会员ID组
-     * @param int $inviter          邀请人
-     * @return bool
-     */
-    public function joinGroup($userid, $inviter)
-    {
-        AbstractModel::transaction(function () use ($inviter, $userid) {
-            foreach (is_array($userid) ? $userid : [$userid] as $value) {
-                if ($value > 0) {
-                    WebSocketDialogUser::updateInsert([
-                        'dialog_id' => $this->id,
-                        'userid' => $value,
-                    ], [
-                        'inviter' => $inviter,
-                    ]);
-                    WebSocketDialogMsg::sendMsg($this->id, 0, 'notice', [
-                        'notice' => User::userid2nickname($value) . " 已加入群组"
-                    ], $inviter, true);
-                }
-            }
-        });
-        $this->pushMsg("groupUpdate", [
-            'id' => $this->id,
-            'people' => WebSocketDialogUser::whereDialogId($this->id)->count()
-        ]);
-        return true;
-    }
-
-    /**
-     * 退出聊天室
-     * @param int|array $userid     退出的会员ID或会员ID组
-     * @param $type
-     */
-    public function exitGroup($userid, $type = 'exit')
-    {
-        $typeDesc = $type === 'remove' ? '移出' : '退出';
-        AbstractModel::transaction(function () use ($typeDesc, $type, $userid) {
-            $builder = WebSocketDialogUser::whereDialogId($this->id);
-            if (is_array($userid)) {
-                $builder->whereIn('userid', $userid);
-            } else {
-                $builder->whereUserid($userid);
-            }
-            $builder->chunkById(100, function($list) use ($typeDesc, $type) {
-                /** @var WebSocketDialogUser $item */
-                foreach ($list as $item) {
-                    if ($type === 'remove' && !in_array(User::userid(), [$this->owner_id, $item->inviter])) {
-                        throw new ApiException('只有群主或邀请人可以移出成员');
-                    }
-                    if ($item->userid == $this->owner_id) {
-                        throw new ApiException('群主不可' . $typeDesc);
-                    }
-                    if ($item->important) {
-                        throw new ApiException('项目人员或任务人员不可' . $typeDesc);
-                    }
-                    $item->delete();
-                    //
-                    if ($type === 'remove') {
-                        $notice = User::nickname() . " 将 " . User::userid2nickname($item->userid) . " 移出群组";
-                    } else {
-                        $notice = User::userid2nickname($item->userid) . " 退出群组";
-                    }
-                    WebSocketDialogMsg::sendMsg($this->id, 0, 'notice', ['notice' => $notice], User::userid(), true);
-                }
-            });
-        });
-        //
-        $this->pushMsg("groupUpdate", [
-            'id' => $this->id,
-            'people' => WebSocketDialogUser::whereDialogId($this->id)->count()
-        ]);
-    }
-
     /**
      * 删除会话
      * @return bool
@@ -211,100 +55,20 @@ class WebSocketDialog extends AbstractModel
     public function deleteDialog()
     {
         AbstractModel::transaction(function () {
-            WebSocketDialogMsgRead::whereDialogId($this->id)
-                ->whereNull('read_at')
-                ->chunkById(100, function ($list) {
-                    WebSocketDialogMsgRead::onlyMarkRead($list);
-                });
+            WebSocketDialogMsgRead::whereDialogId($this->id)->whereNull('read_at')->update([
+                'read_at' => Carbon::now()
+            ]);
             $this->delete();
         });
         return true;
     }
 
-    /**
-     * 还原会话
-     * @return bool
-     */
-    public function recoveryDialog()
-    {
-        $this->restore();
-        return true;
-    }
-
-    /**
-     * 检查群组类型
-     * @param string|array|null $groupType
-     * @return void
-     */
-    public function checkGroup($groupType = null)
-    {
-        if ($this->type !== 'group') {
-            throw new ApiException('仅限群组操作');
-        }
-        if ($groupType) {
-            $groupTypes = is_array($groupType) ? $groupType : [$groupType];
-            if (!in_array($this->group_type, $groupTypes)) {
-                throw new ApiException('操作的群组类型错误');
-            }
-        }
-    }
-
-    /**
-     * 获取群组名称
-     * @return mixed|string|null
-     */
-    public function getGroupName()
-    {
-        if (!isset($this->appendattrs['groupName'])) {
-            $name = $this->name;
-            if ($this->type == "group") {
-                if ($this->group_type === 'project') {
-                    $name = \DB::table('projects')->where('dialog_id', $this->id)->value('name');
-                } elseif ($this->group_type === 'task') {
-                    $name = \DB::table('project_tasks')->where('dialog_id', $this->id)->value('name');
-                }
-            }
-            $this->appendattrs['groupName'] = $name;
-        }
-        return $this->appendattrs['groupName'];
-    }
-
-    /**
-     * 推送消息
-     * @param $action
-     * @param array $data           发送内容，默认为[id=>会话ID]
-     * @param array $userid         指定会员，默认为群组所有成员
-     * @return void
-     */
-    public function pushMsg($action, $data = null, $userid = null)
-    {
-        if ($data === null) {
-            $data = ['id' => $this->id];
-        }
-        //
-        if ($userid === null) {
-            $userid = $this->dialogUser->pluck('userid')->toArray();
-        }
-        //
-        $params = [
-            'userid' => $userid,
-            'msg' => [
-                'type' => 'dialog',
-                'mode' => $action,
-                'data' => $data,
-            ]
-        ];
-        $task = new PushTask($params, false);
-        Task::deliver($task);
-    }
-
     /**
      * 获取对话（同时检验对话身份）
      * @param $dialog_id
-     * @param bool|string $checkOwner 是否校验群组身份，'auto'时有群主为true无群主为false
      * @return self
      */
-    public static function checkDialog($dialog_id, $checkOwner = false)
+    public static function checkDialog($dialog_id)
     {
         $dialog = WebSocketDialog::find($dialog_id);
         if (empty($dialog)) {
@@ -312,14 +76,7 @@ class WebSocketDialog extends AbstractModel
         }
         //
         $userid = User::userid();
-        if ($checkOwner === 'auto') {
-            $checkOwner = $dialog->owner_id > 0;
-        }
-        if ($checkOwner === true && $dialog->owner_id != $userid) {
-            throw new ApiException('仅限群主操作');
-        }
-        //
-        if ($dialog->group_type === 'task') {
+        if ($dialog->type === 'group' && $dialog->group_type === 'task') {
             // 任务群对话校验是否在项目内
             $project_id = intval(ProjectTask::whereDialogId($dialog->id)->value('project_id'));
             if ($project_id > 0) {
@@ -329,7 +86,48 @@ class WebSocketDialog extends AbstractModel
             }
         }
         if (!WebSocketDialogUser::whereDialogId($dialog->id)->whereUserid($userid)->exists()) {
-            throw new ApiException('不在成员列表内', ['dialog_id' => $dialog_id], -4003);
+            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;
         }
         return $dialog;
     }
@@ -337,20 +135,17 @@ class WebSocketDialog extends AbstractModel
     /**
      * 创建聊天室
      * @param string $name          聊天室名称
-     * @param int|array $userid     加入的会员ID(组)
+     * @param int|array $userid     加入的会员ID或会员ID组
      * @param string $group_type    聊天室类型
-     * @param int $owner_id         群主会员ID
      * @return self|null
      */
-    public static function createGroup($name, $userid, $group_type = '', $owner_id = 0)
+    public static function createGroup($name, $userid, $group_type = '')
     {
-        return AbstractModel::transaction(function () use ($owner_id, $userid, $group_type, $name) {
+        return AbstractModel::transaction(function () use ($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) {
@@ -358,7 +153,6 @@ class WebSocketDialog extends AbstractModel
                     WebSocketDialogUser::createInstance([
                         'dialog_id' => $dialog->id,
                         'userid' => $value,
-                        'important' => $group_type != 'user'
                     ])->save();
                 }
             }
@@ -366,6 +160,47 @@ 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
@@ -374,9 +209,6 @@ class WebSocketDialog extends AbstractModel
      */
     public static function checkUserDialog($userid, $userid2)
     {
-        if ($userid == $userid2) {
-            $userid2 = 0;
-        }
         $dialogUser = self::select(['web_socket_dialogs.*'])
             ->join('web_socket_dialog_users as u1', 'web_socket_dialogs.id', '=', 'u1.dialog_id')
             ->join('web_socket_dialog_users as u2', 'web_socket_dialogs.id', '=', 'u2.dialog_id')

app/Models/WebSocketDialogMsg.php

@@ -8,80 +8,45 @@ 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
+ * Class WebSocketDialogMsg
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $dialog_id 对话ID
- * @property string|null $dialog_type 对话类型
  * @property int|null $userid 发送会员ID
  * @property string|null $type 消息类型
- * @property string|null $mtype 消息类型（用于搜索）
  * @property array|mixed $msg 详细消息
- * @property array|mixed $emoji emoji回复
- * @property string|null $key 搜索关键词
  * @property int|null $read 已阅数量
  * @property int|null $send 发送数量
- * @property int|null $tag 标注会员ID
- * @property int|null $link 是否存在链接
- * @property int|null $reply_num 有多少条回复
- * @property int|null $reply_id 回复ID
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
- * @property \Illuminate\Support\Carbon|null $deleted_at
  * @property-read int|mixed $percentage
- * @property-read \App\Models\WebSocketDialogMsg|null $reply_data
- * @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 whereDialogType($value)
- * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereEmoji($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereKey($value)
- * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereLink($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereMsg($value)
- * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereMtype($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereRead($value)
- * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereReplyId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereReplyNum($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereSend($value)
- * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereTag($value)
  * @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',
-        'reply_data',
     ];
 
     protected $hidden = [
-        'key',
         '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
@@ -89,24 +54,13 @@ class WebSocketDialogMsg extends AbstractModel
     public function getPercentageAttribute()
     {
         if (!isset($this->appendattrs['percentage'])) {
-            $this->generatePercentage();
-        }
-        return $this->appendattrs['percentage'];
-    }
-
-    /**
-     * 回复消息详情
-     * @return WebSocketDialogMsg|null
-     */
-    public function getReplyDataAttribute()
-    {
-        if (!isset($this->appendattrs['reply_data'])) {
-            $this->appendattrs['reply_data'] = null;
-            if ($this->reply_id > 0) {
-                $this->appendattrs['reply_data'] = self::find($this->reply_id, ['id', 'userid', 'type', 'msg'])?->cancelAppend() ?: null;
+            if ($this->read > $this->send || empty($this->send)) {
+                $this->appendattrs['percentage'] = 100;
+            } else {
+                $this->appendattrs['percentage'] = intval($this->read / $this->send * 100);
             }
         }
-        return $this->appendattrs['reply_data'];
+        return $this->appendattrs['percentage'];
     }
 
     /**
@@ -124,41 +78,10 @@ class WebSocketDialogMsg extends AbstractModel
             $value['type'] = in_array($value['ext'], ['jpg', 'jpeg', 'png', 'gif']) ? 'img' : 'file';
             $value['path'] = Base::fillUrl($value['path']);
             $value['thumb'] = Base::fillUrl($value['thumb'] ?: Base::extIcon($value['ext']));
-        } else if ($this->type === 'record') {
-            $value['path'] = Base::fillUrl($value['path']);
         }
         return $value;
     }
 
-    /**
-     * emoji回复格式化
-     * @param $value
-     * @return array|mixed
-     */
-    public function getEmojiAttribute($value)
-    {
-        if (is_array($value)) {
-            return $value;
-        }
-        return Base::json2array($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
@@ -188,17 +111,13 @@ class WebSocketDialogMsg extends AbstractModel
             if (!$msgRead->read_at) {
                 $msgRead->read_at = Carbon::now();
                 $msgRead->save();
-                $this->generatePercentage(true);
+                $this->increment('read');
                 PushTask::push([
                     'userid' => $this->userid,
                     'msg' => [
                         'type' => 'dialog',
-                        'mode' => 'readed',
-                        'data' => [
-                            'id' => $this->id,
-                            'read' => $this->read,
-                            'percentage' => $this->percentage,
-                        ],
+                        'mode' => 'update',
+                        'data' => $this->toArray(),
                     ]
                 ]);
             }
@@ -206,373 +125,34 @@ class WebSocketDialogMsg extends AbstractModel
         return true;
     }
 
-    /**
-     * emoji回复
-     * @param $symbol
-     * @param int $sender       发送的会员ID
-     * @return mixed
-     */
-    public function emojiMsg($symbol, $sender)
-    {
-        $exist = false;
-        $array = $this->emoji;
-        foreach ($array as $index => &$item) {
-            if ($item['symbol'] === $symbol) {
-                if (in_array($sender, $item['userids'])) {
-                    // 已存在 去除
-                    $item['userids'] = array_values(array_diff($item['userids'], [$sender]));
-                    if (empty($item['userids'])) {
-                        unset($array[$index]);
-                        $array = array_values($array);
-                    }
-                } else {
-                    // 未存在 添加
-                    array_unshift($item['userids'], $sender);
-                }
-                $exist = true;
-                break;
-            }
-        }
-        if (!$exist) {
-            array_unshift($array, [
-                'symbol' => $symbol,
-                'userids' => [$sender]
-            ]);
-        }
-        //
-        $this->emoji = Base::array2json($array);
-        $this->save();
-        $resData = [
-            'id' => $this->id,
-            'emoji' => $array,
-        ];
-        //
-        $dialog = WebSocketDialog::find($this->dialog_id);
-        $dialog?->pushMsg('update', $resData);
-        //
-        return Base::retSuccess('sucess', $resData);
-    }
-
-    /**
-     * 标注、取消标注
-     * @param int $sender       标注的会员ID
-     * @return mixed
-     */
-    public function toggleTagMsg($sender)
-    {
-        if ($this->type === 'tag') {
-            return Base::retError('此消息不支持标注');
-        }
-        $this->tag = $this->tag ? 0 : $sender;
-        $this->save();
-        $resData = [
-            'id' => $this->id,
-            'tag' => $this->tag,
-        ];
-        //
-        $dialog = WebSocketDialog::find($this->dialog_id);
-        $dialog?->pushMsg('update', $resData);
-        //
-        $data = [
-            'update' => $resData
-        ];
-        $res = self::sendMsg($this->dialog_id, 0, 'tag', [
-            'action' => $this->tag ? 'add' : 'remove',
-            'data' => [
-                'id' => $this->id,
-                'type' => $this->type,
-                'msg' => $this->msg,
-            ]
-        ], $sender);
-        if (Base::isSuccess($res)) {
-            $data['add'] = $res['data'];
-        }
-        //
-        return Base::retSuccess('sucess', $data);
-    }
-
-    /**
-     * 转发消息
-     * @param $userids
-     * @param int $sender       发送的会员ID
-     * @return mixed
-     */
-    public function forwardMsg($userids, $sender)
-    {
-        return AbstractModel::transaction(function() use ($sender, $userids) {
-            $msgs = [];
-            foreach ($userids as $userid) {
-                if (!User::whereUserid($userid)->exists()) {
-                    continue;
-                }
-                $dialog = WebSocketDialog::checkUserDialog($sender, $userid);
-                if ($dialog) {
-                    $res = self::sendMsg($dialog->id, 0, $this->type, $this->getOriginal('msg'), $sender);
-                    if (Base::isSuccess($res)) {
-                        $msgs[] = $res['data'];
-                    }
-                }
-            }
-            return Base::retSuccess('转发成功', [
-                'msgs' => $msgs
-            ]);
-        });
-    }
-
-    /**
-     * 删除消息
-     * @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();
-            //
-            if ($this->reply_id > 0) {
-                self::whereId($this->reply_id)->decrement('reply_num');
-            }
-            //
-            $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 bool $preserveHtml    保留html格式
-     * @param null|array $data
-     * @return string
-     */
-    public function previewMsg($preserveHtml = false, $data = null)
-    {
-        if ($data === null) {
-            $data = [
-                'type' => $this->type,
-                'msg' => $this->msg,
-            ];
-        }
-        switch ($data['type']) {
-            case 'text':
-                return $this->previewTextMsg($data['msg']['text'], $preserveHtml);
-            case 'record':
-                return "[语音]";
-            case 'meeting':
-                return "[会议] ${$data['msg']['name']}";
-            case 'file':
-                if ($data['msg']['type'] == 'img') {
-                    return "[图片]";
-                }
-                return "[文件] {$data['msg']['name']}";
-            case 'tag':
-                $action = $data['msg']['action'] === 'remove' ? '取消标注' : '标注';
-                return "[{$action}] {$this->previewMsg(false, $data['msg']['data'])}";
-            case 'notice':
-                return $data['msg']['notice'];
-            default:
-                return "[未知的消息]";
-        }
-    }
-
-    /**
-     * 生成关键词
-     * @return string
-     */
-    public function generateMsgKey()
-    {
-        return match ($this->type) {
-            'text' => strip_tags($this->msg['text']),
-            'meeting', 'file' => $this->msg['name'],
-            default => '',
-        };
-    }
-
-    /**
-     * 返回文本预览消息
-     * @param $text
-     * @param bool $preserveHtml    保留html格式
-     * @return string|string[]|null
-     */
-    private function previewTextMsg($text, $preserveHtml = false)
-    {
-        if (!$text) return '';
-        $text = preg_replace("/<img\s+class=\"emoticon\"[^>]*?alt=\"(\S+)\"[^>]*?>/", "[$1]", $text);
-        $text = preg_replace("/<img\s+class=\"emoticon\"[^>]*?>/", "[表情]", $text);
-        $text = preg_replace("/<img\s+class=\"browse\"[^>]*?>/", "[图片]", $text);
-        if ($preserveHtml) {
-            return $text;
-        } else {
-            return strip_tags($text);
-        }
-    }
-
-    /**
-     * 处理文本消息内容，用于发送前
-     * @param $text
-     * @param $dialog_id
-     * @return mixed|string|string[]
-     */
-    public static function formatMsg($text, $dialog_id)
-    {
-        @ini_set("pcre.backtrack_limit", 999999999);
-        // 图片 [:IMAGE:className:width:height:src:alt:]
-        preg_match_all("/<img\s+src=\"data:image\/(png|jpg|jpeg|gif);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));
-                if (Base::imgThumb(public_path($tmpPath), public_path($tmpPath) . "_thumb.jpg", 320, 0)) {
-                    $tmpPath .= "_thumb.jpg";
-                }
-                $text = str_replace($matchs[0][$key], "[:IMAGE:browse:{$imagesize[0]}:{$imagesize[1]}:{$tmpPath}::]", $text);
-            }
-        }
-        // 表情图片
-        preg_match_all("/<img\s+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("/<img[^>]*?src=([\"'])(.*?\.(png|jpg|jpeg|gif))\\1[^>]*?>/is", $text, $matchs);
-        foreach ($matchs[2] as $key => $str) {
-            $tmpPath = "uploads/chat/" . date("Ym") . "/" . $dialog_id . "/";
-            Base::makeDir(public_path($tmpPath));
-            $tmpPath .= md5s($str) . "." . $matchs[3][$key];
-            if (file_exists(public_path($tmpPath))) {
-                $imagesize = getimagesize(public_path($tmpPath));
-                if (Base::imgThumb(public_path($tmpPath), public_path($tmpPath) . "_thumb.jpg", 320, 0)) {
-                    $tmpPath .= "_thumb.jpg";
-                }
-                $text = str_replace($matchs[0][$key], "[:IMAGE:browse:{$imagesize[0]}:{$imagesize[1]}:{$tmpPath}::]", $text);
-            } else {
-                $image = file_get_contents($str);
-                if (empty($image)) {
-                    $text = str_replace($matchs[0][$key], "[:IMAGE:browse:90:90:images/other/imgerr.jpg::]", $text);
-                } else if (file_put_contents(public_path($tmpPath), $image)) {
-                    $imagesize = getimagesize(public_path($tmpPath));
-                    if (Base::imgThumb(public_path($tmpPath), public_path($tmpPath) . "_thumb.jpg", 320, 0)) {
-                        $tmpPath .= "_thumb.jpg";
-                    }
-                    $text = str_replace($matchs[0][$key], "[:IMAGE:browse:{$imagesize[0]}:{$imagesize[1]}:{$tmpPath}::]", $text);
-                }
-            }
-        }
-        // @成员、#任务
-        preg_match_all("/<span\s+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);
-        }
-        // 处理链接
-        preg_match_all("/<a[^>]*?href=([\"'])(.*?)\\1[^>]*?>([^<]*?)<\/a>/is", $text, $matchs);
-        foreach ($matchs[2] as $key => $str) {
-            $herf = $matchs[2][$key];
-            $title = $matchs[3][$key] ?: $herf;
-            $text = str_replace($matchs[0][$key], "<a href=\"{$herf}\" target=\"_blank\">{$title}</a>", $text);
-        }
-        // 过滤标签
-        $text = strip_tags($text, '<blockquote> <strong> <pre> <ol> <ul> <li> <em> <p> <s> <u> <a>');
-        $text = preg_replace("/\<(blockquote|strong|pre|ol|ul|li|em|p|s|u).*?\>/is", "<$1>", $text);    // 不用去除a标签，上面已经处理过了
-        $text = preg_replace("/\[: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）
-     * @param int $reply_id     回复ID
      * @param string $type      消息类型
      * @param array $msg        发送的消息
      * @param int $sender       发送的会员ID（默认自己，0为系统）
-     * @param bool $push_self   是否推送给自己
      * @return array
      */
-    public static function sendMsg($dialog_id, $reply_id, $type, $msg, $sender = 0, $push_self = false)
+    public static function sendMsg($dialog_id, $type, $msg, $sender = 0)
     {
-        $link = 0;
-        $mtype = $type;
-        if ($type === 'text') {
-            if (str_contains($msg['text'], '<a ') || preg_match("/https*:\/\//", $msg['text'])) {
-                $link = 1;
-            }
-            if (str_contains($msg['text'], '<img ')) {
-                $mtype = str_contains($msg['text'], '"emoticon"') ? 'emoticon' : 'image';
-            }
-        } elseif ($type === 'file') {
-            if (in_array($msg['ext'], ['jpg', 'jpeg', 'png', 'gif'])) {
-                $mtype = 'image';
-            }
-        }
-        //
         $dialogMsg = self::createInstance([
-            'dialog_id' => $dialog_id,
-            'reply_id' => $reply_id,
             'userid' => $sender ?: User::userid(),
             'type' => $type,
-            'mtype' => $mtype,
-            'link' => $link,
             'msg' => $msg,
             'read' => 0,
         ]);
-        if ($reply_id > 0) {
-            self::whereId($reply_id)->increment('reply_num');
-        }
-        AbstractModel::transaction(function () use ($dialogMsg) {
-            $dialog = WebSocketDialog::find($dialogMsg->dialog_id);
+        AbstractModel::transaction(function () use ($dialog_id, $msg, $dialogMsg) {
+            $dialog = WebSocketDialog::find($dialog_id);
             if (empty($dialog)) {
                 throw new ApiException('获取会话失败');
             }
             $dialog->last_at = Carbon::now();
             $dialog->save();
             $dialogMsg->send = 1;
-            $dialogMsg->dialog_type = $dialog->type;
-            $dialogMsg->key = $dialogMsg->generateMsgKey();
+            $dialogMsg->dialog_id = $dialog->id;
             $dialogMsg->save();
         });
-        //
-        $task = new WebSocketDialogMsgTask($dialogMsg->id);
-        if ($push_self) {
-            $task->setIgnoreFd(null);
-        }
-        Task::deliver($task);
-        //
+        Task::deliver(new WebSocketDialogMsgTask($dialogMsg->id));
         return Base::retSuccess('发送成功', $dialogMsg);
     }
 }

app/Models/WebSocketDialogMsgRead.php

@@ -2,28 +2,22 @@
 
 namespace App\Models;
 
-use Carbon\Carbon;
-
 /**
- * App\Models\WebSocketDialogMsgRead
+ * Class WebSocketDialogMsgRead
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $dialog_id 对话ID
  * @property int|null $msg_id 消息ID
  * @property int|null $userid 发送会员ID
- * @property int|null $mention 是否提及（被@）
- * @property int|null $email 是否发了邮件
  * @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 whereEmail($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereMention($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereMsgId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereReadAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereUserid($value)
@@ -36,38 +30,4 @@ class WebSocketDialogMsgRead extends AbstractModel
         parent::__construct($attributes);
         $this->timestamps = false;
     }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
-    public function webSocketDialogMsg(): \Illuminate\Database\Eloquent\Relations\HasOne
-    {
-        return $this->hasOne(WebSocketDialogMsg::class, 'id', 'msg_id');
-    }
-
-    /**
-     * 仅标记成阅读
-     * @param $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

@@ -3,15 +3,12 @@
 namespace App\Models;
 
 /**
- * App\Models\WebSocketDialogUser
+ * Class WebSocketDialogUser
  *
+ * @package App\Models
  * @property int $id
  * @property int|null $dialog_id 对话ID
  * @property int|null $userid 会员ID
- * @property string|null $top_at 置顶时间
- * @property int|null $mark_unread 是否标记为未读：0否，1是
- * @property int|null $inviter 邀请人
- * @property int|null $important 是否不可移出（项目、任务人员）
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser newModelQuery()
@@ -20,10 +17,6 @@ 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 whereImportant($value)
- * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereInviter($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/Models/WebSocketTmpMsg.php

@@ -3,8 +3,9 @@
 namespace App\Models;
 
 /**
- * App\Models\WebSocketTmpMsg
+ * Class WebSocketTmpMsg
  *
+ * @package App\Models
  * @property int $id
  * @property string|null $md5 MD5(会员ID-消息)
  * @property string|null $msg 详细消息

app/Module/AgoraIO/AccessToken.php

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

app/Module/AgoraIO/AgoraTokenGenerator.php

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

app/Module/AgoraIO/Message.php

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

app/Module/Base.php

@@ -2,17 +2,15 @@
 
 namespace App\Module;
 
-use App\Exceptions\ApiException;
 use App\Models\Setting;
 use App\Models\Tmp;
 use Cache;
+use Exception;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Config;
-use Overtrue\Pinyin\Pinyin;
 use Redirect;
 use Request;
 use Storage;
-use Validator;
 
 class Base
 {
@@ -60,55 +58,20 @@ 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()
     {
-        $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() . ') 过低，最低版本要求 (v' . $min . ')。');
-        }
+        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';
+        });
     }
 
     /**
@@ -285,7 +248,7 @@ class Base
     {
         try {
             Storage::makeDirectory($path);
-        } catch (\Throwable $e) {
+        } catch (Exception $e) {
         }
         if (!file_exists($path)) {
             self::makeDir(dirname($path));
@@ -353,15 +316,19 @@ class Base
     {
         if (strtolower($charset) == 'utf-8') {
             if (Base::getStrlen($string) <= $length) return $string;
-            $strcut = Base::utf8Substr($string, $length, $start);
+            $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);
             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;
     }
@@ -486,7 +453,7 @@ class Base
         try {
             $array = json_decode($string, true);
             return is_array($array) ? $array : [];
-        } catch (\Throwable) {
+        } catch (Exception $e) {
             return [];
         }
     }
@@ -504,7 +471,7 @@ class Base
         }
         try {
             return json_encode($array, $options);
-        } catch (\Throwable) {
+        } catch (Exception $e) {
             return '';
         }
     }
@@ -717,20 +684,24 @@ class Base
     /**
      * 判断两个地址域名是否相同
      * @param string $var1
-     * @param string|array $var2
+     * @param string $var2
      * @return bool
      */
     public static function hostContrast($var1, $var2)
     {
         $arr1 = parse_url($var1);
-        $host1 = $arr1['host'] ?? $var1;
+        $arr2 = parse_url($var2);
         //
-        $host2 = [];
-        foreach (is_array($var2) ? $var2 : [$var2] as $url) {
-            $arr2 = parse_url($url);
-            $host2[] = $arr2['host'] ?? $url;
+        $host1 = $var1;
+        if (isset($arr1['host'])) {
+            $host1 = $arr1['host'];
         }
-        return in_array($host1, $host2);
+        //
+        $host2 = $var2;
+        if (isset($arr2['host'])) {
+            $host2 = $arr2['host'];
+        }
+        return $host1 == $host2;
     }
 
     /**
@@ -754,7 +725,6 @@ class Base
      */
     public static function fillUrl($str = '')
     {
-        global $_A;
         if (is_array($str)) {
             foreach ($str as $key => $item) {
                 $str[$key] = Base::fillUrl($item);
@@ -773,12 +743,9 @@ class Base
         ) {
             return $str;
         } else {
-            if ($_A['__fill_url_remote_url'] === true) {
-                return "{{RemoteURL}}" . $str;
-            }
             try {
                 return url($str);
-            } catch (\Throwable) {
+            } catch (\Throwable $e) {
                 return self::getSchemeAndHost() . "/" . $str;
             }
         }
@@ -799,7 +766,7 @@ class Base
         }
         try {
             $find = url('');
-        } catch (\Throwable) {
+        } catch (\Throwable $e) {
             $find = self::getSchemeAndHost();
         }
         return Base::leftDelete($str, $find . '/');
@@ -815,31 +782,6 @@ 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
@@ -888,16 +830,13 @@ class Base
     /**
      * 数组只保留数字的
      * @param $array
-     * @param bool $int 是否格式化值
      * @return array
      */
-    public static function arrayRetainInt($array, $int = false)
+    public static function arrayRetainInt($array)
     {
         foreach ($array as $k => $v) {
             if (!is_numeric($v)) {
                 unset($array[$k]);
-            } elseif ($int === true) {
-                $array[$k] = intval($v);
             }
         }
         return array_values($array);
@@ -992,16 +931,13 @@ class Base
 
     /**
      * 检测邮箱格式
-     * @param $str
-     * @return bool
+     * @param string $str 需要检测的字符串
+     * @return int
      */
-    public static function isEmail($str)
+    public static function isMail($str)
     {
-        if (filter_var($str, FILTER_VALIDATE_EMAIL)) {
-            return true;
-        } else {
-            return false;
-        }
+        $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);
     }
 
     /**
@@ -1011,7 +947,7 @@ class Base
      */
     public static function isNumber($str)
     {
-        if (preg_match("/^\d+$/", $str)) {
+        if (preg_match("/^\d*$/", $str)) {
             return true;
         } else {
             return false;
@@ -1217,12 +1153,11 @@ class Base
 
     /**
      * 获取或设置
-     * @param $setname          // 配置名称
-     * @param bool $array       // 保存内容
-     * @param false $isUpdate   // 保存内容为更新模式，默认否
+     * @param $setname //配置名称
+     * @param bool $array //保存内容
      * @return array
      */
-    public static function setting($setname, $array = false, $isUpdate = false)
+    public static function setting($setname, $array = false)
     {
         global $_A;
         if (empty($setname)) {
@@ -1233,19 +1168,15 @@ class Base
         }
         $setting = [];
         $row = Setting::whereName($setname)->first();
-        if ($row) {
+        if (!empty($row)) {
             $setting = Base::string2array($row->setting);
         } else {
             $row = Setting::createInstance(['name' => $setname]);
             $row->save();
         }
         if ($array !== false) {
-            if ($isUpdate && is_array($array)) {
-                $setting = array_merge($setting, $array);
-            } else {
-                $setting = $array;
-            }
-            $row->updateInstance(['setting' => $setting]);
+            $setting = $array;
+            $row->updateInstance(['setting' => $array]);
             $row->save();
         }
         $_A["__static_setting_" . $setname] = $setting;
@@ -1628,7 +1559,7 @@ class Base
     }
 
     /**
-     * 用户名、邮箱、手机帐号、银行卡号中间字符串以*隐藏
+     * 用户名、邮箱、手机账号、银行卡号中间字符串以*隐藏
      * @param $str
      * @return string
      */
@@ -1727,46 +1658,24 @@ class Base
      */
     public static function timeDiff($s, $e)
     {
-        $time = $e - $s;
-        $days = 0;
-        if ($time >= 86400) { // 如果大于1天
-            $days = (int)($time / 86400);
-            $time = $time % 86400; // 计算天后剩余的毫秒数
+        $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秒';
         }
-        $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;
     }
 
     /**
@@ -2174,42 +2083,9 @@ class Base
         return Min(Max(Base::nullShow(Request::input($inputName), $default), 1), $max);
     }
 
-    /**
-     * base64语音保存
-     * @param array $param [ base64=带前缀的base64, path=>文件路径 ]
-     * @return array [name=>文件名, size=>文件大小(单位KB),file=>绝对地址, path=>相对地址, url=>全路径地址, ext=>文件后缀名]
-     */
-    public static function record64save($param)
-    {
-        $base64 = $param['base64'];
-        if (preg_match('/^(data:\s*audio\/(\w+);base64,)/', $base64, $res)) {
-            $extension = $res[2];
-            if (!in_array($extension, ['mp3', 'wav'])) {
-                return Base::retError('语音格式错误');
-            }
-            $fileName = 'record_' . md5($base64) . '.' . $extension;
-            $fileDir = $param['path'];
-            $filePath = public_path($fileDir);
-            Base::makeDir($filePath);
-            if (file_put_contents($filePath . $fileName, base64_decode(str_replace($res[1], '', $base64)))) {
-                $fileSize = filesize($filePath . $fileName);
-                $array = [
-                    "name" => $fileName,                                                //原文件名
-                    "size" => Base::twoFloat($fileSize / 1024, true),         //大小KB
-                    "file" => $filePath . $fileName,                                    //文件的完整路径                "D:\www....KzZ.jpg"
-                    "path" => $fileDir . $fileName,                                     //相对路径                     "uploads/pic....KzZ.jpg"
-                    "url" => Base::fillUrl($fileDir . $fileName),                   //完整的URL                    "https://.....hhsKzZ.jpg"
-                    "ext" => $extension,                                                //文件后缀名
-                ];
-                return Base::retSuccess('success', $array);
-            }
-        }
-        return Base::retError('语音保存失败');
-    }
-
     /**
      * image64图片保存
-     * @param array $param [ image64=带前缀的base64, path=>文件路径, fileName=>文件名称, scale=>[压缩原图宽,高, 压缩方式], autoThumb=>false不要自动生成缩略图 ]
+     * @param array $param [ image64=带前缀的base64, path=>文件路径, fileName=>文件名称, scale=>[压缩原图宽,高, 压缩方式] ]
      * @return array [name=>文件名, size=>文件大小(单位KB),file=>绝对地址, path=>相对地址, url=>全路径地址, ext=>文件后缀名]
      */
     public static function image64save($param)
@@ -2229,7 +2105,7 @@ class Base
                     if ($width > 0 || $height > 0) {
                         $scaleName = "_{WIDTH}x{HEIGHT}";
                         if (isset($param['scale'][2])) {
-                            $scaleName .= "_c{$param['scale'][2]}";
+                            $scaleName .= $param['scale'][2];
                         }
                     }
                 }
@@ -2290,13 +2166,8 @@ class Base
                 }
                 //生成缩略图
                 $array['thumb'] = $array['path'];
-                if ($extension === 'gif' && !isset($param['autoThumb'])) {
-                    $param['autoThumb'] = false;
-                }
-                if ($param['autoThumb'] !== false) {
-                    if (Base::imgThumb($array['file'], $array['file'] . "_thumb.jpg", 320, 0)) {
-                        $array['thumb'] .= "_thumb.jpg";
-                    }
+                if (Base::imgThumb($array['file'], $array['file'] . "_thumb.jpg", 180, 0)) {
+                    $array['thumb'] .= "_thumb.jpg";
                 }
                 $array['thumb'] = Base::fillUrl($array['thumb']);
                 return Base::retSuccess('success', $array);
@@ -2345,7 +2216,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', 'ai', 'avi', 'bmp', 'cdr', 'eps', 'mov', 'mp3', 'mp4', 'pr', 'psd', 'svg', 'tif'];
+                    $type = ['jpg', 'jpeg', 'png', 'gif', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'esp', 'pdf', 'rar', 'zip', 'gz'];
                     break;
                 case 'firmware':
                     $type = ['img', 'tar', 'bin'];
@@ -2353,33 +2224,20 @@ 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', 'svg',
-                        'rar', 'zip', 'jar', '7-zip', 'tar', 'gzip', '7z', 'gz', 'apk', 'dmg',
+                        'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw',
+                        'rar', 'zip', 'jar', '7-zip', 'tar', 'gzip', '7z',
                         'tif', 'tiff',
                         'dwg', 'dxf',
                         'ofd',
                         'pdf',
                         'txt',
-                        'htaccess', 'htgroups', 'htpasswd', 'conf', 'bat', 'cmd', 'cpp', 'c', 'cc', 'cxx', 'h', 'hh', 'hpp', 'ino', 'cs', 'css',
-                        'dockerfile', 'go', 'golang', 'html', 'htm', 'xhtml', 'vue', 'we', 'wpy', 'java', 'js', 'jsm', 'jsx', 'json', 'jsp', 'less', 'lua', 'makefile', 'gnumakefile',
-                        'ocamlmakefile', 'make', 'mysql', 'nginx', 'ini', 'cfg', 'prefs', 'm', 'mm', 'pl', 'pm', 'p6', 'pl6', 'pm6', 'pgsql', 'php',
-                        'inc', 'phtml', 'shtml', 'php3', 'php4', 'php5', 'phps', 'phpt', 'aw', 'ctp', 'module', 'ps1', 'py', 'r', 'rb', 'ru', 'gemspec', 'rake', 'guardfile', 'rakefile',
-                        'gemfile', 'rs', 'sass', 'scss', 'sh', 'bash', 'bashrc', 'sql', 'sqlserver', 'swift', 'ts', 'typescript', 'str', 'vbs', 'vb', 'v', 'vh', 'sv', 'svh', 'xml',
-                        'rdf', 'rss', 'wsdl', 'xslt', 'atom', 'mathml', 'mml', 'xul', 'xbl', 'xaml', 'yaml', 'yml',
-                        'asp', 'properties', 'gitignore', 'log', 'bas', 'prg', 'python', 'ftl', 'aspx', 'plist',
+                        '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',
                         'mp3', 'wav', 'mp4', 'flv',
                         'avi', 'mov', 'wmv', 'mkv', '3gp', 'rm',
-                        'xmind',
-                        'rp',
                     ];
                     break;
                 default:
@@ -2394,13 +2252,11 @@ class Base
                 if ($param['size'] > 0 && $fileSize > $param['size'] * 1024) {
                     return Base::retError('文件大小超限，最大限制：' . $param['size'] . 'KB');
                 }
-            } catch (\Throwable) {
+            } catch (Exception $e) {
                 $fileSize = 0;
             }
             $scaleName = "";
-            if ($param['fileName'] === true) {
-                $fileName = $file->getClientOriginalName();
-            } elseif ($param['fileName']) {
+            if ($param['fileName']) {
                 $fileName = $param['fileName'];
             } else {
                 if ($param['scale'] && is_array($param['scale'])) {
@@ -2408,7 +2264,7 @@ class Base
                     if ($width > 0 || $height > 0) {
                         $scaleName = "_{WIDTH}x{HEIGHT}";
                         if (isset($param['scale'][2])) {
-                            $scaleName .= "_c{$param['scale'][2]}";
+                            $scaleName .= $param['scale'][2];
                         }
                     }
                 }
@@ -2488,9 +2344,7 @@ class Base
                 }
                 //生成缩略图
                 $array['thumb'] = $array['path'];
-                if ($extension === 'gif' && !isset($param['autoThumb'])) {
-                    $param['autoThumb'] = false;
-                }
+                if ($param['autoThumb'] === "false") $param['autoThumb'] = false;
                 if ($param['autoThumb'] !== false) {
                     if (Base::imgThumb($array['file'], $array['file'] . "_thumb.jpg", 320, 0)) {
                         $array['thumb'] .= "_thumb.jpg";
@@ -2505,37 +2359,6 @@ 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 源图绝对完整地址{带文件名及后缀名}
@@ -2653,7 +2476,7 @@ class Base
         try {
             $white = imagecolorallocate($dst, 255, 255, 255);
             imagefill($dst, 0, 0, $white);
-        } catch (\Throwable) {
+        } catch (Exception $e) {
 
         }
         if (function_exists('imagecopyresampled')) {
@@ -2807,19 +2630,16 @@ class Base
     /**
      * 遍历获取文件
      * @param $dir
-     * @param bool $subdirectory    是否遍历子目录
      * @return array
      */
-    public static function readDir($dir, $subdirectory = true)
+    public static function readDir($dir)
     {
         $files = array();
         $dir_list = scandir($dir);
         foreach ($dir_list as $file) {
             if ($file != '..' && $file != '.') {
                 if (is_dir($dir . '/' . $file)) {
-                    if ($subdirectory) {
-                        $files = array_merge($files, self::readDir($dir . '/' . $file, $subdirectory));
-                    }
+                    $files = array_merge($files, self::readDir($dir . '/' . $file));
                 } else {
                     $files[] = $dir . "/" . $file;
                 }
@@ -2838,32 +2658,36 @@ class Base
         if (empty($str)) {
             return '';
         }
-        $first = mb_substr($str, 0, 1);
-        if (preg_match("/^\d$/", $first)) {
-            return '#';
-        }
-        if (!preg_match("/^[a-zA-Z]$/", $first)) {
-            $pinyin = new Pinyin();
-            $first = $pinyin->abbr($first, '', PINYIN_NAME);
-        }
-        return $first ? strtoupper($first) : '#';
-    }
-
-    /**
-     * 中文转拼音
-     * @param $str
-     * @return string
-     */
-    public static function cn2pinyin($str)
-    {
-        if (empty($str)) {
-            return '';
-        }
-        if (!preg_match("/^[a-zA-Z0-9_.]+$/", $str)) {
-            $pinyin = new Pinyin();
-            $str = $pinyin->permalink($str, '');
-        }
-        return $str;
+        $fchar = ord($str[0]);
+        if ($fchar >= ord('A') && $fchar <= ord('z')) return strtoupper($str[0]);
+        $s1 = iconv('UTF-8', 'gb2312', $str);
+        $s2 = iconv('gb2312', 'UTF-8', $s1);
+        $s = $s2 == $str ? $s1 : $str;
+        $asc = ord($s[0]) * 256 + ord($s[1]) - 65536;
+        if ($asc >= -20319 && $asc <= -20284) return 'A';
+        if ($asc >= -20283 && $asc <= -19776) return 'B';
+        if ($asc >= -19775 && $asc <= -19219) return 'C';
+        if ($asc >= -19218 && $asc <= -18711) return 'D';
+        if ($asc >= -18710 && $asc <= -18527) return 'E';
+        if ($asc >= -18526 && $asc <= -18240) return 'F';
+        if ($asc >= -18239 && $asc <= -17923) return 'G';
+        if ($asc >= -17922 && $asc <= -17418) return 'H';
+        if ($asc >= -17417 && $asc <= -16475) return 'J';
+        if ($asc >= -16474 && $asc <= -16213) return 'K';
+        if ($asc >= -16212 && $asc <= -15641) return 'L';
+        if ($asc >= -15640 && $asc <= -15166) return 'M';
+        if ($asc >= -15165 && $asc <= -14923) return 'N';
+        if ($asc >= -14922 && $asc <= -14915) return 'O';
+        if ($asc >= -14914 && $asc <= -14631) return 'P';
+        if ($asc >= -14630 && $asc <= -14150) return 'Q';
+        if ($asc >= -14149 && $asc <= -14091) return 'R';
+        if ($asc >= -14090 && $asc <= -13319) return 'S';
+        if ($asc >= -13318 && $asc <= -12839) return 'T';
+        if ($asc >= -12838 && $asc <= -12557) return 'W';
+        if ($asc >= -12556 && $asc <= -11848) return 'X';
+        if ($asc >= -11847 && $asc <= -11056) return 'Y';
+        if ($asc >= -11055 && $asc <= -10247) return 'Z';
+        return '#';
     }
 
     /**
@@ -3044,54 +2868,4 @@ 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

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

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

app/Module/Ihttp.php

@@ -2,6 +2,8 @@
 
 namespace App\Module;
 
+use Exception;
+
 @error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
 
 class Ihttp
@@ -86,7 +88,7 @@ class Ihttp
                 return Base::retError($error);
             } else {
                 if ($isGb2312) {
-                    try { $data = iconv('GB2312', 'UTF-8', $data); }catch (\Throwable) { }
+                    try { $data = iconv('GB2312', 'UTF-8', $data); }catch (Exception $e) { }
                 }
                 $response = self::ihttp_response_parse($data);
                 Base::addLog([
@@ -146,7 +148,7 @@ class Ihttp
                 $content .= fgets($fp, 512);
             fclose($fp);
             if ($isGb2312) {
-                try { $content = iconv('GB2312', 'UTF-8', $content); }catch (\Throwable) { }
+                try { $content = iconv('GB2312', 'UTF-8', $content); }catch (Exception $e) { }
             }
             $response = self::ihttp_response_parse($content, true);
             Base::addLog([

app/Module/RandomColor.php

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

app/Providers/AppServiceProvider.php

@@ -23,14 +23,6 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        \Illuminate\Database\Query\Builder::macro('rawSql', function(){
-            return array_reduce($this->getBindings(), function($sql, $binding){
-                return preg_replace('/\?/', is_numeric($binding) ? $binding : "'".$binding."'" , $sql, 1);
-            }, $this->toSql());
-        });
-
-        \Illuminate\Database\Eloquent\Builder::macro('rawSql', function(){
-            return ($this->getQuery()->rawSql());
-        });
+        //
     }
 }

app/Services/WebSocketService.php

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

app/Tasks/AbstractTask.php

@@ -27,7 +27,7 @@ abstract class AbstractTask extends Task
     {
         try {
             $this->start();
-        } catch (\Throwable $e) {
+        } catch (\Exception $e) {
             $this->info($e);
             $this->failed($e);
         }

app/Tasks/AutoArchivedTask.php

@@ -1,45 +0,0 @@
-<?php
-namespace App\Tasks;
-
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
-use App\Models\AbstractModel;
-use App\Models\ProjectTask;
-use App\Module\Base;
-use Carbon\Carbon;
-
-/**
- * 完成的任务自动归档
- * Class AutoArchivedTask
- * @package App\Tasks
- */
-class AutoArchivedTask extends AbstractTask
-{
-
-    public function __construct()
-    {
-        //
-    }
-
-    public function start()
-    {
-        $setting = Base::setting('system');
-        if ($setting['auto_archived'] === 'open') {
-            $archivedDay = floatval($setting['archived_day']);
-            if ($archivedDay > 0) {
-                $archivedDay = min(100, $archivedDay);
-                $archivedTime = Carbon::now()->subDays($archivedDay);
-                //获取已完成未归档的任务
-                $taskLists = ProjectTask::whereNotNull('complete_at')
-                    ->where('complete_at', '<=', $archivedTime)
-                    ->where('archived_userid', 0)
-                    ->whereNull('archived_at')
-                    ->take(100)
-                    ->get();
-                foreach ($taskLists AS $task) {
-                    $task->archivedTask(Carbon::now(), true);
-                }
-            }
-        }
-    }
-}

app/Tasks/EmailNoticeTask.php

@@ -1,266 +0,0 @@
-<?php
-
-namespace App\Tasks;
-
-use App\Models\ProjectTask;
-use App\Models\ProjectTaskMailLog;
-use App\Models\User;
-use App\Models\WebSocketDialogMsg;
-use App\Models\WebSocketDialogMsgRead;
-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 EmailNoticeTask extends AbstractTask
-{
-    public function __construct()
-    {
-        //
-    }
-
-    public function start()
-    {
-        $setting = Base::setting('emailSetting');
-        // 任务通知
-        if ($setting['notice'] === 'open') {
-            $start = intval($setting['task_start_minute']);
-            $hours = floatval($setting['task_remind_hours']);
-            $hours2 = floatval($setting['task_remind_hours2']);
-            if ($start > -1) {
-                ProjectTask::whereNull("complete_at")
-                    ->whereNull("archived_at")
-                    ->whereBetween("start_at", [
-                        Carbon::now()->subMinutes($start + 10),
-                        Carbon::now()->subMinutes($start)
-                    ])->chunkById(100, function ($tasks) {
-                        /** @var ProjectTask $task */
-                        foreach ($tasks as $task) {
-                            $this->taskEmail($task, 0);
-                        }
-                    });
-            }
-            if ($hours > -1) {
-                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->taskEmail($task, 1);
-                        }
-                    });
-            }
-            if ($hours2 > -1) {
-                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->taskEmail($task, 2);
-                        }
-                    });
-            }
-        }
-        // 消息通知
-        if ($setting['notice_msg'] === 'open') {
-            $userMinute = intval($setting['msg_unread_user_minute']);
-            $groupMinute = intval($setting['msg_unread_group_minute']);
-            \DB::statement("SET SQL_MODE=''");
-            $builder = WebSocketDialogMsg::select(['web_socket_dialog_msgs.*', 'r.id as r_id', 'r.userid as r_userid'])
-                ->join('web_socket_dialog_msg_reads as r', 'web_socket_dialog_msgs.id', '=', 'r.msg_id')
-                ->whereNull("r.read_at")
-                ->where("r.email", 0);
-            if ($userMinute > -1) {
-                $builder->clone()
-                    ->where("web_socket_dialog_msgs.dialog_type", "user")
-                    ->whereBetween("web_socket_dialog_msgs.created_at", [
-                        Carbon::now()->subMinutes($userMinute + 10),
-                        Carbon::now()->subMinutes($userMinute)
-                    ])
-                    ->groupBy('r_userid')
-                    ->chunkById(100, function ($rows) {
-                        $this->unreadMsgEmail($rows, "user");
-                    });
-            }
-            if ($groupMinute > -1) {
-                $builder->clone()
-                    ->where("web_socket_dialog_msgs.dialog_type", "group")
-                    ->whereBetween("web_socket_dialog_msgs.created_at", [
-                        Carbon::now()->subMinutes($groupMinute + 10),
-                        Carbon::now()->subMinutes($groupMinute)
-                    ])
-                    ->groupBy('r_userid')
-                    ->chunkById(100, function ($rows) {
-                        $this->unreadMsgEmail($rows, "group");
-                    });
-            }
-        }
-    }
-
-    /**
-     * 任务过期前、超期后提醒
-     * @param ProjectTask $task
-     * @param int $type
-     * @return void
-     */
-    private function taskEmail(ProjectTask $task, int $type)
-    {
-        $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');
-
-        /** @var User $user */
-        foreach ($users as $user) {
-            $data = [
-                'type' => $type,
-                'userid' => $user->userid,
-                'task_id' => $task->id,
-            ];
-            $emailLog = ProjectTaskMailLog::where($data)->exists();
-            if ($emailLog) {
-                continue;
-            }
-            try {
-                if (!Base::isEmail($user->email)) {
-                    throw new \Exception("User email '{$user->email}' address error");
-                }
-                $subject = match ($type) {
-                    1 => "任务提醒",
-                    2 => "任务过期提醒",
-                    default => "任务开始提醒",
-                };
-                $content = view('email.task', [
-                    'type' => str_replace([0, 1, 2], ['start', 'before', 'after'], $type),
-                    'user' => $user,
-                    'task' => $task,
-                    'setting' => $setting,
-                ])->render();
-                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 (\Throwable $e) {
-                $data['send_error'] = $e->getMessage();
-            }
-            $data['email'] = $user->email;
-            ProjectTaskMailLog::createInstance($data)->save();
-        }
-    }
-
-    /**
-     * 未读消息通知
-     * @param $rows
-     * @param $dialogType
-     * @return void
-     */
-    private function unreadMsgEmail($rows, $dialogType)
-    {
-        $array = $rows->groupBy('r_userid');
-        foreach ($array as $userid => $data) {
-            $data = WebSocketDialogMsg::select(['web_socket_dialog_msgs.*', 'r.id as r_id', 'r.userid as r_userid'])
-                ->join('web_socket_dialog_msg_reads as r', 'web_socket_dialog_msgs.id', '=', 'r.msg_id')
-                ->whereNull("r.read_at")
-                ->where("r.email", 0)
-                ->where("r.userid", $userid)
-                ->where("web_socket_dialog_msgs.dialog_type", $dialogType)
-                ->take(100)
-                ->get();
-            if (empty($data)) {
-                continue;
-            }
-            $user = User::find($userid);
-            if (empty($user)) {
-                continue;
-            }
-            if (!Base::isEmail($user->email)) {
-                continue;
-            }
-            $setting = Base::setting('emailSetting');
-            $msgType = $dialogType === "group" ? "群聊" : "成员";
-            $subject = null;
-            $content = view('email.unread', [
-                'type' => 'head',
-                'nickname' => $user->nickname,
-                'msgType' => $msgType,
-                'count' => count($data),
-            ])->render();
-            $lists = $data->groupBy('dialog_id');
-            /** @var WebSocketDialogMsg[] $items */
-            foreach ($lists as $items) {
-                $dialogId = 0;
-                $dialogName = null;
-                foreach ($items as $item) {
-                    $item->cancelAppend();
-                    $item->userInfo = User::userid2basic($item->userid);
-                    $item->preview = $item->previewMsg(true);
-                    $item->preview = str_replace('<p>', '<p style="margin:0;padding:0">', $item->preview);
-                    if (empty($dialogId)) {
-                        $dialogId = $item->dialog_id;
-                    }
-                    if ($dialogName === null) {
-                        if ($dialogType === "user" && $item->userInfo) {
-                            if ($item->userInfo->profession) {
-                                $dialogName = $item->userInfo->nickname . " ({$item->userInfo->profession})";
-                            } else {
-                                $dialogName = $item->userInfo->nickname;
-                            }
-                        } else {
-                            $dialogName = $item->webSocketDialog?->getGroupName();
-                        }
-                    }
-                }
-                if ($subject === null) {
-                    $count = count($lists);
-                    if ($count > 1) {
-                        $subject = "来自{$count}个{$msgType}未读消息提醒";
-                    } else {
-                        $subject = "来自{$dialogName}未读消息提醒";
-                    }
-                }
-                $content .= view('email.unread', [
-                    'type' => 'content',
-                    'dialogUrl' => config("app.url") . "/manage/messenger?dialog_id={$dialogId}",
-                    'dialogName' => $dialogName,
-                    'unread' => count($items),
-                    'items' => $items,
-                ])->render();
-                $content = str_replace("{{RemoteURL}}", config("app.url") . "/", $content);
-            }
-            try {
-                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 (\Throwable $e) {
-                info("unreadMsgEmail: " . $e->getMessage());
-            }
-            WebSocketDialogMsgRead::whereIn('id', $data->pluck('r_id'))->update([
-                'email' => 1
-            ]);
-        }
-    }
-}

app/Tasks/LoopTask.php

@@ -1,79 +0,0 @@
-<?php
-
-namespace App\Tasks;
-
-use App\Models\ProjectFlow;
-use App\Models\ProjectFlowItem;
-use App\Models\ProjectTask;
-use App\Models\ProjectTaskUser;
-use Carbon\Carbon;
-
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
-
-/**
- * 任务重复周期
- */
-class LoopTask extends AbstractTask
-{
-    public function __construct()
-    {
-
-    }
-
-    public function start()
-    {
-        ProjectTask::whereBetween('loop_at', [
-            Carbon::now()->subMinutes(10),
-            Carbon::now()
-        ])->chunkById(100, function ($list) {
-            /** @var ProjectTask $item */
-            foreach ($list as $item) {
-                try {
-                    $task = $item->copyTask();
-                    // 工作流
-                    $projectFlow = ProjectFlow::whereProjectId($task->project_id)->orderByDesc('id')->first();
-                    if ($projectFlow) {
-                        $projectFlowItem = ProjectFlowItem::whereFlowId($projectFlow->id)->orderBy('sort')->get();
-                        // 赋一个开始状态
-                        foreach ($projectFlowItem as $flowItem) {
-                            if ($flowItem->status == 'start') {
-                                $task->flow_item_id = $flowItem->id;
-                                $task->flow_item_name = $flowItem->status . "|" . $flowItem->name;
-                                if ($flowItem->userids) {
-                                    $userids = array_values(array_unique($flowItem->userids));
-                                    foreach ($userids as $uid) {
-                                        ProjectTaskUser::updateInsert([
-                                            'task_id' => $task->id,
-                                            'userid' => $uid,
-                                        ], [
-                                            'project_id' => $task->project_id,
-                                            'task_pid' => $task->id,
-                                            'owner' => 1,
-                                        ]);
-                                    }
-                                }
-                                break;
-                            }
-                        }
-                    }
-                    // 新任务时间、周期
-                    if ($task->start_at) {
-                        $diffSecond = Carbon::parse($task->start_at)->diffInSeconds(Carbon::parse($task->end_at), true);
-                        $task->start_at = Carbon::parse($task->loop_at);
-                        $task->end_at = $task->start_at->clone()->addSeconds($diffSecond);
-                    }
-                    $task->refreshLoop(true);
-                    $task->addLog("创建任务来自周期任务ID：{$item->id}", [], $task->userid);
-                    // 清空旧周期
-                    $item->loop = '';
-                    $item->loop_at = null;
-                    $item->save();
-                    $item->addLog("已创建新的周期任务ID：{$task->id}，此任务关闭周期", [], $task->userid);
-                } catch (\Throwable $e) {
-                    $item->addLog("生成重复任务失败：" . $e->getMessage(), [], $item->userid);
-                }
-            }
-        });
-    }
-}

app/Tasks/PushTask.php

@@ -172,7 +172,7 @@ class PushTask extends AbstractTask
                     try {
                         $swoole->push($fid, Base::array2json($msg));
                         $tmpMsgId > 0 && WebSocketTmpMsg::whereId($tmpMsgId)->update(['send' => 1]);
-                    } catch (\Throwable) {
+                    } catch (\Exception $e) {
 
                     }
                 }

app/Tasks/PushUmengMsg.php

@@ -1,38 +0,0 @@
-<?php
-namespace App\Tasks;
-
-@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-
-use App\Models\UmengAlias;
-use App\Module\Base;
-
-/**
- * 推送友盟消息
- */
-class PushUmengMsg extends AbstractTask
-{
-    protected $userid = 0;
-    protected $array = [];
-
-    /**
-     * @param array|int $userid
-     * @param array $array
-     */
-    public function __construct($userid, $array = [])
-    {
-        $this->userid = $userid;
-        $this->array = is_array($array) ? $array : [];
-    }
-
-    public function start()
-    {
-        if (empty($this->userid) || empty($this->array)) {
-            return;
-        }
-        $setting = Base::setting('appPushSetting');
-        if ($setting['push'] !== 'open') {
-            return;
-        }
-        UmengAlias::pushMsgToUserid($this->userid, $this->array);
-    }
-}

app/Tasks/WebSocketDialogMsgTask.php

@@ -8,12 +8,11 @@ use App\Models\User;
 use App\Models\WebSocketDialog;
 use App\Models\WebSocketDialogMsg;
 use App\Models\WebSocketDialogMsgRead;
-use Hhxsv5\LaravelS\Swoole\Task\Task;
 use Request;
 
 
 /**
- * 推送会话消息
+ * 推送回话消息
  * Class WebSocketDialogMsgTask
  * @package App\Tasks
  */
@@ -32,22 +31,8 @@ class WebSocketDialogMsgTask extends AbstractTask
         $this->ignoreFd = Request::header('fd');
     }
 
-    /**
-     * @param $ignoreFd
-     */
-    public function setIgnoreFd($ignoreFd)
-    {
-        $this->ignoreFd = $ignoreFd;
-    }
-
     public function start()
     {
-        global $_A;
-        $_A = [
-            '__fill_url_remote_url' => true,
-        ];
-
-        //
         $msg = WebSocketDialogMsg::find($this->id);
         if (empty($msg)) {
             return;
@@ -57,78 +42,31 @@ class WebSocketDialogMsgTask extends AbstractTask
             return;
         }
 
-        // 提及会员
-        $mentions = [];
-        if ($msg->type === 'text') {
-            preg_match_all("/<span class=\"mention user\" data-id=\"(\d+)\">/", $msg->msg['text'], $matchs);
-            if ($matchs) {
-                $mentions = array_values(array_filter(array_unique($matchs[1])));
-            }
-        }
-
-        // 将会话以外的成员加入会话内
+        // 推送目标①：群成员
         $userids = $dialog->dialogUser->pluck('userid')->toArray();
-        $diffids = array_values(array_diff($mentions, $userids));
-        if ($diffids) {
-            // 仅(群聊)且(是群主或没有群主)才可以@成员以外的人
-            if ($dialog->type === 'group' && in_array($dialog->owner_id, [0, $msg->userid])) {
-                $dialog->joinGroup($diffids, $msg->userid);
-                $dialog->pushMsg("groupJoin", null, $diffids);
-                $userids = array_values(array_unique(array_merge($mentions, $userids)));
-            }
-        }
-
-        // 推送目标①：会话成员/群成员
-        $array = [];
         foreach ($userids AS $userid) {
             if ($userid == $msg->userid) {
-                $array[$userid] = false;
-            } else {
-                $mention = array_intersect([0, $userid], $mentions) ? 1 : 0;
-                WebSocketDialogMsgRead::createInstance([
-                    'dialog_id' => $msg->dialog_id,
-                    'msg_id' => $msg->id,
-                    'userid' => $userid,
-                    'mention' => $mention,
-                ])->saveOrIgnore();
-                $array[$userid] = $mention;
+                continue;
             }
+            WebSocketDialogMsgRead::createInstance([
+                'dialog_id' => $msg->dialog_id,
+                'msg_id' => $msg->id,
+                'userid' => $userid,
+            ])->saveOrIgnore();
         }
         // 更新已发送数量
         $msg->send = WebSocketDialogMsgRead::whereMsgId($msg->id)->count();
         $msg->save();
         // 开始推送消息
-        foreach ($array as $userid => $mention) {
-            PushTask::push([
-                'userid' => $userid,
-                'ignoreFd' => $this->ignoreFd,
-                'msg' => [
-                    'type' => 'dialog',
-                    'mode' => 'add',
-                    'data' => array_merge($msg->toArray(), [
-                        'mention' => $mention,
-                    ]),
-                ]
-            ]);
-        }
-        // umeng推送app
-        $umengUserid = $array;
-        if (isset($umengUserid[$msg->userid])) {
-            unset($umengUserid[$msg->userid]);
-        }
-        $umengUserid = array_keys($umengUserid);
-        $umengTitle = User::userid2nickname($msg->userid);
-        if ($dialog->type == 'group') {
-            $umengTitle = "{$dialog->getGroupName()} ($umengTitle)";
-        }
-        $umengMsg = new PushUmengMsg($umengUserid, [
-            'title' => $umengTitle,
-            'body' => $msg->previewMsg(),
-            'description' => "MID:{$msg->id}",
-            'seconds' => 3600,
-            'badge' => 1,
+        PushTask::push([
+            'userid' => $userids,
+            'ignoreFd' => $this->ignoreFd,
+            'msg' => [
+                'type' => 'dialog',
+                'mode' => 'add',
+                'data' => $msg->toArray(),
+            ]
         ]);
-        Task::deliver($umengMsg);
 
         // 推送目标②：正在打开这个任务会话的会员
         if ($dialog->type == 'group' && $dialog->group_type == 'task') {

cliff.toml

@@ -1,60 +0,0 @@
-# configuration file for git-cliff (0.1.0)
-
-[changelog]
-# changelog header
-header = """
-# Changelog\n
-All notable changes to this project will be documented in this file.\n
-"""
-# template for the changelog body
-# https://tera.netlify.app/docs/#introduction
-body = """
-{% if version %}\
-    ## [{{ version | trim_start_matches(pat="v") }}]
-{% else %}\
-    ## [Unreleased]
-{% endif %}\
-{% for group, commits in commits | group_by(attribute="group") %}
-    ### {{ group | upper_first }}
-    {% for commit in commits %}
-        - {% if commit.breaking %}[**breaking**] {% endif %}{{ commit.message | upper_first }}\
-    {% endfor %}
-{% endfor %}\n
-"""
-# remove the leading and trailing whitespace from the template
-trim = true
-# changelog footer
-footer = """
-"""
-
-[git]
-# parse the commits based on https://www.conventionalcommits.org
-conventional_commits = true
-# filter out the commits that are not conventional
-filter_unconventional = true
-# regex for parsing and grouping commits
-commit_parsers = [
-    { message = "^feat", group = "Features"},
-    { message = "^fix", group = "Bug Fixes"},
-    { message = "^doc", group = "Documentation"},
-    { message = "^perf", group = "Performance"},
-    { message = "^pref", group = "Performance"},
-    { message = "^refactor", group = "Refactor"},
-    { message = "^style", group = "Styling"},
-    { message = "^test", group = "Testing"},
-    { message = "^chore\\(release\\): prepare for", skip = true},
-    { message = "^chore", group = "Miscellaneous Tasks"},
-    { body = ".*security", group = "Security"},
-]
-# filter out the commits that are not matched by commit parsers
-filter_commits = true
-# glob pattern for matching git tags
-tag_pattern = "v[0-9]*"
-# regex for skipping tags
-skip_tags = "v0.1.0-beta.1"
-# regex for ignoring tags
-ignore_tags = ""
-# sort the tags chronologically
-date_order = false
-# sort the commits inside sections by oldest/newest order
-sort_commits = "oldest"

cmd

@@ -12,8 +12,6 @@ OK="${Green}[OK]${Font}"
 Error="${Red}[错误]${Font}"
 
 cur_path="$(pwd)"
-cur_arg=$@
-COMPOSE="docker-compose"
 
 judge() {
     if [[ 0 -eq $? ]]; then
@@ -32,15 +30,6 @@ 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
@@ -56,24 +45,15 @@ 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
-        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}"
+        echo -e "${Error} ${RedBG} 未安装 Docker-compose！${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
@@ -81,11 +61,12 @@ check_node() {
 }
 
 docker_name() {
-    echo `$COMPOSE ps | awk '{print $1}' | grep "\-$1\-"`
+    echo `docker-compose ps | awk '{print $1}' | grep "\-$1\-"`
 }
 
 run_compile() {
     local type=$1
+    local npxcmd=""
     check_node
     if [ ! -d "./node_modules" ]; then
         npm install
@@ -93,43 +74,29 @@ run_compile() {
     run_exec php "php bin/run --mode=$type"
     supervisorctl_restart php
     #
+    mix -V &> /dev/null
+    if [ $? -ne  0 ]; then
+        npxcmd="npx"
+    fi
     if [ "$type" = "prod" ]; then
         rm -rf "./public/js/build"
-        npx mix --production
-        echo "$(rand_string 16)" > ./public/js/hash
+        $npxcmd mix --production
     else
-        npx mix watch --hot
+        $npxcmd mix watch --hot
     fi
 }
 
 run_electron() {
     local argv=$@
     check_node
-    if [ ! -d "./node_modules" ]; then
-        npm install
-    fi
     if [ ! -d "./electron/node_modules" ]; then
         pushd electron
         npm install
         popd
     fi
-    #
     if [ -d "./electron/dist" ]; then
         rm -rf "./electron/dist"
     fi
-    if [ -d "./electron/public" ] && [ "$argv" != "--nobuild" ]; then
-        rm -rf "./electron/public"
-    fi
-    mkdir -p ./electron/public
-    cp ./electron/index.html ./electron/public/index.html
-    #
-    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
 }
 
@@ -141,7 +108,11 @@ run_exec() {
         echo -e "${Error} ${RedBG} 没有找到 $container 容器! ${Font}"
         exit 1
     fi
-    docker exec -it "$name" /bin/sh -c "$cmd"
+    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
 }
 
 run_mysql() {
@@ -180,7 +151,6 @@ run_mysql() {
         fi
         docker cp $filename $container_name:/
         run_exec mariadb "gunzip < /$inputname | mysql -u$username -p$password $database"
-        run_exec php "php artisan migrate"
         judge "还原数据库"
     fi
 }
@@ -198,11 +168,8 @@ env_set() {
     if [ -z "$exist" ]; then
         echo "$key=$val" >> $cur_path/.env
     else
-        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
+        command="sed -i '/^$key=/c\\$key=$val' /www/.env"
+        docker run -it --rm -v ${cur_path}:/www alpine sh -c "$command"
         if [ $? -ne  0 ]; then
             echo -e "${Error} ${RedBG} 设置env参数失败！${Font}"
             exit 1
@@ -215,43 +182,16 @@ env_init() {
         cp .env.docker .env
     fi
     if [ -z "$(env_get DB_ROOT_PASSWORD)" ]; then
-        env_set DB_ROOT_PASSWORD "$(rand_string 16)"
+        env_set DB_ROOT_PASSWORD "$(docker run -it --rm alpine sh -c "date +%s%N | md5sum | cut -c 1-16")"
     fi
     if [ -z "$(env_get APP_ID)" ]; then
-        env_set APP_ID "$(rand_string 6)"
+        env_set APP_ID "$(docker run -it --rm alpine sh -c "date +%s%N | md5sum | cut -c 1-6")"
     fi
     if [ -z "$(env_get APP_IPPR)" ]; then
         env_set APP_IPPR "10.$(rand 50 100).$(rand 100 200)"
     fi
 }
 
-arg_get() {
-    local find="n"
-    local value=""
-    for var in $cur_arg; do
-        if [[ "$find" == "y" ]]; then
-            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
-}
-
 ####################################################################################
 ####################################################################################
 ####################################################################################
@@ -264,71 +204,31 @@ 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
-        # 初始化文件
-        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)"
-        $COMPOSE up php -d
-        # 安装composer依赖
+        rm -rf composer.lock
+        rm -rf package-lock.json
+        mkdir -p ${cur_path}/docker/mysql/data
+        chmod -R 777 ${cur_path}/docker/mysql/data
+        docker-compose up -d
+        docker-compose restart php
         run_exec php "composer install"
-        if [ ! -f "${cur_path}/vendor/autoload.php" ]; then
-            run_exec php "composer config repo.packagist composer https://packagist.phpcomposer.com"
-            run_exec php "composer install"
-            run_exec php "composer config --unset repos.packagist"
-        fi
-        if [ ! -f "${cur_path}/vendor/autoload.php" ]; then
-            echo -e "${Error} ${RedBG}composer install 失败，请重试！ ${Font}"
-            exit 1
-        fi
-        [[ -z "$(env_get APP_KEY)" ]] && run_exec php "php artisan key:generate"
-        run_exec php "php bin/run --mode=prod"
-        # 检查数据库
-        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}"
-                exit 1
-            fi
-            chmod -R 775 "${cur_path}/docker/mysql/data"
-            sleep 3
-        done
+        [ -z "$(env_get APP_KEY)" ] && run_exec php "php artisan key:generate"
         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
-        # 设置初始化密码
+        run_exec php "php bin/run --mode=prod"
         res=`run_exec mariadb "sh /etc/mysql/repassword.sh"`
-        $COMPOSE up -d
-        supervisorctl_restart php
+        docker-compose stop
+        docker-compose start
         echo -e "${OK} ${GreenBG} 安装完成 ${Font}"
         echo -e "地址: http://${GreenBG}127.0.0.1:$(env_get APP_PORT)${Font}"
         echo -e "$res"
     elif [[ "$1" == "update" ]]; then
         shift 1
-        run_mysql backup
         git fetch --all
         git reset --hard origin/$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')
         git pull
         run_exec php "composer update"
         run_exec php "php artisan migrate"
         supervisorctl_restart php
-        $COMPOSE up -d
+        docker-compose up -d
     elif [[ "$1" == "uninstall" ]]; then
         shift 1
         read -rp "确定要卸载（含：删除容器、数据库、日志）吗？(y/n): " uninstall
@@ -342,34 +242,11 @@ if [ $# -gt 0 ]; then
             exit 2
             ;;
         esac
-        $COMPOSE down
+        docker-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 $@
-        sleep 3
-        ./cmd install $@
-    elif [[ "$1" == "port" ]]; then
-        shift 1
-        env_set APP_PORT "$1"
-        $COMPOSE up -d
-        echo -e "${OK} ${GreenBG} 修改成功 ${Font}"
-        echo -e "地址: http://${GreenBG}127.0.0.1:$(env_get APP_PORT)${Font}"
-    elif [[ "$1" == "url" ]]; then
-        shift 1
-        env_set APP_URL "$1"
-        supervisorctl_restart php
-        echo -e "${OK} ${GreenBG} 修改成功 ${Font}"
-    elif [[ "$1" == "env" ]]; then
-        shift 1
-        if [ -n "$1" ]; then
-            env_set $1 "$2"
-        fi
-        supervisorctl_restart php
-        echo -e "${OK} ${GreenBG} 修改成功 ${Font}"
     elif [[ "$1" == "repassword" ]]; then
         shift 1
         run_exec mariadb "sh /etc/mysql/repassword.sh \"$@\""
@@ -379,9 +256,6 @@ if [ $# -gt 0 ]; then
     elif [[ "$1" == "prod" ]] || [[ "$1" == "production" ]]; then
         shift 1
         run_compile prod
-    elif [[ "$1" == "appbuild" ]] || [[ "$1" == "buildapp" ]]; then
-        shift 1
-        run_electron app $@
     elif [[ "$1" == "electron" ]]; then
         shift 1
         run_electron $@
@@ -429,10 +303,10 @@ if [ $# -gt 0 ]; then
     elif [[ "$1" == "composer" ]]; then
         shift 1
         e="composer $@" && run_exec php "$e"
-    elif [[ "$1" == "service" ]]; then
+    elif [[ "$1" == "super" ]]; then
         shift 1
-        e="service $@" && run_exec php "$e"
-    elif [[ "$1" == "super" ]] || [[ "$1" == "supervisorctl" ]]; then
+        supervisorctl_restart "$@"
+    elif [[ "$1" == "supervisorctl" ]]; then
         shift 1
         e="supervisorctl $@" && run_exec php "$e"
     elif [[ "$1" == "models" ]]; then
@@ -443,11 +317,11 @@ if [ $# -gt 0 ]; then
         e="./vendor/bin/phpunit $@" && run_exec php "$e"
     elif [[ "$1" == "restart" ]]; then
         shift 1
-        $COMPOSE stop "$@"
-        $COMPOSE start "$@"
+        docker-compose stop "$@"
+        docker-compose start "$@"
     else
-        $COMPOSE "$@"
+        docker-compose "$@"
     fi
 else
-    $COMPOSE ps
+    docker-compose ps
 fi

composer.json

@@ -16,19 +16,14 @@
         "ext-simplexml": "*",
         "fideloper/proxy": "^4.4.1",
         "fruitcake/laravel-cors": "^2.0.4",
-        "guanguans/notify": "^1.21.1",
         "guzzlehttp/guzzle": "^7.3.0",
-        "hedeqiang/umeng": "^2.1",
         "laravel/framework": "^v8.48.1",
         "laravel/tinker": "^v2.6.1",
-        "lasserafn/php-initial-avatar-generator": "^4.2",
         "maatwebsite/excel": "^3.1.31",
         "madnest/madzipper": "^v1.1.0",
         "mews/captcha": "^3.2.6",
         "orangehill/iseed": "^3.0.1",
-        "overtrue/pinyin": "^4.0",
-        "predis/predis": "^1.1.7",
-        "symfony/mailer": "^6.0"
+        "predis/predis": "^1.1.7"
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "^v2.10.0",

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' => 2 * 1024 * 1024,
-        'socket_buffer_size' => 8 * 1024 * 1024,
-        'package_max_length' => 1024 * 1024 * 1024, // 1GB
+        'buffer_output_size' => 200 * 1024 * 1024,
+        'socket_buffer_size' => 256 * 1024 * 1024,
+        'package_max_length' => 200 * 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_27_121827_create_project_invites_table.php

@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateProjectInvitesTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('project_invites', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID');
-            $table->integer('num')->nullable()->default(0)->comment('累计邀请');
-            $table->string('code')->nullable()->default('')->comment('链接码');
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('project_invites');
-    }
-}

database/migrations/2021_12_29_170103_create_file_links_table.php

@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateFileLinksTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('file_links', function (Blueprint $table) {
-            $table->bigIncrements('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();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('file_links');
-    }
-}

database/migrations/2021_12_29_170409_file_users_add_permission.php

@@ -1,55 +0,0 @@
-<?php
-
-use App\Models\File;
-use App\Models\FileUser;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class FileUsersAddPermission extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        $isAdd = false;
-        Schema::table('file_users', function (Blueprint $table) use (&$isAdd) {
-            if (!Schema::hasColumn('file_users', 'permission')) {
-                $isAdd = true;
-                $table->tinyInteger('permission')->nullable()->default(0)->after('userid')->comment('权限：0只读，1读写');
-            }
-        });
-        if ($isAdd) {
-            // 更新数据
-            File::whereShare(1)->chunkById(100, function ($lists) {
-                foreach ($lists as $file) {
-                    FileUser::updateInsert([
-                        'file_id' => $file->id,
-                        'userid' => 0,
-                    ]);
-                }
-            });
-            File::whereShare(2)->update([
-                'share' => 1,
-            ]);
-            FileUser::wherePermission(0)->update([
-                'permission' => 1,
-            ]);
-        }
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('file_users', function (Blueprint $table) {
-            $table->dropColumn("permission");
-        });
-    }
-}

database/migrations/2021_12_30_155338_create_reports_table.php

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

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

@@ -1,32 +0,0 @@
-<?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_06_131020_users_add_disable_at.php

@@ -1,43 +0,0 @@
-<?php
-
-use App\Models\User;
-use Carbon\Carbon;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class UsersAddDisableAt extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        $isAdd = false;
-        Schema::table('users', function (Blueprint $table) use (&$isAdd) {
-            if (!Schema::hasColumn('users', 'disable_at')) {
-                $isAdd = true;
-                $table->timestamp('disable_at')->nullable()->after('created_ip')->comment('禁用时间');
-            }
-        });
-        if ($isAdd) {
-            User::where("identity", "like", "%,disable,%")->update([
-                'disable_at' => Carbon::now(),
-            ]);
-        }
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('users', function (Blueprint $table) {
-            $table->dropColumn("disable_at");
-        });
-    }
-}

database/migrations/2022_01_06_132023_project_tasks_update_subtask_time.php

@@ -1,39 +0,0 @@
-<?php
-
-use App\Models\ProjectTask;
-use Illuminate\Database\Migrations\Migration;
-
-class ProjectTasksUpdateSubtaskTime extends Migration
-{
-    /**
-     * 子任务同步主任务（任务时间）
-     *
-     * @return void
-     */
-    public function up()
-    {
-        ProjectTask::where('parent_id', '>', 0)
-            ->whereNull('end_at')
-            ->chunkById(100, function ($lists) {
-                /** @var ProjectTask $task */
-                foreach ($lists as $task) {
-                    $parent = ProjectTask::whereNotNull('end_at')->find($task->parent_id);
-                    if ($parent) {
-                        $task->start_at = $parent->start_at;
-                        $task->end_at = $parent->end_at;
-                        $task->save();
-                    }
-                }
-            });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-    }
-}

database/migrations/2022_01_06_164034_project_tasks_update_subtask_archived_delete.php

@@ -1,51 +0,0 @@
-<?php
-
-use App\Models\ProjectTask;
-use Illuminate\Database\Migrations\Migration;
-
-class ProjectTasksUpdateSubtaskArchivedDelete extends Migration
-{
-    /**
-     * 子任务同步主任务（归档、删除）
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // 归档
-        ProjectTask::whereParentId(0)
-            ->whereNotNull('archived_at')
-            ->chunkById(100, function ($lists) {
-                /** @var ProjectTask $task */
-                foreach ($lists as $task) {
-                    ProjectTask::whereParentId($task->id)->update([
-                        'archived_at' => $task->archived_at,
-                        'archived_userid' => $task->archived_userid,
-                        'archived_follow' => $task->archived_follow,
-                    ]);
-                }
-            });
-
-        // 删除
-        ProjectTask::onlyTrashed()
-            ->whereParentId(0)
-            ->chunkById(100, function ($lists) {
-                /** @var ProjectTask $task */
-                foreach ($lists as $task) {
-                    ProjectTask::whereParentId($task->id)->update([
-                        'deleted_at' => $task->deleted_at,
-                    ]);
-                }
-            });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-    }
-}

database/migrations/2022_01_08_171816_create_project_flow_items_table.php

@@ -1,38 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateProjectFlowItemsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('project_flow_items', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID');
-            $table->bigInteger('flow_id')->nullable()->default(0)->comment('流程ID');
-            $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->integer('sort')->nullable()->comment('排序');
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('project_flow_items');
-    }
-}

database/migrations/2022_01_08_171816_create_project_flows_table.php

@@ -1,33 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateProjectFlowsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('project_flows', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID');
-            $table->string('name', 50)->nullable()->default('')->comment('流程名称');
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('project_flows');
-    }
-}

database/migrations/2022_01_08_172053_project_tasks_add_flow_item_id_flow_item_name.php

@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class ProjectTasksAddFlowItemIdFlowItemName extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('project_tasks', function (Blueprint $table) {
-            if (!Schema::hasColumn('project_tasks', 'flow_item_id')) {
-                $table->bigInteger('flow_item_id')->nullable()->default(0)->after('dialog_id')->comment('工作流状态ID');
-                $table->string('flow_item_name', 50)->nullable()->default('')->after('flow_item_id')->comment('工作流状态名称');
-            }
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('project_tasks', function (Blueprint $table) {
-            $table->dropColumn("flow_item_id");
-            $table->dropColumn("flow_item_name");
-        });
-    }
-}

database/migrations/2022_01_11_182830_project_flow_items_add_usertype.php

@@ -1,42 +0,0 @@
-<?php
-
-use App\Models\ProjectFlowItem;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class ProjectFlowItemsAddUsertype extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        $isAdd = false;
-        Schema::table('project_flow_items', function (Blueprint $table) use (&$isAdd) {
-            if (!Schema::hasColumn('project_flow_items', 'usertype')) {
-                $isAdd = true;
-                $table->string('usertype', 10)->nullable()->default('')->after('userids')->comment('流转模式');
-            }
-        });
-        if ($isAdd) {
-            ProjectFlowItem::where("usertype", "")->update([
-                'usertype' => 'add',
-            ]);
-        }
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('project_flow_items', function (Blueprint $table) {
-            $table->dropColumn("usertype");
-        });
-    }
-}

database/migrations/2022_01_11_191703_project_logs_add_record.php

@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class ProjectLogsAddRecord extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('project_logs', function (Blueprint $table) {
-            if (!Schema::hasColumn('project_logs', 'record')) {
-                $table->text('record')->nullable()->after('detail')->comment('记录数据');
-            }
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('project_logs', function (Blueprint $table) {
-            $table->dropColumn("record");
-        });
-    }
-}

database/migrations/2022_01_12_153411_project_flow_items_add_userlimit.php

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

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

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

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

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

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

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

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

@@ -1,37 +0,0 @@
-<?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) {
-            //
-        });
-    }
-}