revert: halo-dev#1297 (halo-dev#1343)

ruibaby · Apr 8, 2021 · de2b8da · de2b8da
1 parent 1392f09
commit de2b8da
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/src/main/java/run/halo/app/config/properties/HaloProperties.java b/src/main/java/run/halo/app/config/properties/HaloProperties.java
@@ -22,12 +22,6 @@
 @ConfigurationProperties("halo")
 public class HaloProperties {
 
-    /**
-     * Production env. (Default is true)
-     */
-    @Deprecated
-    private boolean productionEnv = true;
-
     /**
      * Authentication enabled.
      */

diff --git a/src/main/java/run/halo/app/listener/StartedListener.java b/src/main/java/run/halo/app/listener/StartedListener.java
@@ -146,10 +146,6 @@ private void initThemes() {
         Boolean isInstalled = optionService
             .getByPropertyOrDefault(PrimaryProperties.IS_INSTALLED, Boolean.class, false);
 
-        if (isInstalled) {
-            return;
-        }
-
         try {
             String themeClassPath = ResourceUtils.CLASSPATH_URL_PREFIX + ThemeService.THEME_FOLDER;
 
@@ -172,7 +168,7 @@ private void initThemes() {
             Path themePath = themeService.getBasePath();
 
             // Fix the problem that the project cannot start after moving to a new server
-            if (!haloProperties.getMode().isProductionEnv() || Files.notExists(themePath)) {
+            if (Files.notExists(themePath) || !isInstalled) {
                 FileUtils.copyFolder(source, themePath);
                 log.debug("Copied theme folder from [{}] to [{}]", source, themePath);
             } else {