From ef28473992976191df31cf9e0c405c7d36019582 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 15 Jul 2022 14:32:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7Spring=20Cloud=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E7=BB=84=E4=BB=B6=E5=88=B0=E6=9C=80=E6=96=B0=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 35 ++++++++++++++++---
 .../main/resources/META-INF/spring.factories  |  4 ---
 ...ot.autoconfigure.AutoConfiguration.imports |  3 ++
 .../main/resources/META-INF/spring.factories  |  4 ---
 ...ot.autoconfigure.AutoConfiguration.imports |  1 +
 .../main/resources/META-INF/spring.factories  |  4 ---
 ...ot.autoconfigure.AutoConfiguration.imports |  1 +
 .../main/resources/META-INF/spring.factories  |  3 --
 ...ot.autoconfigure.AutoConfiguration.imports |  2 ++
 .../main/resources/META-INF/spring.factories  |  5 ---
 ...ot.autoconfigure.AutoConfiguration.imports |  2 ++
 .../main/resources/META-INF/spring.factories  |  6 ----
 ...ot.autoconfigure.AutoConfiguration.imports |  5 +++
 .../main/resources/META-INF/spring.factories  |  4 ---
 ...ot.autoconfigure.AutoConfiguration.imports |  3 ++
 15 files changed, 47 insertions(+), 35 deletions(-)
 delete mode 100644 ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring.factories
 create mode 100644 ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
 delete mode 100644 ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring.factories
 create mode 100644 ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
 delete mode 100644 ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring.factories
 create mode 100644 ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
 delete mode 100644 ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring.factories
 create mode 100644 ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
 delete mode 100644 ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring.factories
 create mode 100644 ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
 delete mode 100644 ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring.factories
 create mode 100644 ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
 delete mode 100644 ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring.factories
 create mode 100644 ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

diff --git a/pom.xml b/pom.xml
index 5d1f4d3df..a2cde13ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,20 +17,20 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring-boot.version>2.6.8</spring-boot.version>
-        <spring-cloud.version>2021.0.1</spring-cloud.version>
+        <spring-boot.version>2.7.1</spring-boot.version>
+        <spring-cloud.version>2021.0.3</spring-cloud.version>
         <spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
         <alibaba.nacos.version>2.0.4</alibaba.nacos.version>
         <alibaba.seata.version>1.5.1</alibaba.seata.version>
-        <spring-boot-admin.version>2.6.7</spring-boot-admin.version>
+        <spring-boot-admin.version>2.7.2</spring-boot-admin.version>
         <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
         <swagger.fox.version>3.0.0</swagger.fox.version>
         <swagger.core.version>1.6.2</swagger.core.version>
         <tobato.version>1.27.2</tobato.version>
         <kaptcha.version>2.3.2</kaptcha.version>
-        <pagehelper.boot.version>1.4.1</pagehelper.boot.version>
+        <pagehelper.boot.version>1.4.3</pagehelper.boot.version>
         <druid.version>1.2.11</druid.version>
-        <dynamic-ds.version>3.5.0</dynamic-ds.version>
+        <dynamic-ds.version>3.5.1</dynamic-ds.version>
         <commons.io.version>2.11.0</commons.io.version>
         <commons.fileupload.version>1.4</commons.fileupload.version>
         <velocity.version>2.3</velocity.version>
@@ -274,4 +274,29 @@
         </plugins>
     </build>
 
+	<repositories>
+        <repository>
+            <id>public</id>
+            <name>aliyun nexus</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>public</id>
+            <name>aliyun nexus</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
 </project>
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring.factories b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 19bdae5d5..000000000
--- a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,4 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.ruoyi.system.api.factory.RemoteUserFallbackFactory,\
-  com.ruoyi.system.api.factory.RemoteLogFallbackFactory, \
-  com.ruoyi.system.api.factory.RemoteFileFallbackFactory
diff --git a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 000000000..9212ec047
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,3 @@
+com.ruoyi.system.api.factory.RemoteUserFallbackFactory
+com.ruoyi.system.api.factory.RemoteLogFallbackFactory
+com.ruoyi.system.api.factory.RemoteFileFallbackFactory
diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 2628f3277..000000000
--- a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,4 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.ruoyi.common.core.utils.SpringUtils
-
-  
diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 000000000..be83fa9c9
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.ruoyi.common.core.utils.SpringUtils
diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index a9bc860f5..000000000
--- a/ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,4 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.ruoyi.common.datascope.aspect.DataScopeAspect
-
-  
diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 000000000..7402737a0
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.ruoyi.common.datascope.aspect.DataScopeAspect
diff --git a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 4a5ae7d58..000000000
--- a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,3 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.ruoyi.common.log.service.AsyncLogService,\
-  com.ruoyi.common.log.aspect.LogAspect
diff --git a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 000000000..b94398bcb
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+com.ruoyi.common.log.service.AsyncLogService
+com.ruoyi.common.log.aspect.LogAspect
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 60d1d47bb..000000000
--- a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,5 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.ruoyi.common.redis.configure.RedisConfig,\
-  com.ruoyi.common.redis.service.RedisService
-
-  
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 000000000..1ef6ccaf7
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+com.ruoyi.common.redis.configure.RedisConfig
+com.ruoyi.common.redis.service.RedisService
diff --git a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 0158210b3..000000000
--- a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,6 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.ruoyi.common.security.config.WebMvcConfig,\
-  com.ruoyi.common.security.service.TokenService,\
-  com.ruoyi.common.security.aspect.PreAuthorizeAspect,\
-  com.ruoyi.common.security.aspect.InnerAuthAspect,\
-  com.ruoyi.common.security.handler.GlobalExceptionHandler
diff --git a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 000000000..38915f2f4
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,5 @@
+com.ruoyi.common.security.config.WebMvcConfig
+com.ruoyi.common.security.service.TokenService
+com.ruoyi.common.security.aspect.PreAuthorizeAspect
+com.ruoyi.common.security.aspect.InnerAuthAspect
+com.ruoyi.common.security.handler.GlobalExceptionHandler
diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 9eab23d11..000000000
--- a/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,4 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.ruoyi.common.swagger.config.SwaggerAutoConfiguration,\
-  com.ruoyi.common.swagger.config.SwaggerWebConfiguration,\
-  com.ruoyi.common.swagger.config.SwaggerBeanPostProcessor
\ No newline at end of file
diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 000000000..1ed284c88
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,3 @@
+com.ruoyi.common.swagger.config.SwaggerAutoConfiguration
+com.ruoyi.common.swagger.config.SwaggerWebConfiguration
+com.ruoyi.common.swagger.config.SwaggerBeanPostProcessor