Explorar o código

升级Spring Cloud组件到最新版

RuoYi %!s(int64=5) %!d(string=hai) anos
pai
achega
00e2c7f04d
Modificáronse 2 ficheiros con 23 adicións e 30 borrados
  1. 5 12
      pom.xml
  2. 18 18
      ruoyi-common/ruoyi-common-core/pom.xml

+ 5 - 12
pom.xml

@@ -17,11 +17,11 @@
17
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
18
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
19
         <java.version>1.8</java.version>
19
         <java.version>1.8</java.version>
20
-        <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
21
-        <spring-cloud.version>Hoxton.SR4</spring-cloud.version>
22
-		<spring-boot-admin.version>2.2.3</spring-boot-admin.version>
20
+        <spring-boot.version>2.3.4.RELEASE</spring-boot.version>
21
+        <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
22
+        <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>
23
+		<spring-boot-admin.version>2.3.0</spring-boot-admin.version>
23
         <spring-boot.mybatis>2.1.2</spring-boot.mybatis>
24
         <spring-boot.mybatis>2.1.2</spring-boot.mybatis>
24
-        <nacos.version>1.3.0</nacos.version>
25
         <swagger.fox.version>2.9.2</swagger.fox.version>
25
         <swagger.fox.version>2.9.2</swagger.fox.version>
26
         <swagger.core.version>1.5.24</swagger.core.version>
26
         <swagger.core.version>1.5.24</swagger.core.version>
27
         <kaptcha.version>2.3.2</kaptcha.version>
27
         <kaptcha.version>2.3.2</kaptcha.version>
@@ -51,18 +51,11 @@
51
             <dependency>
51
             <dependency>
52
                 <groupId>com.alibaba.cloud</groupId>
52
                 <groupId>com.alibaba.cloud</groupId>
53
                 <artifactId>spring-cloud-alibaba-dependencies</artifactId>
53
                 <artifactId>spring-cloud-alibaba-dependencies</artifactId>
54
-                <version>2.2.1.RELEASE</version>
54
+                <version>${spring-cloud-alibaba.version}</version>
55
                 <type>pom</type>
55
                 <type>pom</type>
56
                 <scope>import</scope>
56
                 <scope>import</scope>
57
             </dependency>
57
             </dependency>
58
 
58
 
59
-			<!-- Alibaba Nacos 配置 -->
60
-			<dependency>
61
-			    <groupId>com.alibaba.nacos</groupId>
62
-			    <artifactId>nacos-client</artifactId>
63
-			    <version>${nacos.version}</version>
64
-			</dependency>
65
-
66
             <!-- SpringBoot 依赖配置 -->
59
             <!-- SpringBoot 依赖配置 -->
67
             <dependency>
60
             <dependency>
68
                 <groupId>org.springframework.boot</groupId>
61
                 <groupId>org.springframework.boot</groupId>

+ 18 - 18
ruoyi-common/ruoyi-common-core/pom.xml

@@ -16,13 +16,13 @@
16
     </description>
16
     </description>
17
 
17
 
18
     <dependencies>
18
     <dependencies>
19
-    
19
+
20
     	<!-- SpringCloud Openfeign -->
20
     	<!-- SpringCloud Openfeign -->
21
         <dependency>
21
         <dependency>
22
             <groupId>org.springframework.cloud</groupId>
22
             <groupId>org.springframework.cloud</groupId>
23
             <artifactId>spring-cloud-starter-openfeign</artifactId>
23
             <artifactId>spring-cloud-starter-openfeign</artifactId>
24
     	</dependency>
24
     	</dependency>
25
-    
25
+
26
     	<!-- Spring Context Support -->
26
     	<!-- Spring Context Support -->
27
     	<dependency>
27
     	<dependency>
28
             <groupId>org.springframework</groupId>
28
             <groupId>org.springframework</groupId>
@@ -34,73 +34,73 @@
34
             <groupId>org.springframework</groupId>
34
             <groupId>org.springframework</groupId>
35
             <artifactId>spring-web</artifactId>
35
             <artifactId>spring-web</artifactId>
36
     	</dependency>
36
     	</dependency>
37
-		
37
+
38
         <!-- Apache Commons Pool2 -->
38
         <!-- Apache Commons Pool2 -->
39
         <dependency>
39
         <dependency>
40
             <groupId>org.apache.commons</groupId>
40
             <groupId>org.apache.commons</groupId>
41
             <artifactId>commons-pool2</artifactId>
41
             <artifactId>commons-pool2</artifactId>
42
         </dependency>
42
         </dependency>
43
-        
43
+
44
         <!-- Pagehelper -->
44
         <!-- Pagehelper -->
45
         <dependency>
45
         <dependency>
46
             <groupId>com.github.pagehelper</groupId>
46
             <groupId>com.github.pagehelper</groupId>
47
             <artifactId>pagehelper-spring-boot-starter</artifactId>
47
             <artifactId>pagehelper-spring-boot-starter</artifactId>
48
         </dependency>
48
         </dependency>
49
-    
50
-        <!-- Java Validation -->
49
+
50
+        <!-- Hibernate Validator -->
51
         <dependency>
51
         <dependency>
52
-            <groupId>javax.validation</groupId>
53
-            <artifactId>validation-api</artifactId>
52
+            <groupId>org.springframework.boot</groupId>
53
+            <artifactId>spring-boot-starter-validation</artifactId>
54
         </dependency>
54
         </dependency>
55
-        
55
+
56
         <!-- Jackson -->
56
         <!-- Jackson -->
57
         <dependency>
57
         <dependency>
58
             <groupId>com.fasterxml.jackson.core</groupId>
58
             <groupId>com.fasterxml.jackson.core</groupId>
59
             <artifactId>jackson-databind</artifactId>
59
             <artifactId>jackson-databind</artifactId>
60
         </dependency>
60
         </dependency>
61
-		
61
+
62
         <!-- Alibaba Fastjson -->
62
         <!-- Alibaba Fastjson -->
63
         <dependency>
63
         <dependency>
64
             <groupId>com.alibaba</groupId>
64
             <groupId>com.alibaba</groupId>
65
             <artifactId>fastjson</artifactId>
65
             <artifactId>fastjson</artifactId>
66
         </dependency>
66
         </dependency>
67
-        
67
+
68
         <!-- Apache Lang3 -->
68
         <!-- Apache Lang3 -->
69
         <dependency>
69
         <dependency>
70
             <groupId>org.apache.commons</groupId>
70
             <groupId>org.apache.commons</groupId>
71
             <artifactId>commons-lang3</artifactId>
71
             <artifactId>commons-lang3</artifactId>
72
         </dependency>
72
         </dependency>
73
-		
73
+
74
         <!-- Commons Io -->
74
         <!-- Commons Io -->
75
         <dependency>
75
         <dependency>
76
             <groupId>commons-io</groupId>
76
             <groupId>commons-io</groupId>
77
             <artifactId>commons-io</artifactId>
77
             <artifactId>commons-io</artifactId>
78
         </dependency>
78
         </dependency>
79
-		
79
+
80
         <!-- Commons Fileupload -->
80
         <!-- Commons Fileupload -->
81
         <dependency>
81
         <dependency>
82
             <groupId>commons-fileupload</groupId>
82
             <groupId>commons-fileupload</groupId>
83
             <artifactId>commons-fileupload</artifactId>
83
             <artifactId>commons-fileupload</artifactId>
84
         </dependency>
84
         </dependency>
85
-        
85
+
86
         <!-- excel工具 -->
86
         <!-- excel工具 -->
87
         <dependency>
87
         <dependency>
88
             <groupId>org.apache.poi</groupId>
88
             <groupId>org.apache.poi</groupId>
89
             <artifactId>poi-ooxml</artifactId>
89
             <artifactId>poi-ooxml</artifactId>
90
         </dependency>
90
         </dependency>
91
-		
91
+
92
         <!-- Java Servlet -->
92
         <!-- Java Servlet -->
93
         <dependency>
93
         <dependency>
94
             <groupId>javax.servlet</groupId>
94
             <groupId>javax.servlet</groupId>
95
             <artifactId>javax.servlet-api</artifactId>
95
             <artifactId>javax.servlet-api</artifactId>
96
         </dependency>
96
         </dependency>
97
-		
97
+
98
         <!-- Swagger -->
98
         <!-- Swagger -->
99
         <dependency>
99
         <dependency>
100
             <groupId>io.swagger</groupId>
100
             <groupId>io.swagger</groupId>
101
             <artifactId>swagger-annotations</artifactId>
101
             <artifactId>swagger-annotations</artifactId>
102
         </dependency>
102
         </dependency>
103
-		
103
+
104
     </dependencies>
104
     </dependencies>
105
-    
105
+
106
 </project>
106
 </project>