Complete admin redirection

038f9e19 · johnniang · b2af6dcc · 038f9e19 · 038f9e19 · 038f9e19
3 changed file
--- a/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java
+++ b/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java
 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

--- 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";
+    }
 }
--- a/src/main/resources/admin/index.html
+++ b/src/main/resources/admin/index.html
+<!DOCTYPE html>
+<html lang=zh-cmn-Hans>
+<head>
+    <meta charset=utf-8>
+    <meta http-equiv=X-UA-Compatible content="IE=edge">
+    <meta name=viewport content="width=device-width,initial-scale=1">
+    <link rel=icon href=/logo.png>
+    <title>Halo Dashboard</title>
+</head>
+<body>
+<noscript><strong>We're sorry but halo dashboard doesn't work properly without JavaScript enabled. Please enable it to
+    continue.</strong></noscript>
+<div id=app>
+    Hello, Halo Dashboard!
+</div>
+</body>
+</html>
\ No newline at end of file