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 c47f7a61..c01f343a 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 @@ -1,14 +1,22 @@ package org.dromara.neutrinoproxy.client; +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; import cn.hutool.core.util.StrUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.noear.solon.Solon; +import org.noear.solon.SolonApp; import org.noear.solon.annotation.SolonMain; +import org.slf4j.LoggerFactory; /** * * @author: aoshiguchen * @date: 2022/6/16 */ +@Slf4j @SolonMain public class ProxyClient { @@ -20,6 +28,8 @@ public class ProxyClient { setAlias("neutrino.proxy.client.jksPath", "jksPath"); setAlias("neutrino.proxy.client.keyStorePassword", "keyStorePassword"); setAlias("neutrino.proxy.client.licenseKey", "licenseKey"); + // 设置日志级别 + setLogLevel(app); }); } @@ -34,4 +44,21 @@ public class ProxyClient { Solon.cfg().put(key, val); } } + + private static void setLogLevel(SolonApp app) { + String loggerLevel = app.cfg().get("neutrino.proxy.logger.level"); + if (StringUtils.isBlank(loggerLevel)) { + return; + } + + try { + Level level = Level.toLevel(loggerLevel); + LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory(); + for (Logger logger : loggerContext.getLoggerList()) { + logger.setLevel(level); + } + } catch (Exception e) { + log.error("日志级别设置失败", e); + } + } } diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/CmdChannelHandler.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/CmdChannelHandler.java index 6db7fdb5..31fb1a9f 100644 --- a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/CmdChannelHandler.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/CmdChannelHandler.java @@ -24,7 +24,7 @@ public class CmdChannelHandler extends SimpleChannelInboundHandler @Override protected void channelRead0(ChannelHandlerContext ctx, ProxyMessage proxyMessage) throws Exception { if (ProxyMessage.TYPE_HEARTBEAT != proxyMessage.getType()) { - log.info("Client CmdChannel recieved proxy message, type is {}", proxyMessage.getType()); + log.debug("Client CmdChannel recieved proxy message, type is {}", proxyMessage.getType()); } Solon.context().getBean(Dispatcher.class).dispatch(ctx, proxyMessage); } diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyChannelHandler.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyChannelHandler.java index ebe217f6..85e7b0f0 100644 --- a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyChannelHandler.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyChannelHandler.java @@ -24,7 +24,7 @@ public class ProxyChannelHandler extends SimpleChannelInboundHandler { // 跨域支持。加-1 优先级更高 app.filter(-1, new CrossFilter().allowedOrigins("*")); + // 设置日志级别 + setLogLevel(app); }); } + + private static void setLogLevel(SolonApp app) { + String loggerLevel = app.cfg().get("neutrino.proxy.logger.level"); + if (StringUtils.isBlank(loggerLevel)) { + return; + } + + try { + Level level = Level.toLevel(loggerLevel); + LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory(); + for (Logger logger : loggerContext.getLoggerList()) { + logger.setLevel(level); + } + } catch (Exception e) { + log.error("日志级别设置失败", e); + } + } } diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/VisitLogInterceptor.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/VisitLogInterceptor.java index 97d46072..181289da 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/VisitLogInterceptor.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/VisitLogInterceptor.java @@ -31,7 +31,7 @@ public class VisitLogInterceptor implements RouterInterceptor { } finally { Date now = new Date(); long elapsedTime = now.getTime() - startTime.getTime(); - log.info("\n-----------------------------------------------------------------接口请求日志:\n{} url:{} 执行耗时:{}\n请求体参数:{}\n响应结果:{}\n客户端IP:{}\n", + log.debug("\n-----------------------------------------------------------------接口请求日志:\n{} url:{} 执行耗时:{}\n请求体参数:{}\n响应结果:{}\n客户端IP:{}\n", ctx.method(), ctx.path(), getElapsedTimeStr(elapsedTime), JSONObject.toJSONString(ctx.paramMap()), JSONObject.toJSONString(JSONObject.toJSONString(ctx.result)), diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/DemoJob.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/DemoJob.java index 687e623b..4696dca2 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/DemoJob.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/DemoJob.java @@ -17,6 +17,6 @@ public class DemoJob implements IJobHandler { @Override public void execute(String param) throws Exception { - System.out.println("DemoJob execute param:" + param); + log.debug("DemoJob execute param: {}", param); } } diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyTunnelChannelHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyTunnelChannelHandler.java index 5d32ff52..0f3d9363 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyTunnelChannelHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyTunnelChannelHandler.java @@ -127,7 +127,7 @@ public class ProxyTunnelChannelHandler extends SimpleChannelInboundHandler