From 10936bcdb5fd7bea581c8371541e2e6d4585bcb3 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Sat, 28 Jan 2023 22:44:52 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E7=AD=BE=E5=88=B0=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/PublicController.php | 28 +++++++++++- app/Http/Controllers/Api/SystemController.php | 6 ++- app/Models/User.php | 4 ++ .../setting/components/SystemCheckin.vue | 40 ++++++++++++++---- .../public/images/avatar/default_checkin.png | Bin 0 -> 9528 bytes 5 files changed, 67 insertions(+), 11 deletions(-) create mode 100644 resources/assets/statics/public/images/avatar/default_checkin.png diff --git a/app/Http/Controllers/Api/PublicController.php b/app/Http/Controllers/Api/PublicController.php index 0bd1c097c..d066d9b1e 100755 --- a/app/Http/Controllers/Api/PublicController.php +++ b/app/Http/Controllers/Api/PublicController.php @@ -2,8 +2,11 @@ namespace App\Http\Controllers\Api; +use App\Models\User; use App\Models\UserCheckinMac; use App\Models\UserCheckinRecord; +use App\Models\WebSocketDialog; +use App\Models\WebSocketDialogMsg; use App\Module\Base; use Request; @@ -87,10 +90,19 @@ class PublicController extends AbstractController if ($key != $setting['key']) { return 'key error'; } + $setting['time'] = $setting['time'] ? Base::json2array($setting['time']) : ['00:00', '23:59']; // $nowDate = date("Y-m-d"); $nowTime = date("H:i:s"); + // + $timeStart = strtotime(date("{$nowDate} {$setting['time'][0]}")); + $timeEnd = strtotime(date("{$nowDate} {$setting['time'][1]}")); + if (Base::time() < $timeStart || Base::time() > $timeEnd) { + return "not in valid time, valid time is {$setting['time'][0]}-{$setting['time'][1]}"; + } + // $macs = explode(",", $mac); + $creates = []; foreach ($macs as $mac) { $mac = strtoupper($mac); if (Base::isMac($mac) && $UserCheckinMac = UserCheckinMac::whereMac($mac)->first()) { @@ -102,11 +114,25 @@ class PublicController extends AbstractController $record = UserCheckinRecord::where($array)->first(); if (empty($record)) { $record = UserCheckinRecord::createInstance($array); - $record->save(); + $creates[] = $UserCheckinMac->userid; } $record->times = Base::array2json(array_merge($record->times, [$nowTime])); $record->report_time = $time; $record->save(); + + } + } + // + if ($creates) { + $botUser = User::botGetOrCreate('check-in'); + if ($botUser) { + foreach ($creates as $create) { + $dialog = WebSocketDialog::checkUserDialog($botUser->userid, $create); + if ($dialog) { + $text = "签到成功，签到时间：" . date("H:i"); + WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => $text], $botUser->userid); // todo 未能在任务end事件来发送任务 + } + } } } return 'success'; diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index 40eddb365..44831de41 100755 --- a/app/Http/Controllers/Api/SystemController.php +++ b/app/Http/Controllers/Api/SystemController.php @@ -224,7 +224,7 @@ class SystemController extends AbstractController * * @apiParam {String} type * - get: 获取（默认） - * - save: 保存设置（参数：['open', 'edit', 'key']） + * - save: 保存设置（参数：['open', 'time', 'notice', 'edit', 'key']） * @apiSuccess {Number} ret 返回状态码（1正确、0错误） * @apiSuccess {String} msg 返回信息（错误描述） * @apiSuccess {Object} data 返回数据 @@ -242,6 +242,8 @@ class SystemController extends AbstractController foreach ($all as $key => $value) { if (!in_array($key, [ 'open', + 'time', + 'notice', 'edit', 'key', ])) { @@ -262,6 +264,8 @@ class SystemController extends AbstractController } // $setting['open'] = $setting['open'] ?: 'close'; + $setting['time'] = $setting['time'] ? Base::json2array($setting['time']) : ['00:00', '23:59']; + $setting['notice'] = $setting['notice'] ?: 'close'; $setting['edit'] = $setting['edit'] ?: 'close'; $setting['cmd'] = "curl -sSL '" . Base::fillUrl("api/public/checkin/install?key={$setting['key']}") . "' | sh"; // diff --git a/app/Models/User.php b/app/Models/User.php index e49d62eac..4dd86e2e6 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -553,6 +553,8 @@ class User extends AbstractModel return url("images/avatar/default_system.png"); } elseif ($email == 'task-alert@bot.system') { return url("images/avatar/default_task.png"); + } elseif ($email == 'check-in@bot.system') { + return url("images/avatar/default_checkin.png"); } elseif ($email == 'bot-manager@bot.system') { return url("images/avatar/default_bot.png"); } @@ -628,6 +630,8 @@ class User extends AbstractModel $update['nickname'] = '系统消息'; } elseif ($key === 'task-alert') { $update['nickname'] = '任务提醒'; + } elseif ($key === 'check-in') { + $update['nickname'] = '签到打卡'; } elseif ($key === 'bot-manager') { $update['nickname'] = '机器人管理'; } diff --git a/resources/assets/js/pages/manage/setting/components/SystemCheckin.vue b/resources/assets/js/pages/manage/setting/components/SystemCheckin.vue index c751017f2..d06c2199d 100644 --- a/resources/assets/js/pages/manage/setting/components/SystemCheckin.vue +++ b/resources/assets/js/pages/manage/setting/components/SystemCheckin.vue @@ -2,7 +2,7 @@
-

{{ $L('自动签到') }}

+

{{ $L('签到设置') }}

{{ $L('开启') }} @@ -14,6 +14,21 @@
+ +
diff --git a/resources/assets/statics/public/images/avatar/default_checkin.png b/resources/assets/statics/public/images/avatar/default_checkin.png new file mode 100644 index 0000000000000000000000000000000000000000..10a9edab39127a0a0f1e77fb82ac3fde287eb538 GIT binary patch literal 9528 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 PNCDK9b(HE9Y{UK!)qFS} literal 0 HcmV?d00001