From efdb7ff3f3784aeec4800c2e7270b23e6912c2bf Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 19 Dec 2023 19:23:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20api=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/menu/manage/MenuManage.java | 3 ++- de-xpack | 2 +- .../src/main/java/io/dataease/utils/WhitelistUtils.java | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) 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 87f7a08b88..e16ac95ec1 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 @@ -96,6 +96,7 @@ public class MenuManage { || coreMenu.getId().equals(21L) || coreMenu.getPid().equals(21L) || coreMenu.getId().equals(25L) - || coreMenu.getId().equals(26L); + || coreMenu.getId().equals(26L) + || coreMenu.getId().equals(35L); } } diff --git a/de-xpack b/de-xpack index dfc290223f..80f4f36ad7 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit dfc290223ffb39bcff839d43f5e828dbe647c730 +Subproject commit 80f4f36ad7d179645d635c2490dd898beda7e746 diff --git a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java index 955cb8e9a4..8f1fdec13e 100644 --- a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java +++ b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java @@ -14,8 +14,8 @@ public class WhitelistUtils { "/dekey", "/index.html", "/model", - "/deApi", - "/demo.html", + // "/deApi", + // "/demo.html", "/swagger-resources", "/doc.html", "/panel.html", @@ -31,7 +31,7 @@ public class WhitelistUtils { return WHITE_PATH.contains(requestURI) || StringUtils.endsWithAny(requestURI, ".ico", "js", ".css", "svg", "png", "jpg", "js.map") || StringUtils.startsWithAny(requestURI, "data:image") - || StringUtils.startsWithAny(requestURI, "/v3/") + // || StringUtils.startsWithAny(requestURI, "/v3/") || StringUtils.startsWithAny(requestURI, "/login/platformLogin/") || StringUtils.startsWithAny(requestURI, "/static-resource/") || StringUtils.startsWithAny(requestURI, "/share/proxyInfo")