diff --git a/.gitignore b/.gitignore index 2511be7f..826452cc 100644 --- a/.gitignore +++ b/.gitignore @@ -30,5 +30,5 @@ *.log logs - +*.rdb diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b4da39a..d3c72b9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # 更新日志 CHANGELOG -## [V1.3.0-RELEASE] 2019.10.05 +## [V1.3.0-RELEASE] 2019.10.06 ### ⭐️ New Features diff --git a/pom.xml b/pom.xml index f2bcaf7f..d7f6e885 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 4.12 0.5.4 1.3.0.Final - 1.4.0 + 1.4.1 3.8.3 3.8.1 @@ -290,9 +290,10 @@ org.apache.shiro - shiro-spring-boot-web-starter + shiro-spring-boot-starter ${shiro.version} + com.auth0 java-jwt diff --git a/src/main/assembly/assembly.xml b/src/main/assembly/assembly.xml index fcb65a85..5c8a23ec 100644 --- a/src/main/assembly/assembly.xml +++ b/src/main/assembly/assembly.xml @@ -79,7 +79,6 @@ NOTICE LICENSE - *.md diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index dfe5734d..b909e8da 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -27,3 +27,8 @@ spring: # logback.xml中有详细的日志配置 logging: file: logs/spring-boot-plus-log.log + +# 打印SQL语句和结果集,本地开发环境可开启,线上注释掉 +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl diff --git a/src/main/resources/config/application-local.yml b/src/main/resources/config/application-local.yml index b78fc38c..57e63ea8 100644 --- a/src/main/resources/config/application-local.yml +++ b/src/main/resources/config/application-local.yml @@ -43,3 +43,8 @@ logging: config: classpath:config/logback.xml # 方便Spring Boot Admin页面上实时查看日志 file: logs/spring-boot-plus.log + +# 打印SQL语句和结果集,本地开发环境可开启,线上注释掉 +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file