From 24e916051b41aa2d6965bb7c54e2e1ec6731d1f1 Mon Sep 17 00:00:00 2001
From: springboot-plus <springbootplus@aliyun.com>
Date: Sun, 6 Oct 2019 14:41:51 +0800
Subject: [PATCH 1/3] :cn: 1.3.0.RELEASE shiro+jwt

---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f2bcaf7f..d7f6e885 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
         <junit.version>4.12</junit.version>
         <ini.version>0.5.4</ini.version>
         <mapstruct.version>1.3.0.Final</mapstruct.version>
-        <shiro.version>1.4.0</shiro.version>
+        <shiro.version>1.4.1</shiro.version>
         <jwt.version>3.8.3</jwt.version>
 
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
@@ -290,9 +290,10 @@
         <!-- Shiro+JWT start -->
         <dependency>
             <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-spring-boot-web-starter</artifactId>
+            <artifactId>shiro-spring-boot-starter</artifactId>
             <version>${shiro.version}</version>
         </dependency>
+
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>

From f7a2e2da7acaec83adee18fd9b1d10f4bba4eb79 Mon Sep 17 00:00:00 2001
From: springboot-plus <springbootplus@aliyun.com>
Date: Sun, 6 Oct 2019 16:52:43 +0800
Subject: [PATCH 2/3] :cn: 1.3.0.RELEASE shiro+jwt

---
 CHANGELOG.md                                    | 2 +-
 src/main/assembly/assembly.xml                  | 1 -
 src/main/resources/config/application-dev.yml   | 4 ++++
 src/main/resources/config/application-local.yml | 4 ++++
 4 files changed, 9 insertions(+), 2 deletions(-)

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/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 @@
             <includes>
                 <include>NOTICE</include>
                 <include>LICENSE</include>
-                <include>*.md</include>
             </includes>
         </fileSet>
     </fileSets>
diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml
index dfe5734d..a0a14e1f 100644
--- a/src/main/resources/config/application-dev.yml
+++ b/src/main/resources/config/application-dev.yml
@@ -27,3 +27,7 @@ spring:
 # logback.xml中有详细的日志配置
 logging:
   file: logs/spring-boot-plus-log.log
+
+# 打印SQL语句和查询结果
+mybatis-plus:
+  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..8280a153 100644
--- a/src/main/resources/config/application-local.yml
+++ b/src/main/resources/config/application-local.yml
@@ -43,3 +43,7 @@ logging:
   config: classpath:config/logback.xml
   #  方便Spring Boot Admin页面上实时查看日志
   file: logs/spring-boot-plus.log
+
+# 打印SQL语句和查询结果
+mybatis-plus:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file

From a8f4aa518ecb19d408c686339eb2c7c663586331 Mon Sep 17 00:00:00 2001
From: springboot-plus <springbootplus@aliyun.com>
Date: Sun, 6 Oct 2019 17:50:09 +0800
Subject: [PATCH 3/3] :cn: 1.3.0.RELEASE shiro+jwt

---
 .gitignore                                      | 2 +-
 src/main/resources/config/application-dev.yml   | 5 +++--
 src/main/resources/config/application-local.yml | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2511be7f..826452cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,5 +30,5 @@
 *.log
 logs
 
-
+*.rdb
 
diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml
index a0a14e1f..b909e8da 100644
--- a/src/main/resources/config/application-dev.yml
+++ b/src/main/resources/config/application-dev.yml
@@ -28,6 +28,7 @@ spring:
 logging:
   file: logs/spring-boot-plus-log.log
 
-# 打印SQL语句和查询结果
+# 打印SQL语句和结果集，本地开发环境可开启，线上注释掉
 mybatis-plus:
-  log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  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 8280a153..57e63ea8 100644
--- a/src/main/resources/config/application-local.yml
+++ b/src/main/resources/config/application-local.yml
@@ -44,6 +44,7 @@ logging:
   #  方便Spring Boot Admin页面上实时查看日志
   file: logs/spring-boot-plus.log
 
-# 打印SQL语句和查询结果
+# 打印SQL语句和结果集，本地开发环境可开启，线上注释掉
 mybatis-plus:
+  configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file