github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Change default theme id to caicai_anatole

pull/146/head
johnniang 2019-04-15 12:00:28 +08:00
parent fae4b9a4ef
commit 4b7df3286f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/run/halo/app/model/support/HaloConst.java
View File

@ -22,7 +22,7 @@ public class HaloConst {
/** /**
* Default theme name. * Default theme name.
*/ */
public final static String DEFAULT_THEME_NAME = "anatole"; public final static String DEFAULT_THEME_ID = "caicai_anatole";
/** /**
* version constant * version constant

4
src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
View File

@ -44,7 +44,7 @@ import java.nio.file.Paths;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; 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 * @author : RYAN0UP
@ -279,7 +279,7 @@ public class ThemeServiceImpl implements ThemeService {
if (StringUtils.isBlank(activatedThemeId)) { if (StringUtils.isBlank(activatedThemeId)) {
synchronized (this) { synchronized (this) {
if (StringUtils.isBlank(activatedThemeId)) { if (StringUtils.isBlank(activatedThemeId)) {
return optionService.getByProperty(PrimaryProperties.THEME).orElse(DEFAULT_THEME_NAME); return optionService.getByProperty(PrimaryProperties.THEME).orElse(DEFAULT_THEME_ID);
} }
} }
} }

4
src/main/java/run/halo/app/web/controller/core/InstallController.java
View File

@ -21,7 +21,7 @@ import javax.validation.Valid;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; 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. * Installation controller.
@ -166,7 +166,7 @@ public class InstallController {
properties.put(BlogProperties.BLOG_LOCALE, installParam.getLocale()); properties.put(BlogProperties.BLOG_LOCALE, installParam.getLocale());
properties.put(BlogProperties.BLOG_TITLE, installParam.getTitle()); properties.put(BlogProperties.BLOG_TITLE, installParam.getTitle());
properties.put(BlogProperties.BLOG_URL, installParam.getUrl()); 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(PrimaryProperties.BIRTHDAY, String.valueOf(System.currentTimeMillis()));
properties.put(EmailProperties.ENABLED, Boolean.FALSE.toString()); properties.put(EmailProperties.ENABLED, Boolean.FALSE.toString());
properties.put(CommentProperties.NEW_NOTICE, Boolean.FALSE.toString()); properties.put(CommentProperties.NEW_NOTICE, Boolean.FALSE.toString());