Merge pull request #68 from geekidea/dev

🇨🇳 1.3.0.RELEASE shiro+jwt

Author: springboot-plus

.gitignore

@@ -30,5 +30,5 @@
 *.log
 logs
 
-
+*.rdb
 

CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志 CHANGELOG
 
-## [V1.3.0-RELEASE] 2019.10.05
+## [V1.3.0-RELEASE] 2019.10.06
 
 ###  ⭐️  New Features
 

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>

src/main/assembly/assembly.xml

@@ -79,7 +79,6 @@
             <includes>
                 <include>NOTICE</include>
                 <include>LICENSE</include>
-                <include>*.md</include>
             </includes>
         </fileSet>
     </fileSets>

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

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