Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # app/Http/Controllers/Api/DialogController.php # app/Http/Controllers/Api/ProjectController.php # app/Models/Project.php # electron/package.json # package.json # public/css/app.css # public/js/app.js # public/js/build/146.js # public/js/build/188.js # public/js/build/188.js.LICENSE.txt # public/js/build/244.js # public/js/build/244.js.LICENSE.txt # public/js/build/278.js # public/js/build/278.js.LICENSE.txt # public/js/build/30.js # public/js/build/423.js # public/js/build/43.js # public/js/build/525.js # public/js/build/644.js.LICENSE.txt # public/js/build/660.js # public/js/build/766.js # public/js/build/831.js # public/js/build/893.js # public/js/build/919.js # public/js/build/919.js.LICENSE.txt # public/js/build/934.js # public/js/build/934.js.LICENSE.txt # resources/assets/js/pages/manage/components/DialogList.vue # resources/assets/js/pages/manage/components/DialogWrapper.vue # resources/assets/js/pages/manage/components/TaskAdd.vue # resources/assets/sass/components/report.scss
2022-02-07 10:50:38 +08:00
parent 469f30044a 32817a4275
commit 3d6df3cc09
67 changed files with 1630 additions and 849 deletions
--- a/app/Http/Controllers/Api/DialogController.php
+++ b/app/Http/Controllers/Api/DialogController.php
@@ -8,9 +8,7 @@ use App\Models\User;
 use App\Models\WebSocketDialog;
 use App\Models\WebSocketDialogMsg;
 use App\Models\WebSocketDialogMsgRead;
-use App\Models\WebSocketDialogUser;
 use App\Module\Base;
-use Carbon\Carbon;
 use Request;
 use Response;

@@ -162,16 +160,28 @@ class DialogController extends AbstractController
    }

    /**
-     * @api {get} api/dialog/msg/sendtext          05. 未读消息
+     * @api {get} api/dialog/msg/unread          05. 获取未读消息数量
     *
     * @apiDescription 需要token身份
     * @apiVersion 1.0.0
     * @apiGroup dialog
-     * @apiName msg__sendtext
+     * @apiName msg__unread
+     *
+     * @apiParam {Number} [dialog_id]         对话ID，留空获取总未读消息数量
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
     */
    public function msg__unread()
    {
-        $unread = WebSocketDialogMsgRead::whereUserid(User::userid())->whereReadAt(null)->count();
+        $dialog_id = intval(Request::input('dialog_id'));
+        //
+        $builder = WebSocketDialogMsgRead::whereUserid(User::userid())->whereReadAt(null);
+        if ($dialog_id > 0) {
+            $builder->whereDialogId($dialog_id);
+        }
+        $unread = $builder->count();
        return Base::retSuccess('success', [
            'unread' => $unread,
        ]);
@@ -331,7 +341,61 @@ class DialogController extends AbstractController
    }

    /**
-     * @api {get} api/dialog/msg/download          09. 文件下载
+     * @api {get} api/dialog/msg/detail          09. 消息详情
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__detail
+     *
+     * @apiParam {Number} msg_id            消息ID
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function msg__detail()
+    {
+        User::auth();
+        //
+        $msg_id = intval(Request::input('msg_id'));
+        //
+        $dialogMsg = WebSocketDialogMsg::whereId($msg_id)->first();
+        if (empty($dialogMsg)) {
+            return Base::retError("文件不存在");
+        }
+        $data = $dialogMsg->toArray();
+        //
+        if ($data['type'] == 'file') {
+            $codeExt = ['txt'];
+            $officeExt = ['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx'];
+            $localExt = ['jpg', 'jpeg', 'png', 'gif'];
+            $msg = Base::json2array($dialogMsg->getRawOriginal('msg'));
+            $filePath = public_path($msg['path']);
+            if (in_array($msg['ext'], $codeExt) && $msg['size'] < 2 * 1024 * 1024) {
+                // 文本预览，限制2M内的文件
+                $data['content'] = file_get_contents($filePath);
+                $data['file_mode'] = 1;
+            } elseif (in_array($msg['ext'], $officeExt)) {
+                // office预览
+                $data['file_mode'] = 2;
+            } else {
+                // 其他预览
+                if (in_array($msg['ext'], $localExt)) {
+                    $url = Base::fillUrl($msg['path']);
+                } else {
+                    $url = 'http://' . env('APP_IPPR') . '.3/' . $msg['path'];
+                }
+                $data['url'] = base64_encode($url);
+                $data['file_mode'] = 3;
+            }
+        }
+        //
+        return Base::retSuccess("success", $data);
+    }
+
+    /**
+     * @api {get} api/dialog/msg/download          10. 文件下载
     *
     * @apiDescription 需要token身份
     * @apiVersion 1.0.0
@@ -363,9 +427,9 @@ class DialogController extends AbstractController
    }

    /**
-     * @api {get} api/dialog/msg/withdraw          聊天消息撤回
+     * @api {get} api/dialog/msg/withdraw          11. 聊天消息撤回
     *
-     * @apiDescription 需要token身份
+     * @apiDescription 消息撤回限制24小时内，需要token身份
     * @apiVersion 1.0.0
     * @apiGroup dialog
     * @apiName msg__withdraw
@@ -375,43 +439,16 @@ class DialogController extends AbstractController
     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
     * @apiSuccess {String} msg     返回信息（错误描述）
     * @apiSuccess {Object} data    返回数据
-     *
-     * @return array
     */
-    public function msg__withdraw(): array
+    public function msg__withdraw()
    {
        $user = User::auth();
        $msg_id = intval(Request::input("msg_id"));
        $msg = WebSocketDialogMsg::whereId($msg_id)->whereUserid($user->userid)->first();
        if (empty($msg)) {
-            return Base::retError("此消息不可撤回");
+            return Base::retError("消息不存在或已被删除");
        }
-        $send_dt = Carbon::parse($msg->created_at)->addMinutes(5);
-        if ($send_dt->lt(Carbon::now()))
-            return Base::retError("已超过5分钟，此消息不能撤回");
-
-
-        // 删除文件、图片
-        if ($msg->type == WebSocketDialogMsg::MSG_TYPE_FILE) {
-            if (is_array($msg->msg)) {
-                // 删除本体
-                if (!empty($msg->msg["file"]))
-                    @unlink($msg->msg["file"]);
-                // 删除缩略图
-                if (!empty($msg->msg["thumb"]))
-                    @unlink($msg->msg["thumb"]);
-            }
-        }
-
-        // 直接删除消息
-        $msg->delete();
-
-        /* 原始需求：消息直接删除，无需提示 */
-        // 发送撤回指令
-//        WebSocketDialogMsg::sendMsg($msg->dialog_id, 'withdraw', [
-//            "msg_id" => $msg->id, // 被撤回的消息Id
-//        ], $user->userid);
-
+        $msg->deleteMsg();
        return Base::retSuccess("success");
    }
 }
--- a/app/Http/Controllers/Api/FileController.php
+++ b/app/Http/Controllers/Api/FileController.php
@@ -2,7 +2,6 @@

 namespace App\Http\Controllers\Api;

-
 use App\Exceptions\ApiException;
 use App\Models\AbstractModel;
 use App\Models\File;
@@ -10,12 +9,14 @@ use App\Models\FileContent;
 use App\Models\FileLink;
 use App\Models\FileUser;
 use App\Models\User;
+use App\Models\WebSocketDialogMsg;
 use App\Module\Base;
 use App\Module\Ihttp;
 use App\Tasks\BatchRemoveFileTask;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
 use Illuminate\Support\Facades\DB;
 use Request;
+use Response;

 /**
 * @apiDefine file
@@ -447,11 +448,11 @@ class FileController extends AbstractController
     * @apiName content
     *
     * @apiParam {Number|String} id
-     * - Number 文件ID（需要登录）
-     * - String 链接码（不需要登录，用于预览）
+     * - Number: 文件ID（需要登录）
+     * - String: 链接码（不需要登录，用于预览）
     * @apiParam {String} down          直接下载
     * - no: 浏览（默认）
-     * - yes: 下载
+     * - yes: 下载（office文件直接下载）
     *
     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
     * @apiSuccess {String} msg     返回信息（错误描述）
@@ -689,6 +690,8 @@ class FileController extends AbstractController
            'asp', 'properties', 'gitignore', 'log', 'bas', 'prg', 'python', 'ftl', 'aspx' => "code",
            'mp3', 'wav', 'mp4', 'flv',
            'avi', 'mov', 'wmv', 'mkv', '3gp', 'rm' => "media",
+            'xmind' => "xmind",
+            'rp' => "axure",
            default => "",
        };
        $file = File::createInstance([
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -1084,7 +1084,61 @@ class ProjectController extends AbstractController
    }

    /**
-     * @api {get} api/project/task/filedown          23. 下载任务文件
+     * @api {get} api/project/task/filedetail          23. 获取任务文件详情
+     *
+     * @apiDescription 需要token身份（限：项目、任务负责人）
+     * @apiVersion 1.0.0
+     * @apiGroup project
+     * @apiName task__filedetail
+     *
+     * @apiParam {Number} file_id            文件ID
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function task__filedetail()
+    {
+        User::auth();
+        //
+        $file_id = intval(Request::input('file_id'));
+        //
+        $file = ProjectTaskFile::find($file_id);
+        if (empty($file)) {
+            return Base::retError("文件不存在");
+        }
+        $data = $file->toArray();
+        $data['path'] = $file->getRawOriginal('path');
+        //
+        ProjectTask::userTask($file->task_id, true, true);
+        //
+        $codeExt = ['txt'];
+        $officeExt = ['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx'];
+        $localExt = ['jpg', 'jpeg', 'png', 'gif'];
+        $filePath = public_path($data['path']);
+        if (in_array($data['ext'], $codeExt) && $data['size'] < 2 * 1024 * 1024) {
+            // 文本预览，限制2M内的文件
+            $data['content'] = file_get_contents($filePath);
+            $data['file_mode'] = 1;
+        } elseif (in_array($data['ext'], $officeExt)) {
+            // office预览
+            $data['file_mode'] = 2;
+        } else {
+            // 其他预览
+            if (in_array($data['ext'], $localExt)) {
+                $url = Base::fillUrl($data['path']);
+            } else {
+                $url = 'http://' . env('APP_IPPR') . '.3/' . $data['path'];
+            }
+            $data['url'] = base64_encode($url);
+            $data['file_mode'] = 3;
+        }
+        //
+        return Base::retSuccess('success', $data);
+    }
+
+    /**
+     * @api {get} api/project/task/filedown          24. 下载任务文件
     *
     * @apiDescription 需要token身份（限：项目、任务负责人）
     * @apiVersion 1.0.0
@@ -1118,7 +1172,7 @@ class ProjectController extends AbstractController
    }

    /**
-     * @api {post} api/project/task/add          24. 添加任务
+     * @api {post} api/project/task/add          25. 添加任务
     *
     * @apiDescription 需要token身份
     * @apiVersion 1.0.0
@@ -1189,7 +1243,7 @@ class ProjectController extends AbstractController
    }

    /**
-     * @api {get} api/project/task/addsub          25. 添加子任务
+     * @api {get} api/project/task/addsub          26. 添加子任务
     *
     * @apiDescription 需要token身份（限：项目、任务负责人）
     * @apiVersion 1.0.0
@@ -1229,7 +1283,7 @@ class ProjectController extends AbstractController
    }

    /**
-     * @api {post} api/project/task/update          26. 修改任务、子任务
+     * @api {post} api/project/task/update          27. 修改任务、子任务
     *
     * @apiDescription 需要token身份（限：项目、任务负责人）
     * @apiVersion 1.0.0
@@ -1274,72 +1328,6 @@ class ProjectController extends AbstractController
        return Base::retSuccess('修改成功', $data);
    }

-    /**
-     * @api {post} api/project/task/upload          27. 上传文件
-     *
-     * @apiDescription 需要token身份（限：项目、任务负责人）
-     * @apiVersion 1.0.0
-     * @apiGroup project
-     * @apiName task__upload
-     *
-     * @apiParam {Number} task_id               任务ID
-     * @apiParam {String} [filename]            post-文件名称
-     * @apiParam {String} [image64]             post-base64图片（二选一）
-     * @apiParam {File} [files]                 post-文件对象（二选一）
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function task__upload()
-    {
-        $user = User::auth();
-        //
-        $task_id = Base::getPostInt('task_id');
-        //
-        $task = ProjectTask::userTask($task_id, true, true);
-        //
-        $path = "uploads/task/" . $task->id . "/";
-        $image64 = Base::getPostValue('image64');
-        $fileName = Base::getPostValue('filename');
-        if ($image64) {
-            $data = Base::image64save([
-                "image64" => $image64,
-                "path" => $path,
-                "fileName" => $fileName,
-            ]);
-        } else {
-            $data = Base::upload([
-                "file" => Request::file('files'),
-                "type" => 'file',
-                "path" => $path,
-                "fileName" => $fileName,
-            ]);
-        }
-        //
-        if (Base::isError($data)) {
-            return Base::retError($data['msg']);
-        } else {
-            $fileData = $data['data'];
-            $file = ProjectTaskFile::createInstance([
-                'project_id' => $task->project_id,
-                'task_id' => $task->id,
-                'name' => $fileData['name'],
-                'size' => $fileData['size'] * 1024,
-                'ext' => $fileData['ext'],
-                'path' => $fileData['path'],
-                'thumb' => Base::unFillUrl($fileData['thumb']),
-                'userid' => $user->userid,
-            ]);
-            $file->save();
-            //
-            $file = ProjectTaskFile::find($file->id);
-            $task->addLog("上传文件：" . $file->name);
-            $task->pushMsg('upload', $file);
-            return Base::retSuccess("上传成功", $file);
-        }
-    }
-
    /**
     * @api {get} api/project/task/dialog          28. 创建/获取聊天室
     *
@@ -1599,7 +1587,7 @@ class ProjectController extends AbstractController
    /**
     * @api {get} api/project/flow/list          33. 工作流列表
     *
-     * @apiDescription 需要token身份（限：项目负责人）
+     * @apiDescription 需要token身份
     * @apiVersion 1.0.0
     * @apiGroup project
     * @apiName flow__list
@@ -1615,13 +1603,8 @@ class ProjectController extends AbstractController
        User::auth();
        //
        $project_id = intval(Request::input('project_id'));
-        $is_filter = intval(Request::input('is_filter', 0));
        //
-        if ($is_filter > 0) {
-            $project = Project::userProject($project_id, null);
-        } else {
-            $project = Project::userProject($project_id, true, true);
-        }
+        $project = Project::userProject($project_id, true);
        //
        $list = ProjectFlow::with(['ProjectFlowItem'])->whereProjectId($project->id)->get();
        return Base::retSuccess('success', $list);