From 9176f5680c8a041573ca66275e8228ba7fce3c11 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 6 Dec 2024 09:32:31 +0800
Subject: [PATCH] =?UTF-8?q?perf(X-Pack):=20=E5=AE=89=E5=85=A8=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/locales/zh-CN.ts             | 13 +++++++++++++
 de-xpack                                            |  2 +-
 .../api/permissions/setting/api/PerSettingApi.java  | 10 ++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 8b208436df..ba7efee897 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -4148,5 +4148,18 @@ export default {
   },
   security: {
     title: '安全设置'
+  },
+  setting_mfa: {
+    title: 'MFA 设置',
+    status: '全局启用 MFA 认证',
+    platformEnable: '第三方认证开启 MFA',
+    exp: 'MFA 校验有效期',
+    otpName: 'OPT 扫描后的名称',
+    rate: 'OTP 延迟有效次数',
+    status_0: '未启用',
+    status_1: '所有用户',
+    status_2: '仅系统管理员',
+    platform_tips: '第三方登录方式包括：OIDC、CAS',
+    exp_tips: '单位：秒，目前仅在查看账号密码校验 MFA 时生效'
   }
 }
diff --git a/de-xpack b/de-xpack
index ceef8f4f12..a17656f426 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit ceef8f4f12864df345954da42bf6236cf392331f
+Subproject commit a17656f4262e0cd59a740151201b1c5df32cf830
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/setting/api/PerSettingApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/setting/api/PerSettingApi.java
index c90ab08465..5f5b164914 100644
--- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/setting/api/PerSettingApi.java
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/setting/api/PerSettingApi.java
@@ -2,6 +2,7 @@ package io.dataease.api.permissions.setting.api;
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.api.permissions.setting.vo.PerSettingItemVO;
+import io.dataease.license.config.XpackResource;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -14,6 +15,7 @@ import java.util.List;
 
 @Tag(name = "认证相关设置")
 @ApiSupport(order = 882)
+@XpackResource
 public interface PerSettingApi {
 
     @Operation(summary = "查询设置")
@@ -27,4 +29,12 @@ public interface PerSettingApi {
     @Hidden
     @GetMapping("/baisc/single/{key}")
     String singleValue(@PathVariable("key") String key);
+
+    @Operation(summary = "查询FMA设置")
+    @GetMapping("/mfa/query")
+    List<PerSettingItemVO> mfaSetting();
+
+    @Operation(summary = "保存FMA设置")
+    @PostMapping("/mfa/save")
+    void saveMfa(@RequestBody List<PerSettingItemVO> settings);
 }