From f073e619658c62c6bdc50c626255394cda1cce1d Mon Sep 17 00:00:00 2001 From: kuaifan Date: Fri, 1 Sep 2023 00:47:54 +0900 Subject: [PATCH] merge optimization --- app/Http/Controllers/Api/UsersController.php | 16 +++++----- app/Models/User.php | 28 +----------------- app/Models/UserBot.php | 1 + app/Models/WebSocketDialog.php | 5 +++- cmd | 20 ------------- .../js/components/DrawerOverlay/index.vue | 2 -- resources/assets/js/components/Minder.vue | 1 - .../public/images/application/app-push.svg | 2 +- .../public/images/application/approve.svg | 2 +- .../public/images/application/ldap.svg | 2 +- .../public/images/application/mail.svg | 2 +- .../images/application/meeting-create.svg | 2 +- .../public/images/application/meeting.svg | 2 +- .../public/images/application/report.svg | 2 +- .../public/images/application/robot.svg | 2 +- .../public/images/application/signin.svg | 2 +- .../public/images/avatar/default_meeting.png | Bin 10614 -> 3995 bytes .../public/images/avatar/default_okr.png | Bin 0 -> 5315 bytes 18 files changed, 23 insertions(+), 68 deletions(-) create mode 100644 resources/assets/statics/public/images/avatar/default_okr.png diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index c1e6d0b12..e77a2e335 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -548,7 +548,7 @@ class UsersController extends AbstractController foreach ($keys['departments'] AS $department) { $query->orWhereRaw("FIND_IN_SET('{$department}', department)"); } - }); + }); } if (in_array($sorts['az'], ['asc', 'desc'])) { $builder->orderBy('az', $sorts['az']); @@ -613,7 +613,7 @@ class UsersController extends AbstractController */ public function basic() { - $sharekey = Request::header('Sharekey'); + $sharekey = Request::header('sharekey'); if(empty($sharekey) || !Meeting::getShareInfo($sharekey)){ User::auth(); } @@ -1215,9 +1215,9 @@ class UsersController extends AbstractController $data['nickname'] = $sharekey ? $username : $user?->nickname; $data['token'] = $token; $data['msgs'] = $msgs; - // + // Meeting::setTouristInfo($data); - // + // return Base::retSuccess('success', $data); } @@ -1927,7 +1927,7 @@ class UsersController extends AbstractController * @apiParam {String} [type] 分享类型：file-文件，text-列表 默认file * @apiParam {Number} [pid] 父级文件id，用于获取子目录和上传到指定目录的id * @apiParam {Number} [upload_file_id] 上传文件id - * + * * @apiSuccess {Number} ret 返回状态码（1正确、0错误） * @apiSuccess {String} msg 返回信息（错误描述） * @apiSuccess {Object} data 返回数据 @@ -1990,9 +1990,9 @@ class UsersController extends AbstractController 'icon' => $avatar, 'url' => $type == "file" ? Base::fillUrl("api/dialog/msg/sendfiles") : Base::fillUrl("api/dialog/msg/sendtext"), 'extend' => [ - 'dialog_ids' => $dialog['id'], - 'text_type' => 'text', - 'reply_id' => 0, + 'dialog_ids' => $dialog['id'], + 'text_type' => 'text', + 'reply_id' => 0, 'silence' => 'no' ] ]; diff --git a/app/Models/User.php b/app/Models/User.php index d3bfcc580..78f654350 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -534,7 +534,7 @@ class User extends AbstractModel case 'approval-alert@bot.system': return url("images/avatar/default_approval.png"); case 'okr-alert@bot.system': - return url("images/avatar/default_task.png"); + return url("images/avatar/default_okr.png"); case 'ai-openai@bot.system': return url("images/avatar/default_openai.png"); case 'ai-claude@bot.system': @@ -611,32 +611,6 @@ class User extends AbstractModel ])->save(); } // - switch ($key) { - case 'system-msg': - $update['nickname'] = '系统消息'; - break; - case 'task-alert': - $update['nickname'] = '任务提醒'; - break; - case 'check-in': - $update['nickname'] = '签到打卡'; - break; - case 'anon-msg': - $update['nickname'] = '匿名消息'; - break; - case 'approval-alert': - $update['nickname'] = '审批'; - break; - case 'okr-alert': - $update['nickname'] = "OKR提醒"; - break; - case 'bot-manager': - $update['nickname'] = '机器人管理'; - break; - case 'meeting-alert': - $update['nickname'] = '会议通知'; - break; - } $update['nickname'] = UserBot::systemBotName($email); } if ($update) { diff --git a/app/Models/UserBot.php b/app/Models/UserBot.php index 8795a85b8..8208075b9 100644 --- a/app/Models/UserBot.php +++ b/app/Models/UserBot.php @@ -59,6 +59,7 @@ class UserBot extends AbstractModel 'ai-qianwen' => '通义千问', 'bot-manager' => '机器人管理', 'meeting-alert' => '会议通知', + 'okr-alert' => 'OKR提醒', default => '', // 不是系统机器人时返回空（也可以拿来判断是否是系统机器人） }; } diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php index 035f4d92a..c11f01a07 100644 --- a/app/Models/WebSocketDialog.php +++ b/app/Models/WebSocketDialog.php @@ -496,7 +496,10 @@ class WebSocketDialog extends AbstractModel } } } - if (!WebSocketDialogUser::whereDialogId($dialog->id)->whereUserid($userid)->exists() && $dialog->group_type != 'okr') { + if ($dialog->group_type == 'okr') { + return $dialog; + } + if (!WebSocketDialogUser::whereDialogId($dialog->id)->whereUserid($userid)->exists()) { throw new ApiException('不在成员列表内', ['dialog_id' => $dialog_id], -4003); } return $dialog; diff --git a/cmd b/cmd index f74964e30..cc229396c 100755 --- a/cmd +++ b/cmd @@ -198,24 +198,6 @@ run_mysql() { run_exec mariadb "gunzip < /$inputname | mysql -u$username -p$password $database" run_exec php "php artisan migrate" judge "还原数据库" - elif [ "$1" = "empty" ]; then - read -rp "确定要清空数据库吗？(Y/n): " empty - [[ -z ${empty} ]] && empty="Y" - case $empty in - [yY][eE][sS] | [yY]) - echo -e "${RedBG} 开始清空... ${Font}" - ;; - *) - echo -e "${GreenBG} 终止清空。 ${Font}" - exit 2 - ;; - esac - ./cmd mysql backup - $COMPOSE stop mariadb - $COMPOSE rm -f mariadb - rm -rf "./docker/mysql/data" - $COMPOSE up -d mariadb - judge "清空数据库" fi } @@ -443,8 +425,6 @@ if [ $# -gt 0 ]; then run_mysql backup elif [ "$1" = "recovery" ]; then run_mysql recovery - elif [ "$1" = "empty" ]; then - run_mysql empty else e="mysql $@" && run_exec mariadb "$e" fi diff --git a/resources/assets/js/components/DrawerOverlay/index.vue b/resources/assets/js/components/DrawerOverlay/index.vue index 825aecda2..186b6fe44 100644 --- a/resources/assets/js/components/DrawerOverlay/index.vue +++ b/resources/assets/js/components/DrawerOverlay/index.vue @@ -23,7 +23,6 @@