build

perf: 下载pdf使用自带浏览器
perf: 优化消息加载中效果
2024-04-17 23:59:29 +08:00 · 2024-04-17 10:21:35 +08:00 · 2024-04-17 09:32:53 +08:00 · 2024-04-17 08:10:08 +08:00 · 2024-04-17 07:46:43 +08:00 · 2024-04-17 00:34:12 +08:00
283 changed files with 3505 additions and 1495 deletions
--- a/.github/workflows/publish-desktop-mac.yml
+++ b/.github/workflows/publish-desktop-mac.yml
@@ -7,6 +7,7 @@ on:

 jobs:
  Build:
+    name: Build Mac
    runs-on: macos-latest
    environment: build

--- a/.github/workflows/publish-desktop-win.yml
+++ b/.github/workflows/publish-desktop-win.yml
@@ -7,6 +7,7 @@ on:

 jobs:
  Build:
+    name: Build Windows
    runs-on: windows-latest
    environment: build

--- a/.prefetch
+++ b/.prefetch
@@ -20,3 +20,8 @@ office/7.5.1-23/web-apps/apps/documenteditor/main/resources/css/app.css
 office/7.5.1-23/web-apps/apps/documenteditor/main/app.js
 office/7.5.1-23/sdkjs/word/sdk-all-min.js
 office/7.5.1-23/sdkjs/word/sdk-all.js
+drawio/webapp/js/app.min.js
+drawio/webapp/js/stencils.min.js
+drawio/webapp/js/extensions.min.js
+drawio/webapp/js/shapes-14-6-5.min.js
+drawio/webapp/math/es5/output/svg/fonts/tex.js
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,105 @@

 All notable changes to this project will be documented in this file.

+## [0.36.75]
+
+### Bug Fixes
+
+- Added non-passive event listener to a scroll-blocking 'touchstart' event
+
+### Performance
+
+- 下载pdf使用自带浏览器
+- 优化消息加载中效果
+- 审批内容禁止转发
+- 滑动快捷表情选择
+- 优化聊天输入框
+- Update chat editor
+- 优化机器人回复
+- 优化android体验
+
+## [0.36.60]
+
+### Performance
+
+- 优化使用默认浏览器打开规则
+- 优化聊天图片上传
+- 临时帐号别名
+- Tab icon load error
+- 优化会议
+- 创建会议不需要加入机器人
+- 暗黑模式下窗口背景色兼容问题
+- 优化网络检查
+- 客户端会议优化
+
+## [0.36.49]
+
+### Performance
+
+- 优化会议室
+
+## [0.36.44]
+
+### Bug Fixes
+
+- 部分情况出现注册失败
+- 最小化阅读窗口新建窗口不自动激活
+- 独立窗口不更新消息
+
+### Performance
+
+- 优化数据读取机制
+- 优化缓存规则
+- 优化完成待办数据推送
+- 评论审批图片和投票深色按钮
+
+## [0.36.36]
+
+### Bug Fixes
+
+- 修改回复、转发消息后引用的部分消失
+
+### Performance
+
+- 优化任务日志内容
+- 查看版本免请求接口
+- 添加任务时选择任务位置内容溢出
+- 消息支持style
+- 回复消息列表隐藏顶部loading
+- 支持FCM推送
+- 设置华为推送自分类
+- 优化添加任务可见性点击效果
+
+## [0.36.26]
+
+### Bug Fixes
+
+- 关闭文件后无法再次打开
+
+### Performance
+
+- 优化数据结构
+- 接龙优化为清空内容默认删除
+- 支持取消发送中的消息
+- 1. 强化接龙接口本地时间戳问题   2. 接龙消息点展开按钮后做缓存处理
+
+## [0.36.15]
+
+### Bug Fixes
+
+- 消息太长导致菜单无法正常显示
+- 项目数量不正确的情况
+- 部分未读和待办信息不显示的情况
+- 审批中心修复loadIng效果
+
+### Performance
+
+- 自动识别md格式发送
+- 优化回复、转发消息数据结构
+- 优化iOS端数据读取失败的情况
+- 回复消息时自动@提及
+- 优化会话数据结构
+
 ## [0.35.90]

 ### Bug Fixes
@@ -10,6 +109,7 @@ All notable changes to this project will be documented in this file.

 ### Performance

+- 聊天文件发送进度
 - 拨打电话确认提示
 - 优化预加载文件

--- a/app/Http/Controllers/Api/ApproveController.php
+++ b/app/Http/Controllers/Api/ApproveController.php
@@ -207,7 +207,7 @@ class ApproveController extends AbstractController
            if ($id != $user->userid) {
                $dialog = WebSocketDialog::checkUserDialog($botUser, $id);
                $processInst['comment_user_id'] = $user->userid;
-                $processInst['comment_content'] = json_decode($data['content'], true)['content'];
+                $processInst['comment_contents'] = json_decode($data['content'], true) ?? [];
                $this->approveMsg('approve_comment_notifier', $dialog, $botUser, $processInst, $processInst);
            }
        }
@@ -983,7 +983,8 @@ class ApproveController extends AbstractController
            'end_day_of_week' => '周' . Base::getTimeWeek(Carbon::parse($process['var']['end_time'])->timestamp),
            'description' => $process['var']['description'],
            'comment_nickname' => $process['comment_user_id'] ? User::userid2nickname($process['comment_user_id']) : '',
-            'comment_content' => $process['comment_content'] ?? ''
+            'comment_content' => $process['comment_contents']['content'] ?? '',
+            'comment_pictures' => $process['comment_contents']['pictures'] ?? []
        ];
        $text = view('push.bot', ['type' => $type, 'action' => $action, 'is_finished' => $process['is_finished'], 'data' => (object)$data])->render();
        $text = preg_replace("/^\x20+/", "", $text);
@@ -992,14 +993,14 @@ class ApproveController extends AbstractController
        if ($action == 'withdraw' || $action == 'pass' || $action == 'refuse') {
            // 任务完成，给发起人发送消息
            if ($type == 'approve_submitter' && $action != 'withdraw') {
-                return WebSocketDialogMsg::sendMsg($msg_action, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, true);
+                return WebSocketDialogMsg::sendMsg($msg_action, $dialog->id, 'text', ['text' => $text, 'approve_type' => $type], $botUser->userid, false, false, true);
            }
            // 查找最后一条消息msg_id
            $msg_action = 'change-' . $toUser['msg_id'];
        }
        //
        try {
-            $msg = WebSocketDialogMsg::sendMsg($msg_action, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, true);
+            $msg = WebSocketDialogMsg::sendMsg($msg_action, $dialog->id, 'text', ['text' => $text, 'approve_type' => $type], $botUser->userid, false, false, true);
            // 关联信息
            if ($action == 'start') {
                $proc_msg = new ApproveProcMsg();
--- a/app/Http/Controllers/Api/DialogController.php
+++ b/app/Http/Controllers/Api/DialogController.php
@@ -58,29 +58,36 @@ class DialogController extends AbstractController
    }

    /**
-     * @api {get} api/dialog/unread          02. 未读对话列表
+     * @api {get} api/dialog/beyond          02. 列表外对话
     *
-     * @apiDescription 需要token身份
+     * @apiDescription 需要token身份，列表外的未读对话 和 列表外的待办对话
     * @apiVersion 1.0.0
     * @apiGroup dialog
-     * @apiName lists
+     * @apiName beyond
     *
-     * @apiParam {String} before_at            在这个时间之前未读的数据
+     * @apiParam {String} unread_at         在这个时间之前未读的数据
+     * - 格式1：2021-01-01 00:00:00
+     * - 格式2：1612051200
+     * @apiParam {String} todo_at           在这个时间之前待办的数据
     *
     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
     * @apiSuccess {String} msg     返回信息（错误描述）
     * @apiSuccess {Object} data    返回数据
     */
-    public function unread()
+    public function beyond()
    {
        $user = User::auth();
        //
-        $beforeAt = Request::input('before_at');
-        if (empty($beforeAt)) {
-            return Base::retError('参数错误');
-        }
+        $unreadAt = Request::input('unread_at');
+        $todoAt = Request::input('todo_at');
        //
-        $data = WebSocketDialog::getDialogUnread($user->userid, Carbon::parse($beforeAt));
+        $unreadAt = Base::isNumber($unreadAt) ? intval($unreadAt) : trim($unreadAt);
+        $unreadAt = Carbon::parse($unreadAt)->setTimezone(config('app.timezone'));
+        //
+        $todoAt = Base::isNumber($todoAt) ? intval($todoAt) : trim($todoAt);
+        $todoAt = Carbon::parse($todoAt)->setTimezone(config('app.timezone'));
+        //
+        $data = WebSocketDialog::getDialogBeyond($user->userid, $unreadAt, $todoAt);
        //
        return Base::retSuccess('success', $data);
    }
@@ -108,12 +115,12 @@ class DialogController extends AbstractController
            return Base::retError('请输入搜索关键词');
        }
        // 搜索会话
-        $dialogs = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
+        $dialogs = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.last_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
            ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
            ->where('web_socket_dialogs.name', 'LIKE', "%{$key}%")
            ->where('u.userid', $user->userid)
            ->orderByDesc('u.top_at')
-            ->orderByDesc('web_socket_dialogs.last_at')
+            ->orderByDesc('u.last_at')
            ->take(20)
            ->get();
        $dialogs->transform(function (WebSocketDialog $item) use ($user) {
@@ -145,7 +152,7 @@ class DialogController extends AbstractController
        }
        // 搜索消息会话
        if (count($list) < 20) {
-            $msgs = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at', 'm.id as search_msg_id'])
+            $msgs = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.last_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at', 'm.id as search_msg_id'])
                ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
                ->join('web_socket_dialog_msgs as m', 'web_socket_dialogs.id', '=', 'm.dialog_id')
                ->where('u.userid', $user->userid)
@@ -178,7 +185,7 @@ class DialogController extends AbstractController
    {
        $user = User::auth();
        // 搜索会话
-        $msgs = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at', 'm.id as search_msg_id'])
+        $msgs = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.last_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at', 'm.id as search_msg_id'])
            ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
            ->join('web_socket_dialog_msgs as m', 'web_socket_dialogs.id', '=', 'm.dialog_id')
            ->where('u.userid', $user->userid)
@@ -213,7 +220,7 @@ class DialogController extends AbstractController
        //
        $dialog_id = intval(Request::input('dialog_id'));
        //
-        $item = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
+        $item = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.last_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
            ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
            ->where('web_socket_dialogs.id', $dialog_id)
            ->where('u.userid', $user->userid)
@@ -249,8 +256,8 @@ class DialogController extends AbstractController
        //
        $dialog = WebSocketDialog::checkDialog($dialog_id);
        //
-        $data = $dialog->dialogUser->toArray();
        if ($getuser === 1) {
+            $data = $dialog->dialogUser->toArray();
            $array = [];
            foreach ($data as $item) {
                $res = User::userid2basic($item['userid']);
@@ -258,14 +265,16 @@ class DialogController extends AbstractController
                    $array[] = array_merge($item, $res->toArray());
                }
            }
-            $data = $array;
-        }
-        //
-        $array = [];
-        foreach ($data as $item) {
-            if ($item['userid'] > 0) {
-                $array[] = $item;
-            }
+            $array = array_filter($array, function ($item) {
+                return $item['userid'] > 0;
+            });
+        } else {
+            $data = WebSocketDialogUser::select(['web_socket_dialog_users.*', 'users.bot'])
+                ->join('users', 'web_socket_dialog_users.userid', '=', 'users.userid')
+                ->where('web_socket_dialog_users.dialog_id', $dialog_id)
+                ->orderBy('web_socket_dialog_users.id')
+                ->get();
+            $array = $data->toArray();
        }
        return Base::retSuccess('success', $array);
    }
@@ -1710,6 +1719,12 @@ class DialogController extends AbstractController
                if (Base::isSuccess($res)) {
                    $add = $res['data'];
                }
+                //
+                $msg->webSocketDialog?->pushMsg('update', [
+                    'id' => $msg->id,
+                    'todo' => $msg->todo,
+                    'dialog_id' => $msg->dialog_id,
+                ]);
            }
        }
        //
@@ -2168,12 +2183,12 @@ class DialogController extends AbstractController
        $dialog_id = intval(Request::input('dialog_id'));
        $uuid = trim(Request::input('uuid'));
        $text = trim(Request::input('text'));
-        $list = Request::input('list');
+        $list = Request::input('list') ?? [];
        //
        WebSocketDialog::checkDialog($dialog_id);
        $strlen = mb_strlen($text);
        $noimglen = mb_strlen(preg_replace("/<img[^>]*?>/i", "", $text));
-        if ($strlen < 1) {
+        if ($strlen < 1 || empty($list)) {
            return Base::retError('内容不能为空');
        }
        if ($noimglen > 200000) {
@@ -2188,17 +2203,31 @@ class DialogController extends AbstractController
                    ->orderByDesc('created_at')
                    ->where('msg', 'like', "%$uuid%")
                    ->value('msg');
-                $list = array_reverse(array_merge($dialogMsg['list'] ?? [], $list));
-                $list = array_reduce($list, function ($result, $item) {
-                    $fieldValue = $item['id'];  // 指定字段名
-                    if (!isset($result[$fieldValue])) {
-                        $result[$fieldValue] = $item;
+                //
+                $createId = $dialogMsg['createid'] ?? $user->userid;
+                // 新增
+                $msgList = $dialogMsg['list'] ?? [];
+                $addList = array_udiff($list, $msgList, function($a, $b) {
+                    return ($a['id'] ?? 0) - $b['id'];
+                });
+                foreach ($addList as $key => $item) {
+                    $item['id'] = intval(round(microtime(true) * 1000)) + $key;
+                    $msgList[] = $item;
+                }
+                // 编辑更新
+                $lists = array_column($list,null,'id');
+                foreach ($msgList as $key => $item) {
+                    if (isset($lists[$item['id']]) && $item['userid'] == $user->userid) {
+                        $msgList[$key] = $lists[$item['id']];
                    }
-                    return $result;
-                }, []);
-                $list = array_reverse(array_values($list));
+                }
+                $list = $msgList;
            } else {
+                $createId = $user->userid;
                $uuid = Base::generatePassword(36);
+                foreach ($list as $key => $item) {
+                    $list[$key]['id'] = intval(round(microtime(true) * 1000)) + $key;
+                }
            }
            //
            usort($list, function ($a, $b) {
@@ -2209,6 +2238,7 @@ class DialogController extends AbstractController
                'text' => $text,
                'list' => $list,
                'userid' => $user->userid,
+                'createid' => $createId,
                'uuid' => $uuid,
            ];
            return WebSocketDialogMsg::sendMsg(null, $dialog_id, 'word-chain', $msgData, $user->userid);
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -2301,7 +2301,7 @@ class ProjectController extends AbstractController
        $project = Project::userProject($task->project_id);
        ProjectPermission::userTaskPermission($project, ProjectPermission::TASK_MOVE, $task);
        //
-        if( $task->project_id == $project_id && $task->column_id == $column_id){
+        if ($task->project_id == $project_id && $task->column_id == $column_id) {
            return Base::retSuccess('移动成功', ['id' => $task_id]);
        }
        //
@@ -2310,7 +2310,7 @@ class ProjectController extends AbstractController
        if (empty($column)) {
            return Base::retError('列表不存在');
        }
-        if($flow_item_id){
+        if ($flow_item_id) {
            $flowItem = projectFlowItem::whereProjectId($project->id)->whereId($flow_item_id)->first();
            if (empty($flowItem)) {
                return Base::retError('任务状态不存在');
@@ -2463,6 +2463,21 @@ class ProjectController extends AbstractController
                'week' => Doo::translate("周" . Base::getTimeWeek($timestamp)),
                'segment' => Doo::translate(Base::getTimeDayeSegment($timestamp)),
            ];
+            $record = Base::json2array($log->record);
+            if (is_array($record['change'])) {
+                foreach ($record['change'] as &$item) {
+                    $item = preg_replace_callback('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', function ($matches) {
+                        $time = strtotime($matches[0]);
+                        $second = date("s", $time);
+                        $second = $second === "00" ? "" : ":$second";
+                        if (date("Y") === date("Y", $time)) {
+                            return date("m-d H:i", $time) . $second;
+                        }
+                        return date("Y-m-d H:i", $time) . $second;
+                    }, $item);
+                }
+                $log->record = $record;
+            }
            return $log;
        });
        //
--- a/app/Http/Controllers/Api/SystemController.php
+++ b/app/Http/Controllers/Api/SystemController.php
@@ -40,7 +40,7 @@ class SystemController extends AbstractController
     * @apiParam {String} type
     * - get: 获取（默认）
     * - all: 获取所有（需要管理员权限）
-     * - save: 保存设置（参数：['reg', 'reg_identity', 'reg_invite', 'login_code', 'password_policy', 'project_invite', 'chat_information', 'anon_message', 'e2e_message', 'auto_archived', 'archived_day', 'task_visible', 'task_default_time', 'all_group_mute', 'all_group_autoin', 'user_private_chat_mute', 'user_group_chat_mute', 'image_compress', 'image_save_local', 'start_home']）
+     * - save: 保存设置（参数：['reg', 'reg_identity', 'reg_invite', 'temp_account_alias', 'login_code', 'password_policy', 'project_invite', 'chat_information', 'anon_message', 'e2e_message', 'auto_archived', 'archived_day', 'task_visible', 'task_default_time', 'all_group_mute', 'all_group_autoin', 'user_private_chat_mute', 'user_group_chat_mute', 'image_compress', 'image_save_local', 'start_home']）

     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
     * @apiSuccess {String} msg     返回信息（错误描述）
@@ -60,6 +60,7 @@ class SystemController extends AbstractController
                    'reg',
                    'reg_identity',
                    'reg_invite',
+                    'temp_account_alias',
                    'login_code',
                    'password_policy',
                    'project_invite',
@@ -99,13 +100,14 @@ class SystemController extends AbstractController
        //
        if ($type == 'all' || $type == 'save') {
            User::auth('admin');
-            $setting['reg_invite'] = $setting['reg_invite'] ?: Base::generatePassword(8);
+            $setting['reg_invite'] = $setting['reg_invite'] ?: Base::generatePassword();
        } else {
            if (isset($setting['reg_invite'])) unset($setting['reg_invite']);
        }
        //
        $setting['reg'] = $setting['reg'] ?: 'open';
        $setting['reg_identity'] = $setting['reg_identity'] ?: 'normal';
+        $setting['temp_account_alias'] = $setting['temp_account_alias'] ?: '';
        $setting['login_code'] = $setting['login_code'] ?: 'auto';
        $setting['password_policy'] = $setting['password_policy'] ?: 'simple';
        $setting['project_invite'] = $setting['project_invite'] ?: 'open';
@@ -202,7 +204,7 @@ class SystemController extends AbstractController
     *
     * @apiParam {String} type
     * - get: 获取（默认）
-     * - save: 保存设置（参数：['open', 'appid', 'app_certificate']）
+     * - save: 保存设置（参数：['open', 'appid', 'app_certificate', 'api_key', 'api_secret']）
     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
     * @apiSuccess {String} msg     返回信息（错误描述）
     * @apiSuccess {Object} data    返回数据
@@ -222,12 +224,14 @@ class SystemController extends AbstractController
                    'open',
                    'appid',
                    'app_certificate',
+                    'api_key',
+                    'api_secret',
                ])) {
                    unset($all[$key]);
                }
            }
            if ($all['open'] === 'open' && (!$all['appid'] || !$all['app_certificate'])) {
-                return Base::retError('请填写完整的参数');
+                return Base::retError('请填写基本配置');
            }
            $setting = Base::setting('meetingSetting', Base::newTrim($all));
        } else {
@@ -238,6 +242,8 @@ class SystemController extends AbstractController
        if (env("SYSTEM_SETTING") == 'disabled') {
            $setting['appid'] = substr($setting['appid'], 0, 4) . str_repeat('*', strlen($setting['appid']) - 8) . substr($setting['appid'], -4);
            $setting['app_certificate'] = substr($setting['app_certificate'], 0, 4) . str_repeat('*', strlen($setting['app_certificate']) - 8) . substr($setting['app_certificate'], -4);
+            $setting['api_key'] = substr($setting['api_key'], 0, 4) . str_repeat('*', strlen($setting['api_key']) - 8) . substr($setting['api_key'], -4);
+            $setting['api_secret'] = substr($setting['api_secret'], 0, 4) . str_repeat('*', strlen($setting['api_secret']) - 8) . substr($setting['api_secret'], -4);
        }
        //
        return Base::retSuccess('success', $setting ?: json_decode('{}'));
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -582,7 +582,7 @@ class UsersController extends AbstractController
                    $tags[] = Doo::translate("系统管理员");
                }
                if ($userInfo->isTemp()) {
-                    $tags[] = Doo::translate("临时帐号");
+                    $tags[] = User::tempAccountAlias(); // 临时帐号
                }
                if ($userInfo->userid > 3 && Carbon::parse($userInfo->created_at)->isAfter(Carbon::now()->subDays(30))) {
                    $tags[] = Doo::translate("新帐号");
@@ -615,7 +615,7 @@ class UsersController extends AbstractController
    public function basic()
    {
        $sharekey = Request::header('sharekey');
-        if(empty($sharekey) || !Meeting::getShareInfo($sharekey)){
+        if (empty($sharekey) || !Meeting::getShareInfo($sharekey)) {
            User::auth();
        }
        //
@@ -768,7 +768,7 @@ class UsersController extends AbstractController
        //
        if ($getCheckinMac) {
            $list->transform(function (User $user) use ($getCheckinMac) {
-                if($getCheckinMac){
+                if ($getCheckinMac) {
                    $user->checkin_macs = UserCheckinMac::select(['id', 'mac', 'remark'])->whereUserid($user->userid)->orderBy('id')->get();
                }
                return $user;
@@ -1101,10 +1101,17 @@ class UsersController extends AbstractController
        ];
        $row = UmengAlias::where($inArray);
        if ($row->exists()) {
-            $row->update(['updated_at' => Carbon::now()]);
+            $row->update([
+                'ua' => $data['userAgent'],
+                'device' => $data['deviceModel'],
+                'updated_at' => Carbon::now()
+            ]);
            return Base::retSuccess('别名已存在');
        }
-        $row = UmengAlias::createInstance($inArray);
+        $row = UmengAlias::createInstance(array_merge($inArray, [
+            'ua' => $data['userAgent'],
+            'device' => $data['deviceModel'],
+        ]));
        if ($row->save()) {
            return Base::retSuccess('添加成功');
        } else {
@@ -1136,17 +1143,17 @@ class UsersController extends AbstractController
    public function meeting__open()
    {
        $type = trim(Request::input('type'));
-        $meetingid = trim(Request::input('meetingid'));
+        $meetingid = str_replace(' ', '', trim(Request::input('meetingid')));
        $name = trim(Request::input('name'));
        $userids = Request::input('userids');
        $sharekey = trim(Request::input('sharekey'));
        $username = trim(Request::input('username'));
        $user = null;
-        if(!empty($sharekey) && $type === 'join'){
-            if(!Meeting::getShareInfo($sharekey)){
+        if (!empty($sharekey) && $type === 'join') {
+            if (!Meeting::getShareInfo($sharekey)) {
                return Base::retError('分享链接已过期');
            }
-        }else{
+        } else {
            $user = User::auth();
        }
        $isCreate = false;
@@ -1156,6 +1163,11 @@ class UsersController extends AbstractController
            if (empty($meeting)) {
                return Base::retError('频道ID不存在');
            }
+            if ($meeting->end_at) {
+                return Base::retError('会议已结束');
+            }
+            $meeting->updated_at = Carbon::now();
+            $meeting->save();
        } elseif ($type === 'create') {
            $meetingid = strtoupper(Base::generatePassword(11, 1));
            $name = $name ?: "{$user?->nickname} 发起的会议";
@@ -1180,9 +1192,9 @@ class UsersController extends AbstractController
        if (empty($meetingSetting['appid']) || empty($meetingSetting['app_certificate'])) {
            return Base::retError('会议功能配置错误，请联系管理员');
        }
-        $uid = intval(str_pad(Base::generatePassword(4,1), 9, 8, STR_PAD_LEFT));
-        if($user){
-            $uid = intval(str_pad(Base::generatePassword(5,1), 6, 9, STR_PAD_LEFT).$user->userid);
+        $uid = intval(str_pad(Base::generatePassword(4, 1), 9, 8, STR_PAD_LEFT));
+        if ($user) {
+            $uid = intval(str_pad(Base::generatePassword(5, 1), 6, 9, STR_PAD_LEFT) . $user->userid);
        }
        try {
            $service = new AgoraTokenGenerator($meetingSetting['appid'], $meetingSetting['app_certificate'], $meeting->channel, $uid);
@@ -1213,7 +1225,7 @@ class UsersController extends AbstractController
        //
        $data['appid'] = $meetingSetting['appid'];
        $data['uid'] = $uid;
-        $data['userimg'] = $sharekey ? Base::fillUrl('avatar/'.$username.'.png') : $user?->userimg;
+        $data['userimg'] = $sharekey ? Base::fillUrl('avatar/' . $username . '.png') : $user?->userimg;
        $data['nickname'] = $sharekey ? $username : $user?->nickname;
        $data['token'] = $token;
        $data['msgs'] = $msgs;
@@ -1242,7 +1254,7 @@ class UsersController extends AbstractController
    {
        $meetingid = trim(Request::input('meetingid'));
        $sharekey = trim(Request::input('sharekey'));
-        if(empty($sharekey) || !Meeting::getShareInfo($sharekey)){
+        if (empty($sharekey) || !Meeting::getShareInfo($sharekey)) {
            User::auth();
        }
        $meeting = Meeting::whereMeetingid($meetingid)->first();
@@ -1963,7 +1975,7 @@ class UsersController extends AbstractController
                }
            }
        } else {
-            if($type == 'file'){
+            if ($type == 'file') {
                $lists[] = [
                    'type' => 'children',
                    'url' => Base::fillUrl("api/users/share/list") . "?pid=0",
--- a/app/Http/Controllers/IndexController.php
+++ b/app/Http/Controllers/IndexController.php
@@ -10,18 +10,19 @@ use Response;
 use App\Module\Doo;
 use App\Models\File;
 use App\Module\Base;
-use App\Tasks\LoopTask;
 use App\Module\Extranet;
-use App\Tasks\AppPushTask;
 use App\Module\RandomColor;
+use App\Tasks\LoopTask;
+use App\Tasks\AppPushTask;
 use App\Tasks\JokeSoupTask;
 use App\Tasks\DeleteTmpTask;
 use App\Tasks\EmailNoticeTask;
 use App\Tasks\AutoArchivedTask;
 use App\Tasks\DeleteBotMsgTask;
 use App\Tasks\CheckinRemindTask;
-use Hhxsv5\LaravelS\Swoole\Task\Task;
+use App\Tasks\CloseMeetingRoomTask;
 use App\Tasks\UnclaimedTaskRemindTask;
+use Hhxsv5\LaravelS\Swoole\Task\Task;
 use LasseRafn\InitialAvatarGenerator\InitialAvatar;


@@ -165,6 +166,8 @@ class IndexController extends InvokeController
        Task::deliver(new JokeSoupTask());
        // 未领取任务通知
        Task::deliver(new UnclaimedTaskRemindTask());
+        // 关闭会议室
+        Task::deliver(new CloseMeetingRoomTask());

        return "success";
    }
--- a/app/Models/ApproveProcMsg.php
+++ b/app/Models/ApproveProcMsg.php
@@ -11,9 +11,15 @@ namespace App\Models;
 * @property int|null $msg_id 消息ID
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg whereId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ApproveProcMsg whereMsgId($value)
--- a/app/Models/Deleted.php
+++ b/app/Models/Deleted.php
@@ -12,9 +12,15 @@ use Carbon\Carbon;
 * @property int|null $did 删除的数据ID
 * @property int|null $userid 关系会员ID
 * @property \Illuminate\Support\Carbon|null $created_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|Deleted newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|Deleted newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|Deleted query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|Deleted whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|Deleted whereDid($value)
 * @method static \Illuminate\Database\Eloquent\Builder|Deleted whereId($value)
--- a/app/Models/File.php
+++ b/app/Models/File.php
@@ -28,10 +28,16 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|File newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|File newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|File onlyTrashed()
 * @method static \Illuminate\Database\Eloquent\Builder|File query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|File whereCid($value)
 * @method static \Illuminate\Database\Eloquent\Builder|File whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|File whereCreatedId($value)
--- a/app/Models/FileContent.php
+++ b/app/Models/FileContent.php
@@ -18,10 +18,16 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|FileContent newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|FileContent newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|FileContent onlyTrashed()
 * @method static \Illuminate\Database\Eloquent\Builder|FileContent query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|FileContent whereContent($value)
 * @method static \Illuminate\Database\Eloquent\Builder|FileContent whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|FileContent whereDeletedAt($value)
--- a/app/Models/FileLink.php
+++ b/app/Models/FileLink.php
@@ -8,16 +8,22 @@ use App\Module\Base;
 * App\Models\FileLink
 *
 * @property int $id
- * @property int|null $file_id 项目ID
+ * @property int|null $file_id 文件ID
 * @property int|null $num 累计访问
 * @property string|null $code 链接码
 * @property int|null $userid 会员ID
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property-read \App\Models\File|null $file
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|FileLink newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|FileLink newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|FileLink query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereCode($value)
 * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereFileId($value)
--- a/app/Models/FileUser.php
+++ b/app/Models/FileUser.php
@@ -12,9 +12,15 @@ namespace App\Models;
 * @property int|null $permission 权限：0只读，1读写
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|FileUser newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|FileUser newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|FileUser query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereFileId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereId($value)
--- a/app/Models/Meeting.php
+++ b/app/Models/Meeting.php
@@ -18,9 +18,15 @@ use Illuminate\Support\Carbon;
 * @property Carbon|null $updated_at
 * @property string|null $end_at
 * @property Carbon|null $deleted_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|Meeting newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|Meeting newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|Meeting query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereChannel($value)
 * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|Meeting whereDeletedAt($value)
@@ -44,12 +50,12 @@ class Meeting extends AbstractModel
    public function getShareLink()
    {
        $code = base64_encode("{$this->meetingid}" . Base::generatePassword());
-        Cache::put(self::CACHE_KEY.'_'.$code, [
+        Cache::put(self::CACHE_KEY . '_' . $code, [
            'id' => $this->id,
            'meetingid' => $this->meetingid,
            'channel' => $this->channel,
        ], Carbon::now()->addHours(self::CACHE_EXPIRED_TIME));
-        return Base::fillUrl("meeting/{$this->meetingid}/".$code);
+        return Base::fillUrl("meeting/{$this->meetingid}/" . $code);
    }

    /**
@@ -58,19 +64,19 @@ class Meeting extends AbstractModel
     */
    public static function getShareInfo($code)
    {
-        if(Cache::has(self::CACHE_KEY.'_'.$code)){
-            return Cache::get(self::CACHE_KEY.'_'.$code);
+        if (Cache::has(self::CACHE_KEY . '_' . $code)) {
+            return Cache::get(self::CACHE_KEY . '_' . $code);
        }
        return null;
    }

    /**
     * 保存访客信息
-     * @return mixed
+     * @return void
     */
    public static function setTouristInfo($data)
    {
-        Cache::put(Meeting::CACHE_KEY.'_'.$data['uid'], [
+        Cache::put(Meeting::CACHE_KEY . '_' . $data['uid'], [
            'uid' => $data['uid'],
            'userimg' => $data['userimg'],
            'nickname' => $data['nickname'],
@@ -83,8 +89,8 @@ class Meeting extends AbstractModel
     */
    public static function getTouristInfo($touristId)
    {
-        if(Cache::has(Meeting::CACHE_KEY.'_'.$touristId)){
-            return Cache::get(Meeting::CACHE_KEY.'_'.$touristId);
+        if (Cache::has(Meeting::CACHE_KEY . '_' . $touristId)) {
+            return Cache::get(Meeting::CACHE_KEY . '_' . $touristId);
        }
        return null;
    }
--- a/app/Models/MeetingMsg.php
+++ b/app/Models/MeetingMsg.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\MeetingMsg
+ *
+ * @property int $id
+ * @property string|null $meetingid 会议ID
+ * @property int|null $dialog_id 对话ID
+ * @property int|null $msg_id 消息ID
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|MeetingMsg newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|MeetingMsg newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|MeetingMsg query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|MeetingMsg whereDialogId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MeetingMsg whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MeetingMsg whereMeetingid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MeetingMsg whereMsgId($value)
+ * @mixin \Eloquent
+ */
+class MeetingMsg extends AbstractModel
+{
+    function __construct(array $attributes = [])
+    {
+        parent::__construct($attributes);
+        $this->timestamps = false;
+    }
+}
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -36,10 +36,16 @@ use Request;
 * @property-read int|null $project_user_count
 * @method static \Illuminate\Database\Eloquent\Builder|Project allData($userid = null)
 * @method static \Illuminate\Database\Eloquent\Builder|Project authData($userid = null, $owner = null)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|Project newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|Project newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|Project onlyTrashed()
 * @method static \Illuminate\Database\Eloquent\Builder|Project query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|Project whereArchivedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|Project whereArchivedUserid($value)
 * @method static \Illuminate\Database\Eloquent\Builder|Project whereCreatedAt($value)
--- a/app/Models/ProjectColumn.php
+++ b/app/Models/ProjectColumn.php
@@ -22,10 +22,16 @@ use Request;
 * @property-read \App\Models\Project|null $project
 * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ProjectTask> $projectTask
 * @property-read int|null $project_task_count
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn onlyTrashed()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn whereColor($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectColumn whereDeletedAt($value)
--- a/app/Models/ProjectFlow.php
+++ b/app/Models/ProjectFlow.php
@@ -2,8 +2,6 @@

 namespace App\Models;

-use App\Module\Base;
-
 /**
 * App\Models\ProjectFlow
 *
@@ -14,9 +12,15 @@ use App\Module\Base;
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ProjectFlowItem> $projectFlowItem
 * @property-read int|null $project_flow_item_count
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereName($value)
--- a/app/Models/ProjectFlowItem.php
+++ b/app/Models/ProjectFlowItem.php
@@ -13,7 +13,7 @@ use App\Module\Base;
 * @property string|null $name 名称
 * @property string|null $status 状态
 * @property array $turns 可流转
- * @property array $userids 自动负责人ID
+ * @property array $userids 状态负责人ID
 * @property string|null $usertype 流转模式
 * @property int|null $userlimit 限制负责人
 * @property int|null $columnid 对应的项目列表
@@ -21,9 +21,15 @@ use App\Module\Base;
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property-read \App\Models\ProjectFlow|null $projectFlow
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereColumnid($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereFlowId($value)
--- a/app/Models/ProjectInvite.php
+++ b/app/Models/ProjectInvite.php
@@ -13,9 +13,15 @@ namespace App\Models;
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property-read bool $already
 * @property-read \App\Models\Project|null $project
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite whereCode($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite whereId($value)
--- a/app/Models/ProjectLog.php
+++ b/app/Models/ProjectLog.php
@@ -10,7 +10,7 @@ use App\Module\Base;
 * @property int $id
 * @property int|null $project_id 项目ID
 * @property int|null $column_id 列表ID
- * @property int|null $task_id 项目ID
+ * @property int|null $task_id 任务ID
 * @property int|null $userid 会员ID
 * @property string|null $detail 详细信息
 * @property array $record 记录数据
@@ -18,9 +18,15 @@ use App\Module\Base;
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property-read \App\Models\ProjectTask|null $projectTask
 * @property-read \App\Models\User|null $user
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereColumnId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereDetail($value)
--- a/app/Models/ProjectPermission.php
+++ b/app/Models/ProjectPermission.php
@@ -13,9 +13,15 @@ use App\Module\Base;
 * @property string $permissions 权限
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectPermission newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectPermission newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectPermission query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectPermission whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectPermission whereId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectPermission wherePermissions($value)
--- a/app/Models/ProjectTask.php
+++ b/app/Models/ProjectTask.php
@@ -63,10 +63,16 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask allData($userid = null)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask authData($userid = null, $owner = null)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask betweenTime($start, $end, $type = 'taskTime')
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask onlyTrashed()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask whereArchivedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask whereArchivedFollow($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask whereArchivedUserid($value)
--- a/app/Models/ProjectTaskContent.php
+++ b/app/Models/ProjectTaskContent.php
@@ -14,9 +14,15 @@ use App\Exceptions\ApiException;
 * @property string|null $content 内容
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereContent($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskContent whereId($value)
--- a/app/Models/ProjectTaskFile.php
+++ b/app/Models/ProjectTaskFile.php
@@ -22,9 +22,15 @@ use Cache;
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property-read int $height
 * @property-read int $width
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFile newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFile newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFile query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFile whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFile whereDownload($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFile whereExt($value)
--- a/app/Models/ProjectTaskFlowChange.php
+++ b/app/Models/ProjectTaskFlowChange.php
@@ -14,9 +14,15 @@ namespace App\Models;
 * @property string|null $after_flow_item_name （变化后）工作流状态名称
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereAfterFlowItemId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereAfterFlowItemName($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereBeforeFlowItemId($value)
--- a/app/Models/ProjectTaskPushLog.php
+++ b/app/Models/ProjectTaskPushLog.php
@@ -17,10 +17,16 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog onlyTrashed()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereDeletedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereId($value)
--- a/app/Models/ProjectTaskTag.php
+++ b/app/Models/ProjectTaskTag.php
@@ -12,9 +12,15 @@ namespace App\Models;
 * @property string|null $color 颜色
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTag newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTag newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTag query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTag whereColor($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTag whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskTag whereId($value)
--- a/app/Models/ProjectTaskUser.php
+++ b/app/Models/ProjectTaskUser.php
@@ -14,9 +14,15 @@ namespace App\Models;
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property-read \App\Models\ProjectTask|null $projectTask
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser whereId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser whereOwner($value)
--- a/app/Models/ProjectTaskVisibilityUser.php
+++ b/app/Models/ProjectTaskVisibilityUser.php
@@ -12,9 +12,15 @@ namespace App\Models;
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property-read \App\Models\ProjectTask|null $projectTask
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser whereId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskVisibilityUser whereProjectId($value)
--- a/app/Models/ProjectUser.php
+++ b/app/Models/ProjectUser.php
@@ -13,9 +13,15 @@ namespace App\Models;
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property-read \App\Models\Project|null $project
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereOwner($value)
--- a/app/Models/Report.php
+++ b/app/Models/Report.php
@@ -29,9 +29,15 @@ use JetBrains\PhpStorm\Pure;
 * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $receivesUser
 * @property-read int|null $receives_user_count
 * @property-read \App\Models\User|null $sendUser
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static Builder|Report newModelQuery()
 * @method static Builder|Report newQuery()
 * @method static Builder|Report query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static Builder|Report whereContent($value)
 * @method static Builder|Report whereCreatedAt($value)
 * @method static Builder|Report whereId($value)
--- a/app/Models/ReportReceive.php
+++ b/app/Models/ReportReceive.php
@@ -13,9 +13,15 @@ use Illuminate\Database\Eloquent\Model;
 * @property string|null $receive_time 接收时间
 * @property int $userid 接收人
 * @property int $read 是否已读
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereRead($value)
 * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereReceiveTime($value)
--- a/app/Models/Setting.php
+++ b/app/Models/Setting.php
@@ -13,9 +13,15 @@ use App\Module\Base;
 * @property string|null $setting
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|Setting newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|Setting newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|Setting query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|Setting whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|Setting whereDesc($value)
 * @method static \Illuminate\Database\Eloquent\Builder|Setting whereId($value)
--- a/app/Models/TaskWorker.php
+++ b/app/Models/TaskWorker.php
@@ -15,10 +15,16 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker onlyTrashed()
 * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereArgs($value)
 * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|TaskWorker whereDeletedAt($value)
--- a/app/Models/Tmp.php
+++ b/app/Models/Tmp.php
@@ -11,9 +11,15 @@ namespace App\Models;
 * @property string|null $content
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|Tmp newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|Tmp newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|Tmp query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|Tmp whereContent($value)
 * @method static \Illuminate\Database\Eloquent\Builder|Tmp whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|Tmp whereId($value)
--- a/app/Models/UmengAlias.php
+++ b/app/Models/UmengAlias.php
@@ -14,15 +14,25 @@ use Hedeqiang\UMeng\IOS;
 * @property int|null $userid 会员ID
 * @property string|null $alias 别名
 * @property string|null $platform 平台类型
+ * @property string|null $device 设备类型
+ * @property string|null $ua userAgent
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereAlias($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereDevice($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias wherePlatform($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUa($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUpdatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereUserid($value)
 * @mixin \Eloquent
@@ -142,7 +152,13 @@ class UmengAlias extends AbstractModel
                    'mi_activity' => 'app.eeui.umeng.activity.MfrMessageActivity',
                    'policy' => [
                        'expire_time' => Carbon::now()->addSeconds($seconds)->toDateTimeString(),
-                    ]
+                    ],
+                    'channel_properties' => [
+                        'vivo_category' => 'IM',
+                        'huawei_channel_importance' => 'NORMAL',
+                        'huawei_channel_category' => 'IM',
+                        'channel_fcm' => 1,
+                    ],
                ]);

            default:
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -37,10 +37,16 @@ use Carbon\Carbon;
 * @property int|null $bot 是否机器人
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
 * @method static \Database\Factories\UserFactory factory(...$parameters)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|User newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|User newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|User query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|User whereAz($value)
 * @method static \Illuminate\Database\Eloquent\Builder|User whereBot($value)
 * @method static \Illuminate\Database\Eloquent\Builder|User whereChangepass($value)
@@ -527,6 +533,16 @@ class User extends AbstractModel
        }
    }

+    /**
+     * 临时帐号别名
+     * @return mixed|string
+     */
+    public static function tempAccountAlias()
+    {
+        $alias = Base::settingFind('system', 'temp_account_alias');
+        return $alias ?: Doo::translate("临时帐号");
+    }
+
    /**
     * 获取头像
     * @param $userid
--- a/app/Models/UserBot.php
+++ b/app/Models/UserBot.php
@@ -21,9 +21,15 @@ use Carbon\Carbon;
 * @property int|null $webhook_num 消息webhook请求次数
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|UserBot newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|UserBot newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|UserBot query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereBotId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereClearAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereClearDay($value)
--- a/app/Models/UserCheckinMac.php
+++ b/app/Models/UserCheckinMac.php
@@ -15,9 +15,15 @@ use App\Module\Base;
 * @property string|null $remark 备注
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinMac newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinMac newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinMac query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinMac whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinMac whereId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinMac whereMac($value)
--- a/app/Models/UserCheckinRecord.php
+++ b/app/Models/UserCheckinRecord.php
@@ -16,9 +16,15 @@ use App\Module\Base;
 * @property int|null $report_time 上报的时间戳
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord whereDate($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinRecord whereId($value)
--- a/app/Models/UserDelete.php
+++ b/app/Models/UserDelete.php
@@ -16,9 +16,15 @@ use App\Module\Base;
 * @property string $cache 会员资料缓存
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|UserDelete newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|UserDelete newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|UserDelete query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereCache($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UserDelete whereEmail($value)
--- a/app/Models/UserDepartment.php
+++ b/app/Models/UserDepartment.php
@@ -14,9 +14,15 @@ use App\Exceptions\ApiException;
 * @property int|null $owner_userid 部门负责人
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereDialogId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UserDepartment whereId($value)
--- a/app/Models/UserEmailVerification.php
+++ b/app/Models/UserEmailVerification.php
@@ -19,9 +19,15 @@ use Guanguans\Notify\Messages\EmailMessage;
 * @property int|null $type 邮件类型：1-邮箱认证，2-修改邮箱
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereCode($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereEmail($value)
--- a/app/Models/UserTransfer.php
+++ b/app/Models/UserTransfer.php
@@ -16,9 +16,15 @@ use Guanguans\Notify\Messages\EmailMessage;
 * @property int|null $new_userid 交接人
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer whereId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer whereNewUserid($value)
--- a/app/Models/WebSocket.php
+++ b/app/Models/WebSocket.php
@@ -13,9 +13,15 @@ namespace App\Models;
 * @property int|null $userid
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocket newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocket newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocket query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocket whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocket whereFd($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocket whereId($value)
--- a/app/Models/WebSocketDialog.php
+++ b/app/Models/WebSocketDialog.php
@@ -20,29 +20,35 @@ use Illuminate\Support\Facades\DB;
 * @property string|null $group_type 聊天室类型
 * @property string|null $name 对话名称
 * @property string $avatar 头像（群）
- * @property string|null $last_at 最后消息时间
 * @property int|null $owner_id 群主用户ID
 * @property int|null $link_id 关联id
+ * @property int|null $top_userid 置顶的用户ID
 * @property int|null $top_msg_id 置顶的消息ID
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property \Illuminate\Support\Carbon|null $deleted_at
 * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\WebSocketDialogUser> $dialogUser
 * @property-read int|null $dialog_user_count
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog onlyTrashed()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereAvatar($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereDeletedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereGroupType($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereLastAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereLinkId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereName($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereOwnerId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereTopMsgId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereTopUserid($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereType($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereUpdatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog withTrashed()
@@ -81,7 +87,7 @@ class WebSocketDialog extends AbstractModel
     */
    public static function getDialogList($userid, $updated = "", $deleted = "")
    {
-        $builder = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
+        $builder = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.last_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
            ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
            ->where('u.userid', $userid);
        if ($updated) {
@@ -89,7 +95,7 @@ class WebSocketDialog extends AbstractModel
        }
        $list = $builder
            ->orderByDesc('u.top_at')
-            ->orderByDesc('web_socket_dialogs.last_at')
+            ->orderByDesc('u.last_at')
            ->paginate(Base::getPaginate(100, 50));
        $list->transform(function (WebSocketDialog $item) use ($userid) {
            return $item->formatData($userid);
@@ -103,31 +109,70 @@ class WebSocketDialog extends AbstractModel
    }

    /**
-     * 获取未读对话列表
+     * 列表外的未读对话 和 列表外的待办对话
     * @param $userid
-     * @param $beforeAt
-     * @param $take
+     * @param $unreadAt
+     * @param $todoAt
     * @return WebSocketDialog[]
     */
-    public static function getDialogUnread($userid, $beforeAt, $take = 20)
+    public static function getDialogBeyond($userid, $unreadAt, $todoAt)
    {
        DB::statement("SET SQL_MODE=''");
-        $list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
-            ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
-            ->join('web_socket_dialog_msg_reads as r', 'web_socket_dialogs.id', '=', 'r.dialog_id')
-            ->where('u.userid', $userid)
-            ->where('r.userid', $userid)
-            ->where('r.silence', 0)
-            ->where('r.read_at')
-            ->where('web_socket_dialogs.last_at', '>', $beforeAt)
-            ->groupBy('web_socket_dialogs.id')
-            ->take(min(100, $take))
-            ->get();
-        $list->transform(function (WebSocketDialog $item) use ($userid) {
-            return $item->formatData($userid);
-        });
-        //
-        return $list;
+        $ids = [];
+        $array = [];
+        if ($unreadAt) {
+            // 未读对话
+            $list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.last_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
+                ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
+                ->join('web_socket_dialog_msg_reads as r', 'web_socket_dialogs.id', '=', 'r.dialog_id')
+                ->where('u.userid', $userid)
+                ->where('r.userid', $userid)
+                ->where('r.read_at')
+                ->where('u.last_at', '<', $unreadAt)
+                ->groupBy('u.dialog_id')
+                ->take(20)
+                ->get();
+            $list->transform(function (WebSocketDialog $item) use ($userid, &$ids, &$array) {
+                if (!in_array($item->id, $ids)) {
+                    $ids[] = $item->id;
+                    $array[] = $item->formatData($userid);
+                }
+            });
+            // 标记未读会话
+            $list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.last_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
+                ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
+                ->where('u.userid', $userid)
+                ->where('u.mark_unread', 1)
+                ->where('u.last_at', '<', $unreadAt)
+                ->take(20)
+                ->get();
+            $list->transform(function (WebSocketDialog $item) use ($userid, &$ids, &$array) {
+                if (!in_array($item->id, $ids)) {
+                    $ids[] = $item->id;
+                    $array[] = $item->formatData($userid);
+                }
+            });
+        }
+        if ($todoAt) {
+            // 待办会话
+            $list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.last_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
+                ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
+                ->join('web_socket_dialog_msg_todos as t', 'web_socket_dialogs.id', '=', 't.dialog_id')
+                ->where('u.userid', $userid)
+                ->where('t.userid', $userid)
+                ->where('t.done_at')
+                ->where('u.last_at', '<', $todoAt)
+                ->groupBy('u.dialog_id')
+                ->take(20)
+                ->get();
+            $list->transform(function (WebSocketDialog $item) use ($userid, &$ids, &$array) {
+                if (!in_array($item->id, $ids)) {
+                    $ids[] = $item->id;
+                    $array[] = $item->formatData($userid);
+                }
+            });
+        }
+        return $array;
    }


@@ -149,6 +194,7 @@ class WebSocketDialog extends AbstractModel
        $time = Carbon::parse($this->user_at ?? $dialogUserFun('updated_at'));
        $this->hide = $this->hide ?? $dialogUserFun('hide');
        $this->top_at = $this->top_at ?? $dialogUserFun('top_at');
+        $this->last_at = $this->last_at ?? $dialogUserFun('last_at');
        $this->user_at = $time->toDateTimeString('millisecond');
        $this->user_ms = $time->valueOf();
        //
@@ -552,20 +598,6 @@ class WebSocketDialog extends AbstractModel
        Task::deliver($task);
    }

-    /**
-     * 更新对话最后消息时间
-     * @return WebSocketDialogMsg|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Model|\Illuminate\Database\Query\Builder|object|null
-     */
-    public function updateMsgLastAt()
-    {
-        $lastMsg = WebSocketDialogMsg::whereDialogId($this->id)->orderByDesc('id')->first();
-        if ($lastMsg) {
-            $this->last_at = $lastMsg->created_at;
-            $this->save();
-        }
-        return $lastMsg;
-    }
-
    /**
     * 获取对话（同时检验对话身份）
     * @param $dialog_id
@@ -622,7 +654,6 @@ class WebSocketDialog extends AbstractModel
                'name' => $name ?: '',
                'group_type' => $group_type,
                'owner_id' => $owner_id,
-                'last_at' => in_array($group_type, ['user', 'department', 'all']) ? Carbon::now() : null,
            ]);
            $dialog->save();
            foreach (is_array($userid) ? $userid : [$userid] as $value) {
@@ -630,7 +661,8 @@ class WebSocketDialog extends AbstractModel
                    WebSocketDialogUser::createInstance([
                        'dialog_id' => $dialog->id,
                        'userid' => $value,
-                        'important' => !in_array($group_type, ['user', 'all'])
+                        'important' => !in_array($group_type, ['user', 'all']),
+                        'last_at' => in_array($group_type, ['user', 'department', 'all']) ? Carbon::now() : null,
                    ])->save();
                }
            }
--- a/app/Models/WebSocketDialogMsg.php
+++ b/app/Models/WebSocketDialogMsg.php
@@ -33,18 +33,21 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @property int|null $reply_id 回复ID
 * @property int|null $forward_id 转发ID
 * @property int|null $forward_num 被转发多少次
- * @property int|null $forward_show 是否显示转发的来源
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property-read \App\Models\WebSocketDialogMsg|null $forward_data
 * @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|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg onlyTrashed()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @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)
@@ -52,7 +55,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereEmoji($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereForwardId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereForwardNum($value)
- * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereForwardShow($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)
@@ -78,8 +80,6 @@ class WebSocketDialogMsg extends AbstractModel

    protected $appends = [
        'percentage',
-        'reply_data',
-        'forward_data',
    ];

    protected $hidden = [
@@ -107,36 +107,6 @@ class WebSocketDialogMsg extends AbstractModel
        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;
-            }
-        }
-        return $this->appendattrs['reply_data'];
-    }
-
-    /**
-     * 转发消息详情
-     * @return WebSocketDialogMsg|null
-     */
-    public function getForwardDataAttribute()
-    {
-        if (!isset($this->appendattrs['forward_data'])) {
-            $this->appendattrs['forward_data'] = null;
-            if ($this->forward_id > 0) {
-                $this->appendattrs['forward_data'] = self::find($this->forward_id, ['id', 'userid', 'type', 'msg'])?->cancelAppend() ?: null;
-            }
-        }
-        return $this->appendattrs['forward_data'];
-    }
-
    /**
     * 消息格式化
     * @param $value
@@ -147,13 +117,9 @@ class WebSocketDialogMsg extends AbstractModel
        if (is_array($value)) {
            return $value;
        }
-        $value = Base::json2array($value);
-        if ($this->type === 'file') {
-            $value['type'] = in_array($value['ext'], ['jpg', 'jpeg', 'webp', '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']);
+        $value = $this->formatDataMsg($this->type, $value);
+        if (isset($value['reply_data'])) {
+            $value['reply_data']['msg'] = $this->formatDataMsg($value['reply_data']['type'], $value['reply_data']['msg']);
        }
        return $value;
    }
@@ -171,6 +137,27 @@ class WebSocketDialogMsg extends AbstractModel
        return Base::json2array($value);
    }

+    /**
+     * 处理消息数据
+     * @param $type
+     * @param $msg
+     * @return mixed
+     */
+    private function formatDataMsg($type, $msg)
+    {
+        if (!is_array($msg)) {
+            $msg = Base::json2array($msg);
+        }
+        if ($type === 'file') {
+            $msg['type'] = in_array($msg['ext'], ['jpg', 'jpeg', 'webp', 'png', 'gif']) ? 'img' : 'file';
+            $msg['path'] = Base::fillUrl($msg['path']);
+            $msg['thumb'] = Base::fillUrl($msg['thumb'] ?: Base::extIcon($msg['ext']));
+        } else if ($type === 'record') {
+            $msg['path'] = Base::fillUrl($msg['path']);
+        }
+        return $msg;
+    }
+
    /**
     * 获取占比
     * @param bool|int $increment 是否新增阅读数
@@ -391,15 +378,25 @@ class WebSocketDialogMsg extends AbstractModel
     * 转发消息
     * @param array|int $dialogids
     * @param array|int $userids
-     * @param User $user    发送的会员
-     * @param int $showSource    是否显示原发送者信息
-     * @param string $leaveMessage    转发留言
+     * @param User $user                发送的会员
+     * @param int $showSource           是否显示原发送者信息
+     * @param string $leaveMessage      转发留言
     * @return mixed
     */
    public function forwardMsg($dialogids, $userids, $user, $showSource = 1, $leaveMessage = '')
    {
-        return AbstractModel::transaction(function() use ($dialogids, $user, $userids, $showSource, $leaveMessage) {
-            $originalMsg = Base::json2array($this->getRawOriginal('msg'));
+        return AbstractModel::transaction(function () use ($dialogids, $user, $userids, $showSource, $leaveMessage) {
+            $msgData = Base::json2array($this->getRawOriginal('msg'));
+            $forwardData = is_array($msgData['forward_data']) ? $msgData['forward_data'] : [];
+            $forwardId = $forwardData['id'] ?: $this->id;
+            $forwardUserid = $forwardData['userid'] ?: $this->userid;
+            $msgData['forward_data'] = [
+                'id' => $forwardId,                 // 转发的消息ID（原始）
+                'userid' => $forwardUserid,         // 转发的消息会员ID（原始）
+                'parent_id' => $this->id,           // 转发的消息ID
+                'parent_userid' => $this->userid,   // 转发的消息会员ID
+                'show' => $showSource,              // 是否显示原发送者信息
+            ];
            $msgs = [];
            $already = [];
            if ($dialogids) {
@@ -407,7 +404,7 @@ class WebSocketDialogMsg extends AbstractModel
                    $dialogids = [$dialogids];
                }
                foreach ($dialogids as $dialogid) {
-                    $res = self::sendMsg('forward-'.( $showSource ? 1 : 0).'-'.($this->forward_id ?: $this->id), $dialogid, $this->type, $originalMsg, $user->userid);
+                    $res = self::sendMsg('forward-' . $forwardId, $dialogid, $this->type, $msgData, $user->userid);
                    if (Base::isSuccess($res)) {
                        $msgs[] = $res['data'];
                        $already[] = $dialogid;
@@ -427,7 +424,7 @@ class WebSocketDialogMsg extends AbstractModel
                    }
                    $dialog = WebSocketDialog::checkUserDialog($user, $userid);
                    if ($dialog && !in_array($dialog->id, $already)) {
-                        $res = self::sendMsg('forward-'.( $showSource ? 1 : 0).'-'.($this->forward_id  ?: $this->id), $dialog->id, $this->type, $originalMsg, $user->userid);
+                        $res = self::sendMsg('forward-' . $forwardId, $dialog->id, $this->type, $msgData, $user->userid);
                        if (Base::isSuccess($res)) {
                            $msgs[] = $res['data'];
                        }
@@ -437,6 +434,9 @@ class WebSocketDialogMsg extends AbstractModel
                    }
                }
            }
+            if (count($msgs) > 0) {
+                $this->increment('forward_num', count($msgs));
+            }
            return Base::retSuccess('转发成功', [
                'msgs' => $msgs
            ]);
@@ -458,9 +458,8 @@ class WebSocketDialogMsg extends AbstractModel
            WebSocketDialogMsgTodo::whereIn('msg_id', $ids)->delete();
            self::whereIn('id', $ids)->delete();
            //
-            $dialogDatas = WebSocketDialog::whereIn('id', $dialogIds)->get();
-            foreach ($dialogDatas as $dialogData) {
-                $dialogData->updateMsgLastAt();
+            foreach ($dialogIds as $dialogId) {
+                WebSocketDialogUser::updateMsgLastAt($dialogId);
            }
            foreach ($replyIds as $id) {
                self::whereId($id)->update(['reply_num' => self::whereReplyId($id)->count()]);
@@ -501,7 +500,7 @@ class WebSocketDialogMsg extends AbstractModel
                        'data' => [
                            'id' => $this->id,
                            'dialog_id' => $this->dialog_id,
-                            'last_msg' => $dialogData->updateMsgLastAt(),
+                            'last_msg' => WebSocketDialogUser::updateMsgLastAt($this->dialog_id),
                            'update_read' => $deleteRead ? 1 : 0
                        ],
                    ]
@@ -786,7 +785,20 @@ class WebSocketDialogMsg extends AbstractModel
        }
        // 过滤标签
        $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_callback("/\<(blockquote|strong|pre|ol|ul|li|em|p|s|u)(.*?)\>/is", function (array $match) {    // 不用去除a标签，上面已经处理过了
+            preg_match("/<[^>]*?style=([\"'])(.*?)\\1[^>]*?>/is", $match[0], $matchs);
+            $attach = '';
+            if ($matchs) {
+                $styleArray = explode(';', $matchs[2]);
+                $validStyles = array_filter($styleArray, function ($styleItem) {
+                    return preg_match('/\s*(?:color|font-size|background-color|font-weight|font-family|text-decoration|font-style)\s*:/i', $styleItem); // 只保留指定样式
+                });
+                if ($validStyles) {
+                    $attach = ' style="' . implode(';', $validStyles) . '"';
+                }
+            }
+            return "<{$match[1]}{$attach}>";
+        }, $text);
        $text = preg_replace_callback("/\[:LINK:(.*?):(.*?):\]/i", function (array $match) {
            return "<a href=\"" . base64_decode($match[1]) . "\" target=\"_blank\">" . base64_decode($match[2]) . "</a>";
        }, $text);
@@ -849,7 +861,7 @@ class WebSocketDialogMsg extends AbstractModel
        $update_id = intval(preg_match("/^update-(\d+)$/", $action, $match) ? $match[1] : 0);
        $change_id = intval(preg_match("/^change-(\d+)$/", $action, $match) ? $match[1] : 0);
        $reply_id = intval(preg_match("/^reply-(\d+)$/", $action, $match) ? $match[1] : 0);
-        $forward_id = intval(preg_match("/^forward-(\d+)-(\d+)$/", $action, $match) ? $match[2] : 0);
+        $forward_id = intval(preg_match("/^forward-(\d+)$/", $action, $match) ? $match[1] : 0);
        $sender = $sender === null ? User::userid() : $sender;
        //
        $dialog = WebSocketDialog::find($dialog_id);
@@ -871,17 +883,26 @@ class WebSocketDialogMsg extends AbstractModel
            if (empty($dialogMsg)) {
                throw new ApiException('消息不存在');
            }
-            if ($dialogMsg->type !== 'text' && $dialogMsg->type !== 'vote') {
-                throw new ApiException('此消息不支持此操作');
-            }
-            if ($dialogMsg->userid != $sender && $dialogMsg->type !== 'vote') {
-                throw new ApiException('仅支持修改自己的消息');
+            $oldMsg = Base::json2array($dialogMsg->getRawOriginal('msg'));
+            if ($dialogMsg->type === 'vote') {
+                if ($dialogMsg->userid != $sender) {
+                    $msg = [
+                        'votes' => $msg['votes'],
+                    ];
+                }
+            } else {
+                if ($dialogMsg->type !== 'text') {
+                    throw new ApiException('此消息不支持此操作');
+                }
+                if ($dialogMsg->userid != $sender) {
+                    throw new ApiException('仅支持修改自己的消息');
+                }
            }
            //
            $updateData = [
                'mtype' => $mtype,
                'link' => $link,
-                'msg' => $msg,
+                'msg' => array_merge($oldMsg, $msg),
                'modify' => $modify,
            ];
            $dialogMsg->updateInstance($updateData);
@@ -902,36 +923,51 @@ class WebSocketDialogMsg extends AbstractModel
            return Base::retSuccess('修改成功', $dialogMsg);
        } else {
            // 发送
-            if ($reply_id && !self::whereId($reply_id)->increment('reply_num')) {
-                throw new ApiException('回复的消息不存在');
-            }
-            // 转发
-            if ($forward_id && !self::whereId($forward_id)->increment('forward_num')) {
-                throw new ApiException('转发的消息不存在');
+            if ($reply_id) {
+                // 回复
+                $replyRow = self::whereId($reply_id)->whereDialogId($dialog_id)->first();
+                if (empty($replyRow)) {
+                    throw new ApiException('回复的消息不存在');
+                }
+                $replyMsg = Base::json2array($replyRow->getRawOriginal('msg'));
+                unset($replyMsg['reply_data']);
+                $msg['reply_data'] = [
+                    'id' => $replyRow->id,
+                    'userid' => $replyRow->userid,
+                    'type' => $replyRow->type,
+                    'msg' => $replyMsg,
+                ];
+                $replyRow->increment('reply_num');
            }
            //
            $dialogMsg = self::createInstance([
                'dialog_id' => $dialog_id,
                'dialog_type' => $dialog->type,
                'reply_id' => $reply_id,
+                'forward_id' => $forward_id,
                'userid' => $sender,
                'type' => $type,
                'mtype' => $mtype,
                'link' => $link,
                'msg' => $msg,
                'read' => 0,
-                'forward_id' => $forward_id,
-                'forward_show' => $forward_id ? $match[1] : 1,
            ]);
-            AbstractModel::transaction(function () use ($dialog, $dialogMsg) {
-                $dialog->last_at = Carbon::now();
-                $dialog->save();
+            AbstractModel::transaction(function () use ($dialogMsg) {
                $dialogMsg->send = 1;
                $dialogMsg->key = $dialogMsg->generateMsgKey();
                $dialogMsg->save();
                //
-                WebSocketDialogUser::whereDialogId($dialog->id)->change([
+                if ($dialogMsg->type === 'meeting') {
+                    MeetingMsg::createInstance([
+                        'meetingid' => $dialogMsg->msg['meetingid'],
+                        'dialog_id' => $dialogMsg->dialog_id,
+                        'msg_id' => $dialogMsg->id,
+                    ])->save();
+                }
+                //
+                WebSocketDialogUser::whereDialogId($dialogMsg->dialog_id)->change([
                    'hide' => 0,    // 有新消息时，显示会话（会话内所有会员）
+                    'last_at' => Carbon::now(),
                    'updated_at' => Carbon::now()->toDateTimeString('millisecond'),
                ]);
            });
--- a/app/Models/WebSocketDialogMsgRead.php
+++ b/app/Models/WebSocketDialogMsgRead.php
@@ -17,9 +17,15 @@ use Carbon\Carbon;
 * @property int|null $after 在阅读之后才添加的记录
 * @property string|null $read_at 阅读时间
 * @property-read \App\Models\WebSocketDialogMsg|null $webSocketDialogMsg
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereAfter($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereDialogId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereEmail($value)
--- a/app/Models/WebSocketDialogMsgTodo.php
+++ b/app/Models/WebSocketDialogMsgTodo.php
@@ -11,9 +11,15 @@ namespace App\Models;
 * @property int|null $userid 接收会员ID
 * @property string|null $done_at 完成时间
 * @property-read array|mixed $msg_data
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTodo newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTodo newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTodo query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTodo whereDialogId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTodo whereDoneAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgTodo whereId($value)
--- a/app/Models/WebSocketDialogUser.php
+++ b/app/Models/WebSocketDialogUser.php
@@ -11,23 +11,33 @@ use Carbon\Carbon;
 * @property int|null $dialog_id 对话ID
 * @property int|null $userid 会员ID
 * @property string|null $top_at 置顶时间
+ * @property string|null $last_at 最后消息时间
 * @property int|null $mark_unread 是否标记为未读：0否，1是
 * @property int|null $silence 是否免打扰：0否，1是
+ * @property int|null $hide 不显示会话：0否，1是
 * @property int|null $inviter 邀请人
- * @property int|null $important 是否不可移出（项目、任务人员）
+ * @property int|null $important 是否不可移出（项目、任务、部门人员）
 * @property string|null $color 颜色
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property-read \App\Models\WebSocketDialog|null $webSocketDialog
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereColor($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereDialogId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereHide($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereImportant($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereInviter($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereLastAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereMarkUnread($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereSilence($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereTopAt($value)
@@ -46,4 +56,17 @@ class WebSocketDialogUser extends AbstractModel
    {
        return $this->hasOne(WebSocketDialog::class, 'id', 'dialog_id');
    }
+
+    /**
+     * 更新对话最后消息时间
+     * @return WebSocketDialogMsg|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Model|\Illuminate\Database\Query\Builder|object|null
+     */
+    public static function updateMsgLastAt($dialogId)
+    {
+        $lastMsg = WebSocketDialogMsg::whereDialogId($dialogId)->orderByDesc('id')->first();
+        if ($lastMsg) {
+            WebSocketDialogUser::whereDialogId($dialogId)->change(['last_at' => $lastMsg->created_at]);
+        }
+        return $lastMsg;
+    }
 }
--- a/app/Models/WebSocketTmpMsg.php
+++ b/app/Models/WebSocketTmpMsg.php
@@ -12,9 +12,15 @@ namespace App\Models;
 * @property int|null $create_id 所属会员ID
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketTmpMsg newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketTmpMsg newQuery()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketTmpMsg query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketTmpMsg whereCreateId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketTmpMsg whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|WebSocketTmpMsg whereId($value)
--- a/app/Module/Doo.php
+++ b/app/Module/Doo.php
@@ -228,6 +228,14 @@ class Doo
        if (Base::isError($data)) {
            throw new ApiException($data['msg'] ?: '注册失败');
        }
+        if (\DB::transactionLevel() > 0) {
+            try {
+                \DB::commit();
+                \DB::beginTransaction();
+            } catch (\Throwable) {
+                // do nothing
+            }
+        }
        $user = User::whereEmail($email)->first();
        if (empty($user)) {
            throw new ApiException('注册失败');
--- a/app/Observers/WebSocketDialogUserObserver.php
+++ b/app/Observers/WebSocketDialogUserObserver.php
@@ -4,6 +4,7 @@ namespace App\Observers;

 use App\Models\Deleted;
 use App\Models\WebSocketDialogUser;
+use Carbon\Carbon;

 class WebSocketDialogUserObserver
 {
@@ -15,6 +16,18 @@ class WebSocketDialogUserObserver
     */
    public function created(WebSocketDialogUser $webSocketDialogUser)
    {
+        if (!$webSocketDialogUser->last_at) {
+            if (in_array($webSocketDialogUser->webSocketDialog?->group_type, ['user', 'department', 'all'])) {
+                $webSocketDialogUser->last_at = Carbon::now();
+                $webSocketDialogUser->save();
+            } else {
+                $item = WebSocketDialogUser::whereDialogId($webSocketDialogUser->dialog_id)->orderByDesc('last_at')->first();
+                if ($item?->last_at) {
+                    $webSocketDialogUser->last_at = $item->last_at;
+                    $webSocketDialogUser->save();
+                }
+            }
+        }
        Deleted::forget('dialog', $webSocketDialogUser->dialog_id, $webSocketDialogUser->userid);
    }

--- a/app/Services/WebSocketService.php
+++ b/app/Services/WebSocketService.php
@@ -62,6 +62,7 @@ class WebSocketService implements WebSocketHandlerInterface
                            'type' => 'open',
                            'data' => [
                                'fd' => $fd,
+                                'ud' => $user->userid,
                            ],
                        ]));
                        // 通知上线
--- a/app/Tasks/BotReceiveMsgTask.php
+++ b/app/Tasks/BotReceiveMsgTask.php
@@ -316,12 +316,12 @@ class BotReceiveMsgTask extends AbstractTask
                    $nameKey = $isManager ? $array[2] : $array[1];
                    $data = $this->botManagerOne($botId, $msg->userid);
                    if ($data) {
-                        $list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
+                        $list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.last_at', 'u.mark_unread', 'u.silence', 'u.hide', 'u.color', 'u.updated_at as user_at'])
                            ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
                            ->where('web_socket_dialogs.name', 'LIKE', "%{$nameKey}%")
                            ->where('u.userid', $data->userid)
                            ->orderByDesc('u.top_at')
-                            ->orderByDesc('web_socket_dialogs.last_at')
+                            ->orderByDesc('u.last_at')
                            ->take(20)
                            ->get();
                        if ($list->isEmpty()) {
--- a/app/Tasks/CloseMeetingRoomTask.php
+++ b/app/Tasks/CloseMeetingRoomTask.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace App\Tasks;
+
+use App\Models\Meeting;
+use App\Models\WebSocketDialog;
+use App\Module\Base;
+use Carbon\Carbon;
+use App\Models\WebSocketDialogMsg;
+use Illuminate\Support\Facades\Cache;
+
+@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
+
+class CloseMeetingRoomTask extends AbstractTask
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    public function start()
+    {
+        // 10分钟执行一次
+        $time = intval(Cache::get("CloseMeetingRoomTask:Time"));
+        if (time() - $time < 600) {
+            return;
+        }
+        Cache::put("CloseMeetingRoomTask:Time", time(), Carbon::now()->addMinutes(10));
+        // 判断参数
+        $setting = Base::setting('meetingSetting');
+        if ($setting['open'] !== 'open') {
+            return;
+        }
+        if (empty($setting['appid']) ||empty($setting['api_key']) || empty($setting['api_secret'])) {
+            return;
+        }
+        $credentials = $setting['api_key'] . ":" . $setting['api_secret'];
+        $base64Credentials = base64_encode($credentials);
+        $arrHeader = [
+            "Accept: application/json",
+            "Authorization: Basic " . $base64Credentials
+        ];
+        // 获取10分钟未更新的会议
+        $meetings = Meeting::whereNull('end_at')
+            ->where('updated_at', '<', Carbon::now()->subMinutes(10))
+            ->take(100)
+            ->get();
+        $dialogIds = [];
+        /** @var Meeting $meeting */
+        foreach ($meetings as $meeting) {
+            if (!$this->isEmptyChannel($setting['appid'], $meeting->channel, $arrHeader)) {
+                $meeting->updated_at = Carbon::now();
+                $meeting->save();
+                continue;
+            }
+            $meeting->end_at = Carbon::now();
+            $meeting->save();
+            // 更新消息
+            $newMsg = $meeting->toArray();
+            $newMsg['end_at'] = $meeting->end_at->toDateTimeString();
+            WebSocketDialogMsg::select(['web_socket_dialog_msgs.*', 'm.meetingid'])
+                ->join("meeting_msgs as m", "m.msg_id", "=", "web_socket_dialog_msgs.id")
+                ->where('m.meetingid', $meeting->meetingid)
+                ->chunk(100, function ($msgs) use ($newMsg, &$dialogIds) {
+                    /** @var WebSocketDialogMsg $msg */
+                    foreach ($msgs as $msg) {
+                        $msgData = Base::json2array($msg->getRawOriginal('msg'));
+                        $msg->msg = Base::array2json(array_merge($msgData, $newMsg));
+                        $msg->save();
+                        //
+                        if (!isset($dialogIds[$msg->dialog_id])) {
+                            $dialogIds[$msg->dialog_id] = [];
+                        }
+                        $dialogIds[$msg->dialog_id][] = [
+                            'id' => $msg->id,
+                            'msg' => $msg->msg,
+                        ];
+                    }
+                });
+        }
+        // 推送更新
+        foreach ($dialogIds as $dialogId => $datas) {
+            $dialog = WebSocketDialog::find($dialogId);
+            if (empty($dialog)) {
+                continue;
+            }
+            foreach ($datas as $data) {
+                $dialog->pushMsg('update', $data);
+            }
+        }
+    }
+
+    public function end()
+    {
+    }
+
+    /**
+     * 是否空频道
+     * @param $appid
+     * @param $channel
+     * @param $arrHeader
+     * @return bool
+     */
+    private function isEmptyChannel($appid, $channel, $arrHeader)
+    {
+        $curl = curl_init();
+        curl_setopt_array($curl, [
+            CURLOPT_URL => "https://api.sd-rtn.com/dev/v1/channel/user/{$appid}/{$channel}",
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_ENCODING => "",
+            CURLOPT_MAXREDIRS => 10,
+            CURLOPT_TIMEOUT => 30,
+            CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
+            CURLOPT_CUSTOMREQUEST => "GET",
+            CURLOPT_HTTPHEADER => $arrHeader,
+        ]);
+        $response = curl_exec($curl);
+        $err = curl_error($curl);
+        curl_close($curl);
+        if ($err) {
+            return false;   // 错误
+        }
+        $data = Base::json2array($response);
+        if (!$data['success']) {
+            return false;   // 失败
+        }
+        if ($data['data']['channel_exist']) {
+            return false;   // 有人
+        }
+        return true;
+    }
+}
--- a/bin/version.js
+++ b/bin/version.js
@@ -43,7 +43,7 @@ runExec("git rev-list --count HEAD $(git branch | sed -n -e 's/^\* \(.*\)/\1/p')
        console.error(err);
        return;
    }
-    const num = 1240 + parseInt(response)
+    const num = 1250 + parseInt(response)
    if (isNaN(num) || Math.floor(num % 100) < 0) {
        console.error("get version error " + response);
        return;
--- a/7
+++ b/7
@@ -475,6 +475,13 @@ if [ $# -gt 0 ]; then
            por="-p 8880:8880"
        fi
        docker run -it --rm -v ${cur_path}/resources/mobile:/work -w /work ${por} kuaifan/eeui-cli:0.0.1 eeui ${cli}
+    elif [[ "$1" == "npm" ]]; then
+        shift 1
+        npm $@
+        cd electron
+        npm $@
+        cd ..
+        docker run --rm -it -v ${cur_path}/resources/mobile:/work -w /work --entrypoint=/bin/bash node:16 -c "npm $@"
    elif [[ "$1" == "doc" ]]; then
        shift 1
        run_exec php "php app/Http/Controllers/Api/apidoc.php"
--- a/database/migrations/2024_03_17_142904_add_web_socket_dialog_users_last_at.php
+++ b/database/migrations/2024_03_17_142904_add_web_socket_dialog_users_last_at.php
@@ -0,0 +1,50 @@
+<?php
+
+use App\Models\WebSocketDialog;
+use App\Models\WebSocketDialogUser;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddWebSocketDialogUsersLastAt extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $isAdd = false;
+        Schema::table('web_socket_dialog_users', function (Blueprint $table) use (&$isAdd) {
+            if (!Schema::hasColumn('web_socket_dialog_users', 'last_at')) {
+                $isAdd = true;
+                $table->timestamp('last_at')->nullable()->after('top_at')->comment('最后消息时间');
+            }
+        });
+        if ($isAdd) {
+            // 更新数据
+            WebSocketDialog::chunk(100, function ($dialogs) {
+                /** @var WebSocketDialog $dialog */
+                foreach ($dialogs as $dialog) {
+                    WebSocketDialogUser::whereDialogId($dialog->id)->update(['last_at' => $dialog->last_at]);
+                }
+            });
+
+            // 删除表字段
+            Schema::table('web_socket_dialogs', function (Blueprint $table) {
+                $table->dropColumn("last_at");
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // 回滚数据 - 无法回滚
+    }
+}
--- a/database/migrations/2024_03_17_160641_add_index_some_20240317.php
+++ b/database/migrations/2024_03_17_160641_add_index_some_20240317.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddIndexSome20240317 extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('web_socket_dialog_users', function (Blueprint $table) {
+            $table->dropIndex(['userid']);
+            $table->index(['userid', 'dialog_id']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return voidw
+     */
+    public function down()
+    {
+        // 回滚数据 - 无法回滚
+    }
+}
--- a/database/migrations/2024_03_18_135604_change_forward_data.php
+++ b/database/migrations/2024_03_18_135604_change_forward_data.php
@@ -0,0 +1,55 @@
+<?php
+
+use App\Module\Base;
+use App\Models\WebSocketDialogMsg;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeForwardData 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', 'forward_show')) {
+                WebSocketDialogMsg::where("forward_id", ">", 0)->chunk(100, function ($items) {
+                    /** @var WebSocketDialogMsg $item */
+                    foreach ($items as $item) {
+                        $msg = Base::json2array($item->getRawOriginal('msg'));
+                        $msg['forward_data'] = [
+                            'id' => $item->forward_id,
+                            'userid' => 0,
+                            'parent_id' => $item->forward_id,
+                            'parent_userid' => 0,
+                            'show' => 0,
+                        ];
+                        $original = WebSocketDialogMsg::select(['id', 'userid', 'forward_show'])->whereId($item->forward_id)->withTrashed()->first();
+                        if ($original) {
+                            $msg['forward_data']['userid'] = $original->userid;
+                            $msg['forward_data']['parent_userid'] = $original->userid;
+                            $msg['forward_data']['show'] = $original->forward_show;
+                        }
+                        $item->msg = Base::array2json($msg);
+                        $item->save();
+                    }
+                });
+                $table->dropColumn("forward_show");
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // 回滚数据 - 无法回滚
+    }
+}
--- a/database/migrations/2024_03_18_153504_change_reply_data.php
+++ b/database/migrations/2024_03_18_153504_change_reply_data.php
@@ -0,0 +1,49 @@
+<?php
+
+use App\Module\Base;
+use App\Models\WebSocketDialogMsg;
+use Illuminate\Database\Migrations\Migration;
+
+class ChangeReplyData extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        WebSocketDialogMsg::where("reply_id", ">", 0)->chunk(100, function ($items) {
+            /** @var WebSocketDialogMsg $item */
+            foreach ($items as $item) {
+                $msg = Base::json2array($item->getRawOriginal('msg'));
+                $msg['reply_data'] = [
+                    'id' => $item->reply_id,
+                    'userid' => 0,
+                    'type' => '',
+                    'msg' => [],
+                ];
+                $original = WebSocketDialogMsg::whereId($item->reply_id)->withTrashed()->first();
+                if ($original) {
+                    $replyMsg = Base::json2array($original->getRawOriginal('msg'));
+                    unset($replyMsg['reply_data']);
+                    $msg['reply_data']['userid'] = $original->userid;
+                    $msg['reply_data']['type'] = $original->type;
+                    $msg['reply_data']['msg'] = $replyMsg;
+                }
+                $item->msg = Base::array2json($msg);
+                $item->save();
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // 回滚数据 - 无法回滚
+    }
+}
--- a/database/migrations/2024_03_20_024119_add_umeng_alias_device.php
+++ b/database/migrations/2024_03_20_024119_add_umeng_alias_device.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddUmengAliasDevice extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        //
+        Schema::table('umeng_alias', function (Blueprint $table) {
+            if (!Schema::hasColumn('umeng_alias', 'device')) {
+                $table->text('ua')->nullable()->after('platform')->comment('userAgent');
+                $table->string('device', 100)->nullable()->default('')->after('platform')->comment('设备类型');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+        Schema::table('umeng_alias', function (Blueprint $table) {
+            $table->dropColumn("ua");
+            $table->dropColumn("device");
+        });
+    }
+}
--- a/database/migrations/2024_03_23_210546_generate_web_socket_dialogs_default_group.php
+++ b/database/migrations/2024_03_23_210546_generate_web_socket_dialogs_default_group.php
@@ -2,6 +2,7 @@

 use App\Models\User;
 use App\Models\WebSocketDialog;
+use App\Models\WebSocketDialogUser;
 use Carbon\Carbon;
 use Illuminate\Database\Migrations\Migration;

@@ -19,8 +20,7 @@ class GenerateWebSocketDialogsDefaultGroup extends Migration
            if ($botUser) {
                $dialog = WebSocketDialog::checkUserDialog($botUser, 1);
                if ($dialog) {
-                    $dialog->last_at = Carbon::now();
-                    $dialog->save();
+                    WebSocketDialogUser::whereDialogId($dialog->id)->update(['last_at' => Carbon::now()]);
                }
            }

--- a/database/migrations/2024_04_08_082823_create_meeting_msgs_table.php
+++ b/database/migrations/2024_04_08_082823_create_meeting_msgs_table.php
@@ -0,0 +1,45 @@
+<?php
+
+use App\Models\WebSocketDialogMsg;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateMeetingMsgsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::dropIfExists('meeting_msgs');
+        Schema::create('meeting_msgs', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('meetingid')->nullable()->default('')->comment('会议ID');
+            $table->bigInteger('dialog_id')->nullable()->default(0)->comment('对话ID');
+            $table->bigInteger('msg_id')->nullable()->default(0)->comment('消息ID');
+        });
+        \DB::table('meetings')->update(['end_at' => null]);
+        WebSocketDialogMsg::whereType('meeting')->chunk(100, function ($msgs) {
+            /** @var WebSocketDialogMsg $msg */
+            foreach ($msgs as $msg) {
+                $meetingid = $msg->msg['meetingid'];
+                $dialog_id = $msg->dialog_id;
+                $msg_id = $msg->id;
+                \DB::table('meeting_msgs')->insert(compact('meetingid', 'dialog_id', 'msg_id'));
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('meeting_msgs');
+    }
+}
--- a/database/seeders/WebSocketDialogUsersTableSeeder.php
+++ b/database/seeders/WebSocketDialogUsersTableSeeder.php
@@ -26,6 +26,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 1,
                'dialog_id' => 1,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 10:46:37'),
                'created_at' => seeders_at('2021-07-01 10:46:37'),
                'updated_at' => seeders_at('2021-07-01 10:46:37'),
            ),
@@ -34,6 +35,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 2,
                'dialog_id' => 1,
                'userid' => 2,
+                'last_at' => seeders_at('2021-07-01 10:46:37'),
                'created_at' => seeders_at('2021-07-01 10:46:37'),
                'updated_at' => seeders_at('2021-07-01 10:46:37'),
            ),
@@ -42,6 +44,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 3,
                'dialog_id' => 2,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 10:46:47'),
                'created_at' => seeders_at('2021-07-01 10:46:47'),
                'updated_at' => seeders_at('2021-07-01 10:46:47'),
            ),
@@ -50,6 +53,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 4,
                'dialog_id' => 3,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 10:46:47'),
                'created_at' => seeders_at('2021-07-01 10:46:47'),
                'updated_at' => seeders_at('2021-07-01 10:46:47'),
            ),
@@ -58,6 +62,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 5,
                'dialog_id' => 4,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 10:47:45'),
                'created_at' => seeders_at('2021-07-01 10:47:45'),
                'updated_at' => seeders_at('2021-07-01 10:47:45'),
            ),
@@ -66,6 +71,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 6,
                'dialog_id' => 5,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 10:47:45'),
                'created_at' => seeders_at('2021-07-01 10:47:45'),
                'updated_at' => seeders_at('2021-07-01 10:47:45'),
            ),
@@ -74,6 +80,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 7,
                'dialog_id' => 6,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 11:02:57'),
                'created_at' => seeders_at('2021-07-01 11:02:57'),
                'updated_at' => seeders_at('2021-07-01 11:02:57'),
            ),
@@ -82,6 +89,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 8,
                'dialog_id' => 7,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 11:02:57'),
                'created_at' => seeders_at('2021-07-01 11:02:57'),
                'updated_at' => seeders_at('2021-07-01 11:02:57'),
            ),
@@ -90,6 +98,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 9,
                'dialog_id' => 8,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 11:43:01'),
                'created_at' => seeders_at('2021-07-01 11:43:01'),
                'updated_at' => seeders_at('2021-07-01 11:43:01'),
            ),
@@ -98,6 +107,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 10,
                'dialog_id' => 9,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 11:43:01'),
                'created_at' => seeders_at('2021-07-01 11:43:01'),
                'updated_at' => seeders_at('2021-07-01 11:43:01'),
            ),
@@ -106,6 +116,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 11,
                'dialog_id' => 10,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 15:33:23'),
                'created_at' => seeders_at('2021-07-01 15:33:23'),
                'updated_at' => seeders_at('2021-07-01 15:33:23'),
            ),
@@ -114,6 +125,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 12,
                'dialog_id' => 11,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 15:33:23'),
                'created_at' => seeders_at('2021-07-01 15:33:23'),
                'updated_at' => seeders_at('2021-07-01 15:33:23'),
            ),
@@ -122,6 +134,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 13,
                'dialog_id' => 12,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 15:37:06'),
                'created_at' => seeders_at('2021-07-01 15:37:06'),
                'updated_at' => seeders_at('2021-07-01 15:37:06'),
            ),
@@ -130,6 +143,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 14,
                'dialog_id' => 13,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 15:37:06'),
                'created_at' => seeders_at('2021-07-01 15:37:06'),
                'updated_at' => seeders_at('2021-07-01 15:37:06'),
            ),
@@ -138,6 +152,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 15,
                'dialog_id' => 14,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 16:15:28'),
                'created_at' => seeders_at('2021-07-01 16:15:28'),
                'updated_at' => seeders_at('2021-07-01 16:15:28'),
            ),
@@ -146,6 +161,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 16,
                'dialog_id' => 15,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 16:15:28'),
                'created_at' => seeders_at('2021-07-01 16:15:28'),
                'updated_at' => seeders_at('2021-07-01 16:15:28'),
            ),
@@ -154,6 +170,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 17,
                'dialog_id' => 7,
                'userid' => 2,
+                'last_at' => seeders_at('2021-07-01 16:22:42'),
                'created_at' => seeders_at('2021-07-01 16:22:42'),
                'updated_at' => seeders_at('2021-07-01 16:22:42'),
            ),
@@ -162,6 +179,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 18,
                'dialog_id' => 5,
                'userid' => 2,
+                'last_at' => seeders_at('2021-07-01 16:23:15'),
                'created_at' => seeders_at('2021-07-01 16:23:15'),
                'updated_at' => seeders_at('2021-07-01 16:23:15'),
            ),
@@ -170,6 +188,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 19,
                'dialog_id' => 15,
                'userid' => 2,
+                'last_at' => seeders_at('2021-07-01 16:23:40'),
                'created_at' => seeders_at('2021-07-01 16:23:40'),
                'updated_at' => seeders_at('2021-07-01 16:23:40'),
            ),
@@ -178,6 +197,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 20,
                'dialog_id' => 11,
                'userid' => 2,
+                'last_at' => seeders_at('2021-07-01 16:29:38'),
                'created_at' => seeders_at('2021-07-01 16:29:38'),
                'updated_at' => seeders_at('2021-07-01 16:29:38'),
            ),
@@ -186,6 +206,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 21,
                'dialog_id' => 16,
                'userid' => 2,
+                'last_at' => seeders_at('2021-07-01 16:56:05'),
                'created_at' => seeders_at('2021-07-01 16:56:05'),
                'updated_at' => seeders_at('2021-07-01 16:56:05'),
            ),
@@ -194,6 +215,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 22,
                'dialog_id' => 16,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 16:56:05'),
                'created_at' => seeders_at('2021-07-01 16:56:05'),
                'updated_at' => seeders_at('2021-07-01 16:56:05'),
            ),
@@ -202,6 +224,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 23,
                'dialog_id' => 17,
                'userid' => 2,
+                'last_at' => seeders_at('2021-07-01 16:56:35'),
                'created_at' => seeders_at('2021-07-01 16:56:35'),
                'updated_at' => seeders_at('2021-07-01 16:56:35'),
            ),
@@ -210,6 +233,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 24,
                'dialog_id' => 17,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 16:56:35'),
                'created_at' => seeders_at('2021-07-01 16:56:35'),
                'updated_at' => seeders_at('2021-07-01 16:56:35'),
            ),
@@ -218,6 +242,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 25,
                'dialog_id' => 18,
                'userid' => 2,
+                'last_at' => seeders_at('2021-07-01 16:56:57'),
                'created_at' => seeders_at('2021-07-01 16:56:57'),
                'updated_at' => seeders_at('2021-07-01 16:56:57'),
            ),
@@ -226,6 +251,7 @@ class WebSocketDialogUsersTableSeeder extends Seeder
                'id' => 26,
                'dialog_id' => 18,
                'userid' => 1,
+                'last_at' => seeders_at('2021-07-01 16:56:57'),
                'created_at' => seeders_at('2021-07-01 16:56:57'),
                'updated_at' => seeders_at('2021-07-01 16:56:57'),
            ),
--- a/database/seeders/WebSocketDialogsTableSeeder.php
+++ b/database/seeders/WebSocketDialogsTableSeeder.php
@@ -4,6 +4,7 @@ namespace Database\Seeders;

 use App\Models\User;
 use App\Models\WebSocketDialog;
+use App\Models\WebSocketDialogUser;
 use Carbon\Carbon;
 use Illuminate\Database\Seeder;

@@ -30,7 +31,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'user',
                'group_type' => '',
                'name' => '',
-                'last_at' => seeders_at('2021-07-01 17:12:52'),
                'created_at' => seeders_at('2021-07-01 10:46:37'),
                'updated_at' => seeders_at('2021-07-01 17:12:52'),
                'deleted_at' => NULL,
@@ -41,7 +41,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'project',
                'name' => '',
-                'last_at' => NULL,
                'created_at' => seeders_at('2021-07-01 10:46:47'),
                'updated_at' => seeders_at('2021-07-01 17:31:03'),
                'deleted_at' => seeders_at('2021-07-01 17:31:03'),
@@ -52,7 +51,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'project',
                'name' => '',
-                'last_at' => NULL,
                'created_at' => seeders_at('2021-07-01 10:46:47'),
                'updated_at' => seeders_at('2021-07-01 10:46:55'),
                'deleted_at' => seeders_at('2021-07-01 10:46:55'),
@@ -63,7 +61,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'project',
                'name' => '',
-                'last_at' => NULL,
                'created_at' => seeders_at('2021-07-01 10:47:45'),
                'updated_at' => seeders_at('2021-07-01 17:30:05'),
                'deleted_at' => seeders_at('2021-07-01 17:30:05'),
@@ -74,7 +71,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'project',
                'name' => '',
-                'last_at' => seeders_at('2021-07-01 16:31:58'),
                'created_at' => seeders_at('2021-07-01 10:47:45'),
                'updated_at' => seeders_at('2021-07-01 16:31:58'),
                'deleted_at' => NULL,
@@ -85,7 +81,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'project',
                'name' => '',
-                'last_at' => NULL,
                'created_at' => seeders_at('2021-07-01 11:02:57'),
                'updated_at' => seeders_at('2021-07-01 17:31:28'),
                'deleted_at' => seeders_at('2021-07-01 17:31:28'),
@@ -96,7 +91,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'project',
                'name' => '',
-                'last_at' => seeders_at('2021-07-01 16:32:50'),
                'created_at' => seeders_at('2021-07-01 11:02:57'),
                'updated_at' => seeders_at('2021-07-01 16:32:50'),
                'deleted_at' => NULL,
@@ -107,7 +101,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'project',
                'name' => '',
-                'last_at' => NULL,
                'created_at' => seeders_at('2021-07-01 11:43:01'),
                'updated_at' => seeders_at('2021-07-01 17:31:28'),
                'deleted_at' => seeders_at('2021-07-01 17:31:28'),
@@ -118,7 +111,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'project',
                'name' => '',
-                'last_at' => seeders_at('2021-07-01 14:02:57'),
                'created_at' => seeders_at('2021-07-01 11:43:01'),
                'updated_at' => seeders_at('2021-07-01 14:02:57'),
                'deleted_at' => NULL,
@@ -129,7 +121,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'project',
                'name' => '',
-                'last_at' => NULL,
                'created_at' => seeders_at('2021-07-01 15:33:23'),
                'updated_at' => seeders_at('2021-07-01 17:31:28'),
                'deleted_at' => seeders_at('2021-07-01 17:31:28'),
@@ -140,7 +131,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'project',
                'name' => '',
-                'last_at' => seeders_at('2021-07-01 16:31:40'),
                'created_at' => seeders_at('2021-07-01 15:33:23'),
                'updated_at' => seeders_at('2021-07-01 16:31:40'),
                'deleted_at' => NULL,
@@ -151,7 +141,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'project',
                'name' => '',
-                'last_at' => NULL,
                'created_at' => seeders_at('2021-07-01 15:37:06'),
                'updated_at' => seeders_at('2021-07-01 17:31:28'),
                'deleted_at' => seeders_at('2021-07-01 17:31:28'),
@@ -162,7 +151,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'project',
                'name' => '',
-                'last_at' => seeders_at('2021-07-01 15:44:09'),
                'created_at' => seeders_at('2021-07-01 15:37:06'),
                'updated_at' => seeders_at('2021-07-01 15:44:09'),
                'deleted_at' => NULL,
@@ -173,7 +161,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'project',
                'name' => '',
-                'last_at' => NULL,
                'created_at' => seeders_at('2021-07-01 16:15:28'),
                'updated_at' => seeders_at('2021-07-01 17:31:28'),
                'deleted_at' => seeders_at('2021-07-01 17:31:28'),
@@ -184,7 +171,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'project',
                'name' => '',
-                'last_at' => seeders_at('2021-07-01 16:37:59'),
                'created_at' => seeders_at('2021-07-01 16:15:28'),
                'updated_at' => seeders_at('2021-07-01 16:37:59'),
                'deleted_at' => NULL,
@@ -195,7 +181,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'task',
                'name' => '',
-                'last_at' => seeders_at('2021-07-01 16:58:02'),
                'created_at' => seeders_at('2021-07-01 16:56:05'),
                'updated_at' => seeders_at('2021-07-01 16:58:02'),
                'deleted_at' => NULL,
@@ -206,7 +191,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'task',
                'name' => '',
-                'last_at' => seeders_at('2021-07-01 16:57:58'),
                'created_at' => seeders_at('2021-07-01 16:56:35'),
                'updated_at' => seeders_at('2021-07-01 16:57:58'),
                'deleted_at' => NULL,
@@ -217,7 +201,6 @@ class WebSocketDialogsTableSeeder extends Seeder
                'type' => 'group',
                'group_type' => 'task',
                'name' => '',
-                'last_at' => seeders_at('2021-07-01 16:57:52'),
                'created_at' => seeders_at('2021-07-01 16:56:57'),
                'updated_at' => seeders_at('2021-07-01 16:57:52'),
                'deleted_at' => NULL,
@@ -228,8 +211,7 @@ class WebSocketDialogsTableSeeder extends Seeder
        if ($botUser) {
            $dialog = WebSocketDialog::checkUserDialog($botUser, 1);
            if ($dialog) {
-                $dialog->last_at = Carbon::now();
-                $dialog->save();
+                WebSocketDialogUser::whereDialogId($dialog->id)->change(['last_at' => Carbon::now()->subSecond()]);
            }
        }
        User::botGetOrCreate('ai-openai');
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
  php:
    container_name: "dootask-php-${APP_ID}"
--- a/docker/mysql/conf.d/docker.cnf
+++ b/docker/mysql/conf.d/docker.cnf
@@ -12,7 +12,7 @@ default_storage_engine = InnoDB
 performance_schema_max_table_instances = 400
 table_definition_cache = 400
 key_buffer_size = 1024M
-max_allowed_packet = 10G
+max_allowed_packet = 8192M
 table_open_cache = 2048
 sort_buffer_size = 4096K
 net_buffer_length = 4K
@@ -47,7 +47,7 @@ innodb_write_io_threads = 2

 [mysqldump]
 quick
-max_allowed_packet = 500M
+max_allowed_packet = 8192M

 [mysql]
 no-auto-rehash
--- a/electron/build.js
+++ b/electron/build.js
@@ -19,14 +19,13 @@ const devloadCachePath = path.resolve(__dirname, ".devload");
 const packageFile = path.resolve(__dirname, "package.json");
 const packageBakFile = path.resolve(__dirname, "package-bak.json");
 const platforms = ["build-mac", "build-win"];
-const comSuffix = os.type() == 'Windows_NT' ? '.cmd' : '';

 /**
 * 克隆 Drawio
 * @param systemInfo
 */
 function cloneDrawio(systemInfo) {
-    child_process.spawnSync("git", ["submodule", "update", "--quiet", "--init", "--depth=1"], {stdio: "inherit"});
+    child_process.execSync("git submodule update --quiet --init --depth=1", {stdio: "inherit"});
    const drawioSrcDir = path.resolve(__dirname, "../resources/drawio/src/main/webapp");
    const drawioCoverDir = path.resolve(__dirname, "../docker/drawio/webapp");
    const drawioDestDir = path.resolve(electronDir, "drawio/webapp");
@@ -122,6 +121,10 @@ function genericPublish({url, key, version, output}) {
        return
    }
    const filePath = path.resolve(__dirname, output)
+    if (!fs.existsSync(filePath)) {
+        console.warn("Publish output not found: " + filePath)
+        return
+    }
    fs.readdir(filePath, async (err, files) => {
        if (err) {
            console.warn(err)
@@ -235,10 +238,10 @@ function startBuild(data) {
        fse.removeSync(publicDir)
        fse.copySync(electronDir, publicDir)
        if (argv[3] === "setting") {
-            child_process.spawnSync("docker", `run -it --rm -v ${eeuiDir}:/work -w /work ${eeuiCli} eeui setting`.split(" "), {stdio: "inherit", cwd: "resources/mobile"});
+            child_process.execSync(`docker run -it --rm -v ${eeuiDir}:/work -w /work ${eeuiCli} eeui setting`, {stdio: "inherit", cwd: "resources/mobile"});
        }
        if (['setting', 'build'].includes(argv[3])) {
-            child_process.spawnSync("docker", `run -it --rm -v ${eeuiDir}:/work -w /work ${eeuiCli} eeui build --simple`.split(" "), {stdio: "inherit", cwd: "resources/mobile"});
+            child_process.execSync(`docker run -it --rm -v ${eeuiDir}:/work -w /work ${eeuiCli} eeui build --simple`, {stdio: "inherit", cwd: "resources/mobile"});
        } else {
            [
                path.resolve(publicDir, "../../platforms/ios/eeuiApp/bundlejs/eeui/public"),
@@ -291,13 +294,13 @@ function startBuild(data) {
        }
        econfig.build.directories.output = `${output}-github`;
        fs.writeFileSync(packageFile, JSON.stringify(econfig, null, 2), 'utf8');
-        child_process.spawnSync("npm" + comSuffix, ["run", `${platform}-publish`], {stdio: "inherit", cwd: "electron"});
+        child_process.execSync(`npm run ${platform}-publish`, {stdio: "inherit", cwd: "electron"});
    }
    // generic (build || publish)
    econfig.build.publish = data.publish
    econfig.build.directories.output = `${output}-generic`;
    fs.writeFileSync(packageFile, JSON.stringify(econfig, null, 2), 'utf8');
-    child_process.spawnSync("npm" + comSuffix, ["run", platform], {stdio: "inherit", cwd: "electron"});
+    child_process.execSync(`npm run ${platform}`, {stdio: "inherit", cwd: "electron"});
    if (publish === true && DP_KEY) {
        genericPublish({
            url: econfig.build.publish.url,
--- a/electron/electron.js
+++ b/electron/electron.js
@@ -294,6 +294,12 @@ function createWebTabWindow(args) {
            }, webPreferences),
        }, config))

+        if (nativeTheme.shouldUseDarkColors) {
+            webTabWindow.setBackgroundColor('#3B3B3D')
+        } else {
+            webTabWindow.setBackgroundColor('#EFF0F4')
+        }
+
        webTabWindow.on('resize', () => {
            resizeWebTab(0)
        })
@@ -352,7 +358,11 @@ function createWebTabWindow(args) {

        })
    }
+    if (webTabWindow.isMinimized()) {
+        webTabWindow.restore()
+    }
    webTabWindow.focus();
+    webTabWindow.show();

    // 创建子窗口
    const browserView = new BrowserView({
@@ -421,6 +431,10 @@ function createWebTabWindow(args) {
            event: 'stop-loading',
            id: browserView.webContents.id,
        }).then(_ => { })
+        // 加载完成暗黑模式下把窗口背景色改成白色，避免透明网站背景色穿透
+        if (nativeTheme.shouldUseDarkColors) {
+            browserView.setBackgroundColor('#FFFFFF')
+        }
    })
    browserView.webContents.on('before-input-event', (event, input) => {
        if (utils.isMetaOrControl(input) && input.key.toLowerCase() === 'r') {
--- a/electron/package.json
+++ b/electron/package.json
@@ -26,14 +26,14 @@
        "url": "https://github.com/kuaifan/dootask.git"
    },
    "devDependencies": {
-        "@electron-forge/cli": "^7.3.0",
-        "@electron-forge/maker-deb": "^7.3.0",
-        "@electron-forge/maker-rpm": "^7.3.0",
-        "@electron-forge/maker-squirrel": "^7.3.0",
-        "@electron-forge/maker-zip": "^7.3.0",
+        "@electron-forge/cli": "^7.3.1",
+        "@electron-forge/maker-deb": "^7.3.1",
+        "@electron-forge/maker-rpm": "^7.3.1",
+        "@electron-forge/maker-squirrel": "^7.3.1",
+        "@electron-forge/maker-zip": "^7.3.1",
        "dotenv": "^16.3.1",
-        "electron": "^29.1.0",
-        "electron-builder": "^24.12.0",
+        "electron": "^29.2.0",
+        "electron-builder": "^24.13.3",
        "electron-notarize": "^1.2.2",
        "form-data": "^4.0.0",
        "ora": "^4.1.1"
--- a/electron/render/tabs/index.html
+++ b/electron/render/tabs/index.html
@@ -79,6 +79,12 @@
                        const faviconItem = this.tabs.find(item => item.id === id)
                        if (faviconItem) {
                            faviconItem.icon = detail.favicons[detail.favicons.length - 1]
+                            //
+                            const img = new Image();
+                            img.onerror = () => {
+                                faviconItem.icon = ''
+                            };
+                            img.src = faviconItem.icon
                        }
                        break

--- a/language/original-api.txt
+++ b/language/original-api.txt
@@ -441,7 +441,7 @@ Api接口文档
 开心笑话
 心灵鸡汤

-请填写完整的参数
+请填写基本配置

 终端SN与License不匹配
 终端MAC与License不匹配
@@ -491,3 +491,6 @@ Api接口文档
 点击下载

 置顶会话无法隐藏
+
+注册失败
+会议已结束
--- a/language/original-web.txt
+++ b/language/original-web.txt
@@ -1106,7 +1106,8 @@ html转markdown
 是否将消息中的网络图片保存到本地服务器。
 保存网络图片
 无声发送
-Markdown 格式发送
+MD 格式发送
+正常发送
 编辑消息
 发送失败
 再次编辑
@@ -1551,3 +1552,14 @@ License Key
 月前
 请输入用户名
 是否拨打电话给(*)？
+
+你确定要取消发送吗？
+消息已发送，不可取消
+取消发送失败
+
+基本配置
+用于生成会议频道。
+用于频道管理。
+比如
+结束会议室
+会议已结束
--- a/language/translate.json
+++ b/language/translate.json
@@ -15278,17 +15278,6 @@
        "fr": "Télécharger maintenant télécharger",
        "id": "Download sekarang"
    },
-    {
-        "key": "请填写完整的参数",
-        "zh": "",
-        "zh-CHT": "請填寫完整的參數",
-        "en": "Please fill in the complete parameters",
-        "ko": "완벽한 파라메터를 기입해 주십시오",
-        "ja": "完全なパラメータをお願いします。",
-        "de": "Füllen sie bitte die vollständige parameter aus",
-        "fr": "Veuillez remplir tous les paramètres",
-        "id": "Silahkan isi seluruh parameter"
-    },
    {
        "key": "图片优化",
        "zh": "",
@@ -15355,17 +15344,6 @@
        "fr": "Envoi en silence",
        "id": "Diam kirim"
    },
-    {
-        "key": "Markdown 格式发送",
-        "zh": "",
-        "zh-CHT": "Markdown 格式發送",
-        "en": "It is sent in Markdown format",
-        "ko": "마크다운 포맷 전송",
-        "ja": "Markdownフォーマット送信します",
-        "de": "Das format in der glauben glauben spielt",
-        "fr": "Envoyer au format Markdown",
-        "id": "Markdown format kirim"
-    },
    {
        "key": "编辑消息",
        "zh": "",
@@ -20029,5 +20007,148 @@
        "de": "Soll ich anrufen (*)?",
        "fr": "Est-ce que vous appelez à (*)?",
        "id": "Apakah ada panggilan untuk (*)?"
+    },
+    {
+        "key": "MD 格式发送",
+        "zh": "",
+        "zh-CHT": "MD 格式發送",
+        "en": "Send in MD format",
+        "ko": "Md 포맷 전송",
+        "ja": "MDフォーマットでお送りします。",
+        "de": "Molt-format raus. Und zwar jetzt.",
+        "fr": "Envoi au format MD",
+        "id": "MD format kirim"
+    },
+    {
+        "key": "正常发送",
+        "zh": "",
+        "zh-CHT": "正常發送",
+        "en": "Normal transmission",
+        "ko": "정상적으로 보내기",
+        "ja": "正常に送ります",
+        "de": "Sende normal.",
+        "fr": "Envoyer comme normal",
+        "id": "Kirim normal"
+    },
+    {
+        "key": "你确定要取消发送吗？",
+        "zh": "",
+        "zh-CHT": "你確定要取消發送嗎？",
+        "en": "Are you sure you want to cancel?",
+        "ko": "발송을 취소하시겠습니까?",
+        "ja": "送信をキャンセルすることは確実ですか?",
+        "de": "Willst du die lieferung wirklich absagen?",
+        "fr": "Êtes-vous sûr de vouloir annuler l’envoi?",
+        "id": "Apakah anda yakin ingin membatalkan pengiriman?"
+    },
+    {
+        "key": "消息已发送，不可取消",
+        "zh": "",
+        "zh-CHT": "消息已發送，不可取消",
+        "en": "The message has been sent and cannot be cancelled",
+        "ko": "메시지가 전송되었습니다. 취소할 수 없습니다",
+        "ja": "メッセージは送信済みですので,キャンセルは不可です",
+        "de": "Die nachricht wurde gesendet, du darfst sie nicht absagen",
+        "fr": "Message envoyé et non annulable",
+        "id": "Pesan terkirim dan tidak dapat dibatalkan"
+    },
+    {
+        "key": "取消发送失败",
+        "zh": "",
+        "zh-CHT": "取消發送失敗",
+        "en": "Unsend failed",
+        "ko": "보내기 취소 실패",
+        "ja": "送信キャンセルに失敗しました",
+        "de": "Sagen sie das ab.",
+        "fr": "Annuler l’envoi a échoué",
+        "id": "Batal kirim"
+    },
+    {
+        "key": "注册失败",
+        "zh": "",
+        "zh-CHT": "註冊失敗",
+        "en": "Registration failure",
+        "ko": "등록 실패",
+        "ja": "登録に失敗しました",
+        "de": "Antrag abgelehnt.",
+        "fr": "L’inscription a échoué",
+        "id": "Gagal mendaftar"
+    },
+    {
+        "key": "请填写基本配置",
+        "zh": "",
+        "zh-CHT": "請填寫基本配置",
+        "en": "Please fill in the basic configuration",
+        "ko": "기본 사양을 기재해 주세요",
+        "ja": "基本仕様をお願いします。",
+        "de": "Füllen sie die grundeinstellungen aus",
+        "fr": "Veuillez remplir la configuration de base",
+        "id": "Silahkan mengisi konfigurasi dasar"
+    },
+    {
+        "key": "会议已结束",
+        "zh": "",
+        "zh-CHT": "會議已結束",
+        "en": "The meeting is over",
+        "ko": "회의는 이미 끝났다",
+        "ja": "会議は終わりました",
+        "de": "Das Treffen ist vorbei.",
+        "fr": "La conférence est terminée",
+        "id": "Pertemuan selesai."
+    },
+    {
+        "key": "基本配置",
+        "zh": "",
+        "zh-CHT": "基本配置",
+        "en": "Basic configuration",
+        "ko": "기본 설정",
+        "ja": "基本的な仕様です",
+        "de": "Grundausstattung. - grundausstattung.",
+        "fr": "La configuration basique",
+        "id": "Konfigurasi dasar"
+    },
+    {
+        "key": "用于生成会议频道。",
+        "zh": "",
+        "zh-CHT": "用於生成會議頻道。",
+        "en": "Used to generate conference channels.",
+        "ko": "회의 채널을 만드는 데 사용합니다.",
+        "ja": "会議のチャンネルを生成します。",
+        "de": "Damit kriegt ihr konferenzkanäle.",
+        "fr": "Utilisé pour générer le canal de conférence.",
+        "id": "Untuk mendapatkan saluran pertemuan."
+    },
+    {
+        "key": "用于频道管理。",
+        "zh": "",
+        "zh-CHT": "用於頻道管理。",
+        "en": "Used for channel management.",
+        "ko": "채널 관리용.",
+        "ja": "チャンネル管理に使われます。",
+        "de": "Du arbeitest für die nachrichtenverwaltung.",
+        "fr": "Pour la gestion des canaux.",
+        "id": "Untuk manajemen saluran."
+    },
+    {
+        "key": "比如",
+        "zh": "",
+        "zh-CHT": "比如",
+        "en": "For example",
+        "ko": "례를들면",
+        "ja": "たとえばです",
+        "de": "Es gibt drei möglichkeiten.",
+        "fr": "Comme",
+        "id": "Seperti"
+    },
+    {
+        "key": "结束会议室",
+        "zh": "",
+        "zh-CHT": "結束會議室",
+        "en": "End meeting room",
+        "ko": "회의실을 마치다",
+        "ja": "会議室を終了します",
+        "de": "Konferenzraum zu ende.",
+        "fr": "Clôture salle de Réunion",
+        "id": "Ruang pertemuan selesai"
    }
 ]
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "DooTask",
-    "version": "0.35.90",
+    "version": "0.36.75",
    "description": "DooTask is task management system.",
    "scripts": {
        "start": "./cmd dev",
@@ -24,6 +24,7 @@
        "axios": "^0.24.0",
        "cross-env": "^7.0.3",
        "css-loader": "^6.7.2",
+        "default-passive-events": "^2.0.0",
        "dexie": "^3.2.3",
        "echarts": "^5.2.2",
        "element-sea": "^2.15.10-7",
@@ -46,8 +47,8 @@
        "openpgp_hi": "^5.7.0-1",
        "photoswipe": "^5.2.8",
        "postcss": "^8.4.5",
-        "quill": "^1.3.7",
-        "quill-mention-hi": "^3.1.0-4",
+        "quill-hitosea": "^2.0.0-rc.5.1",
+        "quill-mention-hitosea": "^4.0.0-6",
        "resolve-url-loader": "^4.0.0",
        "sass": "^1.71.1",
        "sass-loader": "^14.1.1",
@@ -55,7 +56,7 @@
        "stylus-loader": "^7.1.0",
        "tinymce": "^5.10.3",
        "tui-calendar-hi": "^1.15.1-5",
-        "view-design-hi": "^4.7.0-49",
+        "view-design-hi": "^4.7.0-53",
        "vite": "^2.9.15",
        "vite-plugin-file-copy": "^1.0.0",
        "vite-plugin-require": "^1.1.10",
--- a/public/css/fonts/taskfont/iconfont.ttf
+++ b/public/css/fonts/taskfont/iconfont.ttf
--- a/public/css/fonts/taskfont/iconfont.woff
+++ b/public/css/fonts/taskfont/iconfont.woff
--- a/public/css/fonts/taskfont/iconfont.woff2
+++ b/public/css/fonts/taskfont/iconfont.woff2
--- a/public/js/build/404.534a62be.js
+++ b/public/js/build/404.534a62be.js
@@ -1 +0,0 @@
-import{n as e}from"./app.5bd57401.js";import"./@micro-zoe.c2e1472d.js";import"./jquery.ac5df0c3.js";import"./@traptitech.363dce05.js";import"./katex.0b94f27c.js";import"./localforage.063fa592.js";import"./markdown-it.f3afa976.js";import"./entities.797c3e49.js";import"./uc.micro.39573202.js";import"./mdurl.2f66c031.js";import"./linkify-it.3ecfda1e.js";import"./punycode.87a5269f.js";import"./highlight.js.24fdca15.js";import"./markdown-it-link-attributes.e1d5d151.js";import"./vue.eaf71fac.js";import"./vuex.cc7cb26e.js";import"./axios.6ec123f8.js";import"./le5le-store.b40f9152.js";import"./openpgp_hi.15f91b1d.js";import"./vue-router.2d566cd7.js";import"./vue-clipboard2.4402036c.js";import"./clipboard.d74ec60d.js";import"./view-design-hi.86f143ee.js";import"./vuedraggable.c8fae132.js";import"./sortablejs.8b819437.js";import"./vue-resize-observer.5fb00380.js";import"./element-sea.b954f5d6.js";import"./deepmerge.cecf392e.js";import"./resize-observer-polyfill.e60103ad.js";import"./throttle-debounce.7c3948b2.js";import"./babel-helper-vue-jsx-merge-props.5ed215c3.js";import"./normalize-wheel.2a034b9f.js";import"./async-validator.289edf0d.js";import"./babel-runtime.4773988a.js";import"./core-js.314b4a1d.js";var m=function(){var t=this,r=t.$createElement;return t._self._c,t._m(0)},p=[function(){var t=this,r=t.$createElement,i=t._self._c||r;return i("div",{staticClass:"page-404"},[i("div",{staticClass:"flex-center position-ref full-height"},[i("div",{staticClass:"code"},[t._v("404")]),i("div",{staticClass:"message"},[t._v("Not Found")])])])}];const s={},o={};var _=e(s,m,p,!1,n,"7d7154a8",null,null);function n(t){for(let r in o)this[r]=o[r]}var P=function(){return _.exports}();export{P as default};
--- a/public/js/build/404.539ee1cb.js
+++ b/public/js/build/404.539ee1cb.js
@@ -0,0 +1 @@
+import{n as e}from"./app.79ecd097.js";import"./@micro-zoe.c2e1472d.js";import"./jquery.7bba1258.js";import"./@traptitech.363dce05.js";import"./katex.0b94f27c.js";import"./localforage.68acf19b.js";import"./markdown-it.f3afa976.js";import"./entities.797c3e49.js";import"./uc.micro.39573202.js";import"./mdurl.2f66c031.js";import"./linkify-it.3ecfda1e.js";import"./punycode.87a5269f.js";import"./highlight.js.24fdca15.js";import"./markdown-it-link-attributes.e1d5d151.js";import"./vue.eaf71fac.js";import"./vuex.cc7cb26e.js";import"./axios.6ec123f8.js";import"./le5le-store.b40f9152.js";import"./openpgp_hi.15f91b1d.js";import"./vue-router.2d566cd7.js";import"./vue-clipboard2.4402036c.js";import"./clipboard.d74ec60d.js";import"./view-design-hi.76cbd75d.js";import"./default-passive-events.a3d698c9.js";import"./vuedraggable.c8fae132.js";import"./sortablejs.8b819437.js";import"./vue-resize-observer.5fb00380.js";import"./element-sea.b954f5d6.js";import"./deepmerge.cecf392e.js";import"./resize-observer-polyfill.e60103ad.js";import"./throttle-debounce.7c3948b2.js";import"./babel-helper-vue-jsx-merge-props.5ed215c3.js";import"./normalize-wheel.2a034b9f.js";import"./async-validator.289edf0d.js";import"./babel-runtime.4773988a.js";import"./core-js.314b4a1d.js";var m=function(){var t=this,r=t.$createElement;return t._self._c,t._m(0)},p=[function(){var t=this,r=t.$createElement,i=t._self._c||r;return i("div",{staticClass:"page-404"},[i("div",{staticClass:"flex-center position-ref full-height"},[i("div",{staticClass:"code"},[t._v("404")]),i("div",{staticClass:"message"},[t._v("Not Found")])])])}];const s={},o={};var _=e(s,m,p,!1,n,"7d7154a8",null,null);function n(t){for(let r in o)this[r]=o[r]}var Q=function(){return _.exports}();export{Q as default};
--- a/public/js/build/AceEditor.5a5d16d2.js
+++ b/public/js/build/AceEditor.5a5d16d2.js
--- a/public/js/build/AceEditor.f04aa2cb.js
+++ b/public/js/build/AceEditor.f04aa2cb.js
--- a/public/js/build/ApproveExport.7ccf1b48.js
+++ b/public/js/build/ApproveExport.7ccf1b48.js
@@ -1 +1 @@
-import{n}from"./app.5bd57401.js";var l=function(){var t=this,o=t.$createElement,e=t._self._c||o;return e("Modal",{attrs:{title:t.$L("\u5BFC\u51FA\u5BA1\u6279\u6570\u636E"),"mask-closable":!1},model:{value:t.show,callback:function(a){t.show=a},expression:"show"}},[e("Form",{ref:"exportTask",attrs:{model:t.formData,"label-width":"auto"},nativeOn:{submit:function(a){a.preventDefault()}}},[e("FormItem",{attrs:{label:t.$L("\u5BA1\u6279\u7C7B\u578B")}},[e("Select",{on:{"on-open-change":t.getProcName},model:{value:t.formData.proc_def_name,callback:function(a){t.$set(t.formData,"proc_def_name",a)},expression:"formData.proc_def_name"}},t._l(t.procList,function(a,s){return e("Option",{key:s,attrs:{value:a.name}},[t._v(t._s(a.name))])}),1)],1),e("FormItem",{attrs:{label:t.$L("\u65F6\u95F4\u8303\u56F4")}},[e("DatePicker",{staticStyle:{width:"100%"},attrs:{type:"daterange",format:"yyyy/MM/dd",placeholder:t.$L("\u8BF7\u9009\u62E9\u65F6\u95F4")},model:{value:t.formData.date,callback:function(a){t.$set(t.formData,"date",a)},expression:"formData.date"}}),e("div",{staticClass:"form-tip checkin-export-quick-select"},[e("span",[t._v(t._s(t.$L("\u5FEB\u6377\u9009\u62E9"))+":")]),e("em",{on:{click:function(a){t.formData.date=t.dateShortcuts("prev")}}},[t._v(t._s(t.$L("\u4E0A\u4E2A\u6708")))]),e("em",{on:{click:function(a){t.formData.date=t.dateShortcuts("this")}}},[t._v(t._s(t.$L("\u8FD9\u4E2A\u6708")))])])],1),e("FormItem",{attrs:{prop:"type",label:t.$L("\u5BFC\u51FA\u7C7B\u578B")}},[e("RadioGroup",{model:{value:t.formData.is_finished,callback:function(a){t.$set(t.formData,"is_finished",a)},expression:"formData.is_finished"}},[e("Radio",{attrs:{label:"0"}},[t._v(t._s(t.$L("\u672A\u5B8C\u6210")))]),e("Radio",{attrs:{label:"1"}},[t._v(t._s(t.$L("\u5DF2\u5B8C\u6210")))])],1)],1)],1),e("div",{staticClass:"adaption",attrs:{slot:"footer"},slot:"footer"},[e("Button",{attrs:{type:"default"},on:{click:function(a){t.show=!1}}},[t._v(t._s(t.$L("\u53D6\u6D88")))]),e("Button",{attrs:{type:"primary",loading:t.loadIng>0},on:{click:t.onExport}},[t._v(t._s(t.$L("\u5BFC\u51FA")))])],1)],1)},i=[];const c={name:"ApproveExport",props:{value:{type:Boolean,default:!1}},data(){return{show:this.value,loadIng:0,formData:{proc_def_name:"",date:[],is_finished:"1"},procList:[]}},watch:{value(t){this.show=t},show(t){this.value!==t&&this.$emit("input",t)}},methods:{dateShortcuts(t){if(t==="prev")return[$A.getSpecifyDate("\u4E0A\u4E2A\u6708"),$A.getSpecifyDate("\u4E0A\u4E2A\u6708\u7ED3\u675F")];if(t==="this")return[$A.getSpecifyDate("\u672C\u6708"),$A.getSpecifyDate("\u672C\u6708\u7ED3\u675F")]},getProcName(){this.loadIng++,this.$store.dispatch("call",{url:"approve/procdef/all",method:"post"}).then(({data:t})=>{this.procList=t.rows}).catch(({msg:t})=>{$A.modalError(t)}).finally(t=>{this.loadIng--})},onExport(){this.loadIng>0||(this.loadIng++,this.$store.dispatch("call",{url:"approve/export",data:this.formData}).then(({data:t})=>{this.show=!1,this.$store.dispatch("downUrl",{url:t.url})}).catch(({msg:t})=>{$A.modalError(t)}).finally(t=>{this.loadIng--}))}}},r={};var p=n(c,l,i,!1,d,null,null,null);function d(t){for(let o in r)this[o]=r[o]}var _=function(){return p.exports}();export{_ as A};
+import{n}from"./app.79ecd097.js";var l=function(){var t=this,o=t.$createElement,e=t._self._c||o;return e("Modal",{attrs:{title:t.$L("\u5BFC\u51FA\u5BA1\u6279\u6570\u636E"),"mask-closable":!1},model:{value:t.show,callback:function(a){t.show=a},expression:"show"}},[e("Form",{ref:"exportTask",attrs:{model:t.formData,"label-width":"auto"},nativeOn:{submit:function(a){a.preventDefault()}}},[e("FormItem",{attrs:{label:t.$L("\u5BA1\u6279\u7C7B\u578B")}},[e("Select",{on:{"on-open-change":t.getProcName},model:{value:t.formData.proc_def_name,callback:function(a){t.$set(t.formData,"proc_def_name",a)},expression:"formData.proc_def_name"}},t._l(t.procList,function(a,s){return e("Option",{key:s,attrs:{value:a.name}},[t._v(t._s(a.name))])}),1)],1),e("FormItem",{attrs:{label:t.$L("\u65F6\u95F4\u8303\u56F4")}},[e("DatePicker",{staticStyle:{width:"100%"},attrs:{type:"daterange",format:"yyyy/MM/dd",placeholder:t.$L("\u8BF7\u9009\u62E9\u65F6\u95F4")},model:{value:t.formData.date,callback:function(a){t.$set(t.formData,"date",a)},expression:"formData.date"}}),e("div",{staticClass:"form-tip checkin-export-quick-select"},[e("span",[t._v(t._s(t.$L("\u5FEB\u6377\u9009\u62E9"))+":")]),e("em",{on:{click:function(a){t.formData.date=t.dateShortcuts("prev")}}},[t._v(t._s(t.$L("\u4E0A\u4E2A\u6708")))]),e("em",{on:{click:function(a){t.formData.date=t.dateShortcuts("this")}}},[t._v(t._s(t.$L("\u8FD9\u4E2A\u6708")))])])],1),e("FormItem",{attrs:{prop:"type",label:t.$L("\u5BFC\u51FA\u7C7B\u578B")}},[e("RadioGroup",{model:{value:t.formData.is_finished,callback:function(a){t.$set(t.formData,"is_finished",a)},expression:"formData.is_finished"}},[e("Radio",{attrs:{label:"0"}},[t._v(t._s(t.$L("\u672A\u5B8C\u6210")))]),e("Radio",{attrs:{label:"1"}},[t._v(t._s(t.$L("\u5DF2\u5B8C\u6210")))])],1)],1)],1),e("div",{staticClass:"adaption",attrs:{slot:"footer"},slot:"footer"},[e("Button",{attrs:{type:"default"},on:{click:function(a){t.show=!1}}},[t._v(t._s(t.$L("\u53D6\u6D88")))]),e("Button",{attrs:{type:"primary",loading:t.loadIng>0},on:{click:t.onExport}},[t._v(t._s(t.$L("\u5BFC\u51FA")))])],1)],1)},i=[];const c={name:"ApproveExport",props:{value:{type:Boolean,default:!1}},data(){return{show:this.value,loadIng:0,formData:{proc_def_name:"",date:[],is_finished:"1"},procList:[]}},watch:{value(t){this.show=t},show(t){this.value!==t&&this.$emit("input",t)}},methods:{dateShortcuts(t){if(t==="prev")return[$A.getSpecifyDate("\u4E0A\u4E2A\u6708"),$A.getSpecifyDate("\u4E0A\u4E2A\u6708\u7ED3\u675F")];if(t==="this")return[$A.getSpecifyDate("\u672C\u6708"),$A.getSpecifyDate("\u672C\u6708\u7ED3\u675F")]},getProcName(){this.loadIng++,this.$store.dispatch("call",{url:"approve/procdef/all",method:"post"}).then(({data:t})=>{this.procList=t.rows}).catch(({msg:t})=>{$A.modalError(t)}).finally(t=>{this.loadIng--})},onExport(){this.loadIng>0||(this.loadIng++,this.$store.dispatch("call",{url:"approve/export",data:this.formData}).then(({data:t})=>{this.show=!1,this.$store.dispatch("downUrl",{url:t.url})}).catch(({msg:t})=>{$A.modalError(t)}).finally(t=>{this.loadIng--}))}}},r={};var p=n(c,l,i,!1,d,null,null,null);function d(t){for(let o in r)this[o]=r[o]}var _=function(){return p.exports}();export{_ as A};
--- a/public/js/build/CheckinExport.b07e7847.js
+++ b/public/js/build/CheckinExport.b07e7847.js
--- a/public/js/build/DialogWrapper.18ebe30d.js
+++ b/public/js/build/DialogWrapper.18ebe30d.js
--- a/public/js/build/DialogWrapper.b134e42a.js
+++ b/public/js/build/DialogWrapper.b134e42a.js
--- a/public/js/build/DialogWrapper.bc3239e2.css
+++ b/public/js/build/DialogWrapper.bc3239e2.css
--- a/public/js/build/Drawio.b65f592a.js
+++ b/public/js/build/Drawio.b65f592a.js
@@ -0,0 +1 @@
+import{m as s}from"./vuex.cc7cb26e.js";import{I as m}from"./IFrame.b342830d.js";import{n as l,l as r}from"./app.79ecd097.js";import"./@micro-zoe.c2e1472d.js";import"./jquery.7bba1258.js";import"./@traptitech.363dce05.js";import"./katex.0b94f27c.js";import"./localforage.68acf19b.js";import"./markdown-it.f3afa976.js";import"./entities.797c3e49.js";import"./uc.micro.39573202.js";import"./mdurl.2f66c031.js";import"./linkify-it.3ecfda1e.js";import"./punycode.87a5269f.js";import"./highlight.js.24fdca15.js";import"./markdown-it-link-attributes.e1d5d151.js";import"./vue.eaf71fac.js";import"./axios.6ec123f8.js";import"./le5le-store.b40f9152.js";import"./openpgp_hi.15f91b1d.js";import"./vue-router.2d566cd7.js";import"./vue-clipboard2.4402036c.js";import"./clipboard.d74ec60d.js";import"./view-design-hi.76cbd75d.js";import"./default-passive-events.a3d698c9.js";import"./vuedraggable.c8fae132.js";import"./sortablejs.8b819437.js";import"./vue-resize-observer.5fb00380.js";import"./element-sea.b954f5d6.js";import"./deepmerge.cecf392e.js";import"./resize-observer-polyfill.e60103ad.js";import"./throttle-debounce.7c3948b2.js";import"./babel-helper-vue-jsx-merge-props.5ed215c3.js";import"./normalize-wheel.2a034b9f.js";import"./async-validator.289edf0d.js";import"./babel-runtime.4773988a.js";import"./core-js.314b4a1d.js";var p=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{staticClass:"drawio-content"},[i("IFrame",{ref:"frame",staticClass:"drawio-iframe",attrs:{src:t.url},on:{"on-message":t.onMessage}}),t.loadIng?i("div",{staticClass:"drawio-loading"},[i("Loading")],1):t._e()],1)},d=[];const u={name:"Drawio",components:{IFrame:m},props:{value:{type:Object,default:function(){return{}}},title:{type:String,default:""},readOnly:{type:Boolean,default:!1}},data(){return{loadIng:!0,url:null,bakData:""}},created(){let t=r;switch(r){case"zh-CHT":t="zh-tw";break}let e=this.readOnly?1:0,i=this.readOnly?0:1,n=this.themeName==="dark"?"dark":"kennedy",a=`?title=${this.title?encodeURIComponent(this.title):""}&chrome=${i}&lightbox=${e}&ui=${n}&lang=${t}&offline=1&pwa=0&embed=1&noLangIcon=1&noExitBtn=1&noSaveBtn=1&saveAndExit=0&spin=1&proto=json`;this.$Electron?this.url=$A.originUrl(`drawio/webapp/index.html${a}`):this.url=$A.apiUrl(`../drawio/webapp/${a}`)},mounted(){window.addEventListener("message",this.handleMessage)},beforeDestroy(){window.removeEventListener("message",this.handleMessage)},watch:{value:{handler(t){this.bakData!=$A.jsonStringify(t)&&(this.bakData=$A.jsonStringify(t),this.updateContent())},deep:!0}},computed:{...s(["themeName"])},methods:{formatZoom(t){return t+"%"},updateContent(){this.$refs.frame.postMessage(JSON.stringify({action:"load",autosave:1,xml:this.value.xml}))},onMessage(t){switch(t.event){case"init":this.loadIng=!1,this.updateContent();break;case"load":typeof this.value.xml=="undefined"&&this.$refs.frame.postMessage(JSON.stringify({action:"template"}));break;case"autosave":const e={xml:t.xml};this.bakData=$A.jsonStringify(e),this.$emit("input",e);break;case"save":this.$emit("saveData");break}}}},o={};var c=l(u,p,d,!1,h,"14444c66",null,null);function h(t){for(let e in o)this[e]=o[e]}var Y=function(){return c.exports}();export{Y as default};
--- a/public/js/build/Drawio.c2b7f1f3.js
+++ b/public/js/build/Drawio.c2b7f1f3.js
@@ -1 +0,0 @@
-import{m as s}from"./vuex.cc7cb26e.js";import{I as m}from"./IFrame.c5ecea98.js";import{n as l,l as r}from"./app.5bd57401.js";import"./@micro-zoe.c2e1472d.js";import"./jquery.ac5df0c3.js";import"./@traptitech.363dce05.js";import"./katex.0b94f27c.js";import"./localforage.063fa592.js";import"./markdown-it.f3afa976.js";import"./entities.797c3e49.js";import"./uc.micro.39573202.js";import"./mdurl.2f66c031.js";import"./linkify-it.3ecfda1e.js";import"./punycode.87a5269f.js";import"./highlight.js.24fdca15.js";import"./markdown-it-link-attributes.e1d5d151.js";import"./vue.eaf71fac.js";import"./axios.6ec123f8.js";import"./le5le-store.b40f9152.js";import"./openpgp_hi.15f91b1d.js";import"./vue-router.2d566cd7.js";import"./vue-clipboard2.4402036c.js";import"./clipboard.d74ec60d.js";import"./view-design-hi.86f143ee.js";import"./vuedraggable.c8fae132.js";import"./sortablejs.8b819437.js";import"./vue-resize-observer.5fb00380.js";import"./element-sea.b954f5d6.js";import"./deepmerge.cecf392e.js";import"./resize-observer-polyfill.e60103ad.js";import"./throttle-debounce.7c3948b2.js";import"./babel-helper-vue-jsx-merge-props.5ed215c3.js";import"./normalize-wheel.2a034b9f.js";import"./async-validator.289edf0d.js";import"./babel-runtime.4773988a.js";import"./core-js.314b4a1d.js";var p=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{staticClass:"drawio-content"},[i("IFrame",{ref:"frame",staticClass:"drawio-iframe",attrs:{src:t.url},on:{"on-message":t.onMessage}}),t.loadIng?i("div",{staticClass:"drawio-loading"},[i("Loading")],1):t._e()],1)},d=[];const u={name:"Drawio",components:{IFrame:m},props:{value:{type:Object,default:function(){return{}}},title:{type:String,default:""},readOnly:{type:Boolean,default:!1}},data(){return{loadIng:!0,url:null,bakData:""}},created(){let t=r;switch(r){case"zh-CHT":t="zh-tw";break}let e=this.readOnly?1:0,i=this.readOnly?0:1,n=this.themeName==="dark"?"dark":"kennedy",a=`?title=${this.title?encodeURIComponent(this.title):""}&chrome=${i}&lightbox=${e}&ui=${n}&lang=${t}&offline=1&pwa=0&embed=1&noLangIcon=1&noExitBtn=1&noSaveBtn=1&saveAndExit=0&spin=1&proto=json`;this.$Electron?this.url=$A.originUrl(`drawio/webapp/index.html${a}`):this.url=$A.apiUrl(`../drawio/webapp/${a}`)},mounted(){window.addEventListener("message",this.handleMessage)},beforeDestroy(){window.removeEventListener("message",this.handleMessage)},watch:{value:{handler(t){this.bakData!=$A.jsonStringify(t)&&(this.bakData=$A.jsonStringify(t),this.updateContent())},deep:!0}},computed:{...s(["themeName"])},methods:{formatZoom(t){return t+"%"},updateContent(){this.$refs.frame.postMessage(JSON.stringify({action:"load",autosave:1,xml:this.value.xml}))},onMessage(t){switch(t.event){case"init":this.loadIng=!1,this.updateContent();break;case"load":typeof this.value.xml=="undefined"&&this.$refs.frame.postMessage(JSON.stringify({action:"template"}));break;case"autosave":const e={xml:t.xml};this.bakData=$A.jsonStringify(e),this.$emit("input",e);break;case"save":this.$emit("saveData");break}}}},o={};var c=l(u,p,d,!1,h,"14444c66",null,null);function h(t){for(let e in o)this[e]=o[e]}var X=function(){return c.exports}();export{X as default};
--- a/public/js/build/FileContent.823df4c8.js
+++ b/public/js/build/FileContent.823df4c8.js
--- a/public/js/build/FileContent.f6e2812a.js
+++ b/public/js/build/FileContent.f6e2812a.js
--- a/public/js/build/FilePreview.ddbea7df.js
+++ b/public/js/build/FilePreview.ddbea7df.js
--- a/public/js/build/FilePreview.fe249569.js
+++ b/public/js/build/FilePreview.fe249569.js
--- a/public/js/build/IFrame.b342830d.js
+++ b/public/js/build/IFrame.b342830d.js
@@ -1 +1 @@
-import{n}from"./app.5bd57401.js";var i=function(){var e=this,s=e.$createElement,r=e._self._c||s;return r("iframe",{directives:[{name:"show",rawName:"v-show",value:e.src,expression:"src"}],ref:"iframe",attrs:{src:e.src}})},a=[];const o={name:"IFrame",props:{src:{type:String,default:""}},mounted(){this.$refs.iframe.addEventListener("load",this.handleLoad),window.addEventListener("message",this.handleMessage)},beforeDestroy(){this.$refs.iframe.removeEventListener("load",this.handleLoad),window.removeEventListener("message",this.handleMessage)},methods:{handleLoad(){this.$emit("on-load")},handleMessage({data:e,source:s}){var r;s===((r=this.$refs.iframe)==null?void 0:r.contentWindow)&&(e=$A.jsonParse(e),e.source==="fileView"&&e.action==="picture"&&this.$store.dispatch("previewImage",{index:e.params.index,list:e.params.array}),this.$emit("on-message",e))},postMessage(e,s="*"){this.$refs.iframe&&this.$refs.iframe.contentWindow.postMessage(e,s)}}},t={};var m=n(o,i,a,!1,c,null,null,null);function c(e){for(let s in t)this[s]=t[s]}var l=function(){return m.exports}();export{l as I};
+import{n}from"./app.79ecd097.js";var i=function(){var e=this,s=e.$createElement,r=e._self._c||s;return r("iframe",{directives:[{name:"show",rawName:"v-show",value:e.src,expression:"src"}],ref:"iframe",attrs:{src:e.src}})},a=[];const o={name:"IFrame",props:{src:{type:String,default:""}},mounted(){this.$refs.iframe.addEventListener("load",this.handleLoad),window.addEventListener("message",this.handleMessage)},beforeDestroy(){this.$refs.iframe.removeEventListener("load",this.handleLoad),window.removeEventListener("message",this.handleMessage)},methods:{handleLoad(){this.$emit("on-load")},handleMessage({data:e,source:s}){var r;s===((r=this.$refs.iframe)==null?void 0:r.contentWindow)&&(e=$A.jsonParse(e),e.source==="fileView"&&e.action==="picture"&&this.$store.dispatch("previewImage",{index:e.params.index,list:e.params.array}),this.$emit("on-message",e))},postMessage(e,s="*"){this.$refs.iframe&&this.$refs.iframe.contentWindow.postMessage(e,s)}}},t={};var m=n(o,i,a,!1,c,null,null,null);function c(e){for(let s in t)this[s]=t[s]}var l=function(){return m.exports}();export{l as I};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
kuaifan	23a363aeea	build	2024-04-17 23:59:29 +08:00
kuaifan	6cbf2bbada	perf: 下载pdf使用自带浏览器	2024-04-17 10:21:35 +08:00
kuaifan	ee9cf0a6b6	perf: 优化消息加载中效果	2024-04-17 09:32:53 +08:00
Pang	8d39b4aa0d	perf: 审批内容禁止转发	2024-04-17 08:10:08 +08:00
Pang	3c93ad18b2	perf: 滑动快捷表情选择	2024-04-17 07:46:43 +08:00
kuaifan	cc125cc292	perf: 优化聊天输入框	2024-04-17 00:34:12 +08:00
kuaifan	6823d87198	build	2024-04-11 11:52:36 +08:00
kuaifan	288e857321	perf: update chat editor	2024-04-11 11:51:10 +08:00
kuaifan	73d1950d97	fix: added non-passive event listener to a scroll-blocking 'touchstart' event	2024-04-11 11:50:07 +08:00
kuaifan	ee2b047e5d	no message	2024-04-11 10:16:00 +08:00
kuaifan	ae83fce524	perf: 优化机器人回复	2024-04-11 10:12:50 +08:00
kuaifan	985c5ff54b	perf: 优化android体验	2024-04-11 08:48:55 +08:00
Pang	fe5f56e98b	build	2024-04-09 23:35:22 +08:00
Pang	40ef700e5a	perf: 优化使用默认浏览器打开规则	2024-04-09 20:46:56 +08:00
Pang	8661c28d10	build	2024-04-09 19:34:19 +08:00
Pang	9edddc461d	perf: 优化聊天图片上传	2024-04-09 09:05:36 +08:00
kuaifan	2fbb640bc8	build	2024-04-08 17:00:39 +08:00
kuaifan	a03050bc7b	perf: 临时帐号别名	2024-04-08 16:53:24 +08:00
kuaifan	654a90626e	perf: tab icon load error	2024-04-08 14:06:45 +08:00
Pang	9acafed459	perf: 优化会议	2024-04-08 09:37:46 +08:00
Pang	b7dcb543f6	perf: 创建会议不需要加入机器人	2024-04-08 08:58:16 +08:00
Pang	e2768f7f20	perf: 暗黑模式下窗口背景色兼容问题	2024-04-08 08:31:51 +08:00
Pang	cda2d0da27	perf: 优化网络检查	2024-04-08 08:13:30 +08:00
Pang	c61815db3a	perf: 客户端会议优化	2024-04-08 07:51:57 +08:00
Pang	9390965a0c	no message	2024-04-06 11:58:45 +08:00
Pang	0688feefb1	build	2024-04-04 10:33:51 +08:00
Pang	93c8d86caf	perf: 优化会议室	2024-04-04 10:31:12 +08:00
Pang	540bff89cf	no message	2024-04-04 08:42:41 +08:00
Pang	41c09b3838	perf: 优化会议室	2024-04-04 07:40:57 +08:00
Pang	0a26361724	no message	2024-04-04 07:40:38 +08:00
kuaifan	ee9ad65e18	build	2024-04-03 10:32:00 +08:00
kuaifan	db6b571cfb	fix: 部分情况出现注册失败	2024-04-03 10:14:41 +08:00
Pang	bfe359c440	perf: 优化数据读取机制	2024-04-03 07:53:44 +08:00
Pang	ee8f67793a	fix: 最小化阅读窗口新建窗口不自动激活	2024-04-03 07:13:35 +08:00
Pang	629fe79c61	fix: 独立窗口不更新消息	2024-04-03 07:13:35 +08:00
Pang	9ae278d622	perf: 优化缓存规则	2024-04-03 07:13:35 +08:00
Pang	3417d68609	perf: 优化完成待办数据推送	2024-04-03 07:13:35 +08:00
weifs	f757749282	perf: 评论审批图片和投票深色按钮	2024-03-26 17:43:08 +08:00
kuaifan	ea40e95cae	build	2024-03-26 14:19:02 +08:00
kuaifan	eb066f52fe	perf: 优化任务日志内容	2024-03-26 13:52:24 +08:00
kuaifan	b7007135cb	perf: 查看版本免请求接口	2024-03-26 13:28:00 +08:00
kuaifan	a7bd403b2c	perf: 添加任务时选择任务位置内容溢出	2024-03-26 13:22:25 +08:00
Pang	59c7b148dd	perf: 消息支持style	2024-03-26 10:17:49 +08:00
Pang	c67f52e960	perf: 回复消息列表隐藏顶部loading	2024-03-26 08:56:20 +08:00
Pang	f311625060	fix: 修改回复、转发消息后引用的部分消失	2024-03-26 08:51:40 +08:00
kuaifan	d3c08f8d90	perf: 支持FCM推送	2024-03-21 00:37:38 +09:00
kuaifan	2bc655d7ef	perf: 设置华为推送自分类	2024-03-20 15:52:48 +09:00
kuaifan	d2b8d0372e	perf(client): 优化添加任务可见性点击效果	2024-03-20 13:44:22 +09:00
kuaifan	40b637b16e	build	2024-03-20 02:53:37 +09:00
kuaifan	6e68f399b4	perf: 优化数据结构	2024-03-20 02:49:44 +09:00
kuaifan	0be6c70e92	Merge commit '6c2d8fc16313234bbacb4ad4d7f8637b71025a26' into pro	2024-03-20 02:03:26 +09:00
weifs	6c2d8fc163	perf: 接龙优化为清空内容默认删除	2024-03-19 18:41:41 +08:00
kuaifan	a8193b8feb	build	2024-03-19 16:32:39 +09:00
kuaifan	34159caf22	Merge commit 'd12c0c42072452de4c99ef55c5915edb108dd2ef' into pro	2024-03-19 16:04:26 +09:00
kuaifan	c75f406459	no message	2024-03-19 15:57:24 +09:00
kuaifan	99dca06d44	perf: 支持取消发送中的消息	2024-03-19 15:57:07 +09:00
weifs	d12c0c4207	perf: 1. 强化接龙接口本地时间戳问题 2. 接龙消息点展开按钮后做缓存处理	2024-03-19 14:38:15 +08:00
kuaifan	915a5ed7d5	fix: 关闭文件后无法再次打开	2024-03-19 12:07:54 +09:00
kuaifan	7bfc43c85f	no message	2024-03-19 04:06:45 +09:00
kuaifan	77ea022ddf	build	2024-03-19 03:23:09 +09:00
kuaifan	93578f93f4	Merge commit 'cbbd50a2e320ca0427474fb2921f2b93a5ad2c14' into pro	2024-03-19 03:17:19 +09:00
kuaifan	f129615ebe	no message	2024-03-19 03:15:38 +09:00
kuaifan	0e5b44baad	perf: 自动识别md格式发送	2024-03-19 03:15:19 +09:00
kuaifan	3596475790	fix: 消息太长导致菜单无法正常显示	2024-03-19 03:14:09 +09:00
kuaifan	6218521dea	fix: 项目数量不正确的情况	2024-03-19 02:29:06 +09:00
kuaifan	65db8b5703	fix: 部分未读和待办信息不显示的情况	2024-03-19 02:21:48 +09:00
kuaifan	f5ff9a3648	perf: 优化回复、转发消息数据结构	2024-03-18 19:44:20 +09:00
weifs	cbbd50a2e3	fix: 审批中心修复loadIng效果	2024-03-18 14:12:19 +08:00
kuaifan	b04647e65a	build	2024-03-17 17:50:27 +09:00
kuaifan	d34d94faa6	perf: 优化iOS端数据读取失败的情况	2024-03-17 17:21:29 +09:00
kuaifan	4038d9560f	perf: 回复消息时自动@提及	2024-03-17 17:00:05 +09:00
kuaifan	006fc43498	perf: 优化会话数据结构	2024-03-17 16:23:57 +09:00
				`@@ -1 +0,0 @@`
				import{n as e}from"./app.5bd57401.js";import"./@micro-zoe.c2e1472d.js";import"./jquery.ac5df0c3.js";import"./@traptitech.363dce05.js";import"./katex.0b94f27c.js";import"./localforage.063fa592.js";import"./markdown-it.f3afa976.js";import"./entities.797c3e49.js";import"./uc.micro.39573202.js";import"./mdurl.2f66c031.js";import"./linkify-it.3ecfda1e.js";import"./punycode.87a5269f.js";import"./highlight.js.24fdca15.js";import"./markdown-it-link-attributes.e1d5d151.js";import"./vue.eaf71fac.js";import"./vuex.cc7cb26e.js";import"./axios.6ec123f8.js";import"./le5le-store.b40f9152.js";import"./openpgp_hi.15f91b1d.js";import"./vue-router.2d566cd7.js";import"./vue-clipboard2.4402036c.js";import"./clipboard.d74ec60d.js";import"./view-design-hi.86f143ee.js";import"./vuedraggable.c8fae132.js";import"./sortablejs.8b819437.js";import"./vue-resize-observer.5fb00380.js";import"./element-sea.b954f5d6.js";import"./deepmerge.cecf392e.js";import"./resize-observer-polyfill.e60103ad.js";import"./throttle-debounce.7c3948b2.js";import"./babel-helper-vue-jsx-merge-props.5ed215c3.js";import"./normalize-wheel.2a034b9f.js";import"./async-validator.289edf0d.js";import"./babel-runtime.4773988a.js";import"./core-js.314b4a1d.js";var m=function(){var t=this,r=t.$createElement;return t._self._c,t._m(0)},p=[function(){var t=this,r=t.$createElement,i=t._self._c\|\|r;return i("div",{staticClass:"page-404"},[i("div",{staticClass:"flex-center position-ref full-height"},[i("div",{staticClass:"code"},[t._v("404")]),i("div",{staticClass:"message"},[t._v("Not Found")])])])}];const s={},o={};var _=e(s,m,p,!1,n,"7d7154a8",null,null);function n(t){for(let r in o)this[r]=o[r]}var P=function(){return _.exports}();export{P as default};
				`@@ -0,0 +1 @@`
				import{n as e}from"./app.79ecd097.js";import"./@micro-zoe.c2e1472d.js";import"./jquery.7bba1258.js";import"./@traptitech.363dce05.js";import"./katex.0b94f27c.js";import"./localforage.68acf19b.js";import"./markdown-it.f3afa976.js";import"./entities.797c3e49.js";import"./uc.micro.39573202.js";import"./mdurl.2f66c031.js";import"./linkify-it.3ecfda1e.js";import"./punycode.87a5269f.js";import"./highlight.js.24fdca15.js";import"./markdown-it-link-attributes.e1d5d151.js";import"./vue.eaf71fac.js";import"./vuex.cc7cb26e.js";import"./axios.6ec123f8.js";import"./le5le-store.b40f9152.js";import"./openpgp_hi.15f91b1d.js";import"./vue-router.2d566cd7.js";import"./vue-clipboard2.4402036c.js";import"./clipboard.d74ec60d.js";import"./view-design-hi.76cbd75d.js";import"./default-passive-events.a3d698c9.js";import"./vuedraggable.c8fae132.js";import"./sortablejs.8b819437.js";import"./vue-resize-observer.5fb00380.js";import"./element-sea.b954f5d6.js";import"./deepmerge.cecf392e.js";import"./resize-observer-polyfill.e60103ad.js";import"./throttle-debounce.7c3948b2.js";import"./babel-helper-vue-jsx-merge-props.5ed215c3.js";import"./normalize-wheel.2a034b9f.js";import"./async-validator.289edf0d.js";import"./babel-runtime.4773988a.js";import"./core-js.314b4a1d.js";var m=function(){var t=this,r=t.$createElement;return t._self._c,t._m(0)},p=[function(){var t=this,r=t.$createElement,i=t._self._c\|\|r;return i("div",{staticClass:"page-404"},[i("div",{staticClass:"flex-center position-ref full-height"},[i("div",{staticClass:"code"},[t._v("404")]),i("div",{staticClass:"message"},[t._v("Not Found")])])])}];const s={},o={};var _=e(s,m,p,!1,n,"7d7154a8",null,null);function n(t){for(let r in o)this[r]=o[r]}var Q=function(){return _.exports}();export{Q as default};
				`@@ -0,0 +1 @@`
				import{m as s}from"./vuex.cc7cb26e.js";import{I as m}from"./IFrame.b342830d.js";import{n as l,l as r}from"./app.79ecd097.js";import"./@micro-zoe.c2e1472d.js";import"./jquery.7bba1258.js";import"./@traptitech.363dce05.js";import"./katex.0b94f27c.js";import"./localforage.68acf19b.js";import"./markdown-it.f3afa976.js";import"./entities.797c3e49.js";import"./uc.micro.39573202.js";import"./mdurl.2f66c031.js";import"./linkify-it.3ecfda1e.js";import"./punycode.87a5269f.js";import"./highlight.js.24fdca15.js";import"./markdown-it-link-attributes.e1d5d151.js";import"./vue.eaf71fac.js";import"./axios.6ec123f8.js";import"./le5le-store.b40f9152.js";import"./openpgp_hi.15f91b1d.js";import"./vue-router.2d566cd7.js";import"./vue-clipboard2.4402036c.js";import"./clipboard.d74ec60d.js";import"./view-design-hi.76cbd75d.js";import"./default-passive-events.a3d698c9.js";import"./vuedraggable.c8fae132.js";import"./sortablejs.8b819437.js";import"./vue-resize-observer.5fb00380.js";import"./element-sea.b954f5d6.js";import"./deepmerge.cecf392e.js";import"./resize-observer-polyfill.e60103ad.js";import"./throttle-debounce.7c3948b2.js";import"./babel-helper-vue-jsx-merge-props.5ed215c3.js";import"./normalize-wheel.2a034b9f.js";import"./async-validator.289edf0d.js";import"./babel-runtime.4773988a.js";import"./core-js.314b4a1d.js";var p=function(){var t=this,e=t.$createElement,i=t._self._c\|\|e;return i("div",{staticClass:"drawio-content"},[i("IFrame",{ref:"frame",staticClass:"drawio-iframe",attrs:{src:t.url},on:{"on-message":t.onMessage}}),t.loadIng?i("div",{staticClass:"drawio-loading"},[i("Loading")],1):t._e()],1)},d=[];const u={name:"Drawio",components:{IFrame:m},props:{value:{type:Object,default:function(){return{}}},title:{type:String,default:""},readOnly:{type:Boolean,default:!1}},data(){return{loadIng:!0,url:null,bakData:""}},created(){let t=r;switch(r){case"zh-CHT":t="zh-tw";break}let e=this.readOnly?1:0,i=this.readOnly?0:1,n=this.themeName==="dark"?"dark":"kennedy",a=`?title=${this.title?encodeURIComponent(this.title):""}&chrome=${i}&lightbox=${e}&ui=${n}&lang=${t}&offline=1&pwa=0&embed=1&noLangIcon=1&noExitBtn=1&noSaveBtn=1&saveAndExit=0&spin=1&proto=json`;this.$Electron?this.url=$A.originUrl(`drawio/webapp/index.html${a}`):this.url=$A.apiUrl(`../drawio/webapp/${a}`)},mounted(){window.addEventListener("message",this.handleMessage)},beforeDestroy(){window.removeEventListener("message",this.handleMessage)},watch:{value:{handler(t){this.bakData!=$A.jsonStringify(t)&&(this.bakData=$A.jsonStringify(t),this.updateContent())},deep:!0}},computed:{...s(["themeName"])},methods:{formatZoom(t){return t+"%"},updateContent(){this.$refs.frame.postMessage(JSON.stringify({action:"load",autosave:1,xml:this.value.xml}))},onMessage(t){switch(t.event){case"init":this.loadIng=!1,this.updateContent();break;case"load":typeof this.value.xml=="undefined"&&this.$refs.frame.postMessage(JSON.stringify({action:"template"}));break;case"autosave":const e={xml:t.xml};this.bakData=$A.jsonStringify(e),this.$emit("input",e);break;case"save":this.$emit("saveData");break}}}},o={};var c=l(u,p,d,!1,h,"14444c66",null,null);function h(t){for(let e in o)this[e]=o[e]}var Y=function(){return c.exports}();export{Y as default};