From 89a9e0baec07ddef1127a67a03f8f52a24cd2cd8 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 5 Dec 2024 12:25:02 +0800
Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E6=96=B0=E5=A2=9E=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E8=AE=BE=E7=BD=AE=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/menu/manage/MenuManage.java      | 1 +
 core/core-frontend/src/assets/svg/icon_security.svg            | 1 +
 core/core-frontend/src/layout/components/MenuItem.vue          | 2 ++
 core/core-frontend/src/locales/zh-CN.ts                        | 3 +++
 de-xpack                                                       | 2 +-
 5 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 core/core-frontend/src/assets/svg/icon_security.svg

diff --git a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java
index 2f0cbaf27f..595b8c9ac2 100644
--- a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java
+++ b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java
@@ -106,6 +106,7 @@ public class MenuManage {
                 || coreMenu.getId().equals(60L)
                 || coreMenu.getId().equals(61L)
                 || coreMenu.getId().equals(80L)
+                || coreMenu.getId().equals(90L)
                 || coreMenu.getPid().equals(70L);
     }
 }
diff --git a/core/core-frontend/src/assets/svg/icon_security.svg b/core/core-frontend/src/assets/svg/icon_security.svg
new file mode 100644
index 0000000000..9e2635b633
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/icon_security.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1733372295469" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4281" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M213.333333 736.597333l298.666667 149.333334 298.666667-149.333334V204.373333L512 171.2 213.333333 204.373333v532.224zM128 128l384-42.666667 384 42.666667v661.333333l-384 192-384-192V128z" fill="" p-id="4282"></path><path d="M341.333333 448h341.333334v85.333333H341.333333z" fill="" p-id="4283"></path><path d="M469.333333 320h85.333334v341.333333h-85.333334z" fill="" p-id="4284"></path></svg>
\ No newline at end of file
diff --git a/core/core-frontend/src/layout/components/MenuItem.vue b/core/core-frontend/src/layout/components/MenuItem.vue
index 6c8e33e190..08247be881 100644
--- a/core/core-frontend/src/layout/components/MenuItem.vue
+++ b/core/core-frontend/src/layout/components/MenuItem.vue
@@ -19,6 +19,7 @@ import watermark from '@/assets/svg/watermark.svg'
 import icon_font from '@/assets/svg/icon_font.svg'
 import icon_msg_fill from '@/assets/svg/icon_msg_fill.svg'
 import icon_free from '@/assets/svg/icon_free.svg'
+import icon_security from '@/assets/svg/icon_security.svg'
 
 const iconMap = {
   appearance: appearance,
@@ -32,6 +33,7 @@ const iconMap = {
   icon_font: icon_font,
   icon_msg_fill: icon_msg_fill,
   icon_free: icon_free,
+  icon_security,
   auth: auth,
   association: association,
   threshold: threshold,
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 95ec8e90c2..fce45c6e8e 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -4144,5 +4144,8 @@ export default {
     sync_to_org: '迁移至目标组织',
     sync_org_placeholder: '请选择目标组织',
     relation_picture: '血缘关系图'
+  },
+  security: {
+    title: '安全设置'
   }
 }
diff --git a/de-xpack b/de-xpack
index bb65214283..ceef8f4f12 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit bb6521428355868b800aa1f812a8e2a485628908
+Subproject commit ceef8f4f12864df345954da42bf6236cf392331f