Merge branch 'dev-activity-faw' of...

Merge branch 'dev-activity-faw' of http://gitlab.afanticar.com:13140/java-ms/afanti-open-api into develop

pom.xml

@@ -22,6 +22,48 @@
             <groupId>com.afanticar</groupId>
             <artifactId>afanti-activity-api</artifactId>
             <version>1.0.1-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.redisson</groupId>
+                    <artifactId>redisson-spring-boot-starter</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.baomidou</groupId>
+                    <artifactId>mybatis-plus-boot-starter</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.baomidou</groupId>
+                    <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>cn.hutool</groupId>
+                    <artifactId>hutool-core</artifactId>
+                </exclusion>
+                <exclusion>
+                        <groupId>cn.hutool</groupId>
+                        <artifactId>hutool-crypto</artifactId>
+                </exclusion>
+                <exclusion>
+                        <groupId>cn.hutool</groupId>
+                        <artifactId>hutool-extra</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.afanticar</groupId>
+                    <artifactId>afanticar-swagger2-starter</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.afanticar</groupId>
+                    <artifactId>afanticar-rocketmq-starter</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.baomidou</groupId>
+                    <artifactId>mybatis-plus-extension</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.github.xiaoymin</groupId>
+                    <artifactId>knife4j-spring-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -210,6 +252,24 @@
         <!--        运维类依赖-->
 
         <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>mapstruct</artifactId>
+                    <groupId>org.mapstruct</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!--<dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
             <version>2.10.5</version>
@@ -227,7 +287,7 @@
             </exclusions>
         </dependency>
 
-        <!--解决Swagger 2.9.2版本NumberFormatException-->
+        &lt;!&ndash;解决Swagger 2.9.2版本NumberFormatException&ndash;&gt;
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-models</artifactId>
@@ -237,7 +297,7 @@
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
             <version>1.6.0</version>
-        </dependency>
+        </dependency>-->
 
     </dependencies>
 

src/main/java/com/afanticar/afantiopenapi/AfantiOpenApiApplication.java

@@ -5,14 +5,14 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
  *
  * @author Chin
  *
  */
-//@EnableSwagger2WebMvc
+//@EnableSwagger2
 @SpringBootApplication
 @EnableScheduling
 @EnableFeignClients(basePackages = {"com.afanticar"})

src/main/resources/bootstrap.yml

@@ -46,10 +46,6 @@ spring:
           username-property: spring.datasource.dynamic.datasource.tmp.username
           password-property: spring.datasource.dynamic.datasource.tmp.password
 
-ali:
-  ons:
-    rocketmq:
-      enable: false
 #
 #
 #