Skip to content

Commit 03088d0

Browse files
author
Janche
committed
🐛 升级部分依赖的版本,修复批量新增的bug
1 parent 2740ebe commit 03088d0

File tree

5 files changed

+25
-27
lines changed

5 files changed

+25
-27
lines changed

common/src/main/java/com/example/janche/common/core/TkMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.example.janche.common.core;
22

3+
import tk.mybatis.mapper.additional.insert.InsertListMapper;
34
import tk.mybatis.mapper.common.BaseMapper;
45
import tk.mybatis.mapper.common.ConditionMapper;
56
import tk.mybatis.mapper.common.ExampleMapper;
6-
import tk.mybatis.mapper.common.MySqlMapper;
77

88
/**
99
* <P></P>
@@ -14,7 +14,7 @@
1414
*/
1515
public interface TkMapper<T> extends
1616
BaseMapper<T>,
17-
MySqlMapper<T>,
17+
InsertListMapper<T>,
1818
ConditionMapper<T>,
1919
ExampleMapper<T>{
2020
}

pom.xml

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,20 @@
2121
<properties>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24-
<druid.version>1.1.10</druid.version>
24+
<druid.version>1.1.21</druid.version>
2525
<jedis.version>2.9.0</jedis.version>
2626
<poi.version>3.17</poi.version>
27-
<mybatis.version>3.5.0</mybatis.version>
28-
<pagehelper.version>4.1.6</pagehelper.version>
27+
<bean.utils>1.9.4</bean.utils>
28+
<fastjson>1.2.68</fastjson>
2929
</properties>
3030

3131
<parent>
3232
<groupId>org.springframework.boot</groupId>
3333
<artifactId>spring-boot-starter-parent</artifactId>
34-
<version>2.1.4.RELEASE</version>
34+
<version>2.1.8.RELEASE</version>
3535
<relativePath/> <!-- lookup parent from repository -->
3636
</parent>
3737

38-
3938
<dependencies>
4039
<dependency>
4140
<groupId>org.springframework.boot</groupId>
@@ -61,17 +60,17 @@
6160
<dependency>
6261
<groupId>org.apache.commons</groupId>
6362
<artifactId>commons-lang3</artifactId>
64-
<version>3.8.1</version>
63+
<version>3.10</version>
6564
</dependency>
6665
<dependency>
6766
<groupId>commons-beanutils</groupId>
6867
<artifactId>commons-beanutils</artifactId>
69-
<version>1.9.3</version>
68+
<version>${bean.utils}</version>
7069
</dependency>
7170
<dependency>
7271
<groupId>com.alibaba</groupId>
7372
<artifactId>fastjson</artifactId>
74-
<version>1.2.47</version>
73+
<version>${fastjson}</version>
7574
</dependency>
7675
<dependency>
7776
<groupId>org.projectlombok</groupId>
@@ -115,24 +114,23 @@
115114
<dependency>
116115
<groupId>org.apache.poi</groupId>
117116
<artifactId>poi-ooxml</artifactId>
118-
<version>3.17</version>
117+
<version>${poi.version}</version>
119118
</dependency>
120119
<!-- poi end -->
121120

122-
<!-- lombok -->
123-
<dependency>
124-
<groupId>org.projectlombok</groupId>
125-
<artifactId>lombok</artifactId>
126-
<optional>true</optional>
127-
</dependency>
128-
129121
<!-- mybatis分页插件 pagehelper -->
130122
<dependency>
131123
<groupId>com.github.pagehelper</groupId>
132124
<artifactId>pagehelper-spring-boot-starter</artifactId>
133125
<version>1.2.10</version>
134126
</dependency>
135-
<!-- mapper-spring-boot-starter -->
127+
128+
<!-- 通用mapper -->
129+
<dependency>
130+
<groupId>tk.mybatis</groupId>
131+
<artifactId>mapper</artifactId>
132+
<version>4.1.5</version>
133+
</dependency>
136134
<dependency>
137135
<groupId>tk.mybatis</groupId>
138136
<artifactId>mapper-spring-boot-starter</artifactId>
@@ -158,17 +156,17 @@
158156
<dependency>
159157
<groupId>org.mybatis.generator</groupId>
160158
<artifactId>mybatis-generator-core</artifactId>
161-
<version>1.3.6</version>
159+
<version>1.3.7</version>
162160
</dependency>
163161
<dependency>
164162
<groupId>tk.mybatis</groupId>
165163
<artifactId>mapper-generator</artifactId>
166-
<version>1.0.0</version>
164+
<version>1.1.5</version>
167165
</dependency>
168166
<dependency>
169167
<groupId>com.google.guava</groupId>
170168
<artifactId>guava</artifactId>
171-
<version>23.0</version>
169+
<version>20.0</version>
172170
</dependency>
173171
<!-- 代码生成器依赖 end -->
174172

security/src/main/java/com/example/janche/security/metadatasource/UrlFilterInvocationSecurityMetadataSource.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public Collection<ConfigAttribute> getAttributes(Object o) throws IllegalArgumen
4747
// }
4848

4949
HttpServletRequest request = ((FilterInvocation) o).getHttpRequest();
50-
5150
// 检查是否为放行的请求
5251
if (checkIgnores(request)){
5352
return null;

web/src/main/java/com/example/janche/web/config/WebSecurityConfig.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,7 @@ public void configure(WebSecurity web) throws Exception {
7777
"/favicon.ico",
7878
"/static/**",
7979
"/resources/**",
80-
"/error",
81-
"/swagger-ui.html",
82-
"/swagger-resources/**");
80+
"/error");
8381
}
8482

8583
@Override

web/src/main/resources/application-sysconfig.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ custom:
2828
# 需要过滤的请求,不限方法
2929
pattern:
3030
# 配置 不拦截 的请求,测试可以配置 /**
31-
- "/app"
31+
- "/swagger-ui.html"
32+
- "/v2/**"
33+
- "/webjars/**"
34+
- "/swagger-resources/**"
3235

3336
# 热部署插件指定端口,具体视自己情况而定,只要不重复就可以,默认是35729
3437
spring:

0 commit comments

Comments
 (0)