From e2d8792da4342dec89fa4954f8f8c1af912ac8ae Mon Sep 17 00:00:00 2001 From: johnniang Date: Tue, 7 May 2019 11:33:58 +0800 Subject: [PATCH] Add version api for halo application --- .../java/run/halo/app/config/HaloConfiguration.java | 2 +- .../halo/app/controller/admin/api/AdminController.java | 1 + .../controller/content/{api => }/MainController.java | 10 +++++++++- .../java/run/halo/app/model/support/HaloConst.java | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) rename src/main/java/run/halo/app/controller/content/{api => }/MainController.java (62%) diff --git a/src/main/java/run/halo/app/config/HaloConfiguration.java b/src/main/java/run/halo/app/config/HaloConfiguration.java index cdaf7256e..ebef84943 100644 --- a/src/main/java/run/halo/app/config/HaloConfiguration.java +++ b/src/main/java/run/halo/app/config/HaloConfiguration.java @@ -97,7 +97,7 @@ public class HaloConfiguration { OptionService optionService) { ContentFilter contentFilter = new ContentFilter(haloProperties, optionService); contentFilter.setFailureHandler(new ContentAuthenticationFailureHandler()); - contentFilter.addExcludeUrlPatterns("/api/*", "/install", "/admin/*", "/js/*", "/css/*"); + contentFilter.addExcludeUrlPatterns("/api/*", "/install", "/version", "/admin/*", "/js/*", "/css/*"); FilterRegistrationBean contentFrb = new FilterRegistrationBean<>(); contentFrb.addUrlPatterns("/*"); diff --git a/src/main/java/run/halo/app/controller/admin/api/AdminController.java b/src/main/java/run/halo/app/controller/admin/api/AdminController.java index 89c3c5413..b8906642e 100644 --- a/src/main/java/run/halo/app/controller/admin/api/AdminController.java +++ b/src/main/java/run/halo/app/controller/admin/api/AdminController.java @@ -66,4 +66,5 @@ public class AdminController { public AuthToken refresh(@PathVariable("refreshToken") String refreshToken) { return adminService.refreshToken(refreshToken); } + } diff --git a/src/main/java/run/halo/app/controller/content/api/MainController.java b/src/main/java/run/halo/app/controller/content/MainController.java similarity index 62% rename from src/main/java/run/halo/app/controller/content/api/MainController.java rename to src/main/java/run/halo/app/controller/content/MainController.java index b511257b8..12b95ffd2 100644 --- a/src/main/java/run/halo/app/controller/content/api/MainController.java +++ b/src/main/java/run/halo/app/controller/content/MainController.java @@ -1,7 +1,9 @@ -package run.halo.app.controller.content.api; +package run.halo.app.controller.content; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import run.halo.app.model.support.HaloConst; /** * Admin page. @@ -22,4 +24,10 @@ public class MainController { public String installation() { return "redirect:/admin/index.html#install"; } + + @GetMapping("/version") + @ResponseBody + public String version() { + return HaloConst.HALO_VERSION; + } } diff --git a/src/main/java/run/halo/app/model/support/HaloConst.java b/src/main/java/run/halo/app/model/support/HaloConst.java index 37e295a68..922aeb6d1 100644 --- a/src/main/java/run/halo/app/model/support/HaloConst.java +++ b/src/main/java/run/halo/app/model/support/HaloConst.java @@ -76,6 +76,7 @@ public class HaloConst { public static String USER_SESSION_KEY = "user_session"; static { + // Set version HALO_VERSION = HaloConst.class.getPackage().getImplementationVersion(); } }