Merge pull request #69 from geekidea/dev

🇨🇳 1.3.0.RELEASE shiro+jwt

Author: springboot-plus

Diff for: CHANGELOG.md

@@ -3,16 +3,35 @@
 ## [V1.3.0-RELEASE] 2019.10.06
 
 ###  ⭐️  New Features
+- 集成Apache Shiro安全框架
+- 集成JWT 跨域身份验证解决方案
 
 ### ⚡️ Optimization
+- 优化代码生成模块格式
+- mybatis控制台打印SQL执行语句及结果集
+- Redis使用Jackson序列化 `RedisTemplateConfig` `GenericJackson2JsonRedisSerializer`
+- 删除security目录	
+- [修改sys_user表结构](https://github.com/geekidea/spring-boot-plus/blob/master/docs/db/mysql_spring_boot_plus.sql)
 
 ### 📝 Added/Modified
+- Add `SpringBootPlusFilterConfig` 过滤器配置类
+- Add `SpringBootPlusException`,`DaoException` 自定义异常类
+- Add `ShiroConfig`, `ShiroPermissionConfig`, `ShiroProperties` Shiro配置类
+- Add `JwtCredentialsMatcher`, 'JwtFilter', 'JwtProperties', 'JwtRealm', 'JwtToken' JWT配置
+- Add `LoginRedisService`, 'LoginRedisServiceImpl' Redis登陆缓存处理
 
+### 🐞  Bug Fixes
+- fix startup.sh启动jar指定logback.xml
 
 ### 📔  Documentation
+- [https://springboot.plus/guide/shiro-jwt.html](https://springboot.plus/guide/shiro-jwt.html)
 
 ### 🔨 Dependency Upgrades
 - Upgrade to `Fastjson` 1.2.61
+- Add `shiro-spring-boot-starter` `1.4.1`
+- Add `java-jwt` `3.8.3`
+- Add `mapstruct`, `mapstruct-processor` `1.3.0.Final` 对象属性复制
+- Add `ini4j` `0.5.4` ini格式文件处理
 
 
 ## [V1.2.3-RELEASE] 2019.09.09 :computer: 

Diff for: README-zh.md

@@ -71,7 +71,7 @@ commons-codec | 1.13 | 加密解密等工具包 |
 commons-collections4 | 4.4 | 集合工具包 |
 reflections | 0.9.11 | 反射工具包 |
 hibernate-validator | 6.0.17.Final | 后台参数校验注解 |
-Shiro | 1.4.0 | 权限控制 |
+Shiro | 1.4.1 | 权限控制 |
 JWT | 3.8.3 | JSON WEB TOKEN |
 hutool-all | 4.6.4 | 常用工具集 |
 lombok | 1.18.8 | 注解生成Java Bean等工具 |

Diff for: README.md

@@ -73,7 +73,7 @@ commons-codec | 1.13 | Apache Toolkit such as encryption and decryption |
 commons-collections4 | 4.4 | Apache collections toolkit |
 reflections | 0.9.11 | Reflection Toolkit  |
 hibernate-validator | 6.0.17.Final | Validator toolkit |
-Shiro | 1.4.0 | Permission control |
+Shiro | 1.4.1 | Permission control |
 JWT | 3.8.3 | JSON WEB TOKEN |
 hutool-all | 4.6.4 | Common toolset |
 lombok | 1.18.8 | Automatically plugs |

Diff for: pom.xml

@@ -66,7 +66,7 @@
         <spring-boot-admin.version>2.1.6</spring-boot-admin.version>
         <hutool.version>4.6.4</hutool.version>
         <junit.version>4.12</junit.version>
-        <ini.version>0.5.4</ini.version>
+        <ini4j.version>0.5.4</ini4j.version>
         <mapstruct.version>1.3.0.Final</mapstruct.version>
         <shiro.version>1.4.1</shiro.version>
         <jwt.version>3.8.3</jwt.version>
@@ -271,7 +271,7 @@
         <dependency>
             <groupId>org.ini4j</groupId>
             <artifactId>ini4j</artifactId>
-            <version>${ini.version}</version>
+            <version>${ini4j.version}</version>
         </dependency>
 
         <!-- 对象属性复制 -->