🇨🇳 1.3.0.RELEASE shiro+jwt

Author: springboot-plus

README-zh.md

@@ -38,7 +38,7 @@
 2. 集成mybatis plus快速dao操作
 3. 快速生成后台代码: entity/param/vo/controller/service/mapper/xml
 4. 集成swagger2，可自动生成api文档
-5. 集成jwt、spring security权限控制
+5. 集成jwt、shiro/spring security权限控制
 6. 集成redis、spring cache、ehcache缓存
 7. 集成rabbit/rocket/kafka mq消息队列
 8. 集成druid连接池，JDBC性能和慢查询检测
@@ -71,9 +71,11 @@ commons-codec | 1.13 | 加密解密等工具包 |
 commons-collections4 | 4.4 | 集合工具包 |
 reflections | 0.9.11 | 反射工具包 |
 hibernate-validator | 6.0.17.Final | 后台参数校验注解 |
-jwt | 0.9.1 | json web token |
+Shiro | 1.4.0 | 权限控制 |
+JWT | 3.8.3 | JSON WEB TOKEN |
 hutool-all | 4.6.4 | 常用工具集 |
 lombok | 1.18.8 | 注解生成Java Bean等工具 |
+mapstruct | 1.3.0.Final | 对象属性复制工具 |
 
 ## CHANGELOG
 #### [CHANGELOG.md](https://github.com/geekidea/spring-boot-plus/blob/master/CHANGELOG.md)

README.md

@@ -40,7 +40,7 @@
 - Integrated mybatis-plus fast dao operation
 - Quickly generate background code:entity/param/vo/controller/service/mapper/xml
 - Integrated swagger2, automatic generation of api documents
-- Integrated JWT, spring security permission control
+- Integrated JWT,Shiro/Spring security permission control
 - Integrated Redis、spring cache、ehcache,etc
 - Integrated Rabbit/Rocket/Kafka MQ
 - Integration alibaba druid connection pool, JDBC performance and slow query detection
@@ -73,9 +73,11 @@ 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 |
-jwt | 0.9.1 | JSON WEB TOKEN |
+Shiro | 1.4.0 | Permission control |
+JWT | 3.8.3 | JSON WEB TOKEN |
 hutool-all | 4.6.4 | Common toolset |
 lombok | 1.18.8 | Automatically plugs |
+mapstruct | 1.3.0.Final | Object property replication tool |
 
 ## CHANGELOG
 #### [CHANGELOG.md](https://github.com/geekidea/spring-boot-plus/blob/master/CHANGELOG.md)

pom.xml

@@ -63,11 +63,13 @@
         <jansi.version>1.18</jansi.version>
         <lombok.version>1.18.8</lombok.version>
         <commons-pool2.version>2.7.0</commons-pool2.version>
-        <jwt.version>0.9.1</jwt.version>
         <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>
         <mapstruct.version>1.3.0.Final</mapstruct.version>
+        <shiro.version>1.4.0</shiro.version>
+        <jwt.version>3.8.3</jwt.version>
 
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
@@ -265,12 +267,14 @@
         </dependency>
         <!-- spring boot admin end -->
 
+        <!-- ini格式处理 -->
         <dependency>
             <groupId>org.ini4j</groupId>
             <artifactId>ini4j</artifactId>
-            <version>0.5.4</version>
+            <version>${ini.version}</version>
         </dependency>
 
+        <!-- 对象属性复制 -->
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct</artifactId>
@@ -283,29 +287,22 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Shiro JWT start -->
+        <!-- Shiro+JWT start -->
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-spring-boot-web-starter</artifactId>
-            <version>1.4.0</version>
+            <version>${shiro.version}</version>
         </dependency>
-
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
-            <version>3.8.3</version>
+            <version>${jwt.version}</version>
         </dependency>
-
-<!--        <dependency>-->
-<!--            <groupId>io.jsonwebtoken</groupId>-->
-<!--            <artifactId>jjwt</artifactId>-->
-<!--            <version>${jwt.version}</version>-->
-<!--        </dependency>-->
-
-        <!-- Spring Security JWT start -->
+        <!-- Shiro+JWT end -->
 
     </dependencies>
 
+
     <build>
         <finalName>spring-boot-plus</finalName>
 

src/main/java/io/geekidea/springbootplus/shiro/jwt/JwtFilter.java

@@ -151,22 +151,6 @@ protected boolean onLoginSuccess(AuthenticationToken token, Subject subject, Ser
         return true;
     }
 
-    /**
-     * 如果(当前时间+倒计时) > 过期时间，则刷新token
-     * 并更新缓存
-     * 当前token失效，返回新token
-     * 当前请求有效，返回状态码：460
-     * 前端下次使用新token
-     * 如果token继续发往后台，则提示，此token已失效，请使用新token，不在返回新token，返回状态码：461
-     *
-     * @param authenticationToken
-     */
-    protected void refreshToken(AuthenticationToken authenticationToken, ServletResponse response) {
-
-
-    }
-
-
     /**
      * 登陆失败处理
      *

src/main/java/io/geekidea/springbootplus/shiro/service/LoginService.java

@@ -42,7 +42,12 @@ public interface LoginService {
     ApiResult login(LoginParam loginParam, HttpServletResponse response);
 
     /**
-     * 刷新token
+     * 如果(当前时间+倒计时) > 过期时间，则刷新token
+     * 并更新缓存
+     * 当前token失效，返回新token
+     * 当前请求有效，返回状态码：460
+     * 前端下次使用新token
+     * 如果token继续发往后台，则提示，此token已失效，请使用新token，不在返回新token，返回状态码：461
      *
      * @param jwtToken
      * @param httpServletResponse

src/main/resources/config/logback.xml

@@ -87,14 +87,13 @@
         <appender-ref ref ="ERROR_FILE"/>
     </appender>
 
-
     <!-- 不同环境的日志级别配置 -->
     <springProfile name="local">
         <logger name="io.geekidea.springbootplus" level="DEBUG"/>
     </springProfile>
 
     <!-- 解决SpringBootAdmin错误日志问题 -->
-<!--    <logger name="org.apache.catalina.connector.CoyoteAdapter" level="OFF"/>-->
+    <logger name="org.apache.catalina.connector.CoyoteAdapter" level="OFF"/>
 
     <root level="INFO">
         <appender-ref ref="CONSOLE" />