From cb9aa5da819c1206804c38e6058fad590a682dcf Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Thu, 26 Oct 2023 21:24:43 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0LOG=5FLEVEL?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=202=E3=80=81aot=E5=A4=84=E7=90=86=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E4=B8=8D=E6=89=A7=E8=A1=8C=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/neutrinoproxy/client/ProxyClient.java  | 6 ++++++
 neutrino-proxy-client/src/main/resources/app.yml            | 1 -
 .../java/org/dromara/neutrinoproxy/server/ProxyServer.java  | 6 ++++++
 .../dromara/neutrinoproxy/server/base/db/DBInitialize.java  | 5 +++++
 neutrino-proxy-server/src/main/resources/app.yml            | 4 +---
 5 files changed, 18 insertions(+), 4 deletions(-)

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<AppLoadEndEvent> {
 
 	@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: