Skip to content

Commit 59b71f8

Browse files
colorful3colorful3
authored
Refactor/replace deprecated api usage (#183)
1 parent 2e7d4ff commit 59b71f8

File tree

12 files changed

+35
-33
lines changed

12 files changed

+35
-33
lines changed

‎src/main/java/io/github/talelin/latticy/common/configuration/CommonConfiguration.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
66
import com.baomidou.mybatisplus.core.injector.ISqlInjector;
77
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
8-
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
98
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
109
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
1110
import io.github.talelin.autoconfigure.bean.PermissionMetaCollector;

‎src/main/java/io/github/talelin/latticy/common/enumeration/GroupLevelEnum.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.github.talelin.latticy.common.enumeration;
22

3-
import com.baomidou.mybatisplus.core.enums.IEnum;
3+
4+
import com.baomidou.mybatisplus.annotation.IEnum;
45

56
/**
67
* @author colorful@TaleLin
@@ -30,7 +31,7 @@ public enum GroupLevelEnum implements IEnum<Integer> {
3031
* MybatisEnumTypeHandler 转换时调用此方法
3132
*
3233
* @return 枚举对应的 code 值
33-
* @see com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler
34+
* @see com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler
3435
*/
3536
@Override
3637
public Integer getValue() {

‎src/main/java/io/github/talelin/latticy/common/interceptor/LoggerImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
/**
2121
* @author pedro@TaleLin
2222
* @author Juzi@TaleLin
23+
* @author colorful@TaleLin
2324
*/
2425
@Slf4j
2526
@Component
@@ -40,7 +41,7 @@ public void handle(PermissionMeta meta, Logger logger, HttpServletRequest reques
4041
template = this.parseTemplate(template, user, request, response);
4142
String permission = "";
4243
if (meta != null) {
43-
permission = StringUtils.isEmpty(meta.value()) ? meta.value() : meta.value();
44+
permission = !StringUtils.hasLength(meta.value()) ? meta.value() : meta.value();
4445
}
4546
Integer userId = user.getId();
4647
String username = user.getUsername();

‎src/main/java/io/github/talelin/latticy/common/interceptor/RequestLogInterceptor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
package io.github.talelin.latticy.common.interceptor;
22

33
import lombok.extern.slf4j.Slf4j;
4-
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
4+
import org.springframework.web.servlet.AsyncHandlerInterceptor;
55

66
import javax.servlet.http.HttpServletRequest;
77
import javax.servlet.http.HttpServletResponse;
88

99
/**
1010
* @author pedro@TaleLin
11+
* @author colorful@TaleLin
1112
*/
1213
@Slf4j
13-
public class RequestLogInterceptor extends HandlerInterceptorAdapter {
14+
public class RequestLogInterceptor implements AsyncHandlerInterceptor {
1415

1516

1617
private ThreadLocal<Long> startTime = new ThreadLocal<>();
1718

1819
@Override
1920
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
2021
startTime.set(System.currentTimeMillis());
21-
return super.preHandle(request, response, handler);
22+
return true;
2223
}
2324

2425
@Override
2526
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
26-
super.afterCompletion(request, response, handler, ex);
2727
log.info("[{}] -> [{}] from: {} costs: {}ms",
2828
request.getMethod(),
2929
request.getServletPath(),

‎src/main/java/io/github/talelin/latticy/dto/admin/NewGroupDTO.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class NewGroupDTO {
1616
@Length(min = 1, max = 60, message = "{group.name.length}")
1717
private String name;
1818

19-
@Length(min = 1, max = 255, message = "{group.info.length}")
19+
@Length(max = 255, message = "{group.info.length}")
2020
private String info;
2121

2222
private List<Integer> permissionIds;

‎src/main/java/io/github/talelin/latticy/dto/admin/UpdateGroupDTO.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ public class UpdateGroupDTO {
1515
@Length(min = 1, max = 60, message = "{group.name.length}")
1616
private String name;
1717

18-
@Length(min = 1, max = 255, message = "{group.info.length}")
18+
@Length(max = 255, message = "{group.info.length}")
1919
private String info;
2020
}

‎src/main/java/io/github/talelin/latticy/module/file/AbstractUploader.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ protected byte[] getFileBytes(MultipartFile file) {
140140
try {
141141
bytes = file.getBytes();
142142
} catch (Exception e) {
143-
throw new FailedException("read file date failed", 10190);
143+
throw new FailedException(10190, "read file date failed");
144144
}
145145
return bytes;
146146
}

‎src/main/resources/application.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ spring:
99
mvc:
1010
# 404 交给异常处理器处理
1111
throw-exception-if-no-handler-found: true
12-
resources:
13-
# 关闭静态资源的映射
14-
add-mappings: false
15-
12+
web:
13+
resources:
14+
# 关闭默认静态资源的映射规则
15+
add-mappings: false
1616

1717
mybatis-plus:
1818
configuration:
1919
# 开启下划线转驼峰
2020
map-underscore-to-camel-case: true
2121
# 指定默认枚举类型的类型转换器
22-
default-enum-type-handler: com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler
22+
default-enum-type-handler: com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler
2323
global-config:
2424
# 开启/关闭 banner 打印
2525
banner: false
@@ -42,6 +42,7 @@ lin:
4242
# 令牌 secret
4343
token-secret: x88Wf0991079889x8796a0Ac68f9ecJJU17c5Vbe8beod7d8d3e695*4
4444
logging:
45-
file:
46-
max-history:
45+
logback:
46+
rollingpolicy:
47+
max-history:
4748
config:

‎src/main/resources/mapper/GroupMapper.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<id column="id" property="id"/>
88
<result column="name" property="name"/>
99
<result column="info" property="info"/>
10-
<result column="level" property="level" typeHandler="com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler"/>
10+
<result column="level" property="level" typeHandler="com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler"/>
1111
<result column="create_time" property="createTime"/>
1212
<result column="update_time" property="updateTime"/>
1313
<result column="delete_time" property="deleteTime"/>

‎src/test/java/io/github/talelin/latticy/controller/cms/AdminControllerTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public void changeUserPassword() throws Exception {
130130
dto.setConfirmPassword(newPassword);
131131

132132
ObjectMapper mapper = new ObjectMapper();
133-
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES);
133+
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
134134
String content = mapper.writeValueAsString(dto);
135135

136136
mvc.perform(put(String.format("/cms/admin/user/%s/password", user.getId()))
@@ -187,7 +187,7 @@ public void updateUser() throws Exception {
187187
dto.setGroupIds(Arrays.asList(group.getId()));
188188

189189
ObjectMapper mapper = new ObjectMapper();
190-
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES);
190+
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
191191
String content = mapper.writeValueAsString(dto);
192192

193193
mvc.perform(put("/cms/admin/user/" + user.getId())
@@ -278,7 +278,7 @@ public void createGroup() throws Exception {
278278
dto.setPermissionIds(Arrays.asList(permission.getId()));
279279

280280
ObjectMapper mapper = new ObjectMapper();
281-
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES);
281+
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
282282
String content = mapper.writeValueAsString(dto);
283283

284284
mvc.perform(post("/cms/admin/group/")
@@ -308,7 +308,7 @@ public void updateGroup() throws Exception {
308308
dto.setInfo("flink is a finger");
309309

310310
ObjectMapper mapper = new ObjectMapper();
311-
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES);
311+
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
312312
String content = mapper.writeValueAsString(dto);
313313

314314
mvc.perform(put("/cms/admin/group/" + group.getId())
@@ -359,7 +359,7 @@ public void dispatchPermission() throws Exception {
359359
dto.setPermissionId(permission.getId());
360360

361361
ObjectMapper mapper = new ObjectMapper();
362-
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES);
362+
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
363363
String content = mapper.writeValueAsString(dto);
364364

365365
mvc.perform(post("/cms/admin/permission/dispatch")
@@ -389,7 +389,7 @@ public void dispatchPermissions() throws Exception {
389389
dto.setPermissionIds(Arrays.asList(permission.getId(), permission1.getId()));
390390

391391
ObjectMapper mapper = new ObjectMapper();
392-
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES);
392+
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
393393
String content = mapper.writeValueAsString(dto);
394394

395395
mvc.perform(post("/cms/admin/permission/dispatch/batch")
@@ -422,7 +422,7 @@ public void removePermissions() throws Exception {
422422
dto.setPermissionIds(Arrays.asList(permission1.getId()));
423423

424424
ObjectMapper mapper = new ObjectMapper();
425-
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES);
425+
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
426426
String content = mapper.writeValueAsString(dto);
427427

428428
mvc.perform(post("/cms/admin/permission/remove")

0 commit comments

Comments
 (0)