From 80a6cf0999b30d621c7116117f85182d009cf76d Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Sat, 4 May 2019 11:16:00 +0800
Subject: [PATCH] Add additional static location

---
 .../app/config/WebMvcAutoConfiguration.java   |  3 +-
 .../halo/app/listener/StartedListener.java    | 32 +------------------
 2 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java b/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java
index 07430b10f..d46577754 100644
--- a/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java
+++ b/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java
@@ -79,7 +79,8 @@ public class WebMvcAutoConfiguration implements WebMvcConfigurer {
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         String workDir = FILE_PROTOCOL + haloProperties.getWorkDir();
         registry.addResourceHandler("/static/**")
-                .addResourceLocations("classpath:/static/");
+                .addResourceLocations("classpath:/static/")
+                .addResourceLocations(workDir + "static/");
         registry.addResourceHandler("/**")
                 .addResourceLocations(workDir + "templates/themes/")
                 .addResourceLocations(workDir + "templates/admin/")
diff --git a/src/main/java/run/halo/app/listener/StartedListener.java b/src/main/java/run/halo/app/listener/StartedListener.java
index 9c044b542..2025ed41e 100644
--- a/src/main/java/run/halo/app/listener/StartedListener.java
+++ b/src/main/java/run/halo/app/listener/StartedListener.java
@@ -52,38 +52,8 @@ public class StartedListener implements ApplicationListener<ApplicationStartedEv
         // save halo version to database
         this.printStartInfo();
         this.initThemes();
-
-        // Init user in development environment
-//        if (!haloProperties.isProductionEnv()) {
-//            initAnTestUserIfAbsent();
-//        }
     }
 
-//    /**
-//     * Initialize an test user if absent
-//     */
-//    private void initAnTestUserIfAbsent() {
-//        // Create an user if absent
-//        List<User> users = userService.listAll();
-//
-//        if (users.isEmpty()) {
-//            UserParam userParam = new UserParam();
-//            userParam.setUsername("test");
-//            userParam.setNickname("developer");
-//            userParam.setEmail("test@test.com");
-//            userParam.setPassword("opentest");
-//
-//            log.debug("Initializing a test user: [{}]", userParam);
-//
-//            // Validate the user param
-//            ValidationUtils.validate(userParam, CreateCheck.class);
-//
-//            User testUser = userService.createBy(userParam);
-//
-//            log.debug("Initialized a test user: [{}]", testUser);
-//        }
-//    }
-
     private void printStartInfo() {
         String blogUrl = optionService.getBlogBaseUrl();
 
@@ -102,7 +72,7 @@ public class StartedListener implements ApplicationListener<ApplicationStartedEv
         // Whether the blog has initialized
         Boolean isInstalled = optionService.getByPropertyOrDefault(PrimaryProperties.IS_INSTALLED, Boolean.class, false);
 
-        if (isInstalled) {
+        if (haloProperties.isProductionEnv() && isInstalled) {
             // Skip
             return;
         }