diff --git a/src/main/java/com/rebuild/core/support/SysbaseHeartbeat.java b/src/main/java/com/rebuild/core/support/SysbaseHeartbeat.java index 7f31a7b38..a8b8dc226 100644 --- a/src/main/java/com/rebuild/core/support/SysbaseHeartbeat.java +++ b/src/main/java/com/rebuild/core/support/SysbaseHeartbeat.java @@ -164,9 +164,11 @@ public class SysbaseHeartbeat { } /** + * 获取最新的日志文件 + * * @return */ - public static File getLogbackFile() { + public static File getLastLogbackFile() { LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); Logger lg = lc.getLogger("ROOT"); FileAppender fa = (FileAppender) lg.getAppender("FILE"); diff --git a/src/main/java/com/rebuild/core/support/SysbaseSupport.java b/src/main/java/com/rebuild/core/support/SysbaseSupport.java index e4f098996..47bb2ab50 100644 --- a/src/main/java/com/rebuild/core/support/SysbaseSupport.java +++ b/src/main/java/com/rebuild/core/support/SysbaseSupport.java @@ -57,7 +57,7 @@ public class SysbaseSupport { vmLog.append(System.getProperties()); log.warn(vmLog.append("----------").toString()); - File logFile = SysbaseHeartbeat.getLogbackFile(); + File logFile = SysbaseHeartbeat.getLastLogbackFile(); JSONObject resJson; try { diff --git a/src/main/java/com/rebuild/web/admin/AdminVerfiyController.java b/src/main/java/com/rebuild/web/admin/AdminVerfiyController.java index e1c6474a9..56ed51bf0 100644 --- a/src/main/java/com/rebuild/web/admin/AdminVerfiyController.java +++ b/src/main/java/com/rebuild/web/admin/AdminVerfiyController.java @@ -125,10 +125,10 @@ public class AdminVerfiyController extends BaseController { return; } - final String type = getParameterNotNull(request, "type"); + final String type = getParameter(request, "type", "log"); // 日志 if ("log".equalsIgnoreCase(type)) { - File logFile = SysbaseHeartbeat.getLogbackFile(); + File logFile = SysbaseHeartbeat.getLastLogbackFile(); FileDownloader.setDownloadHeaders(response, logFile.getName(), false); FileDownloader.writeLocalFile(logFile, response); return; diff --git a/src/test/java/com/rebuild/core/support/SysbaseSupportTest.java b/src/test/java/com/rebuild/core/support/SysbaseSupportTest.java index 568ae3388..47571595f 100644 --- a/src/test/java/com/rebuild/core/support/SysbaseSupportTest.java +++ b/src/test/java/com/rebuild/core/support/SysbaseSupportTest.java @@ -26,7 +26,7 @@ class SysbaseSupportTest { void getLogbackFile() throws IOException { log.info("SysbaseSupportTest#getLogbackFile"); - File file = SysbaseHeartbeat.getLogbackFile(); + File file = SysbaseHeartbeat.getLastLogbackFile(); System.out.println(file + " >> " + file.exists()); System.out.println(FileUtils.readFileToString(file, AppUtils.UTF8)); }