Skip to content

Commit 3ea5a7e

Browse files
🚔 sys_department添加level字段
1 parent b103023 commit 3ea5a7e

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ logs
3232

3333
*.rdb
3434

35+

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,16 @@
1212
- 自定义是否启用Shiro权限拦截
1313
- 优化LogAop配置
1414
- 代码生成模板优化,三种生成策略
15+
- 自定义生成Shiro `RequiresPermissions`注解
16+
- Jackson工具类,按字段顺序格式化输出
1517

1618
### 🐞 Bug Fixes
1719
- fix #81 刷新token问题
1820
- fix 获取角色token问题
1921
- fix refreshToken方法和LoginUtil工具类方法问题
2022

2123
### 📔 Documentation
24+
- [RBAC用户角色权限](https://springboot.plus/guide/rbac.html)
2225

2326
### 🔨 Dependency Upgrades
2427
- Upgrade to `spring-boot` 2.2.0.RELEASE

README-zh.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
10. 使用assembly maven插件进行不同环境打包部署,包含启动、重启命令,配置文件提取到外部config目录
4747

4848
## 项目架构
49-
![spring-boot-plus-architecture.jpg](https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/img/spring-boot-plus-architecture.jpg)
49+
![spring-boot-plus-architecture.jpg](https://spring-boot-plus.gitee.io/img/spring-boot-plus-architecture.jpg)
5050

5151
### 项目环境
5252
中间件 | 版本 | 备注
@@ -285,7 +285,7 @@ public class SpringBootPlusApplication {
285285
[http://127.0.0.1:8888/swagger-ui.html](http://127.0.0.1:8888/swagger-ui.html)
286286

287287
### 5. 系统用户 增删改查分页Swagger
288-
![sys_user_swagger-zh.png](https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/img/sys_user_swagger-zh.png)
288+
![sys_user_swagger-zh.png](https://spring-boot-plus.gitee.io/img/sys_user_swagger-zh.png)
289289

290290
## 快速开始
291291
[快速开始](https://springboot.plus/guide/quick-start.html)
@@ -298,7 +298,7 @@ public class SpringBootPlusApplication {
298298
> 安装 `jdk`, `git`, `maven`, `redis`, `mysql`
299299
300300
```bash
301-
wget -O download-install-all.sh https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/bin/install/download-install-all.sh
301+
wget -O download-install-all.sh https://springboot.plus/bin/download-install-all.sh
302302
```
303303

304304
### 2. 运行安装脚本
@@ -324,7 +324,7 @@ exit
324324
325325
### 5. 下载部署脚本 `deploy.sh`
326326
```bash
327-
wget -O deploy.sh https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/deploy/deploy.sh
327+
wget -O deploy.sh https://springboot.plus/bin/deploy.sh
328328
```
329329
330330
### 6. 执行脚本
@@ -399,7 +399,7 @@ tail -f -n 1000 /root/spring-boot-plus-server/logs/spring-boot-plus.log
399399
400400
- spring-boot-plus技术交流群
401401
402-
![spring-boot-plus QQ Group](https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/img/spring-boot-plus-qq-group.png)
402+
![spring-boot-plus QQ Group](https://spring-boot-plus.gitee.io/img/spring-boot-plus-qq-group.png)
403403
404404
405405
## License

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
- Integrate maven-assembly-plugin for different environment package deployment, including startup and restart commands, and extract configuration files to external config directory
4949

5050
## Architecture
51-
![spring-boot-plus-architecture.jpg](https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/img/spring-boot-plus-architecture.jpg)
51+
![spring-boot-plus-architecture.jpg](https://springboot.plus/img/spring-boot-plus-architecture.jpg)
5252

5353
### Project Environment
5454
Middleware | Version | Remark
@@ -284,7 +284,7 @@ public class SpringBootPlusApplication {
284284
[http://127.0.0.1:8888/swagger-ui.html](http://127.0.0.1:8888/swagger-ui.html)
285285

286286
### 5. SysUser CRUD Swagger
287-
![sys_user_swagger.png](https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/img/sys_user_swagger.png)
287+
![sys_user_swagger.png](https://springboot.plus/img/sys_user_swagger.png)
288288

289289

290290
## Quick Start
@@ -300,7 +300,7 @@ public class SpringBootPlusApplication {
300300
> Install `jdk`, `git`, `maven`, `redis`, `mysql`
301301
302302
```bash
303-
wget -O download-install-all.sh https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/bin/install/download-install-all.sh
303+
wget -O download-install-all.sh https://springboot.plus/bin/download-install-all.sh
304304
```
305305

306306
### 2. Run the installation script
@@ -326,7 +326,7 @@ exit
326326
327327
### 5. Download deployment script `deploy.sh`
328328
```bash
329-
wget -O deploy.sh https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/deploy/deploy.sh
329+
wget -O deploy.sh https://springboot.plus/bin/deploy.sh
330330
```
331331
332332
### 6. Execution script

src/main/java/io/geekidea/springbootplus/core/aop/AbstractLogAop.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package io.geekidea.springbootplus.core.aop;
1818

19+
import com.alibaba.fastjson.JSON;
1920
import com.alibaba.fastjson.JSONObject;
2021
import io.geekidea.springbootplus.common.api.ApiCode;
2122
import io.geekidea.springbootplus.common.api.ApiResult;
@@ -294,7 +295,7 @@ protected String formatRequestInfo(Map<String, Object> map) {
294295
String requestInfo = null;
295296
try {
296297
if (logAopConfig.isRequestLogFormat()) {
297-
requestInfo = "\n" + Jackson.toJsonString(map, true);
298+
requestInfo = "\n" + JSON.toJSONString(map, true);
298299
} else {
299300
requestInfo = Jackson.toJsonString(map);
300301
}

0 commit comments

Comments
 (0)