diff --git a/core/core-backend/src/main/resources/ehcache/ehcache.xml b/core/core-backend/src/main/resources/ehcache/ehcache.xml
index 3ab97697c6..a0593b902f 100644
--- a/core/core-backend/src/main/resources/ehcache/ehcache.xml
+++ b/core/core-backend/src/main/resources/ehcache/ehcache.xml
@@ -78,6 +78,11 @@
java.util.List
+
+ java.lang.String
+ java.util.List
+
+
java.lang.String
io.dataease.license.bo.F2CLicResult
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 c1ab6fe947..36f2ff55d2 100644
--- a/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue
+++ b/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue
@@ -279,7 +279,7 @@ const edit = (val, arr) => {
)
}
const loadOrgOptions = async () => {
- const res = await request.post({ url: '/org/mounted', data: {} })
+ const res = await request.get({ url: '/org/page/tree' })
const data = res.data
formatOrg(data)
state.orgOptions = data
diff --git a/pom.xml b/pom.xml
index f1ee593bbf..2161a567b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,8 @@
sdk
- de-xpack
- core
+
org.springframework.boot
diff --git a/sdk/common/src/main/java/io/dataease/constant/AuthResourceEnum.java b/sdk/common/src/main/java/io/dataease/constant/AuthResourceEnum.java
index 08f70447a1..4244084950 100644
--- a/sdk/common/src/main/java/io/dataease/constant/AuthResourceEnum.java
+++ b/sdk/common/src/main/java/io/dataease/constant/AuthResourceEnum.java
@@ -1,28 +1,15 @@
package io.dataease.constant;
+import lombok.Getter;
+
+@Getter
public enum AuthResourceEnum {
PANEL(2, 1), SCREEN(3, 2), DATASET(5, 3), DATASOURCE(6, 4), SYSTEM(7, 0), USER(8, 5), ROLE(8, 6), ORG(9, 7), SYNC_DATASOURCE(23, 9), TASK(24, 9), SUMMARY(22, 9), DATA_FILLING(60, 8), SPREADSHEET(100L, 10);
- private long menuId;
+ private final long menuId;
- private int flag;
-
- public long getMenuId() {
- return menuId;
- }
-
- public void setMenuId(long menuId) {
- this.menuId = menuId;
- }
-
- public int getFlag() {
- return flag;
- }
-
- public void setFlag(int flag) {
- this.flag = flag;
- }
+ private final int flag;
AuthResourceEnum(long menuId, int flag) {
this.menuId = menuId;
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 8c9ba59213..2f93c66f01 100644
--- a/sdk/common/src/main/java/io/dataease/constant/CacheConstant.java
+++ b/sdk/common/src/main/java/io/dataease/constant/CacheConstant.java
@@ -21,7 +21,7 @@ public class CacheConstant {
public static final String ORG_GLOBAL_RESOURCE_CACHE = "de_v2_org_global_resource";
public static final String ALL_OID_FLAG_RESOURCE_CACHE = "de_v2_all_oid_flag_resource";
public static final String ALL_RESOURCES_CACHE = "de_v2_all_resources";
-
+ public static final String ORG_BUSI_PERS_INTERACTIVE_CACHE = "de_v2_org_busi_pers_interactive";
}