diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index d613e27b3..bd4581a40 100755 --- 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'; diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index b83b2a0f4..5ce991a12 100755 --- 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("新帐号"); diff --git a/app/Models/User.php b/app/Models/User.php index e79b5dcb0..7f3fbc978 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -533,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 diff --git a/database/migrations/2023_03_23_210546_generate_web_socket_dialogs_default_group.php b/database/migrations/2024_03_23_210546_generate_web_socket_dialogs_default_group.php similarity index 86% rename from database/migrations/2023_03_23_210546_generate_web_socket_dialogs_default_group.php rename to database/migrations/2024_03_23_210546_generate_web_socket_dialogs_default_group.php index 9f48a08dc..842c090e9 100644 --- a/database/migrations/2023_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()]); } } diff --git a/resources/assets/js/pages/manage/setting/components/SystemSetting.vue b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue index d269a1c02..8f272f198 100644 --- a/resources/assets/js/pages/manage/setting/components/SystemSetting.vue +++ b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue @@ -23,6 +23,13 @@ {{$L('正常帐号')}} {{$L('临时帐号')}} + + {{$L('临时帐号')}} {{$L('别名')}} +

{{$L('临时帐号')}}:

    @@ -270,6 +277,7 @@ export default { this.loadIng++; this.$store.dispatch("call", { url: 'system/setting?type=' + (save ? 'save' : 'all'), + method: 'post', data: this.formDatum, }).then(({data}) => { if (save) { @@ -277,6 +285,9 @@ export default { } this.formDatum = data; this.formDatum_bak = $A.cloneJSON(this.formDatum); + this.$store.state.systemConfig = Object.assign(this.formDatum_bak, { + __state: "success", + }) }).catch(({msg}) => { if (save) { $A.modalError(msg);