From ad443bd06d4acb8039d06fb6b49b21d0b3f8922d Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Mon, 29 Apr 2019 03:20:20 +0800
Subject: [PATCH] Replace blank blog url with machine ip when installing

---
 .../run/halo/app/controller/admin/api/InstallController.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/run/halo/app/controller/admin/api/InstallController.java b/src/main/java/run/halo/app/controller/admin/api/InstallController.java
index cd2ee6238..88c69390d 100644
--- a/src/main/java/run/halo/app/controller/admin/api/InstallController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/InstallController.java
@@ -2,6 +2,7 @@ package run.halo.app.controller.admin.api;
 
 import freemarker.template.Configuration;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Controller;
@@ -165,7 +166,8 @@ public class InstallController {
         properties.put(PrimaryProperties.IS_INSTALLED, Boolean.TRUE.toString());
         properties.put(BlogProperties.BLOG_LOCALE, installParam.getLocale());
         properties.put(BlogProperties.BLOG_TITLE, installParam.getTitle());
-        properties.put(BlogProperties.BLOG_URL, installParam.getUrl());
+        properties.put(BlogProperties.BLOG_URL, StringUtils.isBlank(installParam.getUrl()) ?
+                optionService.getBlogBaseUrl() : installParam.getUrl());
         properties.put(PrimaryProperties.THEME, DEFAULT_THEME_ID);
         properties.put(PrimaryProperties.BIRTHDAY, String.valueOf(System.currentTimeMillis()));
         properties.put(EmailProperties.ENABLED, Boolean.FALSE.toString());