diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/SystemInistService.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemInistService.java similarity index 89% rename from litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/SystemInistService.java rename to litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemInistService.java index f425e011..2a34b21c 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/SystemInistService.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemInistService.java @@ -1,26 +1,28 @@ -package org.linlinjava.litemall.wx.service; +package org.linlinjava.litemall.core.system; -import org.linlinjava.litemall.core.system.SystemInfoPrinter; +import org.linlinjava.litemall.core.util.SystemInfoPrinter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; +/** + * 系统启动服务,用于检查系统状态及打印系统信息 + */ @Component -public class SystemInistService { +class SystemInistService { private SystemInistService systemInistService; @Autowired private Environment environment; @PostConstruct - public void inist() { + private void inist() { systemInistService = this; - SystemInfoPrinter.printInfo("WX-API 初始化信息", getSystemInfo()); + SystemInfoPrinter.printInfo("Litemall 初始化信息", getSystemInfo()); } private Map getSystemInfo() { diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemInfoPrinter.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/SystemInfoPrinter.java similarity index 91% rename from litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemInfoPrinter.java rename to litemall-core/src/main/java/org/linlinjava/litemall/core/util/SystemInfoPrinter.java index 1dc2bf19..dac7d57d 100644 --- a/litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemInfoPrinter.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/SystemInfoPrinter.java @@ -1,4 +1,4 @@ -package org.linlinjava.litemall.core.system; +package org.linlinjava.litemall.core.util; import java.util.Map; @@ -21,6 +21,9 @@ public class SystemInfoPrinter { private static void setMaxSize(Map infos) { for (Map.Entry entry : infos.entrySet()) { + if (entry.getValue() == null) + continue; + int size = entry.getKey().length() + entry.getValue().length(); if (size > maxSize) @@ -52,6 +55,9 @@ public class SystemInfoPrinter { } private static void printLine(String head, String line) { + if (line == null) + return; + if (head.startsWith(CREATE_PART_COPPER)) { System.out.println(""); System.out.println(" [[ " + line + " ]]");