diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java index 49406871cd..659e7527b3 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java @@ -1195,6 +1195,7 @@ public class DatasourceServer implements DatasourceApi { } + @XpackInteract(value = "syncDatasourceStatus", before = false) public void updateDatasourceStatus() { Specification findTypeNotInSpec = (root, query, cb) -> { List predicates = new ArrayList<>(); diff --git a/core/core-backend/src/main/java/io/dataease/job/schedule/CheckDsStatusJob.java b/core/core-backend/src/main/java/io/dataease/job/schedule/CheckDsStatusJob.java index cf3c0e087b..4d98249ef9 100644 --- a/core/core-backend/src/main/java/io/dataease/job/schedule/CheckDsStatusJob.java +++ b/core/core-backend/src/main/java/io/dataease/job/schedule/CheckDsStatusJob.java @@ -2,6 +2,7 @@ package io.dataease.job.schedule; import io.dataease.datasource.server.DatasourceServer; +import io.dataease.license.utils.LicenseUtil; import io.dataease.utils.CommonBeanFactory; import io.dataease.utils.LogUtil; import jakarta.annotation.Resource; @@ -23,6 +24,13 @@ public class CheckDsStatusJob implements Job { @Override public void execute(JobExecutionContext context) throws JobExecutionException { LogUtil.info("Begin to check ds status..."); + try { + // 兼容同步管理 + // datasourceServer.updateDatasourceStatus() 前补 LicenseUtil.validate(),让 Quartz 线程先初始化 license ThreadLocal + LicenseUtil.validate(); + } catch (Exception e) { + LogUtil.error(e.getMessage(), e); + } datasourceServer.updateDatasourceStatus(); } diff --git a/de-xpack b/de-xpack index 7a5801a73e..07da549b03 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 7a5801a73efd3cfa402c8eee5a91deae7c236f81 +Subproject commit 07da549b03b237067219a6078e0671a65b4add28