From a4172dabff0a4cf201df000608ea8155e2413794 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 4 Dec 2024 17:46:31 +0800 Subject: [PATCH] =?UTF-8?q?perf(X-Pack):=20=E4=BC=98=E5=8C=96OAuth2?= =?UTF-8?q?=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/svg/logo_oauth.svg | 19 ++----------------- core/core-frontend/src/locales/en.ts | 2 +- core/core-frontend/src/locales/tw.ts | 2 +- core/core-frontend/src/locales/zh-CN.ts | 2 +- .../system/parameter/basic/BasicEdit.vue | 2 +- .../system/parameter/basic/BasicInfo.vue | 2 +- de-xpack | 2 +- 7 files changed, 8 insertions(+), 23 deletions(-) diff --git a/core/core-frontend/src/assets/svg/logo_oauth.svg b/core/core-frontend/src/assets/svg/logo_oauth.svg index 51eb5b5ffc..89ef68c191 100644 --- a/core/core-frontend/src/assets/svg/logo_oauth.svg +++ b/core/core-frontend/src/assets/svg/logo_oauth.svg @@ -1,18 +1,3 @@ - - - - - - - - - - - - - - - - - + + diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index a22bdc474c..2fb67890f7 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -546,7 +546,7 @@ export default { "Filter [Possible options are cn or uid or sAMAccountName={'{'}0{'}'}, such as: (uid={'{'}0{'}'})]", ldap_attribute_mapping: 'LDAP attribute mapping', incorrect_please_re_enter_de: 'URL format error, please re-enter', - oauth2_settings: 'OAUTH2 settings', + oauth2_settings: 'OAuth2 settings', authorization_end_address: 'Authorization end address', token_end_address: 'Token end address', information_end_address: 'User information end address', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index e45217f8e9..d8bb9d5b8d 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -531,7 +531,7 @@ export default { such_as_uid: "過濾器[可能的選項是cn或uid或sAMAccountName={'{'}0{'}'}, 如：(uid={'{'}0{'}'})]", ldap_attribute_mapping: 'LDAP屬性映射', incorrect_please_re_enter_de: 'url格式錯誤，請重新輸入', - oauth2_settings: 'OAUTH2設定', + oauth2_settings: 'OAuth2設定', authorization_end_address: '授權端位址', token_end_address: 'Token 端位址', information_end_address: '使用者訊息端位址', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index ebe44e9221..95ec8e90c2 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -534,7 +534,7 @@ export default { such_as_uid: "过滤器 [可能的选项是cn或uid或sAMAccountName={'{'}0{'}'}, 如：(uid={'{'}0{'}'})]", ldap_attribute_mapping: 'LDAP属性映射', incorrect_please_re_enter_de: 'url格式错误，请重新输入', - oauth2_settings: 'OAUTH2设置', + oauth2_settings: 'OAuth2设置', authorization_end_address: '授权端地址', token_end_address: 'Token 端地址', information_end_address: '用户信息端地址', diff --git a/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue b/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue index 0f16482961..2a5527ec20 100644 --- a/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue +++ b/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue @@ -50,7 +50,7 @@ const state = reactive({ { value: '1', label: 'LDAP' }, { value: '2', label: 'OIDC' }, { value: '3', label: 'CAS' }, - { value: '9', label: 'OAUTH2' } + { value: '9', label: 'OAuth2' } ], sortOptions: [ { value: '0', label: t('resource_sort.time_asc') }, diff --git a/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue b/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue index b872c1d438..39c4a950c1 100644 --- a/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue +++ b/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue @@ -126,7 +126,7 @@ const state = reactive({ { value: '1', label: 'LDAP' }, { value: '2', label: 'OIDC' }, { value: '3', label: 'CAS' }, - { value: '9', label: 'OAUTH2' } + { value: '9', label: 'OAuth2' } ], sortOptions: [ { value: '0', label: t('resource_sort.time_asc') }, diff --git a/de-xpack b/de-xpack index 9e46a3a6ff..bb65214283 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 9e46a3a6ffc6f7501e34845bc5d676b678628f18 +Subproject commit bb6521428355868b800aa1f812a8e2a485628908