From d8d5cc61ab88ca9b02148c3d8f6b8c96a85560be Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Mon, 30 Oct 2023 18:19:56 +0800 Subject: [PATCH] =?UTF-8?q?aot=E9=98=B6=E6=AE=B5=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=80=BB=E8=BE=91=E8=B7=B3=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../neutrinoproxy/server/base/db/DBInitialize.java | 8 ++++---- .../server/service/JobInfoService.java | 14 ++++++++++---- .../server/service/JobLogService.java | 6 ++++++ .../server/service/LicenseService.java | 5 +++++ .../server/service/PortMappingService.java | 5 +++++ 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DBInitialize.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DBInitialize.java index 0765fe96..a387e1ce 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DBInitialize.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DBInitialize.java @@ -58,10 +58,10 @@ public class DBInitialize implements EventListener { @Init public void init() throws Throwable { -// // aot 阶段，不初始化数据库 -// if (NativeDetector.isAotRuntime()) { -// return; -// } + // aot 阶段，不初始化数据库 + if (NativeDetector.isAotRuntime()) { + return; + } Assert.notNull(dbConfig.getType(), "neutrino.data.db.type不能为空!"); dbTypeEnum = DbTypeEnum.of(dbConfig.getType()); Assert.notNull(dbTypeEnum, "neutrino.data.db.type取值异常!"); diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobInfoService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobInfoService.java index 35379fbb..9ae7c1ee 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobInfoService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobInfoService.java @@ -35,11 +35,9 @@ import org.noear.solon.Solon; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Init; import org.noear.solon.annotation.Inject; +import org.noear.solon.core.runtime.NativeDetector; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -67,6 +65,10 @@ public class JobInfoService implements IJobSource { @Init public void init() { + // aot 阶段，不初始化 + if (NativeDetector.isAotRuntime()) { + return; + } jobHandlerMap.put("DataCleanJob", dataCleanJob); jobHandlerMap.put("DemoJob", demoJob); jobHandlerMap.put("FlowReportForDayJob", flowReportForDayJob); @@ -107,6 +109,10 @@ public class JobInfoService implements IJobSource { @Override public List sourceList() { + // aot 阶段，不查数据库 + if (NativeDetector.isAotRuntime()) { + return Collections.emptyList(); + } List jobInfoList = Lists.newArrayList(); List jobInfoDOList = jobInfoMapper.findList(); if (CollectionUtil.isEmpty(jobInfoDOList)) { diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobLogService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobLogService.java index 766419ac..b7e6789e 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobLogService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobLogService.java @@ -35,7 +35,9 @@ import org.dromara.neutrinoproxy.server.dal.entity.JobLogDO; import org.dromara.solonplugins.job.IJobCallback; import org.dromara.solonplugins.job.JobInfo; import org.noear.solon.annotation.Component; +import org.noear.solon.core.runtime.NativeDetector; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -53,6 +55,10 @@ public class JobLogService implements IJobCallback { @Override public void executeLog(JobInfo jobInfo, String param, Throwable throwable) { + // aot 阶段，不查数据库 + if (NativeDetector.isAotRuntime()) { + return; + } Integer code = 0; String msg = ""; if (null == throwable) { diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java index f1830055..2c0a3dac 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java @@ -34,6 +34,7 @@ import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Init; import org.noear.solon.annotation.Inject; import org.noear.solon.core.bean.LifecycleBean; +import org.noear.solon.core.runtime.NativeDetector; import java.util.Arrays; import java.util.Date; @@ -238,6 +239,10 @@ public class LicenseService implements LifecycleBean { */ @Init public void init() { + // aot 阶段，不初始化 + if (NativeDetector.isAotRuntime()) { + return; + } licenseMapper.updateOnlineStatus(OnlineStatusEnum.OFFLINE.getStatus(), new Date()); } diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortMappingService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortMappingService.java index 1683f708..1c1c2de0 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortMappingService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortMappingService.java @@ -40,6 +40,7 @@ import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Init; import org.noear.solon.annotation.Inject; import org.noear.solon.core.bean.LifecycleBean; +import org.noear.solon.core.runtime.NativeDetector; import java.util.Comparator; import java.util.Date; @@ -295,6 +296,10 @@ public class PortMappingService implements LifecycleBean { */ @Init public void init() { + // aot 阶段，不初始化 + if (NativeDetector.isAotRuntime()) { + return; + } portMappingMapper.updateOnlineStatus(OnlineStatusEnum.OFFLINE.getStatus(), new Date()); // 未配置域名，则不需要处理域名映射逻辑