From a1bb447088ec8271aea3ceb4220df31b570060d6 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 20 May 2024 17:36:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E6=96=B0=E5=A2=9E=E5=BC=BA?=
 =?UTF-8?q?=E5=88=B6=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=20#9231?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/layout/index.vue       |  2 ++
 core/core-frontend/src/locales/zh-CN.ts       |  5 ++++-
 core/core-frontend/src/utils/logout.ts        |  6 +++++-
 core/core-frontend/src/views/login/index.vue  | 17 +++++++++++++++
 .../system/parameter/basic/BasicEdit.vue      | 21 ++++++++++++++++++-
 .../system/parameter/basic/BasicInfo.vue      | 17 ++++++++++++++-
 de-xpack                                      |  2 +-
 .../api/permissions/user/api/UserApi.java     |  5 +++++
 .../api/permissions/user/vo/InvalidPwdVO.java | 16 ++++++++++++++
 .../constant/XpackSettingConstants.java       |  2 ++
 .../java/io/dataease/utils/CalendarUtils.java | 16 ++++++++++++++
 .../io/dataease/utils/SystemSettingUtils.java |  2 ++
 12 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/InvalidPwdVO.java
 create mode 100644 sdk/common/src/main/java/io/dataease/utils/CalendarUtils.java

diff --git a/core/core-frontend/src/layout/index.vue b/core/core-frontend/src/layout/index.vue
index f0a0a62280..b32de3685c 100644
--- a/core/core-frontend/src/layout/index.vue
+++ b/core/core-frontend/src/layout/index.vue
@@ -8,6 +8,7 @@ import Main from './components/Main.vue'
 import CollapseBar from './components/CollapseBar.vue'
 import { ElContainer } from 'element-plus-secondary'
 import { useRoute } from 'vue-router'
+import { XpackComponent } from '@/components/plugin'
 const route = useRoute()
 const systemMenu = computed(() => route.path.includes('system'))
 const settingMenu = computed(() => route.path.includes('sys-setting'))
@@ -49,6 +50,7 @@ const setCollapse = () => {
       ></Main>
     </el-container>
   </div>
+  <XpackComponent jsname="L2NvbXBvbmVudC9sb2dpbi9Qd2RJbnZhbGlkVGlwcw==" />
 </template>
 
 <style lang="less" scoped>
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 08cc0e679d..6114bc917b 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -2180,7 +2180,10 @@ export default {
     frontTimeOut: '请求超时时间（秒）',
     logLiveTime: '操作日志保留时间（天）',
     platformOid: '第三方平台用户组织',
-    platformRid: '第三方平台用户角色'
+    platformRid: '第三方平台用户角色',
+    pwdStrategy: '开启密码策略',
+    dip: '禁用初始密码',
+    pvp: '密码有效期'
   },
   setting_email: {
     title: '邮件设置',
diff --git a/core/core-frontend/src/utils/logout.ts b/core/core-frontend/src/utils/logout.ts
index ddce738b2a..632a1747f6 100644
--- a/core/core-frontend/src/utils/logout.ts
+++ b/core/core-frontend/src/utils/logout.ts
@@ -39,7 +39,11 @@ export const logoutHandler = (justClean?: boolean) => {
 const removeCache = () => {
   const keys = Object.keys(wsCache['storage'])
   keys.forEach(key => {
-    if (key.startsWith('de-plugin-') || key === 'de-platform-client') {
+    if (
+      key.startsWith('de-plugin-') ||
+      key === 'de-platform-client' ||
+      key === 'pwd-validity-period'
+    ) {
       wsCache.delete(key)
     }
   })
diff --git a/core/core-frontend/src/views/login/index.vue b/core/core-frontend/src/views/login/index.vue
index 530c31ec21..83b14b8432 100644
--- a/core/core-frontend/src/views/login/index.vue
+++ b/core/core-frontend/src/views/login/index.vue
@@ -36,6 +36,7 @@ const footContent = ref(null)
 const loginErrorMsg = ref('')
 const xpackLoginHandler = ref()
 const showDempTips = ref(false)
+const xpackInvalidPwd = ref()
 const demoTips = computed(() => {
   if (!showDempTips.value) {
     return ''
@@ -113,6 +114,16 @@ const handleLogin = () => {
           const { token, exp } = res.data
           userStore.setToken(token)
           userStore.setExp(exp)
+          if (!xpackLoadFail.value && xpackInvalidPwd.value?.invokeMethod) {
+            const param = {
+              methodName: 'init',
+              args: () => {
+                duringLogin.value = false
+              }
+            }
+            xpackInvalidPwd?.value.invokeMethod(param)
+            return
+          }
           const queryRedirectPath = getCurLocation()
           router.push({ path: queryRedirectPath })
         })
@@ -135,6 +146,7 @@ const tablePaneList = ref([{ title: '普通登录', name: 'simple' }])
 const xpackLoaded = info => {
   tablePaneList.value.push(info)
 }
+const xpackLoadFail = ref(false)
 
 const loginContainer = ref()
 const loginContainerWidth = ref(0)
@@ -334,6 +346,11 @@ onMounted(() => {
                 jsname="L2NvbXBvbmVudC9sb2dpbi9IYW5kbGVy"
                 @loaded="xpackLoaded"
               />
+              <XpackComponent
+                ref="xpackInvalidPwd"
+                jsname="L2NvbXBvbmVudC9sb2dpbi9JbnZhbGlkUHdk"
+                @load-fail="() => (xpackLoadFail = true)"
+              />
             </div>
 
             <div class="login-msg">
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 2de0221747..84685254d4 100644
--- a/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
+++ b/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
@@ -12,6 +12,13 @@ const options = [
   { value: 'minute', label: '分钟（执行时间：0秒）' },
   { value: 'hour', label: '小时（执行时间：0分0秒）' }
 ]
+const pvpOptions = [
+  { value: '0', label: '永久' },
+  { value: '1', label: '一年' },
+  { value: '2', label: '半年' },
+  { value: '3', label: '三个月' },
+  { value: '4', label: '一个月' }
+]
 const state = reactive({
   form: reactive({
     dsIntervalTime: '30',
@@ -207,7 +214,9 @@ defineExpose({
       >
         <el-switch
           class="de-basic-switch"
-          v-if="item.pkey === 'autoCreateUser'"
+          v-if="
+            item.pkey === 'autoCreateUser' || item.pkey === 'pwdStrategy' || item.pkey === 'dip'
+          "
           active-value="true"
           inactive-value="false"
           v-model="state.form[item.pkey]"
@@ -282,6 +291,16 @@ defineExpose({
             check-on-click-node
           />
         </div>
+        <div v-else-if="item.pkey === 'pvp'">
+          <el-select v-model="state.form[item.pkey]" class="edit-all-line">
+            <el-option
+              v-for="item in pvpOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </div>
         <v-else />
       </el-form-item>
     </el-form>
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 6d16a75dda..2af5de4c18 100644
--- a/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue
+++ b/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue
@@ -22,6 +22,13 @@ import { useI18n } from '@/hooks/web/useI18n'
 const { t } = useI18n()
 const editor = ref()
 const infoTemplate = ref()
+const pvpOptions = [
+  { value: '0', label: '永久' },
+  { value: '1', label: '一年' },
+  { value: '2', label: '半年' },
+  { value: '3', label: '三个月' },
+  { value: '4', label: '一个月' }
+]
 const tooltips = [
   {
     key: 'setting_basic.frontTimeOut',
@@ -59,6 +66,7 @@ const selectedOid = ref('')
 const selectedOName = ref('')
 const selectedRid = ref<string[]>([])
 const selectedRName = ref<string[]>([])
+const selectedPvp = ref('0')
 const search = cb => {
   const url = '/sysParameter/basic/query'
   originData = []
@@ -68,7 +76,11 @@ const search = cb => {
     const data = res.data
     for (let index = 0; index < data.length; index++) {
       const item = data[index]
-      if (item.pkey === 'basic.autoCreateUser') {
+      if (
+        item.pkey === 'basic.autoCreateUser' ||
+        item.pkey === 'basic.dip' ||
+        item.pkey === 'basic.pwdStrategy'
+      ) {
         item.pval = item.pval === 'true' ? '开启' : '未开启'
       } else if (item.pkey === 'basic.platformOid') {
         selectedOid.value = item.pval
@@ -89,6 +101,9 @@ const search = cb => {
           selectedRid.value = []
           item.pval = '普通角色'
         }
+      } else if (item.pkey === 'basic.pvp') {
+        selectedPvp.value = item.pval || '0'
+        item.pval = pvpOptions.filter(cur => cur.value === selectedPvp.value)[0].label
       } else {
         item.pval = item.pval
       }
diff --git a/de-xpack b/de-xpack
index 84ddcd508b..922a07f77e 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 84ddcd508b614bab67e08ca7bdc5e7a37573f59c
+Subproject commit 922a07f77e584f46705d5f02cdef70ed8e4e0f98
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 46c5c40513..993e470c5f 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
@@ -185,4 +185,9 @@ public interface UserApi {
     @Hidden
     @GetMapping("/orgAdmin")
     boolean orgAdmin();
+
+    @Hidden
+    @GetMapping("/invalidPwd")
+    InvalidPwdVO invalidPwd();
+
 }
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/InvalidPwdVO.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/InvalidPwdVO.java
new file mode 100644
index 0000000000..83b4ec913f
--- /dev/null
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/InvalidPwdVO.java
@@ -0,0 +1,16 @@
+package io.dataease.api.permissions.user.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+public class InvalidPwdVO implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 3684394012648654165L;
+
+    private boolean invalid;
+
+    private Long validityPeriod;
+}
diff --git a/sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java b/sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java
index bae89ab159..f47ac333e2 100644
--- a/sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java
+++ b/sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java
@@ -7,4 +7,6 @@ public class XpackSettingConstants {
     public static final String Front_Time_Out = "basic.frontTimeOut";
     public static final String PLATFORM_OID = "basic.platformOid";
     public static final String PLATFORM_RID = "basic.platformRid";
+    public static final String DIP = "basic.dip";
+    public static final String PVP = "basic.pvp";
 }
diff --git a/sdk/common/src/main/java/io/dataease/utils/CalendarUtils.java b/sdk/common/src/main/java/io/dataease/utils/CalendarUtils.java
new file mode 100644
index 0000000000..8c99af3043
--- /dev/null
+++ b/sdk/common/src/main/java/io/dataease/utils/CalendarUtils.java
@@ -0,0 +1,16 @@
+package io.dataease.utils;
+
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.util.Calendar;
+
+public class CalendarUtils {
+
+    public static Long getTimeAfterMonth(Long time, int months) {
+        if (ObjectUtils.isEmpty(time)) time = System.currentTimeMillis();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(time);
+        calendar.add(Calendar.MONTH, months);
+        return calendar.getTimeInMillis();
+    }
+}
diff --git a/sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java b/sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java
index 74d3002f1f..0f9ee25c7d 100644
--- a/sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java
+++ b/sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java
@@ -11,6 +11,8 @@ public class SystemSettingUtils {
         List<String> xpackSettingList = List.of(XpackSettingConstants.AUTO_CREATE_USER,
                 XpackSettingConstants.LOG_LIVE_TIME,
                 XpackSettingConstants.PLATFORM_OID,
+                XpackSettingConstants.DIP,
+                XpackSettingConstants.PVP,
                 XpackSettingConstants.PLATFORM_RID);
         return xpackSettingList.contains(pkey);
     }