From 722b3b4788877519f430331776d6ba6dc1f49f86 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Sun, 11 Jun 2023 07:24:31 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/DialogController.php | 56 ------------------- package.json | 4 +- resources/assets/js/app.js | 2 +- .../PreviewImage/components/view.vue | 4 +- resources/assets/js/store/actions.js | 2 +- resources/assets/sass/element.scss | 18 +++--- vite.config.js | 2 +- 7 files changed, 16 insertions(+), 72 deletions(-) diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php index 483e3b441..2e2eb4528 100755 --- a/app/Http/Controllers/Api/DialogController.php +++ b/app/Http/Controllers/Api/DialogController.php @@ -1791,60 +1791,4 @@ class DialogController extends AbstractController 'list' => $builder->take(20)->get() ]); } - - - /** - * @api {post} api/dialog/msg/sendfiles 38. 群发文件上传 - * - * @apiDescription 需要token身份 - * @apiVersion 1.0.0 - * @apiGroup dialog - * @apiName msg__sendfiles - * - * @apiParam {String} user_ids 用户ID - * @apiParam {String} dialog_ids 对话ID（user_ids 二选一） - * @apiParam {Number} [reply_id] 回复ID - * @apiParam {Number} [image_attachment] 图片是否也存到附件 - * @apiParam {String} [filename] post-文件名称 - * @apiParam {String} [image64] post-base64图片（二选一） - * @apiParam {File} [files] post-文件对象（二选一） - * - * @apiSuccess {Number} ret 返回状态码（1正确、0错误） - * @apiSuccess {String} msg 返回信息（错误描述） - * @apiSuccess {Object} data 返回数据 - */ - public function msg__sendfiles() - { - $user = User::auth(); - $files = Request::file('files'); - $image64 = Request::input('image64'); - $fileName = Request::input('filename'); - $replyId = intval(Request::input('reply_id')); - $imageAttachment = intval(Request::input('image_attachment')); - // - $dialogIds = trim(Request::input('dialog_ids')); - if($dialogIds){ - $dialogIds = explode(',',$dialogIds); - }else{ - $dialogIds = []; - } - // 用户 - $userIds = trim(Request::input('user_ids')); - if($userIds){ - $userIds = explode(',',$userIds); - foreach($userIds as $userId){ - $dialog = WebSocketDialog::checkUserDialog($user, $userId); - if (empty($dialog)) { - return Base::retError('打开会话失败'); - } - $dialogIds[] = $dialog->id; - } - } - // - if(empty($dialogIds)){ - return Base::retError('找不到会话'); - } - // - return WebSocketDialog::sendMsgFiles($user,$dialogIds,$files,$image64,$fileName,$replyId,$imageAttachment); - } } diff --git a/package.json b/package.json index 2ca7d5d34..ae6df563a 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "css-loader": "^6.7.2", "dexie": "^3.2.3", "echarts": "^5.2.2", - "element-ui": "git+https://github.com/kuaifan/element.git#master", + "element-sea": "^2.15.10-3", "file-loader": "^6.2.0", "highlight.js": "^11.7.0", "inquirer": "^8.2.0", @@ -43,7 +43,7 @@ "moment": "^2.29.1", "node-sass": "^6.0.1", "notification-koro1": "^1.1.1", - "openpgp": "git+https://github.com/kuaifan/openpgpjs.git#base64", + "openpgp_hi": "^5.7.0-1", "photoswipe": "^5.2.8", "postcss": "^8.4.5", "quill": "^1.3.7", diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index fa54f5051..60a1cccba 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -59,7 +59,7 @@ import { Dropdown, DropdownMenu, DropdownItem, -} from 'element-ui'; +} from 'element-sea'; Vue.component('EAvatar', Avatar); Vue.component('ETooltip', Tooltip); diff --git a/resources/assets/js/components/PreviewImage/components/view.vue b/resources/assets/js/components/PreviewImage/components/view.vue index c76e3c5ad..df949e7a2 100644 --- a/resources/assets/js/components/PreviewImage/components/view.vue +++ b/resources/assets/js/components/PreviewImage/components/view.vue @@ -144,8 +144,8 @@