Merge branch 'master' into dev

magic-api-plugins/magic-api-plugin-swagger/src/main/java/org/ssssssss/magicapi/swagger/entity/SwaggerProvider.java

@@ -149,7 +149,7 @@ public class SwaggerProvider {
 				parameter.put("schema", schema);
 				parameters.add(parameter);
 			} else {
-				Object object = JsonUtils.readValue(info.getRequestBody(), Object.class);
+				Object object = JsonUtils.readValue(Objects.toString(info.getResponseBody(), BODY_EMPTY), Object.class);
 				boolean isListOrMap = (object instanceof List || object instanceof Map);
 				if (isListOrMap && BooleanLiteral.isTrue(object)) {
 					parameters.add(SwaggerEntity.createParameter(false, VAR_NAME_REQUEST_BODY, VAR_NAME_REQUEST_BODY, object instanceof List ? VAR_NAME_REQUEST_BODY_VALUE_TYPE_ARRAY : VAR_NAME_REQUEST_BODY_VALUE_TYPE_OBJECT, null, object));

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

@@ -48,10 +48,12 @@ public class ApplicationUriPrinter implements CommandLineRunner {
 		String schema = "http://";
 		String localUrl = schema + PathUtils.replaceSlash(String.format("localhost:%s/%s/%s/", port, contextPath, Objects.toString(properties.getPrefix(), "")));
 		String externUrl = schema + PathUtils.replaceSlash(String.format("%s:%s/%s/%s/", ip, port, contextPath, Objects.toString(properties.getPrefix(), "")));
-		System.out.println(
-				"服务启动成功，magic-api已内置启动! Access URLs:\n\t" +
-						"接口本地地址: \t\t" + localUrl + "\n\t" +
-						"接口外部访问地址: \t" + externUrl
+		System.out.printf(
+				"服务启动成功，magic-api已内置启动! Access URLs:" +
+				"\n\t接口本地地址: \t\t%s" +
+				"\n\t接口外部访问地址: \t\t%s\n"
+				, localUrl
+				, externUrl
 		);
 		if (!StringUtils.isEmpty(magicWebPath)) {
 			String webPath = schema + PathUtils.replaceSlash(String.format("%s:%s/%s/%s/index.html", ip, port, contextPath, magicWebPath));
@@ -59,6 +61,5 @@ public class ApplicationUriPrinter implements CommandLineRunner {
 		}
 		System.out.println("\t可通过配置关闭输出: \tmagic-api.show-url=false");
 		System.out.println("********************************************当前服务相关地址********************************************");
-
 	}
 }