Просмотр исходного кода

升级spring-boot-mybatis到最新版2.2.0

RuoYi лет назад: 4
Родитель
Сommit
83ee4223be
1 измененных файлов с 23 добавлено и 23 удалено
  1. 23 23
      pom.xml

+ 23 - 23
pom.xml

@@ -22,7 +22,7 @@
22
         <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
22
         <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
23
         <alibaba.nacos.version>2.0.2</alibaba.nacos.version>
23
         <alibaba.nacos.version>2.0.2</alibaba.nacos.version>
24
         <spring-boot-admin.version>2.4.3</spring-boot-admin.version>
24
         <spring-boot-admin.version>2.4.3</spring-boot-admin.version>
25
-        <spring-boot.mybatis>2.1.4</spring-boot.mybatis>
25
+        <spring-boot.mybatis>2.2.0</spring-boot.mybatis>
26
         <swagger.fox.version>3.0.0</swagger.fox.version>
26
         <swagger.fox.version>3.0.0</swagger.fox.version>
27
         <swagger.core.version>1.6.2</swagger.core.version>
27
         <swagger.core.version>1.6.2</swagger.core.version>
28
         <tobato.version>1.26.5</tobato.version>
28
         <tobato.version>1.26.5</tobato.version>
@@ -35,7 +35,7 @@
35
         <velocity.version>1.7</velocity.version>
35
         <velocity.version>1.7</velocity.version>
36
         <fastjson.version>1.2.76</fastjson.version>
36
         <fastjson.version>1.2.76</fastjson.version>
37
         <minio.version>8.2.1</minio.version>
37
         <minio.version>8.2.1</minio.version>
38
-		<poi.version>4.1.2</poi.version>
38
+        <poi.version>4.1.2</poi.version>
39
         <common-pool.version>2.6.2</common-pool.version>
39
         <common-pool.version>2.6.2</common-pool.version>
40
         <commons-collections.version>3.2.2</commons-collections.version>
40
         <commons-collections.version>3.2.2</commons-collections.version>
41
     </properties>
41
     </properties>
@@ -53,7 +53,7 @@
53
                 <scope>import</scope>
53
                 <scope>import</scope>
54
             </dependency>
54
             </dependency>
55
 
55
 
56
-			<!-- SpringCloud Alibaba 微服务 -->
56
+            <!-- SpringCloud Alibaba 微服务 -->
57
             <dependency>
57
             <dependency>
58
                 <groupId>com.alibaba.cloud</groupId>
58
                 <groupId>com.alibaba.cloud</groupId>
59
                 <artifactId>spring-cloud-alibaba-dependencies</artifactId>
59
                 <artifactId>spring-cloud-alibaba-dependencies</artifactId>
@@ -77,28 +77,28 @@
77
                 <type>pom</type>
77
                 <type>pom</type>
78
                 <scope>import</scope>
78
                 <scope>import</scope>
79
             </dependency>
79
             </dependency>
80
-			
80
+
81
             <!--  SpringBoot 监控客户端 -->
81
             <!--  SpringBoot 监控客户端 -->
82
             <dependency>
82
             <dependency>
83
                 <groupId>de.codecentric</groupId>
83
                 <groupId>de.codecentric</groupId>
84
                 <artifactId>spring-boot-admin-starter-client</artifactId>
84
                 <artifactId>spring-boot-admin-starter-client</artifactId>
85
                 <version>${spring-boot-admin.version}</version>
85
                 <version>${spring-boot-admin.version}</version>
86
             </dependency>
86
             </dependency>
87
-			
87
+
88
             <!-- FastDFS 分布式文件系统 -->
88
             <!-- FastDFS 分布式文件系统 -->
89
             <dependency>
89
             <dependency>
90
                 <groupId>com.github.tobato</groupId>
90
                 <groupId>com.github.tobato</groupId>
91
                 <artifactId>fastdfs-client</artifactId>
91
                 <artifactId>fastdfs-client</artifactId>
92
                 <version>${tobato.version}</version>
92
                 <version>${tobato.version}</version>
93
             </dependency>
93
             </dependency>
94
-			
94
+
95
             <!-- Mybatis 依赖配置 -->
95
             <!-- Mybatis 依赖配置 -->
96
             <dependency>
96
             <dependency>
97
                 <groupId>org.mybatis.spring.boot</groupId>
97
                 <groupId>org.mybatis.spring.boot</groupId>
98
                 <artifactId>mybatis-spring-boot-starter</artifactId>
98
                 <artifactId>mybatis-spring-boot-starter</artifactId>
99
                 <version>${spring-boot.mybatis}</version>
99
                 <version>${spring-boot.mybatis}</version>
100
             </dependency>
100
             </dependency>
101
-			
101
+
102
             <!-- Swagger 依赖配置 -->
102
             <!-- Swagger 依赖配置 -->
103
             <dependency>
103
             <dependency>
104
                 <groupId>io.swagger</groupId>
104
                 <groupId>io.swagger</groupId>
@@ -172,7 +172,7 @@
172
                 <artifactId>fastjson</artifactId>
172
                 <artifactId>fastjson</artifactId>
173
                 <version>${fastjson.version}</version>
173
                 <version>${fastjson.version}</version>
174
             </dependency>
174
             </dependency>
175
-            
175
+
176
             <!-- 公共资源池 -->
176
             <!-- 公共资源池 -->
177
             <dependency>
177
             <dependency>
178
                 <groupId>org.apache.commons</groupId>
178
                 <groupId>org.apache.commons</groupId>
@@ -181,71 +181,71 @@
181
             </dependency>
181
             </dependency>
182
 
182
 
183
             <!-- 核心模块 -->
183
             <!-- 核心模块 -->
184
-	        <dependency>
184
+            <dependency>
185
                 <groupId>com.ruoyi</groupId>
185
                 <groupId>com.ruoyi</groupId>
186
                 <artifactId>ruoyi-common-core</artifactId>
186
                 <artifactId>ruoyi-common-core</artifactId>
187
                 <version>${ruoyi.version}</version>
187
                 <version>${ruoyi.version}</version>
188
             </dependency>
188
             </dependency>
189
-			
189
+
190
             <!-- 接口模块 -->
190
             <!-- 接口模块 -->
191
             <dependency>
191
             <dependency>
192
                 <groupId>com.ruoyi</groupId>
192
                 <groupId>com.ruoyi</groupId>
193
                 <artifactId>ruoyi-common-swagger</artifactId>
193
                 <artifactId>ruoyi-common-swagger</artifactId>
194
                 <version>${ruoyi.version}</version>
194
                 <version>${ruoyi.version}</version>
195
             </dependency>
195
             </dependency>
196
-	        
196
+
197
             <!-- 安全模块 -->
197
             <!-- 安全模块 -->
198
             <dependency>
198
             <dependency>
199
                 <groupId>com.ruoyi</groupId>
199
                 <groupId>com.ruoyi</groupId>
200
                 <artifactId>ruoyi-common-security</artifactId>
200
                 <artifactId>ruoyi-common-security</artifactId>
201
                 <version>${ruoyi.version}</version>
201
                 <version>${ruoyi.version}</version>
202
             </dependency>
202
             </dependency>
203
-	        
203
+
204
             <!-- 权限范围 -->
204
             <!-- 权限范围 -->
205
             <dependency>
205
             <dependency>
206
                 <groupId>com.ruoyi</groupId>
206
                 <groupId>com.ruoyi</groupId>
207
                 <artifactId>ruoyi-common-datascope</artifactId>
207
                 <artifactId>ruoyi-common-datascope</artifactId>
208
                 <version>${ruoyi.version}</version>
208
                 <version>${ruoyi.version}</version>
209
             </dependency>
209
             </dependency>
210
-            
210
+
211
             <!-- 多数据源 -->
211
             <!-- 多数据源 -->
212
             <dependency>
212
             <dependency>
213
                 <groupId>com.ruoyi</groupId>
213
                 <groupId>com.ruoyi</groupId>
214
                 <artifactId>ruoyi-common-datasource</artifactId>
214
                 <artifactId>ruoyi-common-datasource</artifactId>
215
                 <version>${ruoyi.version}</version>
215
                 <version>${ruoyi.version}</version>
216
             </dependency>
216
             </dependency>
217
-			
217
+
218
             <!-- 日志记录 -->
218
             <!-- 日志记录 -->
219
             <dependency>
219
             <dependency>
220
                 <groupId>com.ruoyi</groupId>
220
                 <groupId>com.ruoyi</groupId>
221
                 <artifactId>ruoyi-common-log</artifactId>
221
                 <artifactId>ruoyi-common-log</artifactId>
222
                 <version>${ruoyi.version}</version>
222
                 <version>${ruoyi.version}</version>
223
             </dependency>
223
             </dependency>
224
-			
224
+
225
             <!-- 缓存服务 -->
225
             <!-- 缓存服务 -->
226
             <dependency>
226
             <dependency>
227
                 <groupId>com.ruoyi</groupId>
227
                 <groupId>com.ruoyi</groupId>
228
                 <artifactId>ruoyi-common-redis</artifactId>
228
                 <artifactId>ruoyi-common-redis</artifactId>
229
                 <version>${ruoyi.version}</version>
229
                 <version>${ruoyi.version}</version>
230
             </dependency>
230
             </dependency>
231
-			
231
+
232
             <!-- 系统接口 -->
232
             <!-- 系统接口 -->
233
             <dependency>
233
             <dependency>
234
                 <groupId>com.ruoyi</groupId>
234
                 <groupId>com.ruoyi</groupId>
235
                 <artifactId>ruoyi-api-system</artifactId>
235
                 <artifactId>ruoyi-api-system</artifactId>
236
                 <version>${ruoyi.version}</version>
236
                 <version>${ruoyi.version}</version>
237
             </dependency>
237
             </dependency>
238
-			
238
+
239
         </dependencies>
239
         </dependencies>
240
     </dependencyManagement>
240
     </dependencyManagement>
241
 
241
 
242
     <modules>
242
     <modules>
243
-		<module>ruoyi-auth</module>
244
-		<module>ruoyi-gateway</module>
245
-		<module>ruoyi-visual</module>
246
-		<module>ruoyi-modules</module>
247
-		<module>ruoyi-api</module>
248
-		<module>ruoyi-common</module>
243
+        <module>ruoyi-auth</module>
244
+        <module>ruoyi-gateway</module>
245
+        <module>ruoyi-visual</module>
246
+        <module>ruoyi-modules</module>
247
+        <module>ruoyi-api</module>
248
+        <module>ruoyi-common</module>
249
     </modules>
249
     </modules>
250
     <packaging>pom</packaging>
250
     <packaging>pom</packaging>
251
 
251