修正了一部分错误。

core/core-backend/src/main/java/io/gisbi/commons/utils/SqlparserUtils.java

@@ -8,7 +8,6 @@ import io.gisbi.extensions.datasource.vo.DatasourceConfiguration;
 import io.gisbi.extensions.datasource.vo.XpackPluginsDatasourceVO;
 import io.gisbi.extensions.view.dto.SqlVariableDetails;
 import io.gisbi.i18n.Translator;
-import io.dataease.license.utils.LicenseUtil;
 import io.gisbi.utils.JsonUtil;
 import io.gisbi.utils.LogUtil;
 import net.sf.jsqlparser.expression.*;
@@ -113,7 +112,6 @@ public class SqlparserUtils {
                     prefix = datasourceType.getPrefix();
                     suffix = datasourceType.getSuffix();
                 } else {
-                    if (LicenseUtil.licenseValid()) {
                     List<XpackPluginsDatasourceVO> xpackPluginsDatasourceVOS = pluginManage.queryPluginDs();
                     List<XpackPluginsDatasourceVO> list = xpackPluginsDatasourceVOS.stream().filter(ele -> StringUtils.equals(ele.getType(), value.getType())).toList();
                     if (ObjectUtils.isNotEmpty(list)) {
@@ -124,7 +122,6 @@ public class SqlparserUtils {
                         DEException.throwException("当前数据源插件不存在");
                     }
                 }
-                }
 
                 Pattern pattern = Pattern.compile("(`.*?`)");
                 Matcher matcher = pattern.matcher(sql);

core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetSQLManage.java

@@ -27,7 +27,6 @@ import io.gisbi.extensions.view.dto.ChartExtFilterDTO;
 import io.gisbi.extensions.view.dto.ChartExtRequest;
 import io.gisbi.extensions.view.dto.SqlVariableDetails;
 import io.gisbi.i18n.Translator;
-import io.dataease.license.utils.LicenseUtil;
 import io.gisbi.utils.BeanUtils;
 import io.gisbi.utils.JsonUtil;
 import jakarta.annotation.Resource;
@@ -399,7 +398,6 @@ public class DatasetSQLManage {
             BeanUtils.copyBean(dto, datasourceType);
             return dto;
         } else {
-            if (LicenseUtil.licenseValid()) {
             List<XpackPluginsDatasourceVO> xpackPluginsDatasourceVOS = pluginManage.queryPluginDs();
             List<XpackPluginsDatasourceVO> list = xpackPluginsDatasourceVOS.stream().filter(ele -> StringUtils.equals(ele.getType(), type)).toList();
             if (ObjectUtils.isNotEmpty(list)) {
@@ -414,7 +412,6 @@ public class DatasetSQLManage {
             } else {
                 DEException.throwException(Translator.get("i18n_dataset_plugin_error"));
             }
-            }
             return null;
         }
     }

core/core-backend/src/main/java/io/gisbi/datasource/manage/DataSourceManage.java

@@ -5,51 +5,42 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import io.gisbi.commons.constants.OptConstants;
 import io.gisbi.commons.constants.TaskStatus;
 import io.gisbi.constant.DataSourceType;
-import io.gisbi.constant.MessageEnum;
 import io.gisbi.datasource.dao.auto.entity.CoreDatasource;
-import io.gisbi.datasource.dao.auto.mapper.CoreDatasourceMapper;
 import io.gisbi.datasource.dao.ext.mapper.CoreDatasourceExtMapper;
-import io.gisbi.datasource.dao.ext.mapper.DataSourceExtMapper;
 import io.gisbi.datasource.dao.ext.po.DataSourceNodePO;
 import io.gisbi.datasource.dao.ext.po.DsItem;
 import io.gisbi.datasource.dto.DatasourceNodeBO;
 import io.gisbi.exception.DEException;
 import io.gisbi.extensions.datasource.dto.DatasourceDTO;
 import io.gisbi.i18n.Translator;
-import io.dataease.license.config.XpackInteract;
-import io.dataease.license.utils.LicenseUtil;
 import io.gisbi.model.BusiNodeRequest;
 import io.gisbi.model.BusiNodeVO;
 import io.gisbi.operation.manage.CoreOptRecentManage;
-import io.gisbi.utils.*;
+import io.gisbi.utils.AuthUtils;
+import io.gisbi.utils.BeanUtils;
+import io.gisbi.utils.CommunityUtils;
+import io.gisbi.utils.TreeUtils;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
-
+import io.gisbi.datasource.dao.ext.mapper.DataSourceExtMapper;
+import io.gisbi.datasource.dao.auto.mapper.CoreDatasourceMapper;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Stack;
 
 @Component
 public class DataSourceManage {
-
     @Resource
     private DataSourceExtMapper dataSourceExtMapper;
-
     @Resource
     private CoreDatasourceMapper coreDatasourceMapper;
-
-    @Resource
-    private CoreOptRecentManage coreOptRecentManage;
-
     @Resource
     private CoreDatasourceExtMapper coreDatasourceExtMapper;
-
     @Resource
-    private EngineManage engineManage;
+    private CoreOptRecentManage coreOptRecentManage;
-
     private DatasourceNodeBO rootNode() {
         return new DatasourceNodeBO(0L, "root", false, 7, -1L, 0, "mysql");
     }
@@ -64,7 +55,7 @@ public class DataSourceManage {
         return new DatasourceNodeBO(po.getId(), po.getName(), !StringUtils.equals(po.getType(), "folder"), 9, po.getPid(), extraFlag, dataSourceType.name());
     }
 
-    @XpackInteract(value = "datasourceResourceTree", replace = true, invalid = true)
+
     public List<BusiNodeVO> tree(BusiNodeRequest request) {
 
         QueryWrapper<DataSourceNodePO> queryWrapper = new QueryWrapper<>();
@@ -86,7 +77,7 @@ public class DataSourceManage {
     }
 
 
-    @XpackInteract(value = "datasourceResourceTree", before = false)
+
     public void innerSave(DatasourceDTO dataSourceDTO) {
         CoreDatasource coreDatasource = new CoreDatasource();
         coreDatasource.setTaskStatus(TaskStatus.WaitingForExecution.name());
@@ -102,7 +93,7 @@ public class DataSourceManage {
         }
         QueryWrapper<CoreDatasource> wrapper = new QueryWrapper<>();
         if (ObjectUtils.isNotEmpty(dto.getPid())) {
-            if (LicenseUtil.licenseValid() && dto.getPid().equals(0L)) {
+            if ( dto.getPid().equals(0L)) {
                 wrapper.eq("pid", -100L);
             } else {
                 wrapper.eq("pid", dto.getPid());
@@ -128,13 +119,13 @@ public class DataSourceManage {
         }
     }
 
-    @XpackInteract(value = "larkManage", replace = true)
+
     public String getTenantAccessToken() {
         return null;
     }
 
 
-    @XpackInteract(value = "datasourceResourceTree", before = false)
+
     public void innerEdit(CoreDatasource coreDatasource) {
         UpdateWrapper<CoreDatasource> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", coreDatasource.getId());
@@ -146,7 +137,7 @@ public class DataSourceManage {
     }
 
 
-    @XpackInteract(value = "datasourceResourceTree", before = false)
+
     public void innerEditStatus(CoreDatasource coreDatasource) {
         UpdateWrapper<CoreDatasource> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", coreDatasource.getId());
@@ -155,7 +146,7 @@ public class DataSourceManage {
     }
 
 
-    @XpackInteract(value = "datasourceResourceTree", before = false)
+
     public void move(DatasourceDTO dataSourceDTO) {
         Long id = dataSourceDTO.getId();
         CoreDatasource sourceData = null;
@@ -182,11 +173,11 @@ public class DataSourceManage {
         });
     }
 
-    @XpackInteract(value = "datasourceResourceTree", before = false)
+
     public CoreDatasource getCoreDatasource(Long id) {
-        if (id == -1L) {
+//        if (id == -1L) {
-            return engineManage.getDeEngine();
+//            return engineManage.getDeEngine();
-        }
+//        }
         return coreDatasourceMapper.selectById(id);
     }
 

core/core-backend/src/main/java/io/gisbi/datasource/server/DatasourceServer.java

@@ -14,6 +14,7 @@ import io.gisbi.commons.constants.TaskStatus;
 import io.gisbi.constant.DataSourceType;
 import io.gisbi.constant.LogOT;
 import io.gisbi.constant.LogST;
+import io.gisbi.constant.SQLConstants;
 import io.gisbi.dataset.manage.DatasetDataManage;
 import io.gisbi.dataset.utils.TableUtils;
 import io.gisbi.datasource.dao.auto.entity.*;
@@ -27,7 +28,6 @@ import io.gisbi.datasource.manage.DatasourceSyncManage;
 import io.gisbi.datasource.manage.EngineManage;
 import io.gisbi.datasource.provider.CalciteProvider;
 import io.gisbi.datasource.provider.ExcelUtils;
-import io.gisbi.constant.SQLConstants;
 import io.gisbi.exception.DEException;
 import io.gisbi.extensions.datasource.api.PluginManageApi;
 import io.gisbi.extensions.datasource.dto.*;
@@ -38,8 +38,6 @@ import io.gisbi.extensions.datasource.vo.XpackPluginsDatasourceVO;
 import io.gisbi.i18n.Translator;
 import io.gisbi.job.schedule.CheckDsStatusJob;
 import io.gisbi.job.schedule.ScheduleManager;
-import io.dataease.license.config.XpackInteract;
-import io.dataease.license.utils.LicenseUtil;
 import io.gisbi.log.DeLog;
 import io.gisbi.model.BusiNodeRequest;
 import io.gisbi.model.BusiNodeVO;
@@ -439,9 +437,6 @@ public class DatasourceServer implements DatasourceApi {
                 dataSourceManage.innerEdit(requestDatasource);
             }
         } else {
-            if (!LicenseUtil.licenseValid()) {
-                requestDatasource.setEnableDataFill(null);
-            }
             checkParams(dataSourceDTO.getConfiguration());
             dataSourceManage.checkName(dataSourceDTO);
             dataSourceManage.innerEdit(requestDatasource);
@@ -561,7 +556,6 @@ public class DatasourceServer implements DatasourceApi {
     @Transactional
     @DeLog(id = "#p0", ot = LogOT.DELETE, st = LogST.DATASOURCE)
     @Override
-    @XpackInteract(value = "datasourceResourceTree", before = false)
     public void delete(Long datasourceId) throws DEException {
         Objects.requireNonNull(CommonBeanFactory.getBean(DatasourceServer.class)).recursionDel(datasourceId);
     }
@@ -911,11 +905,8 @@ public class DatasourceServer implements DatasourceApi {
 
     private void preCheckDs(DatasourceDTO datasource) throws DEException {
         List<String> list = datasourceTypes().stream().map(DatasourceConfiguration.DatasourceType::getType).collect(Collectors.toList());
-        if (LicenseUtil.licenseValid()) {
         List<XpackPluginsDatasourceVO> xpackPluginsDatasourceVOS = pluginManage.queryPluginDs();
         xpackPluginsDatasourceVOS.forEach(ele -> list.add(ele.getType()));
-        }
-
         if (!list.contains(datasource.getType())) {
             DEException.throwException("Datasource type not supported.");
         }
@@ -1009,7 +1000,7 @@ public class DatasourceServer implements DatasourceApi {
                 syncDsIds.add(datasource.getId());
                 commonThreadPool.addTask(() -> {
                     try {
-                        LicenseUtil.validate();
+//                        LicenseUtil.validate();
                         validate(datasource);
                     } catch (Exception e) {
                     } finally {

core/core-backend/src/main/java/io/gisbi/home/manage/DeIndexManage.java

@@ -1,12 +1,11 @@
 package io.gisbi.home.manage;
 
-import io.dataease.license.config.XpackInteract;
 import org.springframework.stereotype.Component;
 
 @Component
 public class DeIndexManage {
 
-    @XpackInteract(value = "deIndexManage", replace = true)
+
     public Boolean xpackModel() {
         return null;
     }

core/core-backend/src/main/java/io/gisbi/job/schedule/DeDataFillingTaskExecutor.java

@@ -1,7 +1,6 @@
 package io.gisbi.job.schedule;
 
 import io.gisbi.commons.utils.CronUtils;
-import io.dataease.license.config.XpackInteract;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.ObjectUtils;
 import org.quartz.JobDataMap;
@@ -25,12 +24,11 @@ public class DeDataFillingTaskExecutor {
     @Resource
     private ScheduleManager scheduleManager;
 
-    @XpackInteract(value = "dataFillingTaskExecutor", replace = true)
+
     public boolean execute(Map<String, Object> taskData) {
         return false;
     }
 
-    @XpackInteract(value = "dataFillingTaskExecutor", replace = true)
     public void init() {
     }
 

core/core-backend/src/main/java/io/gisbi/job/schedule/DeTaskExecutor.java

@@ -1,7 +1,6 @@
 package io.gisbi.job.schedule;
 
 import io.gisbi.commons.utils.CronUtils;
-import io.dataease.license.config.XpackInteract;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.ObjectUtils;
 import org.quartz.JobDataMap;
@@ -27,12 +26,12 @@ public class DeTaskExecutor {
     @Resource
     private ScheduleManager scheduleManager;
 
-    @XpackInteract(value = "xpackTaskExecutor", replace = true)
+
     public boolean execute(Map<String, Object> taskData) {
         return false;
     }
 
-    @XpackInteract(value = "xpackTaskExecutor", replace = true)
+
     public void init() {
     }
 

core/core-backend/src/main/java/io/gisbi/job/schedule/DeXpackDataFillingScheduleJob.java

@@ -1,6 +1,5 @@
 package io.gisbi.job.schedule;
 
-import io.dataease.license.utils.LicenseUtil;
 import io.gisbi.utils.CommonBeanFactory;
 import io.gisbi.utils.LogUtil;
 import org.quartz.*;
@@ -20,7 +19,6 @@ public class DeXpackDataFillingScheduleJob implements Job {
         DeDataFillingTaskExecutor deTaskExecutor = CommonBeanFactory.getBean(DeDataFillingTaskExecutor.class);
         assert deTaskExecutor != null;
         try {
-            LicenseUtil.validate();
             boolean taskLoaded = deTaskExecutor.execute(jobDataMap);
             if (!taskLoaded) {
                 Objects.requireNonNull(CommonBeanFactory.getBean(ScheduleManager.class)).removeJob(jobKey, trigger.getKey());

core/core-backend/src/main/java/io/gisbi/job/schedule/DeXpackScheduleJob.java

@@ -1,6 +1,4 @@
 package io.gisbi.job.schedule;
-
-import io.dataease.license.utils.LicenseUtil;
 import io.gisbi.utils.CommonBeanFactory;
 import io.gisbi.utils.LogUtil;
 import org.quartz.*;
@@ -20,7 +18,6 @@ public class DeXpackScheduleJob implements Job {
         DeTaskExecutor deTaskExecutor = CommonBeanFactory.getBean(DeTaskExecutor.class);
         assert deTaskExecutor != null;
         try {
-            LicenseUtil.validate();
             boolean taskLoaded = deTaskExecutor.execute(jobDataMap);
             if (!taskLoaded) {
                 Objects.requireNonNull(CommonBeanFactory.getBean(ScheduleManager.class)).removeJob(jobKey, trigger.getKey());

core/core-backend/src/main/java/io/gisbi/license/server/LicenseServer.java

@@ -1,42 +0,0 @@
-package io.gisbi.license.server;
-
-import io.gisbi.api.license.LicenseApi;
-import io.gisbi.api.license.dto.LicenseRequest;
-import io.dataease.license.bo.F2CLicResult;
-import io.gisbi.license.manage.CoreLicManage;
-import io.dataease.license.manage.F2CLicManage;
-import jakarta.annotation.Resource;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/license")
-public class LicenseServer implements LicenseApi {
-
-    private static final String product = "DataEase v2";
-    @Resource
-    private CoreLicManage coreLicManage;
-
-    @Resource
-    private F2CLicManage f2CLicManage;
-
-
-    @Override
-    public F2CLicResult update(LicenseRequest request) {
-        return f2CLicManage.updateLicense(product, request.getLicense());
-    }
-
-    @Override
-    public F2CLicResult validate(LicenseRequest request) {
-        if (StringUtils.isBlank(request.getLicense())) {
-            return f2CLicManage.validate();
-        }
-        return f2CLicManage.validate(product, request.getLicense());
-    }
-
-    @Override
-    public String version() {
-        return coreLicManage.getVersion();
-    }
-}

core/core-backend/src/main/java/io/gisbi/listener/TemplateInitListener.java

@@ -1,7 +1,6 @@
 package io.gisbi.listener;
-
-import io.dataease.license.utils.LogUtil;
 import io.gisbi.template.manage.TemplateLocalParseManage;
+import io.gisbi.utils.LogUtil;
 import jakarta.annotation.Resource;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationListener;

core/core-backend/src/main/java/io/gisbi/listener/XpackTaskStarter.java

@@ -2,7 +2,6 @@ package io.gisbi.listener;
 
 import io.gisbi.job.schedule.DeDataFillingTaskExecutor;
 import io.gisbi.job.schedule.DeTaskExecutor;
-import io.dataease.license.utils.LicenseUtil;
 import io.gisbi.utils.LogUtil;
 import jakarta.annotation.Resource;
 import org.springframework.boot.ApplicationArguments;
@@ -23,13 +22,13 @@ public class XpackTaskStarter implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments args) {
         try {
-            LicenseUtil.validate();
+//            LicenseUtil.validate();
             deTaskExecutor.init();
         } catch (Exception e) {
             LogUtil.error(e.getMessage(), e.getCause());
         }
         try {
-            LicenseUtil.validate();
+//            LicenseUtil.validate();
             deDataFillingTaskExecutor.init();
         } catch (Exception e) {
             LogUtil.error(e.getMessage(), e.getCause());

core/core-backend/src/main/java/io/gisbi/menu/manage/MenuManage.java

@@ -3,7 +3,6 @@ package io.gisbi.menu.manage;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.gisbi.api.menu.vo.MenuMeta;
 import io.gisbi.api.menu.vo.MenuVO;
-import io.dataease.license.config.XpackInteract;
 import io.gisbi.menu.bo.MenuTreeNode;
 import io.gisbi.menu.dao.auto.entity.CoreMenu;
 import io.gisbi.menu.dao.auto.mapper.CoreMenuMapper;
@@ -30,7 +29,6 @@ public class MenuManage {
     private CoreMenuMapper coreMenuMapper;
 
 
-    @XpackInteract(value = "menuApi")
     public List<MenuVO> query(List<CoreMenu> coreMenus) {
         List<MenuTreeNode> menuTreeNodes = new ArrayList<>(coreMenus.stream().map(menu -> BeanUtils.copyBean(new MenuTreeNode(), menu)).toList());
         menuTreeNodes.sort(Comparator.comparing(MenuTreeNode::getMenuSort));

core/core-backend/src/main/java/io/gisbi/msgCenter/MsgCenterServer.java

@@ -1,7 +1,6 @@
 package io.gisbi.msgCenter;
 
 import io.gisbi.api.msgCenter.MsgCenterApi;
-import io.dataease.license.config.XpackInteract;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -9,7 +8,6 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/msg-center")
 public class MsgCenterServer implements MsgCenterApi {
     @Override
-    @XpackInteract(value = "msgCenterServer", replace = true)
     public long count() {
         return 0;
     }

core/core-backend/src/main/java/io/gisbi/share/manage/XpackShareManage.java

@@ -16,8 +16,6 @@ import io.gisbi.constant.AuthConstant;
 import io.gisbi.constant.BusiResourceEnum;
 import io.gisbi.exception.DEException;
 import io.gisbi.i18n.Translator;
-import io.dataease.license.config.XpackInteract;
-import io.dataease.license.utils.LicenseUtil;
 import io.gisbi.share.dao.auto.entity.XpackShare;
 import io.gisbi.share.dao.auto.mapper.XpackShareMapper;
 import io.gisbi.share.dao.ext.mapper.XpackShareExtMapper;
@@ -184,7 +182,6 @@ public class XpackShareManage {
         };
     }
 
-    @XpackInteract(value = "perFilterShareManage", recursion = true, invalid = true)
     public IPage<XpackShareGridVO> query(int pageNum, int pageSize, VisualizationWorkbranchQueryRequest request) {
         IPage<XpackSharePO> poiPage = proxy().querySharePage(pageNum, pageSize, request);
         List<XpackShareGridVO> vos = proxy().formatResult(poiPage.getRecords());
@@ -228,7 +225,7 @@ public class XpackShareManage {
             vo.setShareDisable(true);
             return vo;
         }
-        boolean inIframeError = request.isInIframe() && !LicenseUtil.licenseValid();
+        boolean inIframeError = request.isInIframe() ;
         if (inIframeError) {
             return new XpackShareProxyVO();
         }

core/core-backend/src/main/java/io/gisbi/system/manage/CoreUserManage.java

@@ -1,13 +1,12 @@
 package io.gisbi.system.manage;
 
-import io.dataease.license.config.XpackInteract;
+
 import org.springframework.stereotype.Component;
 
 @Component
 public class CoreUserManage {
 
 
-    @XpackInteract(value = "coreUserManage", replace = true)
     public String getUserName(Long uid) {
         return "管理员";
     }

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

@@ -5,7 +5,6 @@ import io.gisbi.api.system.request.OnlineMapEditor;
 import io.gisbi.api.system.vo.SettingItemVO;
 import io.gisbi.api.system.vo.ShareBaseVO;
 import io.gisbi.datasource.server.DatasourceServer;
-import io.dataease.license.config.XpackInteract;
 import io.gisbi.system.dao.auto.entity.CoreSysSetting;
 import io.gisbi.system.dao.auto.mapper.CoreSysSettingMapper;
 import io.gisbi.system.dao.ext.mapper.ExtCoreSysSettingMapper;
@@ -107,12 +106,12 @@ public class SysParameterManage {
         return coreSysSettingMapper.selectList(queryWrapper);
     }
 
-    @XpackInteract(value = "perSetting")
+
     public List<SettingItemVO> convert(List<CoreSysSetting> sysSettings) {
         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() {
         List<Object> result = new ArrayList<>();
         result.add(buildSettingItem("community", true));
@@ -121,7 +120,7 @@ public class SysParameterManage {
         return result;
     }
 
-    @XpackInteract(value = "perSetting", replace = true)
+
     public Integer defaultLogin() {
         return 0;
     }
@@ -149,7 +148,7 @@ public class SysParameterManage {
     }
 
 
-    @XpackInteract(value = "perSetting", before = false)
+
     @Transactional
     public void saveBasic(List<SettingItemVO> vos) {
         String key = "basic.";

core/core-backend/src/main/java/io/gisbi/template/manage/TemplateLocalParseManage.java

@@ -2,10 +2,11 @@ package io.gisbi.template.manage;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.gisbi.api.visualization.request.DataVisualizationBaseRequest;
-import io.dataease.license.utils.LogUtil;
+
 import io.gisbi.template.dao.auto.entity.DeTemplateVersion;
 import io.gisbi.template.dao.auto.mapper.DeTemplateVersionMapper;
 import io.gisbi.utils.JsonUtil;
+import io.gisbi.utils.LogUtil;
 import io.gisbi.visualization.server.StaticResourceServer;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;

core/core-backend/src/main/java/io/gisbi/visualization/manage/CoreVisualizationManage.java

@@ -10,7 +10,6 @@ import io.gisbi.commons.constants.DataVisualizationConstants;
 import io.gisbi.commons.constants.OptConstants;
 import io.gisbi.constant.BusiResourceEnum;
 import io.gisbi.exception.DEException;
-import io.dataease.license.config.XpackInteract;
 import io.gisbi.model.BusiNodeRequest;
 import io.gisbi.model.BusiNodeVO;
 import io.gisbi.operation.manage.CoreOptRecentManage;
@@ -48,7 +47,7 @@ public class CoreVisualizationManage {
     @Resource
     private CoreOptRecentManage coreOptRecentManage;
 
-    @XpackInteract(value = "visualizationResourceTree", replace = true, invalid = true)
+
     public List<BusiNodeVO> tree(BusiNodeRequest request) {
         List<VisualizationNodeBO> nodes = new ArrayList<>();
         if (ObjectUtils.isEmpty(request.getLeaf()) || !request.getLeaf()) {
@@ -71,7 +70,7 @@ public class CoreVisualizationManage {
         return TreeUtils.mergeTree(nodes, BusiNodeVO.class, false);
     }
 
-    @XpackInteract(value = "visualizationResourceTree", before = false)
+
     public void delete(Long id) {
         DataVisualizationInfo info = mapper.selectById(id);
         if (ObjectUtils.isEmpty(info)) {
@@ -101,7 +100,7 @@ public class CoreVisualizationManage {
         coreOptRecentManage.saveOpt(id, OptConstants.OPT_RESOURCE_TYPE.VISUALIZATION, OptConstants.OPT_TYPE.DELETE);
     }
 
-    @XpackInteract(value = "visualizationResourceTree", before = false)
+
     public void move(DataVisualizationBaseRequest request) {
         if (!request.getMoveFromUpdate()) {
             DataVisualizationInfo visualizationInfo = new DataVisualizationInfo();
@@ -115,7 +114,7 @@ public class CoreVisualizationManage {
         }
     }
 
-    @XpackInteract(value = "visualizationResourceTree", before = false)
+
     public Long innerSave(DataVisualizationInfo visualizationInfo) {
         visualizationInfo.setVersion(3);
         return preInnerSave(visualizationInfo);
@@ -137,7 +136,7 @@ public class CoreVisualizationManage {
         return visualizationInfo.getId();
     }
 
-    @XpackInteract(value = "visualizationResourceTree", before = false)
+
     public void innerEdit(DataVisualizationInfo visualizationInfo) {
         visualizationInfo.setUpdateTime(System.currentTimeMillis());
         visualizationInfo.setUpdateBy(AuthUtils.getUser().getUserId().toString());
@@ -162,7 +161,7 @@ public class CoreVisualizationManage {
         return CommonBeanFactory.getBean(this.getClass());
     }
 
-    @XpackInteract(value = "perFilterManage", recursion = true, invalid = true)
+
     public IPage<VisualizationResourceVO> query(int pageNum, int pageSize, VisualizationWorkbranchQueryRequest request) {
         IPage<VisualizationResourcePO> visualizationResourcePOPageIPage = proxy().queryVisualizationPage(pageNum, pageSize, request);
         if (ObjectUtils.isEmpty(visualizationResourcePOPageIPage)) {

core/core-backend/src/main/java/io/gisbi/visualization/manage/VisualizationStoreManage.java

@@ -8,7 +8,6 @@ import io.gisbi.api.visualization.request.VisualizationWorkbranchQueryRequest;
 import io.gisbi.api.visualization.vo.VisualizationStoreVO;
 import io.gisbi.constant.BusiResourceEnum;
 import io.gisbi.exception.DEException;
-import io.dataease.license.config.XpackInteract;
 import io.gisbi.utils.AuthUtils;
 import io.gisbi.utils.CommonBeanFactory;
 import io.gisbi.utils.CommunityUtils;
@@ -66,7 +65,6 @@ public class VisualizationStoreManage {
         return coreStoreMapper.exists(queryWrapper);
     }
 
-    @XpackInteract(value = "perFilterManage", recursion = true, invalid = true)
     public IPage<VisualizationStoreVO> query(int pageNum, int pageSize, VisualizationWorkbranchQueryRequest request) {
         IPage<StorePO> storePOIPage = proxy().queryStorePage(pageNum, pageSize, request);
         if (ObjectUtils.isEmpty(storePOIPage)) return null;

core/core-backend/src/main/java/io/gisbi/visualization/server/DataVisualizationServer.java

@@ -36,7 +36,6 @@ import io.gisbi.exception.DEException;
 import io.gisbi.extensions.datasource.vo.DatasourceConfiguration;
 import io.gisbi.extensions.view.dto.ChartViewDTO;
 import io.gisbi.i18n.Translator;
-import io.dataease.license.config.XpackInteract;
 import io.gisbi.license.manage.CoreLicManage;
 import io.gisbi.log.DeLog;
 import io.gisbi.model.BusiNodeRequest;
@@ -157,7 +156,6 @@ public class DataVisualizationServer implements DataVisualizationApi {
     @DeLinkPermit("#p0.id")
     @DeLog(id = "#p0.id", ot = LogOT.READ, stExp = "#p0.busiFlag")
     @Override
-    @XpackInteract(value = "dataVisualizationServer", original = true)
      public DataVisualizationVO findById(DataVisualizationBaseRequest request) {
         Long dvId = request.getId();
         String busiFlag = request.getBusiFlag();