diff --git a/src/main/java/run/halo/app/config/HaloConfiguration.java b/src/main/java/run/halo/app/config/HaloConfiguration.java index 0b3d8f627..25844f4d1 100644 --- a/src/main/java/run/halo/app/config/HaloConfiguration.java +++ b/src/main/java/run/halo/app/config/HaloConfiguration.java @@ -149,7 +149,8 @@ public class HaloConfiguration { "/api/admin/login", "/api/admin/refresh/*", "/api/admin/installations", - "/api/admin/recoveries/migrations/*" + "/api/admin/recoveries/migrations/*", + "/api/admin/is_installed" ); adminAuthenticationFilter.setFailureHandler( failureHandler); 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 0586dcfc9..57b9091d3 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 @@ -8,9 +8,11 @@ import run.halo.app.cache.lock.CacheLock; import run.halo.app.model.dto.EnvironmentDTO; import run.halo.app.model.dto.StatisticDTO; import run.halo.app.model.params.LoginParam; +import run.halo.app.model.properties.PrimaryProperties; import run.halo.app.model.support.BaseResponse; import run.halo.app.security.token.AuthToken; import run.halo.app.service.AdminService; +import run.halo.app.service.OptionService; import javax.validation.Valid; @@ -28,25 +30,17 @@ public class AdminController { private final AdminService adminService; - public AdminController(AdminService adminService) { + private final OptionService optionService; + + public AdminController(AdminService adminService, OptionService optionService) { this.adminService = adminService; + this.optionService = optionService; } - /** - * Get some statistics about the count of posts, the count of comments, etc. - * - * @return counts - */ - @GetMapping("counts") - @ApiOperation("Gets count info") - public StatisticDTO getCount() { - return adminService.getCount(); - } - - @GetMapping("environments") - @ApiOperation("Gets environments info") - public EnvironmentDTO getEnvironments() { - return adminService.getEnvironments(); + @GetMapping(value = "/is_installed") + @ApiOperation("Check install status") + public boolean isInstall() { + return optionService.getByPropertyOrDefault(PrimaryProperties.IS_INSTALLED, Boolean.class, false); } @PostMapping("login") @@ -70,6 +64,23 @@ public class AdminController { return adminService.refreshToken(refreshToken); } + /** + * Get some statistics about the count of posts, the count of comments, etc. + * + * @return counts + */ + @GetMapping("counts") + @ApiOperation("Gets count info") + public StatisticDTO getCount() { + return adminService.getCount(); + } + + @GetMapping("environments") + @ApiOperation("Gets environments info") + public EnvironmentDTO getEnvironments() { + return adminService.getEnvironments(); + } + @PutMapping("halo-admin") @ApiOperation("Updates halo-admin manually") public void updateAdmin() { @@ -79,6 +90,6 @@ public class AdminController { @GetMapping("spring/logs") @ApiOperation("Get application logs") public BaseResponse getSpringLogs() { - return BaseResponse.ok(HttpStatus.OK.getReasonPhrase(),adminService.getSpringLogs()); + return BaseResponse.ok(HttpStatus.OK.getReasonPhrase(), adminService.getSpringLogs()); } } diff --git a/src/main/resources/templates/common/web/sitemap_html.ftl b/src/main/resources/templates/common/web/sitemap_html.ftl index 2d25a4782..9e24e0f09 100644 --- a/src/main/resources/templates/common/web/sitemap_html.ftl +++ b/src/main/resources/templates/common/web/sitemap_html.ftl @@ -116,10 +116,6 @@ see https://gitee.com/yadong.zhang/DBlog/blob/master/blog-web/src/main/java/com/ overflow: hidden; } } - - @media (min-width: 768px) { - - } @@ -192,7 +188,7 @@ see https://gitee.com/yadong.zhang/DBlog/blob/master/blog-web/src/main/java/com/