From a65181757d007aaf8ea813900136705b00a4830f Mon Sep 17 00:00:00 2001 From: kuaifan Date: Sat, 2 Mar 2024 13:21:01 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E9=BB=98=E8=AE=A4=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E7=AB=AF=E5=88=B0=E7=AB=AF=E5=8A=A0=E5=AF=86=E4=BC=A0=E8=BE=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/SystemController.php | 4 +++- .../setting/components/SystemSetting.vue | 8 ++++++++ resources/assets/js/store/actions.js | 20 ++++++++++--------- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index 2e2033b20..e271745c6 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', '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', '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 返回信息(错误描述) @@ -65,6 +65,7 @@ class SystemController extends AbstractController 'project_invite', 'chat_information', 'anon_message', + 'e2e_message', 'auto_archived', 'archived_day', 'task_visible', @@ -110,6 +111,7 @@ class SystemController extends AbstractController $setting['project_invite'] = $setting['project_invite'] ?: 'open'; $setting['chat_information'] = $setting['chat_information'] ?: 'optional'; $setting['anon_message'] = $setting['anon_message'] ?: 'open'; + $setting['e2e_message'] = $setting['e2e_message'] ?: 'close'; $setting['auto_archived'] = $setting['auto_archived'] ?: 'close'; $setting['archived_day'] = floatval($setting['archived_day']) ?: 7; $setting['task_visible'] = $setting['task_visible'] ?: 'close'; diff --git a/resources/assets/js/pages/manage/setting/components/SystemSetting.vue b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue index b3ec9aa78..d269a1c02 100644 --- a/resources/assets/js/pages/manage/setting/components/SystemSetting.vue +++ b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue @@ -170,6 +170,14 @@
{{$L('允许匿名发送消息给其他成员。')}}
{{$L('禁止匿名发送消息。')}}
+ + + {{$L('开启')}} + {{$L('关闭')}} + +
{{$L('使用端到端加密传输数据。')}}
+
{{$L('关闭端到端加密传输数据。')}}
+
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index 4a32448f6..5b7c9cbe1 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -116,15 +116,17 @@ export default { } else { params.header = header } - if (params.encrypt === undefined && $A.inArray(params.url, [ - 'users/login', - 'users/editpass', - 'users/operation', - 'users/delete/account', - 'system/license', - 'users/bot/*', - 'dialog/msg/*', - ], true)) { + if (state.systemConfig.e2e_message === 'open' + && params.encrypt === undefined + && $A.inArray(params.url, [ + 'users/login', + 'users/editpass', + 'users/operation', + 'users/delete/account', + 'system/license', + 'users/bot/*', + 'dialog/msg/*', + ], true)) { params.encrypt = true } if (params.encrypt) {