From 9242a1d47428ac00df50c29a7bb2df97ee758bd8 Mon Sep 17 00:00:00 2001 From: LamGC Date: Wed, 10 Jun 2020 09:13:12 +0800 Subject: [PATCH] =?UTF-8?q?[Change]=20MiraiToSlf4jLoggerAdapter=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=B1=BB=E5=91=BD=E5=90=8D(MiraiToSlf4jLogge?= =?UTF-8?q?r=20->=20MiraiToSlf4jLoggerAdapter);=20[Change]=20MiraiMain=20?= =?UTF-8?q?=E9=80=82=E9=85=8D=E8=B0=83=E6=95=B4;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java | 2 +- ...MiraiToSlf4jLogger.java => MiraiToSlf4jLoggerAdapter.java} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/main/java/net/lamgc/cgj/bot/framework/mirai/{MiraiToSlf4jLogger.java => MiraiToSlf4jLoggerAdapter.java} (94%) diff --git a/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java b/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java index d681340..a97c36e 100644 --- a/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java +++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java @@ -49,7 +49,7 @@ public class MiraiMain implements Closeable { return; } - Utils.setDefaultLogger(MiraiToSlf4jLogger::new); + Utils.setDefaultLogger(MiraiToSlf4jLoggerAdapter::new); BotConfiguration configuration = new BotConfiguration(); configuration.setProtocol(BotConfiguration.MiraiProtocol.ANDROID_PAD); bot = BotFactoryJvm.newBot(Long.parseLong(botProperties.getProperty("bot.qq", "0")), Base64.decodeBase64(botProperties.getProperty("bot.password", "")), configuration); diff --git a/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiToSlf4jLogger.java b/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiToSlf4jLoggerAdapter.java similarity index 94% rename from src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiToSlf4jLogger.java rename to src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiToSlf4jLoggerAdapter.java index 56c008a..de54969 100644 --- a/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiToSlf4jLogger.java +++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiToSlf4jLoggerAdapter.java @@ -13,7 +13,7 @@ import org.slf4j.MarkerFactory; *

该Logger通过Slf4j的Marker进行标识, loggerName为{@code mirai.[identity]}

*

由于适配器适配方式的原因, 日志输出的调用信息将不可用(调用指向了适配器内的方法);

*/ -public class MiraiToSlf4jLogger extends MiraiLoggerPlatformBase { +public class MiraiToSlf4jLoggerAdapter extends MiraiLoggerPlatformBase { private final static Marker marker = MarkerFactory.getMarker("mirai"); @@ -21,7 +21,7 @@ public class MiraiToSlf4jLogger extends MiraiLoggerPlatformBase { private final String identity; - public MiraiToSlf4jLogger(String identity) { + public MiraiToSlf4jLoggerAdapter(String identity) { this.identity = identity; this.logger = LoggerFactory.getLogger("mirai." + identity); }