diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java index 3f5d6628..ba044973 100644 --- a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java @@ -3,6 +3,7 @@ package org.dromara.neutrinoproxy.client; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; import org.noear.solon.Solon; +import org.noear.solon.Utils; import org.noear.solon.annotation.SolonMain; /** @@ -16,6 +17,11 @@ public class ProxyClient { public static void main(String[] args) { Solon.start(ProxyClient.class, args, app -> { + String loglevel = System.getenv("LOG_LEVEL"); + if (Utils.isNotEmpty(loglevel)) { + app.cfg().put("solon.logging.logger.root.level", loglevel); + } + setAlias("neutrino.proxy.tunnel.server-ip", "serverIp"); setAlias("neutrino.proxy.tunnel.server-port", "serverPort"); setAlias("neutrino.proxy.tunnel.ssl-enable", "sslEnable"); diff --git a/neutrino-proxy-client/src/main/resources/app.yml b/neutrino-proxy-client/src/main/resources/app.yml index 78d10326..056f5e98 100644 --- a/neutrino-proxy-client/src/main/resources/app.yml +++ b/neutrino-proxy-client/src/main/resources/app.yml @@ -12,7 +12,6 @@ solon.logging.appender: rolling: "logs/${neutrino.application.name}_%d{yyyy-MM-dd}_%i.log.gz" solon.logging.logger: "root": - # level: ${LOG_LEVEL:info} level: info neutrino: application: diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java index eaba8930..e31f257b 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java @@ -2,7 +2,9 @@ package org.dromara.neutrinoproxy.server; import lombok.extern.slf4j.Slf4j; import org.dromara.solonplugins.job.annotation.EnableJob; +import org.noear.snack.core.utils.StringUtil; import org.noear.solon.Solon; +import org.noear.solon.Utils; import org.noear.solon.annotation.SolonMain; import org.noear.solon.web.cors.CrossFilter; @@ -20,6 +22,10 @@ public class ProxyServer { Solon.start(ProxyServer.class, args, app -> { // 跨域支持。加-1 优先级更高 app.filter(-1, new CrossFilter().allowedOrigins("*")); + String loglevel = System.getenv("LOG_LEVEL"); + if (Utils.isNotEmpty(loglevel)) { + app.cfg().put("solon.logging.logger.root.level", loglevel); + } }); } } 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 23a67d2c..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 @@ -33,6 +33,7 @@ import org.noear.solon.annotation.Init; import org.noear.solon.annotation.Inject; import org.noear.solon.core.event.AppLoadEndEvent; import org.noear.solon.core.event.EventListener; +import org.noear.solon.core.runtime.NativeDetector; import org.noear.wood.DbContext; import org.noear.wood.annotation.Db; @@ -57,6 +58,10 @@ public class DBInitialize implements EventListener { @Init public void init() throws Throwable { + // 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/resources/app.yml b/neutrino-proxy-server/src/main/resources/app.yml index 1a5eba6b..91e530a3 100644 --- a/neutrino-proxy-server/src/main/resources/app.yml +++ b/neutrino-proxy-server/src/main/resources/app.yml @@ -20,9 +20,7 @@ solon.logging.appender: rolling: "logs/${solon.app.name}_%d{yyyy-MM-dd}_%i.log" solon.logging.logger: "root": - level: ${LOG_LEVEL:info} -# level: info - + level: info neutrino: proxy: