From 459b9be347d7967fa3b90c485df3191368da9af8 Mon Sep 17 00:00:00 2001
From: yangjiyu <yangjiyu@fkhwl.com>
Date: Wed, 23 Nov 2022 14:00:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=95=B4=E8=A7=A3=E5=86=B3POM?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

原因是因为supreme项目没有正确推送导致远端拉回来的版本号持续错误，同时把swagger版本号统一升到3.0.0 hutool升到5.8.10
---
 aos-element/aos-element-common/pom.xml            |  1 -
 coffee/aos-swagger/pom.xml                        |  1 -
 coffee/aos-web/pom.xml                            |  1 -
 .../aos/web/advice/ControllerResponseAdvice.java  | 15 ++++++++++-----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/aos-element/aos-element-common/pom.xml b/aos-element/aos-element-common/pom.xml
index 8617a90..e1df443 100644
--- a/aos-element/aos-element-common/pom.xml
+++ b/aos-element/aos-element-common/pom.xml
@@ -45,7 +45,6 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-core</artifactId>
-            <version>5.8.10</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
diff --git a/coffee/aos-swagger/pom.xml b/coffee/aos-swagger/pom.xml
index 7f98642..2518ccf 100644
--- a/coffee/aos-swagger/pom.xml
+++ b/coffee/aos-swagger/pom.xml
@@ -43,7 +43,6 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
-            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
diff --git a/coffee/aos-web/pom.xml b/coffee/aos-web/pom.xml
index e174ca3..5e9d52a 100644
--- a/coffee/aos-web/pom.xml
+++ b/coffee/aos-web/pom.xml
@@ -87,7 +87,6 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/coffee/aos-web/src/main/java/com/aos/web/advice/ControllerResponseAdvice.java b/coffee/aos-web/src/main/java/com/aos/web/advice/ControllerResponseAdvice.java
index eb6aafb..24b2e81 100644
--- a/coffee/aos-web/src/main/java/com/aos/web/advice/ControllerResponseAdvice.java
+++ b/coffee/aos-web/src/main/java/com/aos/web/advice/ControllerResponseAdvice.java
@@ -7,7 +7,9 @@ import com.aos.web.exception.AosWebBizException;
 import com.aos.web.exception.WebResultCode;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
@@ -16,8 +18,10 @@ import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+
 import springfox.documentation.swagger.web.ApiResourceController;
-import springfox.documentation.swagger2.web.Swagger2Controller;
+import springfox.documentation.swagger2.web.Swagger2ControllerWebFlux;
+import springfox.documentation.swagger2.web.Swagger2ControllerWebMvc;
 
 
 /**
@@ -48,14 +52,15 @@ public class ControllerResponseAdvice implements ResponseBodyAdvice<Object> {
          * 跳过swagger
          */
         boolean apiResourceController = !methodParameter.getDeclaringClass().isAssignableFrom(ApiResourceController.class);
-        boolean swagger2Controller = !methodParameter.getDeclaringClass().isAssignableFrom(Swagger2Controller.class);
-
-        return apiResourceController && swagger2Controller && (assignableFrom && hasAnnotation);
+        boolean swagger2ControllerWebFlux = !methodParameter.getDeclaringClass().isAssignableFrom(Swagger2ControllerWebFlux.class);
+        boolean swagger2ControllerWebMvc = !methodParameter.getDeclaringClass().isAssignableFrom(Swagger2ControllerWebMvc.class);
 
+        return apiResourceController && swagger2ControllerWebFlux && swagger2ControllerWebMvc && (assignableFrom && hasAnnotation);
     }
 
     @Override
-    public Object beforeBodyWrite(Object data, MethodParameter returnType, MediaType selectedContentType, Class<? extends HttpMessageConverter<?>> selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
+    public Object beforeBodyWrite(Object data, MethodParameter returnType, MediaType selectedContentType, Class<?
+        extends HttpMessageConverter<?>> selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
         if (returnType.getGenericParameterType().equals(String.class)) {
             try {
                 /**