From 86177973cdd4f832b6ab047056b5d99a87ce3ebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=A2=A6=E6=8A=80=E6=9C=AF?= <596392912@qq.com>
Date: Tue, 13 Jul 2021 17:50:06 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=9B=B4=E5=8A=A0=E7=B2=BE?=
 =?UTF-8?q?=E5=87=86=E7=9A=84=E7=AB=AF=E5=8F=A3=E8=AF=BB=E5=8F=96=E5=92=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20magic-api=20showUrl=20=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spring/boot/starter/ApplicationUriPrinter.java  |  5 ++++-
 .../spring/boot/starter/MagicAPIProperties.java     | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ApplicationUriPrinter.java b/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ApplicationUriPrinter.java
index 57dd6e98..4b53162a 100644
--- a/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ApplicationUriPrinter.java
+++ b/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ApplicationUriPrinter.java
@@ -4,6 +4,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.web.context.WebServerApplicationContext;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.stereotype.Component;
@@ -29,6 +30,8 @@ public class ApplicationUriPrinter implements CommandLineRunner {
 	private ConfigurableEnvironment springEnv;
 	@Autowired
 	private MagicAPIProperties properties;
+	@Autowired
+	private WebServerApplicationContext serverApplicationContext;
 
 	@Override
 	public void run(String... args) throws Exception {
@@ -39,7 +42,7 @@ public class ApplicationUriPrinter implements CommandLineRunner {
 		} catch (UnknownHostException e) {
 			System.out.println("当前服务地址获取失败");
 		}
-		String port = springEnv.getProperty("server.port", "port");
+		int port = serverApplicationContext.getWebServer().getPort();
 		String path = springEnv.getProperty("server.servlet.context-path", "");
 		String magicWebPath = properties.getWeb();
 		String schema = "http://";
diff --git a/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIProperties.java b/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIProperties.java
index aaca653a..69fb40d9 100644
--- a/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIProperties.java
+++ b/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIProperties.java
@@ -97,6 +97,10 @@ public class MagicAPIProperties {
 	 */
 	private String pushPath = "/_magic-api-sync";
 
+	/**
+	 * 启动完成之后打印地址
+	 */
+	private boolean showUrl = true;
 
 	@NestedConfigurationProperty
 	private SecurityConfig securityConfig = new SecurityConfig();
@@ -325,4 +329,13 @@ public class MagicAPIProperties {
 	public void setPushPath(String pushPath) {
 		this.pushPath = pushPath;
 	}
+
+	public boolean isShowUrl() {
+		return showUrl;
+	}
+
+	public MagicAPIProperties setShowUrl(boolean showUrl) {
+		this.showUrl = showUrl;
+		return this;
+	}
 }