Skip to content

Commit cd04e83

Browse files
author
smallchill
committed
🎉 4.4.0.RELEASE 新增黑白名单、脱敏工具、BladeRedis新版工具
1 parent 74669ce commit cd04e83

File tree

18 files changed

+376
-77
lines changed

18 files changed

+376
-77
lines changed

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<img src="https://img.shields.io/badge/Release-V4.3.0-green.svg" alt="Downloads">
2+
<img src="https://img.shields.io/badge/Release-V4.4.0-green.svg" alt="Downloads">
33
<img src="https://img.shields.io/badge/JDK-17+-green.svg" alt="Build Status">
44
<img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="Build Status">
55
<img src="https://img.shields.io/badge/Spring%20Cloud-2023-blue.svg" alt="Coverage Status">
@@ -33,8 +33,8 @@
3333
|----------------------|------------|
3434
| Java | 17+ |
3535
| NodeJS | 18+ |
36-
| Spring | 6.1.14 |
37-
| Spring Boot | 3.2.10 |
36+
| Spring | 6.1.15 |
37+
| Spring Boot | 3.2.12 |
3838
| Spring Cloud | 2023.0.3 |
3939
| Spring Cloud Alibaba | 2023.0.1.2 |
4040
| Nacos Alibaba | 2.3.2 |

‎blade-auth/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
<groupId>org.springblade</groupId>
3838
<artifactId>blade-starter-social</artifactId>
3939
</dependency>
40+
<dependency>
41+
<groupId>org.springblade</groupId>
42+
<artifactId>blade-starter-redis</artifactId>
43+
</dependency>
4044
<dependency>
4145
<groupId>org.springblade</groupId>
4246
<artifactId>blade-user-api</artifactId>

‎blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
import org.springblade.auth.granter.TokenParameter;
2626
import org.springblade.auth.utils.TokenUtil;
2727
import org.springblade.common.cache.CacheNames;
28+
import org.springblade.core.redis.cache.BladeRedis;
2829
import org.springblade.core.secure.AuthInfo;
2930
import org.springblade.core.tool.api.R;
3031
import org.springblade.core.tool.support.Kv;
3132
import org.springblade.core.tool.utils.Func;
32-
import org.springblade.core.tool.utils.RedisUtil;
3333
import org.springblade.core.tool.utils.WebUtil;
3434
import org.springblade.system.user.entity.UserInfo;
3535
import org.springframework.web.bind.annotation.GetMapping;
@@ -50,7 +50,7 @@
5050
@Tag(name = "用户授权认证", description = "授权接口")
5151
public class AuthController {
5252

53-
private RedisUtil redisUtil;
53+
private BladeRedis bladeRedis;
5454

5555
@PostMapping("token")
5656
@Operation(summary = "获取认证token", description = "传入租户ID:tenantId,账号:account,密码:password")
@@ -87,7 +87,7 @@ public R<Kv> captcha() {
8787
String verCode = specCaptcha.text().toLowerCase();
8888
String key = UUID.randomUUID().toString();
8989
// 存入redis并设置过期时间为30分钟
90-
redisUtil.set(CacheNames.CAPTCHA_KEY + key, verCode, 30L, TimeUnit.MINUTES);
90+
bladeRedis.setEx(CacheNames.CAPTCHA_KEY + key, verCode, 30L, TimeUnit.MINUTES);
9191
// 将key和base64返回给前端
9292
return R.data(Kv.init().set("key", key).set("image", specCaptcha.toBase64()));
9393
}

‎blade-auth/src/main/java/org/springblade/auth/granter/CaptchaTokenGranter.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.springblade.auth.utils.TokenUtil;
2121
import org.springblade.common.cache.CacheNames;
2222
import org.springblade.core.log.exception.ServiceException;
23+
import org.springblade.core.redis.cache.BladeRedis;
2324
import org.springblade.core.secure.props.BladeAuthProperties;
2425
import org.springblade.core.tool.api.R;
2526
import org.springblade.core.tool.utils.*;
@@ -41,7 +42,7 @@ public class CaptchaTokenGranter implements ITokenGranter {
4142
public static final String GRANT_TYPE = "captcha";
4243

4344
private IUserClient userClient;
44-
private RedisUtil redisUtil;
45+
private BladeRedis bladeRedis;
4546

4647
private BladeAuthProperties authProperties;
4748

@@ -52,7 +53,7 @@ public UserInfo grant(TokenParameter tokenParameter) {
5253
String key = request.getHeader(TokenUtil.CAPTCHA_HEADER_KEY);
5354
String code = request.getHeader(TokenUtil.CAPTCHA_HEADER_CODE);
5455
// 获取验证码
55-
String redisCode = String.valueOf(redisUtil.get(CacheNames.CAPTCHA_KEY + key));
56+
String redisCode = Func.toStr(bladeRedis.get(CacheNames.CAPTCHA_KEY + key));
5657
// 判断验证码
5758
if (code == null || !StringUtil.equalsIgnoreCase(redisCode, code)) {
5859
throw new ServiceException(TokenUtil.CAPTCHA_NOT_CORRECT);

‎blade-service/blade-log/src/main/java/org/springblade/core/log/controller/LogApiController.java

+7-16
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,25 @@
1717

1818

1919
import com.baomidou.mybatisplus.core.metadata.IPage;
20-
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
2120
import io.swagger.v3.oas.annotations.Hidden;
2221
import io.swagger.v3.oas.annotations.Parameter;
2322
import lombok.AllArgsConstructor;
2423
import org.springblade.core.log.model.LogApi;
25-
import org.springblade.core.log.model.LogApiVo;
24+
import org.springblade.core.log.pojo.LogApiVO;
2625
import org.springblade.core.log.service.ILogApiService;
26+
import org.springblade.core.log.wrapper.LogApiWrapper;
2727
import org.springblade.core.mp.support.Condition;
2828
import org.springblade.core.mp.support.Query;
2929
import org.springblade.core.secure.annotation.PreAuth;
3030
import org.springblade.core.tool.api.R;
3131
import org.springblade.core.tool.constant.RoleConstant;
32-
import org.springblade.core.tool.utils.BeanUtil;
33-
import org.springblade.core.tool.utils.Func;
3432
import org.springblade.core.tool.utils.StringPool;
3533
import org.springframework.web.bind.annotation.GetMapping;
3634
import org.springframework.web.bind.annotation.RequestMapping;
3735
import org.springframework.web.bind.annotation.RequestParam;
3836
import org.springframework.web.bind.annotation.RestController;
3937

40-
import java.util.List;
4138
import java.util.Map;
42-
import java.util.stream.Collectors;
4339

4440
/**
4541
* 控制器
@@ -59,27 +55,22 @@ public class LogApiController {
5955
* 查询单条
6056
*/
6157
@GetMapping("/detail")
58+
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
6259
public R<LogApi> detail(LogApi log) {
63-
return R.data(logService.getOne(Condition.getQueryWrapper(log)));
60+
LogApi logApi = logService.getOne(Condition.getQueryWrapper(log));
61+
return R.data(LogApiWrapper.build().entity(logApi));
6462
}
6563

6664
/**
6765
* 查询多条(分页)
6866
*/
6967
@GetMapping("/list")
7068
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
71-
public R<IPage<LogApiVo>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> log, Query query) {
69+
public R<IPage<LogApiVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> log, Query query) {
7270
query.setAscs("create_time");
7371
query.setDescs(StringPool.EMPTY);
7472
IPage<LogApi> pages = logService.page(Condition.getPage(query), Condition.getQueryWrapper(log, LogApi.class));
75-
List<LogApiVo> records = pages.getRecords().stream().map(logApi -> {
76-
LogApiVo vo = BeanUtil.copyProperties(logApi, LogApiVo.class);
77-
vo.setStrId(Func.toStr(logApi.getId()));
78-
return vo;
79-
}).collect(Collectors.toList());
80-
IPage<LogApiVo> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
81-
pageVo.setRecords(records);
82-
return R.data(pageVo);
73+
return R.data(LogApiWrapper.build().pageVO(pages));
8374
}
8475

8576
}

‎blade-service/blade-log/src/main/java/org/springblade/core/log/controller/LogErrorController.java

+8-17
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,25 @@
1717

1818

1919
import com.baomidou.mybatisplus.core.metadata.IPage;
20-
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
2120
import io.swagger.v3.oas.annotations.Hidden;
2221
import io.swagger.v3.oas.annotations.Parameter;
2322
import lombok.AllArgsConstructor;
2423
import org.springblade.core.log.model.LogError;
25-
import org.springblade.core.log.model.LogErrorVo;
24+
import org.springblade.core.log.pojo.LogErrorVO;
2625
import org.springblade.core.log.service.ILogErrorService;
26+
import org.springblade.core.log.wrapper.LogErrorWrapper;
2727
import org.springblade.core.mp.support.Condition;
2828
import org.springblade.core.mp.support.Query;
2929
import org.springblade.core.secure.annotation.PreAuth;
3030
import org.springblade.core.tool.api.R;
3131
import org.springblade.core.tool.constant.RoleConstant;
32-
import org.springblade.core.tool.utils.BeanUtil;
33-
import org.springblade.core.tool.utils.Func;
3432
import org.springblade.core.tool.utils.StringPool;
3533
import org.springframework.web.bind.annotation.GetMapping;
3634
import org.springframework.web.bind.annotation.RequestMapping;
3735
import org.springframework.web.bind.annotation.RequestParam;
3836
import org.springframework.web.bind.annotation.RestController;
3937

40-
import java.util.List;
4138
import java.util.Map;
42-
import java.util.stream.Collectors;
4339

4440
/**
4541
* 控制器
@@ -59,27 +55,22 @@ public class LogErrorController {
5955
* 查询单条
6056
*/
6157
@GetMapping("/detail")
62-
public R<LogError> detail(LogError logError) {
63-
return R.data(errorLogService.getOne(Condition.getQueryWrapper(logError)));
58+
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
59+
public R<LogError> detail(LogError log) {
60+
LogError logError = errorLogService.getOne(Condition.getQueryWrapper(log));
61+
return R.data(LogErrorWrapper.build().entity(logError));
6462
}
6563

6664
/**
6765
* 查询多条(分页)
6866
*/
6967
@GetMapping("/list")
7068
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
71-
public R<IPage<LogErrorVo>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> logError, Query query) {
69+
public R<IPage<LogErrorVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> logError, Query query) {
7270
query.setAscs("create_time");
7371
query.setDescs(StringPool.EMPTY);
7472
IPage<LogError> pages = errorLogService.page(Condition.getPage(query), Condition.getQueryWrapper(logError, LogError.class));
75-
List<LogErrorVo> records = pages.getRecords().stream().map(logApi -> {
76-
LogErrorVo vo = BeanUtil.copyProperties(logApi, LogErrorVo.class);
77-
vo.setStrId(Func.toStr(logApi.getId()));
78-
return vo;
79-
}).collect(Collectors.toList());
80-
IPage<LogErrorVo> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
81-
pageVo.setRecords(records);
82-
return R.data(pageVo);
73+
return R.data(LogErrorWrapper.build().pageVO(pages));
8374
}
8475

8576
}

‎blade-service/blade-log/src/main/java/org/springblade/core/log/controller/LogUsualController.java

+7-16
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,25 @@
1717

1818

1919
import com.baomidou.mybatisplus.core.metadata.IPage;
20-
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
2120
import io.swagger.v3.oas.annotations.Hidden;
2221
import io.swagger.v3.oas.annotations.Parameter;
2322
import lombok.AllArgsConstructor;
2423
import org.springblade.core.log.model.LogUsual;
25-
import org.springblade.core.log.model.LogUsualVo;
24+
import org.springblade.core.log.pojo.LogUsualVO;
2625
import org.springblade.core.log.service.ILogUsualService;
26+
import org.springblade.core.log.wrapper.LogUsualWrapper;
2727
import org.springblade.core.mp.support.Condition;
2828
import org.springblade.core.mp.support.Query;
2929
import org.springblade.core.secure.annotation.PreAuth;
3030
import org.springblade.core.tool.api.R;
3131
import org.springblade.core.tool.constant.RoleConstant;
32-
import org.springblade.core.tool.utils.BeanUtil;
33-
import org.springblade.core.tool.utils.Func;
3432
import org.springblade.core.tool.utils.StringPool;
3533
import org.springframework.web.bind.annotation.GetMapping;
3634
import org.springframework.web.bind.annotation.RequestMapping;
3735
import org.springframework.web.bind.annotation.RequestParam;
3836
import org.springframework.web.bind.annotation.RestController;
3937

40-
import java.util.List;
4138
import java.util.Map;
42-
import java.util.stream.Collectors;
4339

4440
/**
4541
* 控制器
@@ -59,27 +55,22 @@ public class LogUsualController {
5955
* 查询单条
6056
*/
6157
@GetMapping("/detail")
58+
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
6259
public R<LogUsual> detail(LogUsual log) {
63-
return R.data(logService.getOne(Condition.getQueryWrapper(log)));
60+
LogUsual logUsual = logService.getOne(Condition.getQueryWrapper(log));
61+
return R.data(LogUsualWrapper.build().entity(logUsual));
6462
}
6563

6664
/**
6765
* 查询多条(分页)
6866
*/
6967
@GetMapping("/list")
7068
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
71-
public R<IPage<LogUsualVo>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> log, Query query) {
69+
public R<IPage<LogUsualVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> log, Query query) {
7270
query.setAscs("create_time");
7371
query.setDescs(StringPool.EMPTY);
7472
IPage<LogUsual> pages = logService.page(Condition.getPage(query), Condition.getQueryWrapper(log, LogUsual.class));
75-
List<LogUsualVo> records = pages.getRecords().stream().map(logApi -> {
76-
LogUsualVo vo = BeanUtil.copyProperties(logApi, LogUsualVo.class);
77-
vo.setStrId(Func.toStr(logApi.getId()));
78-
return vo;
79-
}).collect(Collectors.toList());
80-
IPage<LogUsualVo> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
81-
pageVo.setRecords(records);
82-
return R.data(pageVo);
73+
return R.data(LogUsualWrapper.build().pageVO(pages));
8374
}
8475

8576
}

‎blade-service/blade-log/src/main/java/org/springblade/core/log/pojo/LogApiVO.java

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/**
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 ([email protected]).
3+
* <p>
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
* <p>
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
* <p>
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.springblade.core.log.pojo;
17+
18+
import com.fasterxml.jackson.annotation.JsonIgnore;
19+
import lombok.Data;
20+
import lombok.EqualsAndHashCode;
21+
import org.springblade.core.log.model.LogApi;
22+
23+
import java.io.Serial;
24+
25+
/**
26+
* LogApiVO
27+
*
28+
* @author Chill
29+
*/
30+
@Data
31+
@EqualsAndHashCode(callSuper = true)
32+
public class LogApiVO extends LogApi {
33+
34+
@Serial
35+
private static final long serialVersionUID = 1L;
36+
37+
/**
38+
* 操作提交的数据
39+
*/
40+
@JsonIgnore
41+
private String params;
42+
43+
44+
}

‎blade-service/blade-log/src/main/java/org/springblade/core/log/pojo/LogErrorVO.java

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
/**
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 ([email protected]).
3+
* <p>
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
* <p>
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
* <p>
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.springblade.core.log.pojo;
17+
18+
import com.fasterxml.jackson.annotation.JsonIgnore;
19+
import lombok.Data;
20+
import lombok.EqualsAndHashCode;
21+
import org.springblade.core.log.model.LogError;
22+
23+
import java.io.Serial;
24+
25+
/**
26+
* LogErrorVO
27+
*
28+
* @author Chill
29+
*/
30+
@Data
31+
@EqualsAndHashCode(callSuper = true)
32+
public class LogErrorVO extends LogError {
33+
34+
@Serial
35+
private static final long serialVersionUID = 1L;
36+
37+
/**
38+
* 操作提交的数据
39+
*/
40+
@JsonIgnore
41+
private String params;
42+
43+
/**
44+
* 堆栈信息
45+
*/
46+
@JsonIgnore
47+
private String stackTrace;
48+
49+
/**
50+
* 异常消息
51+
*/
52+
@JsonIgnore
53+
private String message;
54+
}

0 commit comments

Comments
 (0)