From 3778560b8315a05dd84e714cc3c6ebc9b656f0d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 13 Oct 2022 16:11:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xm-bootstrap/src/main/java/com/{xm => }/AutoConfig.java      | 2 +-
 .../xm => xm-bootstrap/src/main/java/com}/SwaggerConfig.java | 5 +++--
 .../src/main/java/com/{xm => }/WebSecurityConfig.java        | 2 +-
 xm-bootstrap/src/main/java/com/{xm => }/XmApplication.java   | 4 +---
 xm-core/src/test/java/com/{xm => }/AutoConfig.java           | 3 +--
 .../com/xm => xm-core/src/test/java/com}/SwaggerConfig.java  | 5 +++--
 xm-core/src/test/java/com/{xm => }/WebSecurityConfig.java    | 2 +-
 xm-core/src/test/java/com/{xm => }/XmApplication.java        | 4 +---
 8 files changed, 12 insertions(+), 15 deletions(-)
 rename xm-bootstrap/src/main/java/com/{xm => }/AutoConfig.java (96%)
 rename {xm-core/src/test/java/com/xm => xm-bootstrap/src/main/java/com}/SwaggerConfig.java (92%)
 rename xm-bootstrap/src/main/java/com/{xm => }/WebSecurityConfig.java (99%)
 rename xm-bootstrap/src/main/java/com/{xm => }/XmApplication.java (75%)
 rename xm-core/src/test/java/com/{xm => }/AutoConfig.java (79%)
 rename {xm-bootstrap/src/main/java/com/xm => xm-core/src/test/java/com}/SwaggerConfig.java (92%)
 rename xm-core/src/test/java/com/{xm => }/WebSecurityConfig.java (99%)
 rename xm-core/src/test/java/com/{xm => }/XmApplication.java (75%)

diff --git a/xm-bootstrap/src/main/java/com/xm/AutoConfig.java b/xm-bootstrap/src/main/java/com/AutoConfig.java
similarity index 96%
rename from xm-bootstrap/src/main/java/com/xm/AutoConfig.java
rename to xm-bootstrap/src/main/java/com/AutoConfig.java
index 40e5e089..eb3c3b90 100644
--- a/xm-bootstrap/src/main/java/com/xm/AutoConfig.java
+++ b/xm-bootstrap/src/main/java/com/AutoConfig.java
@@ -1,4 +1,4 @@
-package com.xm;
+package com;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/xm-core/src/test/java/com/xm/SwaggerConfig.java b/xm-bootstrap/src/main/java/com/SwaggerConfig.java
similarity index 92%
rename from xm-core/src/test/java/com/xm/SwaggerConfig.java
rename to xm-bootstrap/src/main/java/com/SwaggerConfig.java
index 54ac7fcc..565943e3 100644
--- a/xm-core/src/test/java/com/xm/SwaggerConfig.java
+++ b/xm-bootstrap/src/main/java/com/SwaggerConfig.java
@@ -1,4 +1,4 @@
-package com.xm;
+package com;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -19,7 +19,8 @@ import java.util.List;
 /**
  * api 文档,
  * 生产环境需要禁止访问,每个项目需要单独引入swagger包，不能继承
- *
+ * 如果要mdp swagger enhance生效，必须 把启动文件置于com.mdp的上层或者顶层目录下，否则加载不到升级文件
+ * mdp swagger enhance主要解决的是接收参数是map的时候的文档输出问题。参考 https://blog.csdn.net/x11819130/article/details/111608470
  * 需要将下面路径放到 WebSecurityConfig 中
  *
  *                 "/swagger-ui.html",
diff --git a/xm-bootstrap/src/main/java/com/xm/WebSecurityConfig.java b/xm-bootstrap/src/main/java/com/WebSecurityConfig.java
similarity index 99%
rename from xm-bootstrap/src/main/java/com/xm/WebSecurityConfig.java
rename to xm-bootstrap/src/main/java/com/WebSecurityConfig.java
index 03e892d1..7541a5e2 100644
--- a/xm-bootstrap/src/main/java/com/xm/WebSecurityConfig.java
+++ b/xm-bootstrap/src/main/java/com/WebSecurityConfig.java
@@ -1,4 +1,4 @@
-package com.xm;
+package com;
 
 import com.mdp.oauth2.client.resource.MdpJwtAuthenticationConverter;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/xm-bootstrap/src/main/java/com/xm/XmApplication.java b/xm-bootstrap/src/main/java/com/XmApplication.java
similarity index 75%
rename from xm-bootstrap/src/main/java/com/xm/XmApplication.java
rename to xm-bootstrap/src/main/java/com/XmApplication.java
index 3ba22042..410f5e25 100644
--- a/xm-bootstrap/src/main/java/com/xm/XmApplication.java
+++ b/xm-bootstrap/src/main/java/com/XmApplication.java
@@ -1,10 +1,8 @@
-package com.xm;
+package com;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
-import org.springframework.stereotype.Component;
 
 @SpringCloudApplication
 @EnableRedisHttpSession
diff --git a/xm-core/src/test/java/com/xm/AutoConfig.java b/xm-core/src/test/java/com/AutoConfig.java
similarity index 79%
rename from xm-core/src/test/java/com/xm/AutoConfig.java
rename to xm-core/src/test/java/com/AutoConfig.java
index e286a917..623fad96 100644
--- a/xm-core/src/test/java/com/xm/AutoConfig.java
+++ b/xm-core/src/test/java/com/AutoConfig.java
@@ -1,8 +1,7 @@
-package com.xm;
+package com;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
  * 要使用mdp平台功能，必须 扫码com.mdp包
diff --git a/xm-bootstrap/src/main/java/com/xm/SwaggerConfig.java b/xm-core/src/test/java/com/SwaggerConfig.java
similarity index 92%
rename from xm-bootstrap/src/main/java/com/xm/SwaggerConfig.java
rename to xm-core/src/test/java/com/SwaggerConfig.java
index 54ac7fcc..565943e3 100644
--- a/xm-bootstrap/src/main/java/com/xm/SwaggerConfig.java
+++ b/xm-core/src/test/java/com/SwaggerConfig.java
@@ -1,4 +1,4 @@
-package com.xm;
+package com;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -19,7 +19,8 @@ import java.util.List;
 /**
  * api 文档,
  * 生产环境需要禁止访问,每个项目需要单独引入swagger包，不能继承
- *
+ * 如果要mdp swagger enhance生效，必须 把启动文件置于com.mdp的上层或者顶层目录下，否则加载不到升级文件
+ * mdp swagger enhance主要解决的是接收参数是map的时候的文档输出问题。参考 https://blog.csdn.net/x11819130/article/details/111608470
  * 需要将下面路径放到 WebSecurityConfig 中
  *
  *                 "/swagger-ui.html",
diff --git a/xm-core/src/test/java/com/xm/WebSecurityConfig.java b/xm-core/src/test/java/com/WebSecurityConfig.java
similarity index 99%
rename from xm-core/src/test/java/com/xm/WebSecurityConfig.java
rename to xm-core/src/test/java/com/WebSecurityConfig.java
index 504daf23..57774695 100644
--- a/xm-core/src/test/java/com/xm/WebSecurityConfig.java
+++ b/xm-core/src/test/java/com/WebSecurityConfig.java
@@ -1,4 +1,4 @@
-package com.xm;
+package com;
 
 import com.mdp.oauth2.client.resource.MdpJwtAuthenticationConverter;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/xm-core/src/test/java/com/xm/XmApplication.java b/xm-core/src/test/java/com/XmApplication.java
similarity index 75%
rename from xm-core/src/test/java/com/xm/XmApplication.java
rename to xm-core/src/test/java/com/XmApplication.java
index 57a5c3ad..706123ef 100644
--- a/xm-core/src/test/java/com/xm/XmApplication.java
+++ b/xm-core/src/test/java/com/XmApplication.java
@@ -1,10 +1,8 @@
-package com.xm;
+package com;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 //@ComponentScan(basePackages={"com.mdp","com.xm"})
 @SpringBootApplication