diff --git a/core/core-backend/src/main/resources/ehcache/ehcache.xml b/core/core-backend/src/main/resources/ehcache/ehcache.xml index 80802ab0b4..566d008260 100644 --- a/core/core-backend/src/main/resources/ehcache/ehcache.xml +++ b/core/core-backend/src/main/resources/ehcache/ehcache.xml @@ -94,6 +94,10 @@ java.lang.String java.util.List + + java.lang.String + java.lang.Object + java.lang.String diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 42d125d3ce..f1a1621661 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -4152,6 +4152,7 @@ export default { status_1: '所有用户', status_2: '仅系统管理员', platform_tips: '第三方登录方式包括:OIDC、CAS', - exp_tips: '单位:秒,目前仅在查看账号密码校验 MFA 时生效' + exp_tips: '单位:秒,目前仅在查看账号密码校验 MFA 时生效', + user_enable: '启用 MFA 多因子认证' } } diff --git a/de-xpack b/de-xpack index a17656f426..613aa72bd3 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit a17656f4262e0cd59a740151201b1c5df32cf830 +Subproject commit 613aa72bd3d02647b19c79a79ea0861fb586751c 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 c0b9e41ede..489aca93cd 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 @@ -37,4 +37,8 @@ public interface PerSettingApi { @Operation(summary = "保存MFA设置") @PostMapping("/mfa/save") void saveMfa(@RequestBody List settings); + + @Operation(summary = "查询MFA状态") + @GetMapping("/mfaStatus") + Integer mfaStatus(); } diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserCreator.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserCreator.java index 970a9ae8d5..11e54fed2b 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserCreator.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserCreator.java @@ -32,6 +32,7 @@ public class UserCreator implements Serializable { @Schema(hidden = true) @JsonIgnore private Long uid; + private Boolean mfaEnable = false; @Schema(description = "系统变量") private List variables; } diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java index 2c0730cfe1..9a357de0fb 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java @@ -44,6 +44,9 @@ public class UserFormVO implements Serializable { @Schema(description = "模式") private String model; + @Schema(description = "MFA状态") + private Boolean mfaEnable = false; + @Schema(description = "系统变量") private List variables; } diff --git a/sdk/common/src/main/java/io/dataease/constant/CacheConstant.java b/sdk/common/src/main/java/io/dataease/constant/CacheConstant.java index bbeeca217f..87f1152da0 100644 --- a/sdk/common/src/main/java/io/dataease/constant/CacheConstant.java +++ b/sdk/common/src/main/java/io/dataease/constant/CacheConstant.java @@ -28,6 +28,7 @@ public class CacheConstant { public static final String CUSTOM_GEO_CACHE = "de_v2_custom_geo"; public static final String RSA_CACHE = "de_v2_rsa"; public static final String PER_MENU_ID_CACHE = "de_v2_per_menu_id"; + public static final String GLOBAL_MFA_CACHE = "de_v2_global_mfa"; } public static class LicenseCacheConstant {