diff --git a/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java b/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java index e9181f3ed..f84eecce2 100644 --- a/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java +++ b/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java @@ -1,7 +1,6 @@ package run.halo.app.config; import com.fasterxml.jackson.databind.ObjectMapper; -import freemarker.template.TemplateExceptionHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.jackson.JsonComponentModule; import org.springframework.context.annotation.Bean; @@ -78,7 +77,7 @@ public class WebMvcAutoConfiguration implements WebMvcConfigurer { registry.addResourceHandler("/static/**") .addResourceLocations("classpath:/static/"); registry.addResourceHandler("/**") - .addResourceLocations("classpath:/templates/themes/") + .addResourceLocations("classpath:/admin/") .addResourceLocations(FILE_PROTOCOL + haloProperties.getWorkDir() + "templates/themes/"); registry.addResourceHandler("/upload/**") .addResourceLocations(FILE_PROTOCOL + haloProperties.getWorkDir() + "upload/"); @@ -87,7 +86,7 @@ public class WebMvcAutoConfiguration implements WebMvcConfigurer { registry.addResourceHandler("/backup/**") .addResourceLocations(FILE_PROTOCOL + haloProperties.getWorkDir() + "backup/"); registry.addResourceHandler("/admin/**") - .addResourceLocations("classpath:/static/admin/"); + .addResourceLocations("classpath:/admin/"); if (!haloProperties.isDocDisabled()) { // If doc is enable diff --git a/src/main/java/run/halo/app/web/controller/content/ContentIndexController.java b/src/main/java/run/halo/app/web/controller/content/ContentIndexController.java index 3c91545a0..ed4ec203d 100644 --- a/src/main/java/run/halo/app/web/controller/content/ContentIndexController.java +++ b/src/main/java/run/halo/app/web/controller/content/ContentIndexController.java @@ -83,4 +83,9 @@ public class ContentIndexController { model.addAttribute("rainbow", rainbow); return themeService.render("index"); } + + @GetMapping("/admin") + public String admin() { + return "redirect:/admin/index.html"; + } } diff --git a/src/main/resources/admin/index.html b/src/main/resources/admin/index.html new file mode 100644 index 000000000..f1d9af69b --- /dev/null +++ b/src/main/resources/admin/index.html @@ -0,0 +1,17 @@ + + + + + + + + Halo Dashboard + + + +
+ Hello, Halo Dashboard! +
+ + \ No newline at end of file