Преглед изворни кода

升级Spring Cloud相关组件到最新版

RuoYi пре 3 година
родитељ
комит
ef28473992
15 измењених фајлова са 47 додато и 35 уклоњено
  1. 30 5
      pom.xml
  2. 0 4
      ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring.factories
  3. 3 0
      ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
  4. 0 4
      ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring.factories
  5. 1 0
      ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
  6. 0 4
      ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring.factories
  7. 1 0
      ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
  8. 0 3
      ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring.factories
  9. 2 0
      ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
  10. 0 5
      ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring.factories
  11. 2 0
      ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
  12. 0 6
      ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring.factories
  13. 5 0
      ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
  14. 0 4
      ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring.factories
  15. 3 0
      ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

+ 30 - 5
pom.xml

@@ -17,20 +17,20 @@
17 17
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18 18
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
19 19
         <java.version>1.8</java.version>
20
-        <spring-boot.version>2.6.8</spring-boot.version>
21
-        <spring-cloud.version>2021.0.1</spring-cloud.version>
20
+        <spring-boot.version>2.7.1</spring-boot.version>
21
+        <spring-cloud.version>2021.0.3</spring-cloud.version>
22 22
         <spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
23 23
         <alibaba.nacos.version>2.0.4</alibaba.nacos.version>
24 24
         <alibaba.seata.version>1.5.1</alibaba.seata.version>
25
-        <spring-boot-admin.version>2.6.7</spring-boot-admin.version>
25
+        <spring-boot-admin.version>2.7.2</spring-boot-admin.version>
26 26
         <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
27 27
         <swagger.fox.version>3.0.0</swagger.fox.version>
28 28
         <swagger.core.version>1.6.2</swagger.core.version>
29 29
         <tobato.version>1.27.2</tobato.version>
30 30
         <kaptcha.version>2.3.2</kaptcha.version>
31
-        <pagehelper.boot.version>1.4.1</pagehelper.boot.version>
31
+        <pagehelper.boot.version>1.4.3</pagehelper.boot.version>
32 32
         <druid.version>1.2.11</druid.version>
33
-        <dynamic-ds.version>3.5.0</dynamic-ds.version>
33
+        <dynamic-ds.version>3.5.1</dynamic-ds.version>
34 34
         <commons.io.version>2.11.0</commons.io.version>
35 35
         <commons.fileupload.version>1.4</commons.fileupload.version>
36 36
         <velocity.version>2.3</velocity.version>
@@ -274,4 +274,29 @@
274 274
         </plugins>
275 275
     </build>
276 276
 
277
+	<repositories>
278
+        <repository>
279
+            <id>public</id>
280
+            <name>aliyun nexus</name>
281
+            <url>https://maven.aliyun.com/repository/public</url>
282
+            <releases>
283
+                <enabled>true</enabled>
284
+            </releases>
285
+        </repository>
286
+    </repositories>
287
+
288
+    <pluginRepositories>
289
+        <pluginRepository>
290
+            <id>public</id>
291
+            <name>aliyun nexus</name>
292
+            <url>https://maven.aliyun.com/repository/public</url>
293
+            <releases>
294
+                <enabled>true</enabled>
295
+            </releases>
296
+            <snapshots>
297
+                <enabled>false</enabled>
298
+            </snapshots>
299
+        </pluginRepository>
300
+    </pluginRepositories>
301
+
277 302
 </project>

+ 0 - 4
ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring.factories

@@ -1,4 +0,0 @@
1
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2
-  com.ruoyi.system.api.factory.RemoteUserFallbackFactory,\
3
-  com.ruoyi.system.api.factory.RemoteLogFallbackFactory, \
4
-  com.ruoyi.system.api.factory.RemoteFileFallbackFactory

+ 3 - 0
ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,3 @@
1
+com.ruoyi.system.api.factory.RemoteUserFallbackFactory
2
+com.ruoyi.system.api.factory.RemoteLogFallbackFactory
3
+com.ruoyi.system.api.factory.RemoteFileFallbackFactory

+ 0 - 4
ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring.factories

@@ -1,4 +0,0 @@
1
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2
-  com.ruoyi.common.core.utils.SpringUtils
3
-
4
-  

+ 1 - 0
ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
1
+com.ruoyi.common.core.utils.SpringUtils

+ 0 - 4
ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring.factories

@@ -1,4 +0,0 @@
1
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2
-  com.ruoyi.common.datascope.aspect.DataScopeAspect
3
-
4
-  

+ 1 - 0
ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
1
+com.ruoyi.common.datascope.aspect.DataScopeAspect

+ 0 - 3
ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring.factories

@@ -1,3 +0,0 @@
1
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2
-  com.ruoyi.common.log.service.AsyncLogService,\
3
-  com.ruoyi.common.log.aspect.LogAspect

+ 2 - 0
ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,2 @@
1
+com.ruoyi.common.log.service.AsyncLogService
2
+com.ruoyi.common.log.aspect.LogAspect

+ 0 - 5
ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring.factories

@@ -1,5 +0,0 @@
1
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2
-  com.ruoyi.common.redis.configure.RedisConfig,\
3
-  com.ruoyi.common.redis.service.RedisService
4
-
5
-  

+ 2 - 0
ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,2 @@
1
+com.ruoyi.common.redis.configure.RedisConfig
2
+com.ruoyi.common.redis.service.RedisService

+ 0 - 6
ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring.factories

@@ -1,6 +0,0 @@
1
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2
-  com.ruoyi.common.security.config.WebMvcConfig,\
3
-  com.ruoyi.common.security.service.TokenService,\
4
-  com.ruoyi.common.security.aspect.PreAuthorizeAspect,\
5
-  com.ruoyi.common.security.aspect.InnerAuthAspect,\
6
-  com.ruoyi.common.security.handler.GlobalExceptionHandler

+ 5 - 0
ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,5 @@
1
+com.ruoyi.common.security.config.WebMvcConfig
2
+com.ruoyi.common.security.service.TokenService
3
+com.ruoyi.common.security.aspect.PreAuthorizeAspect
4
+com.ruoyi.common.security.aspect.InnerAuthAspect
5
+com.ruoyi.common.security.handler.GlobalExceptionHandler

+ 0 - 4
ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring.factories

@@ -1,4 +0,0 @@
1
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2
-  com.ruoyi.common.swagger.config.SwaggerAutoConfiguration,\
3
-  com.ruoyi.common.swagger.config.SwaggerWebConfiguration,\
4
-  com.ruoyi.common.swagger.config.SwaggerBeanPostProcessor

+ 3 - 0
ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,3 @@
1
+com.ruoyi.common.swagger.config.SwaggerAutoConfiguration
2
+com.ruoyi.common.swagger.config.SwaggerWebConfiguration
3
+com.ruoyi.common.swagger.config.SwaggerBeanPostProcessor