fix(X-Pack): 社区版本系统参数设置报错

core/core-backend/src/main/java/io/dataease/system/manage/SysParameterManage.java

@@ -91,6 +91,11 @@ public class SysParameterManage {
         return sysSettings.stream().sorted(Comparator.comparing(CoreSysSetting::getSort)).map(item -> BeanUtils.copyBean(new SettingItemVO(), item)).toList();
     }
 
+    @XpackInteract(value = "perSetting", replace = true)
+    public List<Object> getUiList() {
+        return null;
+    }
+
 
     @Transactional
     public void saveGroup(List<SettingItemVO> vos, String groupKey) {

core/core-backend/src/main/java/io/dataease/system/server/SysParameterServer.java

@@ -8,7 +8,6 @@ import io.dataease.system.dao.auto.entity.CoreSysSetting;
 import io.dataease.system.manage.SysParameterManage;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -61,4 +60,9 @@ public class SysParameterServer implements SysParameterApi {
         }
         return frontTimeOut;
     }
+
+    @Override
+    public List<Object> ui() {
+        return sysParameterManage.getUiList();
+    }
 }

core/core-frontend/src/api/login.ts

@@ -12,4 +12,4 @@ export const logoutApi = () => request.get({ url: '/logout' })
 
 export const refreshApi = () => request.get({ url: '/login/refresh' })
 
-export const uiLoadApi = () => request.get({ url: '/appearance/query' })
+export const uiLoadApi = () => request.get({ url: '/sysParameter/ui' })

de-xpack

@@ -1 +1 @@
-Subproject commit a1c4b52372679fde98c2635264ef0b48ac64a50f
+Subproject commit 124e721b41f42cd3c60673037ca3894938dfcc0a

sdk/api/api-base/src/main/java/io/dataease/api/system/SysParameterApi.java

@@ -3,6 +3,7 @@ package io.dataease.api.system;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.api.system.request.OnlineMapEditor;
 import io.dataease.api.system.vo.SettingItemVO;
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
@@ -43,4 +44,8 @@ public interface SysParameterApi {
     @GetMapping("/requestTimeOut")
     public Integer RequestTimeOut();
 
+    @Hidden
+    @GetMapping("/ui")
+    List<Object> ui();
+
 }

sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java

@@ -5,4 +5,6 @@ public class XpackSettingConstants {
     public static final String AUTO_CREATE_USER = "basic.autoCreateUser";
     public static final String LOG_LIVE_TIME = "basic.logLiveTime";
     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";
 }

sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java

@@ -8,7 +8,10 @@ public class SystemSettingUtils {
 
     public static boolean xpackSetting(String pkey) {
 
-        List<String> xpackSettingList = List.of(XpackSettingConstants.AUTO_CREATE_USER, XpackSettingConstants.LOG_LIVE_TIME);
+        List<String> xpackSettingList = List.of(XpackSettingConstants.AUTO_CREATE_USER,
+                XpackSettingConstants.LOG_LIVE_TIME,
+                XpackSettingConstants.PLATFORM_OID,
+                XpackSettingConstants.PLATFORM_RID);
         return xpackSettingList.contains(pkey);
     }
 }

sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java

@@ -39,7 +39,7 @@ public class WhitelistUtils {
             "/wecom/token",
             "/sysParameter/requestTimeOut",
             "/setting/authentication/status",
-            "/appearance/query",
+            "/sysParameter/ui",
             "/");
 
     public static boolean match(String requestURI) {