Skip to content

Commit 15359e5

Browse files
author
smallchill
committed
🎉 3.7.1.RELEASE 升级系统安全性能
1 parent 0ff435c commit 15359e5

File tree

35 files changed

+71
-59
lines changed

35 files changed

+71
-59
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<p align="center">
2-
<img src="https://img.shields.io/badge/Release-V3.7.0-green.svg" alt="Downloads">
2+
<img src="https://img.shields.io/badge/Release-V3.7.1-green.svg" alt="Downloads">
33
<img src="https://img.shields.io/badge/JDK-1.8+-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-2021-blue.svg" alt="Coverage Status">
6-
<img src="https://img.shields.io/badge/Spring%20Boot-2.7.10-blue.svg" alt="Downloads">
6+
<img src="https://img.shields.io/badge/Spring%20Boot-2.7.18-blue.svg" alt="Downloads">
77
<a target="_blank" href="https://bladex.cn">
88
<img src="https://img.shields.io/badge/Author-Small%20Chill-ff69b4.svg" alt="Downloads">
99
</a>

‎blade-auth/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<artifactId>SpringBlade</artifactId>
1010
<groupId>org.springblade</groupId>
11-
<version>3.7.0</version>
11+
<version>3.7.1</version>
1212
</parent>
1313

1414
<artifactId>blade-auth</artifactId>

‎blade-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>SpringBlade</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-gateway/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>SpringBlade</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-ops/blade-admin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-ops</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-ops/blade-develop/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springblade</groupId>
88
<artifactId>blade-ops</artifactId>
9-
<version>3.7.0</version>
9+
<version>3.7.1</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

‎blade-ops/blade-report/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springblade</groupId>
77
<artifactId>blade-ops</artifactId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>

‎blade-ops/blade-resource/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-ops</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-ops/blade-seata-order/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-ops</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-ops/blade-seata-storage/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-ops</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-ops/blade-swagger/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-ops</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-ops/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<artifactId>SpringBlade</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>blade-ops</artifactId>
1313
<name>${project.artifactId}</name>
14-
<version>3.7.0</version>
14+
<version>3.7.1</version>
1515
<packaging>pom</packaging>
1616
<modules>
1717
<module>blade-admin</module>

‎blade-service-api/blade-demo-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service-api</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-service-api/blade-desk-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service-api</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-service-api/blade-dict-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service-api</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-service-api/blade-scope-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service-api</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-service-api/blade-system-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service-api</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-service-api/blade-user-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service-api</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-service-api/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<artifactId>SpringBlade</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>blade-service-api</artifactId>
1313
<name>${project.artifactId}</name>
14-
<version>3.7.0</version>
14+
<version>3.7.1</version>
1515
<packaging>pom</packaging>
1616
<description>SpringBlade 微服务API集合</description>
1717

‎blade-service/blade-demo/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-service/blade-desk/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springblade</groupId>
88
<artifactId>blade-service</artifactId>
9-
<version>3.7.0</version>
9+
<version>3.7.1</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

‎blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java

-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
import org.springblade.core.boot.ctrl.BladeController;
2424
import org.springblade.core.mp.support.Condition;
2525
import org.springblade.core.mp.support.Query;
26-
import org.springblade.core.secure.annotation.PreAuth;
2726
import org.springblade.core.tool.api.R;
28-
import org.springblade.core.tool.constant.RoleConstant;
2927
import org.springblade.core.tool.utils.Func;
3028
import org.springblade.desk.entity.Notice;
3129
import org.springblade.desk.service.INoticeService;
@@ -42,7 +40,6 @@
4240
* @author Chill
4341
* @since 2018-09-29
4442
*/
45-
@PreAuth(RoleConstant.HAS_CRYPTO)
4643
@RestController
4744
@RequestMapping("notice")
4845
@AllArgsConstructor

‎blade-service/blade-log/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

+3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
import org.springblade.core.log.service.ILogApiService;
2525
import org.springblade.core.mp.support.Condition;
2626
import org.springblade.core.mp.support.Query;
27+
import org.springblade.core.secure.annotation.PreAuth;
2728
import org.springblade.core.tool.api.R;
29+
import org.springblade.core.tool.constant.RoleConstant;
2830
import org.springblade.core.tool.utils.BeanUtil;
2931
import org.springblade.core.tool.utils.Func;
3032
import org.springblade.core.tool.utils.StringPool;
@@ -63,6 +65,7 @@ public R<LogApi> detail(LogApi log) {
6365
* 查询多条(分页)
6466
*/
6567
@GetMapping("/list")
68+
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
6669
public R<IPage<LogApiVo>> list(@ApiIgnore @RequestParam Map<String, Object> log, Query query) {
6770
query.setAscs("create_time");
6871
query.setDescs(StringPool.EMPTY);

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

+3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
import org.springblade.core.log.service.ILogErrorService;
2525
import org.springblade.core.mp.support.Condition;
2626
import org.springblade.core.mp.support.Query;
27+
import org.springblade.core.secure.annotation.PreAuth;
2728
import org.springblade.core.tool.api.R;
29+
import org.springblade.core.tool.constant.RoleConstant;
2830
import org.springblade.core.tool.utils.BeanUtil;
2931
import org.springblade.core.tool.utils.Func;
3032
import org.springblade.core.tool.utils.StringPool;
@@ -63,6 +65,7 @@ public R<LogError> detail(LogError logError) {
6365
* 查询多条(分页)
6466
*/
6567
@GetMapping("/list")
68+
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
6669
public R<IPage<LogErrorVo>> list(@ApiIgnore @RequestParam Map<String, Object> logError, Query query) {
6770
query.setAscs("create_time");
6871
query.setDescs(StringPool.EMPTY);

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

+3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
import org.springblade.core.log.service.ILogUsualService;
2525
import org.springblade.core.mp.support.Condition;
2626
import org.springblade.core.mp.support.Query;
27+
import org.springblade.core.secure.annotation.PreAuth;
2728
import org.springblade.core.tool.api.R;
29+
import org.springblade.core.tool.constant.RoleConstant;
2830
import org.springblade.core.tool.utils.BeanUtil;
2931
import org.springblade.core.tool.utils.Func;
3032
import org.springblade.core.tool.utils.StringPool;
@@ -63,6 +65,7 @@ public R<LogUsual> detail(LogUsual log) {
6365
* 查询多条(分页)
6466
*/
6567
@GetMapping("/list")
68+
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
6669
public R<IPage<LogUsualVo>> list(@ApiIgnore @RequestParam Map<String, Object> log, Query query) {
6770
query.setAscs("create_time");
6871
query.setDescs(StringPool.EMPTY);

‎blade-service/blade-system/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-service/blade-system/src/main/java/org/springblade/system/controller/ParamController.java

+3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
import org.springblade.core.boot.ctrl.BladeController;
2323
import org.springblade.core.mp.support.Condition;
2424
import org.springblade.core.mp.support.Query;
25+
import org.springblade.core.secure.annotation.PreAuth;
2526
import org.springblade.core.tool.api.R;
27+
import org.springblade.core.tool.constant.RoleConstant;
2628
import org.springblade.core.tool.utils.Func;
2729
import org.springblade.system.entity.Param;
2830
import org.springblade.system.service.IParamService;
@@ -67,6 +69,7 @@ public R<Param> detail(Param param) {
6769
})
6870
@ApiOperationSupport(order = 2)
6971
@ApiOperation(value = "分页", notes = "传入param")
72+
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
7073
public R<IPage<Param>> list(@ApiIgnore @RequestParam Map<String, Object> param, Query query) {
7174
IPage<Param> pages = paramService.page(Condition.getPage(query), Condition.getQueryWrapper(param, Param.class));
7275
return R.data(pages);

‎blade-service/blade-user/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>3.7.0</version>
8+
<version>3.7.1</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>

‎blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

+8-5
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@
2727
import io.swagger.annotations.ApiParam;
2828
import lombok.AllArgsConstructor;
2929
import lombok.SneakyThrows;
30-
import org.apache.commons.codec.Charsets;
3130
import org.springblade.core.mp.support.Condition;
3231
import org.springblade.core.mp.support.Query;
3332
import org.springblade.core.secure.BladeUser;
33+
import org.springblade.core.secure.annotation.PreAuth;
3434
import org.springblade.core.secure.utils.SecureUtil;
3535
import org.springblade.core.tool.api.R;
3636
import org.springblade.core.tool.constant.BladeConstant;
37+
import org.springblade.core.tool.constant.RoleConstant;
3738
import org.springblade.core.tool.utils.Func;
3839
import org.springblade.system.user.entity.User;
3940
import org.springblade.system.user.excel.UserExcel;
@@ -52,6 +53,7 @@
5253
import java.io.IOException;
5354
import java.io.InputStream;
5455
import java.net.URLEncoder;
56+
import java.nio.charset.StandardCharsets;
5557
import java.util.ArrayList;
5658
import java.util.List;
5759
import java.util.Map;
@@ -227,6 +229,7 @@ public R importUser(MultipartFile file, Integer isCovered) {
227229
@GetMapping("export-user")
228230
@ApiOperationSupport(order = 13)
229231
@ApiOperation(value = "导出用户", notes = "传入user")
232+
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
230233
public void exportUser(@ApiIgnore @RequestParam Map<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
231234
QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
232235
if (!SecureUtil.isAdministrator()){
@@ -235,8 +238,8 @@ public void exportUser(@ApiIgnore @RequestParam Map<String, Object> user, BladeU
235238
queryWrapper.lambda().eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED);
236239
List<UserExcel> list = userService.exportUser(queryWrapper);
237240
response.setContentType("application/vnd.ms-excel");
238-
response.setCharacterEncoding(Charsets.UTF_8.name());
239-
String fileName = URLEncoder.encode("用户数据导出", Charsets.UTF_8.name());
241+
response.setCharacterEncoding(StandardCharsets.UTF_8.name());
242+
String fileName = URLEncoder.encode("用户数据导出", StandardCharsets.UTF_8.name());
240243
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
241244
EasyExcel.write(response.getOutputStream(), UserExcel.class).sheet("用户数据表").doWrite(list);
242245
}
@@ -251,8 +254,8 @@ public void exportUser(@ApiIgnore @RequestParam Map<String, Object> user, BladeU
251254
public void exportUser(HttpServletResponse response) {
252255
List<UserExcel> list = new ArrayList<>();
253256
response.setContentType("application/vnd.ms-excel");
254-
response.setCharacterEncoding(Charsets.UTF_8.name());
255-
String fileName = URLEncoder.encode("用户数据模板", Charsets.UTF_8.name());
257+
response.setCharacterEncoding(StandardCharsets.UTF_8.name());
258+
String fileName = URLEncoder.encode("用户数据模板", StandardCharsets.UTF_8.name());
256259
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
257260
EasyExcel.write(response.getOutputStream(), UserExcel.class).sheet("用户数据表").doWrite(list);
258261
}

‎blade-service/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>org.springblade</groupId>
99
<artifactId>SpringBlade</artifactId>
10-
<version>3.7.0</version>
10+
<version>3.7.1</version>
1111
</parent>
1212

1313
<artifactId>blade-service</artifactId>
1414
<name>${project.artifactId}</name>
15-
<version>3.7.0</version>
15+
<version>3.7.1</version>
1616
<packaging>pom</packaging>
1717
<description>SpringBlade 微服务集合</description>
1818

0 commit comments

Comments
 (0)