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

fix: #1394 (#1396)

pull/1401/head
Ryan Wang 2021-06-11 23:45:37 +08:00 committed by GitHub
parent 9de40a0a1c
commit e72fe2179a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/run/halo/app/controller/admin/api/InstallController.java
View File

@ -295,21 +295,7 @@ public class InstallController {
properties.put(BlogProperties.BLOG_URL, properties.put(BlogProperties.BLOG_URL,
StringUtils.isBlank(installParam.getUrl()) ? optionService.getBlogBaseUrl() : StringUtils.isBlank(installParam.getUrl()) ? optionService.getBlogBaseUrl() :
installParam.getUrl()); installParam.getUrl());
Long birthday =
optionService.getByPropertyOrDefault(PrimaryProperties.BIRTHDAY, Long.class, 0L);
if (birthday.equals(0L)) {
properties.put(PrimaryProperties.BIRTHDAY, String.valueOf(System.currentTimeMillis()));
}
Boolean globalAbsolutePathEnabled = optionService
.getByPropertyOrDefault(OtherProperties.GLOBAL_ABSOLUTE_PATH_ENABLED, Boolean.class,
null);
if (globalAbsolutePathEnabled == null) {
properties.put(OtherProperties.GLOBAL_ABSOLUTE_PATH_ENABLED, Boolean.FALSE.toString()); properties.put(OtherProperties.GLOBAL_ABSOLUTE_PATH_ENABLED, Boolean.FALSE.toString());
}
// Create properties // Create properties
optionService.saveProperties(properties); optionService.saveProperties(properties);

2
src/test/java/run/halo/app/it/IndexPageRequestTest.java
View File

@ -33,7 +33,7 @@ class IndexPageRequestTest extends BaseApiTest {
// validate post link // validate post link
Element postTitleLink = Element postTitleLink =
document.body().selectFirst(".content > .post > .post-title > h3 > a"); document.body().selectFirst(".content > .post > .post-title > h3 > a");
assertEquals(blogUrl + "/archives/hello-halo", postTitleLink.attr("href")); assertEquals("/archives/hello-halo", postTitleLink.attr("href"));
assertEquals("Hello Halo", postTitleLink.text()); assertEquals("Hello Halo", postTitleLink.text());
} }
} }