优化代码

magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ApplicationUriPrinter.java

@@ -7,13 +7,16 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.stereotype.Component;
+import org.ssssssss.magicapi.utils.PathUtils;
 
 import javax.annotation.Resource;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.Objects;
 
 /**
  * 输出服务访问地址
+ *
  * @author 冰点
  * @date 2021-6-3 12:08:59
  * @since 1.2.1
@@ -22,35 +25,36 @@ import java.net.UnknownHostException;
 @ConditionalOnProperty(name = "magic-api.show-url", havingValue = "true", matchIfMissing = true)
 @Order
 public class ApplicationUriPrinter implements CommandLineRunner {
-    @Resource
-    private ConfigurableEnvironment springEnv;
-    @Autowired
-    private  MagicAPIProperties properties;
-    @Override
-    public void run(String... args) throws Exception {
-        System.out.println("****************************************************当前服务相关地址start****************************************************");
-        String ip = "IP";
-        try {
-            ip = InetAddress.getLocalHost().getHostAddress();
-        } catch (UnknownHostException e) {
-            System.out.println("当前服务地址获取失败");
-        }
-        String port = springEnv.getProperty("server.port","port");
-        String path =springEnv.getProperty("server.servlet.context-path","");
-        String magicWebPath =properties.getWeb();
-        System.out.println(
-                "服务启动成功，magic-api已内置启动! Access URLs:\n\t" +
-                        "接口本地地址: \t\thttp://localhost:" + port + path + "/\n\t" +
-                        "接口外部访问地址: \thttp://" + ip + ":" + port + path + "/"
-        );
-        if(!StringUtils.isEmpty(magicWebPath)){
-            if(!magicWebPath.startsWith("/")){
-                magicWebPath="/"+magicWebPath;
-            }
-            System.out.println("\t接口配置平台: \t\thttp://" + ip + ":" + port +path+ magicWebPath + "/index.html\n");
-        }
+	@Resource
+	private ConfigurableEnvironment springEnv;
+	@Autowired
+	private MagicAPIProperties properties;
 
-        System.out.println("****************************************************当前服务相关地址end 可通过配置关闭输出magic-api.show-url=false****************************************************");
+	@Override
+	public void run(String... args) throws Exception {
+		System.out.println("********************************************当前服务相关地址********************************************");
+		String ip = "IP";
+		try {
+			ip = InetAddress.getLocalHost().getHostAddress();
+		} catch (UnknownHostException e) {
+			System.out.println("当前服务地址获取失败");
+		}
+		String port = springEnv.getProperty("server.port", "port");
+		String path = springEnv.getProperty("server.servlet.context-path", "");
+		String magicWebPath = properties.getWeb();
+		String localUrl = PathUtils.replaceSlash(String.format("http://localhost:%s/%s/%s/",port,path, Objects.toString(properties.getPrefix(),"")));
+		String externUrl = PathUtils.replaceSlash(String.format("http://%s:%s/%s/%s/",ip,port,path, Objects.toString(properties.getPrefix(),"")));
+		System.out.println(
+				"服务启动成功，magic-api已内置启动! Access URLs:\n\t" +
+						"接口本地地址: \t\t"+localUrl+"\n\t" +
+						"接口外部访问地址: \t" + externUrl
+		);
+		if (!StringUtils.isEmpty(magicWebPath)) {
+            String webPath = PathUtils.replaceSlash(String.format("http://%s:%s/%s/%s/index.html", ip, port, path, magicWebPath));
+            System.out.println("\t接口配置平台: \t\t" + webPath);
+		}
+		System.out.println("\t可通过配置关闭输出: \tmagic-api.show-url=false");
+		System.out.println("********************************************当前服务相关地址********************************************");
 
-    }
+	}
 }