Skip to content
This repository was archived by the owner on Mar 6, 2024. It is now read-only.

Commit 970e586

Browse files
committed
refactor: optimize log info
1 parent 7f33dee commit 970e586

File tree

5 files changed

+43
-5
lines changed

5 files changed

+43
-5
lines changed

src/main/java/org/code4everything/wetool/controller/MainController.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import org.code4everything.wetool.constant.TitleConsts;
5151
import org.code4everything.wetool.constant.ViewConsts;
5252
import org.code4everything.wetool.handler.MouseMotionEventHandler;
53+
import org.code4everything.wetool.logback.AppNameConverter;
5354
import org.code4everything.wetool.plugin.PluginLoader;
5455
import org.code4everything.wetool.plugin.support.BaseViewController;
5556
import org.code4everything.wetool.plugin.support.config.WeConfig;
@@ -219,6 +220,7 @@ public void handleEvent0(String s, Date date) {
219220
multiDesktopOnWindows();
220221

221222
registerActions();
223+
AppNameConverter.registerToFunctionCenter();
222224
WeUtils.execute(PluginLoader::loadPlugins);
223225
BeanFactory.get(WeStatus.class).setState(WeStatus.State.RUNNING);
224226
}

src/main/java/org/code4everything/wetool/logback/AppNameConverter.java

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@
22

33
import ch.qos.logback.classic.pattern.ClassicConverter;
44
import ch.qos.logback.classic.spi.ILoggingEvent;
5+
import cn.hutool.core.collection.CollUtil;
56
import cn.hutool.core.comparator.ComparatorChain;
7+
import cn.hutool.core.util.ObjectUtil;
68
import org.code4everything.wetool.plugin.support.exception.PluginException;
9+
import org.code4everything.wetool.plugin.support.func.FunctionCenter;
10+
import org.code4everything.wetool.plugin.support.func.MethodCallback;
711

12+
import java.util.List;
813
import java.util.Map;
914
import java.util.Map.Entry;
15+
import java.util.Objects;
1016
import java.util.TreeMap;
1117

1218
/**
@@ -21,7 +27,36 @@ public class AppNameConverter extends ClassicConverter {
2127
PLUGIN_NAME_MAP.put("org.code4everything.wetool", "wetool");
2228
}
2329

30+
public static void registerToFunctionCenter() {
31+
FunctionCenter.registerFunc(new MethodCallback() {
32+
@Override
33+
public String getUniqueMethodName() {
34+
return "add-package-to-app-name-mapping";
35+
}
36+
37+
@Override
38+
public String getDescription() {
39+
return "添加包名与插件名称的映射";
40+
}
41+
42+
@Override
43+
public List<Class<?>> getParamTypes() {
44+
return List.of(String.class, String.class);
45+
}
46+
47+
@Override
48+
public Object callMethod(List<Object> list) {
49+
String s1 = ObjectUtil.toString(CollUtil.get(list, 0));
50+
String s2 = ObjectUtil.toString(CollUtil.get(list, 1));
51+
putName(s1, s2);
52+
return null;
53+
}
54+
});
55+
}
56+
2457
public static void putName(String packageName, String appName) {
58+
Objects.requireNonNull(packageName);
59+
Objects.requireNonNull(appName);
2560
if (PLUGIN_NAME_MAP.containsKey(packageName)) {
2661
throw new PluginException("包已存在:" + packageName);
2762
}
@@ -36,6 +71,6 @@ public String convert(ILoggingEvent iLoggingEvent) {
3671
return entry.getValue();
3772
}
3873
}
39-
return "wetool";
74+
return "unknown";
4075
}
4176
}

src/main/java/org/code4everything/wetool/logback/ExtendedPatternLayoutEncoder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ public class ExtendedPatternLayoutEncoder extends PatternLayoutEncoder {
1313

1414
@Override
1515
public void start() {
16-
log.info("register logback pid converter");
16+
log.debug("register logback pid converter");
1717
PatternLayout.defaultConverterMap.put("pid", PidConverter.class.getName());
18+
log.debug("register logback app name converter");
1819
PatternLayout.defaultConverterMap.put("app", AppNameConverter.class.getName());
1920
super.start();
2021
}

src/main/resources/logback.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
<totalSizeCap>1GB</totalSizeCap>
88
</rollingPolicy>
99
<encoder class="org.code4everything.wetool.logback.ExtendedPatternLayoutEncoder">
10-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%pid] [%app] [%thread] %5p %c{0}:%L - %m%n</pattern>
10+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%pid] [%app] [%thread] %5p %c:%L - %m%n</pattern>
1111
<charset class="java.nio.charset.Charset">UTF-8</charset>
1212
</encoder>
1313
</appender>
1414

1515
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
1616
<encoder class="org.code4everything.wetool.logback.ExtendedPatternLayoutEncoder">
17-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%pid] [%app] [%thread] %5p %c{0}:%L - %m%n</pattern>
17+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%pid] [%app] [%thread] %5p %c:%L - %m%n</pattern>
1818
</encoder>
1919
</appender>
2020

src/test/resources/logback-test.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<configuration>
22
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
33
<encoder class="org.code4everything.wetool.logback.ExtendedPatternLayoutEncoder">
4-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%pid] [%app] [%thread] %5p %c{0}:%L - %m%n</pattern>
4+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%pid] [%app] [%thread] %5p %c:%L - %m%n</pattern>
55
</encoder>
66
</appender>
77

0 commit comments

Comments
 (0)