From 252ab03af53e92ef09d2d00429a662c18cb08b7d Mon Sep 17 00:00:00 2001 From: jianneng-fit2cloud Date: Mon, 25 May 2026 16:45:58 +0800 Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E4=BF=AE=E5=A4=8D=E5=9C=A8?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=E4=B8=AD=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=BA=866=E5=88=86=E9=92=9F=E6=A3=80=E6=B5=8B=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=E6=8D=AE=E6=BA=90=EF=BC=8C=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=97=B4=E9=9A=94=E5=88=B0=E4=BA=86=E4=B9=8B=E5=90=8E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5=E6=B2=A1=E6=9C=89=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E7=8A=B6=E6=80=81=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/datasource/server/DatasourceServer.java | 1 + .../java/io/dataease/job/schedule/CheckDsStatusJob.java | 8 ++++++++ de-xpack | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) 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