diff --git a/wx-dump-admin/src/main/java/com/xcs/wx/WxDumpApplication.java b/wx-dump-admin/src/main/java/com/xcs/wx/WxDumpApplication.java index 3618ec3..917f74a 100644 --- a/wx-dump-admin/src/main/java/com/xcs/wx/WxDumpApplication.java +++ b/wx-dump-admin/src/main/java/com/xcs/wx/WxDumpApplication.java @@ -2,9 +2,14 @@ package com.xcs.wx; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.transaction.annotation.EnableTransactionManagement; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Date; + /** * @author xcs * @date 2023年12月21日 17时02分 @@ -14,7 +19,26 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @EnableTransactionManagement public class WxDumpApplication { - public static void main(String[] args) { - SpringApplication.run(WxDumpApplication.class, args); + public static void main(String[] args) throws UnknownHostException { + long startTime = System.currentTimeMillis(); + ConfigurableApplicationContext context = SpringApplication.run(WxDumpApplication.class, args); + long endTime = System.currentTimeMillis(); + + String port = context.getEnvironment().getProperty("server.port", "8080"); + String contextPath = context.getEnvironment().getProperty("server.servlet.context-path", ""); + String localHostAddress = InetAddress.getLocalHost().getHostAddress(); + + String localUrl = "http://localhost:" + port + contextPath; + String networkUrl = "http://" + localHostAddress + ":" + port + contextPath; + + System.out.println("DONE successfully in " + (endTime - startTime) + "ms"); + System.out.println("Time: " + new Date()); + System.out.println("╔════════════════════════════════════════════════════╗"); + System.out.println("║ App listening at: ║"); + System.out.println("║ > Local: " + localUrl + " "); + System.out.println("║ > Network: " + networkUrl + " "); + System.out.println("║ ║"); + System.out.println("║ Now you can open browser with the above addresses↑ ║"); + System.out.println("╚════════════════════════════════════════════════════╝"); } } diff --git a/wx-dump-admin/src/main/java/com/xcs/wx/repository/impl/MsgRepositoryImpl.java b/wx-dump-admin/src/main/java/com/xcs/wx/repository/impl/MsgRepositoryImpl.java index d20a4ee..33bdbd0 100644 --- a/wx-dump-admin/src/main/java/com/xcs/wx/repository/impl/MsgRepositoryImpl.java +++ b/wx-dump-admin/src/main/java/com/xcs/wx/repository/impl/MsgRepositoryImpl.java @@ -50,21 +50,21 @@ public class MsgRepositoryImpl extends ServiceImpl implements Ms @Override public List queryMsgBySequence(String poolName, Long nextSequence) { - log.info("开始查询数据:[{}][{}]", poolName, nextSequence); + log.info("Start querying data:[{}][{}]", poolName, nextSequence); // 切换数据源 DynamicDataSourceContextHolder.push(poolName); // 根据数量与序列号获取消息 List msgs = getBaseMapper().queryMsgBySequence(nextSequence); // 清理动态数据源 DynamicDataSourceContextHolder.clear(); - log.info("结束查询数据:[{}][{}]", poolName, nextSequence); + log.info("End querying data:[{}][{}]", poolName, nextSequence); // 返回数据 return msgs; } @Override public boolean saveBatch(String poolName, List msg) { - log.info("开始新增数据:[{}][{}]", poolName, msg.size()); + log.info("Start adding new data:[{}][{}]", poolName, msg.size()); // 切换数据源 DynamicDataSourceContextHolder.push(poolName); // 批量执行 @@ -74,7 +74,7 @@ public class MsgRepositoryImpl extends ServiceImpl implements Ms }); // 清理动态数据源 DynamicDataSourceContextHolder.clear(); - log.info("结束新增数据:[{}][{}]", poolName, msg.size()); + log.info("End adding new data:[{}][{}]", poolName, msg.size()); // 返回数据 return true; } diff --git a/wx-dump-admin/src/main/java/com/xcs/wx/service/impl/ChatRoomServiceImpl.java b/wx-dump-admin/src/main/java/com/xcs/wx/service/impl/ChatRoomServiceImpl.java index fb5906f..2a551e5 100644 --- a/wx-dump-admin/src/main/java/com/xcs/wx/service/impl/ChatRoomServiceImpl.java +++ b/wx-dump-admin/src/main/java/com/xcs/wx/service/impl/ChatRoomServiceImpl.java @@ -157,7 +157,7 @@ public class ChatRoomServiceImpl implements ChatRoomService { // 群成员 chatRoomDetailVo.setMembers(chatRoomMapping.convert(membersList, headImgUrlMap, contactNicknameMap)); } catch (InvalidProtocolBufferException e) { - log.error("解析RoomData失败,群聊名称:{},群聊标题:{},错误信息:{}", chatRoomDetailVo.getChatRoomName(), chatRoomDetailVo.getChatRoomTitle(), e); + log.error("Failed to parse RoomData", e); } } diff --git a/wx-dump-admin/src/main/java/com/xcs/wx/service/impl/DatabaseServiceImpl.java b/wx-dump-admin/src/main/java/com/xcs/wx/service/impl/DatabaseServiceImpl.java index 2cef036..f3f063a 100644 --- a/wx-dump-admin/src/main/java/com/xcs/wx/service/impl/DatabaseServiceImpl.java +++ b/wx-dump-admin/src/main/java/com/xcs/wx/service/impl/DatabaseServiceImpl.java @@ -99,7 +99,7 @@ public class DatabaseServiceImpl implements DatabaseService, ApplicationRunner { // 合并聊天记录 mergeMsg(); } catch (Exception e) { - log.error("Sqlite数据库解密失败", e); + log.error("Sqlite database decryption failed", e); } } diff --git a/wx-dump-admin/src/main/java/com/xcs/wx/service/impl/MsgServiceImpl.java b/wx-dump-admin/src/main/java/com/xcs/wx/service/impl/MsgServiceImpl.java index 06cd369..97a6b9b 100644 --- a/wx-dump-admin/src/main/java/com/xcs/wx/service/impl/MsgServiceImpl.java +++ b/wx-dump-admin/src/main/java/com/xcs/wx/service/impl/MsgServiceImpl.java @@ -139,7 +139,7 @@ public class MsgServiceImpl implements MsgService { } } } catch (InvalidProtocolBufferException e) { - log.error("获取对话人Id失败", e); + log.error("Failed to obtain the conversationalist Id", e); } return talker; } diff --git a/wx-dump-admin/src/main/java/com/xcs/wx/util/XmlUtil.java b/wx-dump-admin/src/main/java/com/xcs/wx/util/XmlUtil.java index c56f23c..fe730c9 100644 --- a/wx-dump-admin/src/main/java/com/xcs/wx/util/XmlUtil.java +++ b/wx-dump-admin/src/main/java/com/xcs/wx/util/XmlUtil.java @@ -31,7 +31,7 @@ public class XmlUtil { } return MAPPER.readValue(content, valueType); } catch (JsonProcessingException e) { - log.error("解析XML失败", e); + log.error("Parsing XML failed", e); } return null; } diff --git a/wx-dump-admin/src/main/resources/application.yml b/wx-dump-admin/src/main/resources/application.yml index 460abeb..395fab2 100644 --- a/wx-dump-admin/src/main/resources/application.yml +++ b/wx-dump-admin/src/main/resources/application.yml @@ -33,4 +33,12 @@ wechat-offset: "[3.9.10.19]": nickname: 95129768 account: 95129544 - mobile: 95129576 \ No newline at end of file + mobile: 95129576 + "[3.9.10.27]": + nickname: 95125656 + account: 95126992 + mobile: 95125464 + +mybatis-plus: + global-config: + banner: off \ No newline at end of file diff --git a/wx-dump-admin/src/main/resources/banner.txt b/wx-dump-admin/src/main/resources/banner.txt new file mode 100644 index 0000000..6675992 --- /dev/null +++ b/wx-dump-admin/src/main/resources/banner.txt @@ -0,0 +1,9 @@ +JDK Version: ${java.version} +Spring Boot Version: ${spring-boot.version} +## ## ## ## ######## ## ## ## ## ######## ## ## +## ## ## ## ## ## ## ## ## ### ### ## ## ## ## ## +## ## ## ## ## ## ## ## ## #### #### ## ## ## ## ## +## ## ## ### ####### ## ## ## ## ## ### ## ######## ####### ## ## ## +## ## ## ## ## ## ## ## ## ## ## ## ######### ## ## +## ## ## ## ## ## ## ## ## ## ## ## ## ## ## + ### ### ## ## ######## ####### ## ## ## ## ######