From e983677e570ffd9855decf8df7be04d7f938d4ee Mon Sep 17 00:00:00 2001 From: kuaifan Date: Sat, 23 Nov 2024 13:30:03 +0800 Subject: [PATCH] no message --- app/Http/Controllers/Api/UsersController.php | 4 +- app/Http/Controllers/IndexController.php | 52 +++++++++++-------- app/Models/User.php | 2 +- app/Models/WebSocketDialog.php | 2 +- ...23_013018_process_user_transfer_dialog.php | 36 ------------- language/original-web.txt | 3 +- language/translate.json | 12 ----- .../setting/components/SystemSetting.vue | 12 ++--- resources/mobile | 2 +- 9 files changed, 44 insertions(+), 81 deletions(-) delete mode 100644 database/migrations/2024_11_23_013018_process_user_transfer_dialog.php diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index e177bb912..9990721fd 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -130,7 +130,7 @@ public function login() return $retError('帐号或密码错误'); } // - if (in_array('disable', $user->identity)) { + if ($user->isDisable()) { return $retError('帐号已停用...'); } Cache::forget("code::" . $email); @@ -928,7 +928,7 @@ public function operation() if ($transferUser->userid === $userInfo->userid) { return Base::retError('不能移交给自己'); } - if (in_array('disable', $transferUser->identity)) { + if ($transferUser->isDisable()) { return Base::retError('交接人已离职，请选择另一个交接人'); } break; diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php index d20e10b13..640025b94 100755 --- a/app/Http/Controllers/IndexController.php +++ b/app/Http/Controllers/IndexController.php @@ -8,6 +8,7 @@ use Redirect; use Response; use App\Models\File; +use App\Models\User; use App\Models\UserTransfer; use App\Module\Doo; use App\Module\Base; @@ -261,27 +262,6 @@ public function crontab() return "success"; } - /** - * 迁移辅助路由 - * @return array - */ - public function migration__userdialog() - { - if (Request::header('app-key') !== env('APP_KEY')) { - return Base::retError("key error"); - } - go(function() { - Coroutine::sleep(3); - UserTransfer::orderBy('id')->chunkById(10, function ($transfers) { - /** @var UserTransfer $transfer */ - foreach ($transfers as $transfer) { - $transfer->exitDialog(); - } - }); - }); - return Base::retSuccess('success'); - } - /** * 桌面客户端发布 */ @@ -520,6 +500,36 @@ public function online__preview() return Redirect::to($redirectUrl, 301); } + /** + * 修复操作离职后续操作(todo 临时，后期删除) + * @return array + */ + public function migration__userdialog() + { + if (Request::header('app-key') !== env('APP_KEY')) { + return Base::retError("key error"); + } + go(function() { + Coroutine::sleep(3); + $handled = []; + UserTransfer::orderBy('id')->chunkById(10, function ($transfers) use ($handled) { + /** @var UserTransfer $transfer */ + foreach ($transfers as $transfer) { + if (in_array($transfer->original_userid, $handled)) { + continue; + } + $handled[] = $transfer->original_userid; + // + $user = User::find($transfer->original_userid); + if ($user?->isDisable()) { + $transfer->exitDialog(); + } + } + }); + }); + return Base::retSuccess('success'); + } + /** * 保存配置 (todo 已废弃) * @return string diff --git a/app/Models/User.php b/app/Models/User.php index c721b75db..a8b9b9b23 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -421,7 +421,7 @@ public static function auth($identity = null) throw new ApiException('请登录后继续...', [], -1); } } - if (in_array('disable', $user->identity)) { + if ($user->isDisable()) { throw new ApiException('帐号已停用...', [], -1); } if ($identity) { diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php index cef01e8dd..b930e8251 100644 --- a/app/Models/WebSocketDialog.php +++ b/app/Models/WebSocketDialog.php @@ -79,7 +79,7 @@ public function dialogUser(): \Illuminate\Database\Eloquent\Relations\HasMany } /** - * 获取对话成员（剔除离职） + * 获取对话成员（连表查） * @param $addField * @return User|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder */ diff --git a/database/migrations/2024_11_23_013018_process_user_transfer_dialog.php b/database/migrations/2024_11_23_013018_process_user_transfer_dialog.php deleted file mode 100644 index d83dfd3e3..000000000 --- a/database/migrations/2024_11_23_013018_process_user_transfer_dialog.php +++ /dev/null @@ -1,36 +0,0 @@ - env('APP_KEY') - ], 10); - } catch (\Throwable $e) { - info($e); - } - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - } -} diff --git a/language/original-web.txt b/language/original-web.txt index 70a8ab367..572127090 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -243,7 +243,6 @@ ID、名称、描述... 添加协助人员 点击加入会议 点击复制链接 -自动归档任务 获取会话失败 请输入昵称！ 请输入验证码 @@ -1825,3 +1824,5 @@ WiFi签到延迟时长为±1分钟。 今天下班前 明天下班前 + +自动归档 diff --git a/language/translate.json b/language/translate.json index 9679bdc75..f26837d0a 100644 --- a/language/translate.json +++ b/language/translate.json @@ -3659,18 +3659,6 @@ "id": "Klik untuk menyalin tautan", "ru": "Нажмите, чтобы скопировать ссылку" }, - { - "key": "自动归档任务", - "zh": "", - "zh-CHT": "自動歸檔任務", - "en": "Automatically archive tasks", - "ko": "작업 자동 보관", - "ja": "タスクを自動アーカイブ", - "de": "Aufgaben automatisch archivieren", - "fr": "Archiver automatiquement les tâches", - "id": "Arsipkan tugas secara otomatis", - "ru": "Автоматически архивировать задачи" - }, { "key": "请输入昵称！", "zh": "", diff --git a/resources/assets/js/pages/manage/setting/components/SystemSetting.vue b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue index 25efe6625..995cf10e0 100644 --- a/resources/assets/js/pages/manage/setting/components/SystemSetting.vue +++ b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue @@ -75,7 +75,12 @@
{{$L('开启：项目管理员可生成链接邀请成员加入项目。')}}
- + + +
+

{{ $L('任务相关') }}

+
+ {{$L('开启')}} {{$L('关闭')}} @@ -90,11 +95,6 @@
{{$L('任务完成 (*) 天后自动归档。', formDatum.archived_day)}}
 -
-
-
-

{{ $L('任务相关') }}

-
{{$L('保持')}} diff --git a/resources/mobile b/resources/mobile index c0bbd0886..9d4d2a318 160000 --- a/resources/mobile +++ b/resources/mobile @@ -1 +1 @@ -Subproject commit c0bbd08866ecb00f3022ab3ece29df56848c7a48 +Subproject commit 9d4d2a3189fa2454b25af9f7f2ab64f776d40b53