From 3a62fe5eebdc45936352126a50d86c8c842bcd5d Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 10 Dec 2024 15:37:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?perf(X-Pack):=20=E7=94=A8=E6=88=B7=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=20MFA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/zh-CN.ts | 9 +++++++-- de-xpack | 2 +- .../api/permissions/user/api/UserApi.java | 17 +++++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 52436bb6d4..8317980051 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -4169,7 +4169,12 @@ export default { status_2: '仅系统管理员', platform_tips: '第三方登录方式包括：OIDC、CAS', exp_tips: '单位：秒，目前仅在查看账号密码校验 MFA 时生效', - user_enable: '启用 MFA 多因子认证', - code_input_msg: '请输入 {0} 位数字' + user_enable: 'MFA 多因子认证', + code_input_msg: '请输入 {0} 位数字', + bind_ready: '已绑定', + bind_unready: '未绑定', + bind_title: '绑定 MFA 多因子认证', + enable_siwtch_tips: '管理员已设置所有用户开启 MFA 认证', + reset_key_tips: '重置 FMA' } } diff --git a/de-xpack b/de-xpack index 2f08e32ac4..fa1304ec67 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 2f08e32ac4d9457bda077a210a939b7f0e2cd1e3 +Subproject commit fa1304ec67735aa265114ef46c4c0023281f6f65 diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java index 613b0f6384..22fe366dbc 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java @@ -2,6 +2,8 @@ package io.dataease.api.permissions.user.api; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiSupport; +import io.dataease.api.permissions.login.dto.MfaLoginDTO; +import io.dataease.api.permissions.login.vo.MfaQrVO; import io.dataease.api.permissions.role.dto.UserRequest; import io.dataease.api.permissions.user.dto.*; import io.dataease.api.permissions.user.vo.*; @@ -210,4 +212,19 @@ public interface UserApi { List> listUserInfosByIds(List ids); + @GetMapping("/mfaQr") + MfaQrVO mfaQr(); + + @GetMapping("/mfabound") + Boolean mfaBound(); + + @PostMapping("/mfaBind") + void mfaBind(@RequestBody MfaLoginDTO dto); + + @PostMapping("/mfaUnbind") + void mfaUnbind(); + + @PostMapping("/mfaRest/{id}") + void resetBind(@PathVariable("id") Long id); + } From d61502e881af3a226bc57a1464207135f7161f02 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 10 Dec 2024 15:39:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?perf(X-Pack):=20MFA=20=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/zh-CN.ts | 2 +- de-xpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 8317980051..a068475cb3 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -4174,7 +4174,7 @@ export default { bind_ready: '已绑定', bind_unready: '未绑定', bind_title: '绑定 MFA 多因子认证', - enable_siwtch_tips: '管理员已设置所有用户开启 MFA 认证', + enable_switch_tips: '管理员已设置所有用户开启 MFA 认证', reset_key_tips: '重置 FMA' } } diff --git a/de-xpack b/de-xpack index fa1304ec67..cb6d275109 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit fa1304ec67735aa265114ef46c4c0023281f6f65 +Subproject commit cb6d275109949c33f1474054908d961f1e9f0e2d