diff --git a/src/main/java/run/halo/app/model/support/HaloConst.java b/src/main/java/run/halo/app/model/support/HaloConst.java index 56a5b3397..820064065 100644 --- a/src/main/java/run/halo/app/model/support/HaloConst.java +++ b/src/main/java/run/halo/app/model/support/HaloConst.java @@ -22,7 +22,7 @@ public class HaloConst { /** * Default theme name. */ - public final static String DEFAULT_THEME_NAME = "anatole"; + public final static String DEFAULT_THEME_ID = "caicai_anatole"; /** * version constant diff --git a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java index 1bc493c05..02b7955a3 100644 --- a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java @@ -44,7 +44,7 @@ import java.nio.file.Paths; import java.util.*; import java.util.stream.Collectors; -import static run.halo.app.model.support.HaloConst.DEFAULT_THEME_NAME; +import static run.halo.app.model.support.HaloConst.DEFAULT_THEME_ID; /** * @author : RYAN0UP @@ -279,7 +279,7 @@ public class ThemeServiceImpl implements ThemeService { if (StringUtils.isBlank(activatedThemeId)) { synchronized (this) { if (StringUtils.isBlank(activatedThemeId)) { - return optionService.getByProperty(PrimaryProperties.THEME).orElse(DEFAULT_THEME_NAME); + return optionService.getByProperty(PrimaryProperties.THEME).orElse(DEFAULT_THEME_ID); } } } diff --git a/src/main/java/run/halo/app/web/controller/core/InstallController.java b/src/main/java/run/halo/app/web/controller/core/InstallController.java index a81088090..77d8a09c5 100644 --- a/src/main/java/run/halo/app/web/controller/core/InstallController.java +++ b/src/main/java/run/halo/app/web/controller/core/InstallController.java @@ -21,7 +21,7 @@ import javax.validation.Valid; import java.util.HashMap; import java.util.Map; -import static run.halo.app.model.support.HaloConst.DEFAULT_THEME_NAME; +import static run.halo.app.model.support.HaloConst.DEFAULT_THEME_ID; /** * Installation controller. @@ -166,7 +166,7 @@ public class InstallController { properties.put(BlogProperties.BLOG_LOCALE, installParam.getLocale()); properties.put(BlogProperties.BLOG_TITLE, installParam.getTitle()); properties.put(BlogProperties.BLOG_URL, installParam.getUrl()); - properties.put(PrimaryProperties.THEME, DEFAULT_THEME_NAME); + properties.put(PrimaryProperties.THEME, DEFAULT_THEME_ID); properties.put(PrimaryProperties.BIRTHDAY, String.valueOf(System.currentTimeMillis())); properties.put(EmailProperties.ENABLED, Boolean.FALSE.toString()); properties.put(CommentProperties.NEW_NOTICE, Boolean.FALSE.toString());