更新 token

README.md

@@ -1,4 +1,8 @@
 # szwlServer 申泽移动物联
+## 功能设计文档
+UI图：https://lanhuapp.com/url/rk4hO-Av0mUD
+文档：https://docs.qq.com/doc/DUEtOTHB3TlpyT1Ri
+UI图：https://lanhuapp.com/url/rk4hO-Av0mUD
 
 ## 注册中心
 http://112.74.63.148:49001/
@@ -38,4 +42,9 @@ ResponseCodesEnum 为错误码，其中 ALL_OK("00000","SUCCESS") 表示成功
 启动命令：/app/appsystem/startSpringCloud.sh  /app/appsystem/springcloud/你的包名.jar
 查看状态：/app/appsystem/checkSpringCloud.sh
 关闭命令：/app/appsystem/stopSpringCloud.sh /app/appsystem/springcloud/你的包名.jar
-查看日志：vi /app/applogs/szwl-server/szwl-server.log
+查看日志：vi /app/applogs/szwl-server/szwl-server.log
+
+## 审计日志
+例：@Audit(type = AuditEnum.QUERY,bizNo = "#returnObj.data.num",content = "#loginUser.userRealName + '调用 测试审计日志功能'")
+参考 DemoController.testAuditLog
+日志内容，支持SPEL，使用 #作为标识符，具体参考com.szwl.annotation.Audit 里面的描述

src/main/java/com/szwl/filter/HeadTokenInterceptor.java

@@ -1,4 +1,4 @@
-package com.szwl.filter;
+package com.szwl.aspect;
 
 import com.szwl.constant.ResponseCodesEnum;
 import com.szwl.exception.BizException;
@@ -19,9 +19,6 @@ import javax.servlet.http.HttpServletResponse;
 public class HeadTokenInterceptor implements HandlerInterceptor {
     @Autowired
     private TokenManager tokenManager;
-    @Value("${permitAll.url:[]}")
-    private String[] permitAll;
-
     //在Controller执行之前调用，如果返回false，controller不执行
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {

src/main/java/com/szwl/filter/MyWebMvcConfigurer.java

@@ -1,6 +1,5 @@
-package com.szwl.filter;
+package com.szwl.aspect;
 
-import cn.hutool.core.collection.CollUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
@@ -8,8 +7,6 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
-import java.util.ArrayList;
-
 @Configuration
 public class MyWebMvcConfigurer extends WebMvcConfigurationSupport {
     @Value("${swagger.url:[]}")

src/main/java/com/szwl/filter/TokenFilter.java

@@ -1,64 +0,0 @@
-//package com.szwl.filter;
-//
-//import com.szwl.constant.ResponseCodesEnum;
-//import com.szwl.manager.TokenManager;
-//import com.szwl.model.bo.R;
-//import com.szwl.util.ServletUtil;
-//import com.szwl.util.UrlUtil;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.data.redis.core.RedisTemplate;
-//import org.springframework.stereotype.Component;
-//import org.springframework.web.filter.OncePerRequestFilter;
-//
-//import javax.servlet.FilterChain;
-//import javax.servlet.ServletException;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.IOException;
-//import java.util.List;
-//
-///**
-// * @author PT-ZHOUYUHENG
-// * @date 2021-11-01 15:59
-// */
-//@Component
-//@Slf4j
-//public class TokenFilter extends OncePerRequestFilter {
-//
-//    @Autowired
-//    private TokenManager tokenManager;
-//
-//    @Value("${permitAll.url:[]}")
-//    private String[] permitAll;
-//
-//    /**
-//     * token不能为空
-//     *
-//     * @param httpServletRequest
-//     * @param httpServletResponse
-//     * @param filterChain
-//     * @throws ServletException
-//     * @throws IOException
-//     */
-//    @Override
-//    protected void doFilterInternal(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, FilterChain filterChain) throws ServletException, IOException {
-//        String uri = httpServletRequest.getRequestURI();
-//        log.info("--request uri: {}", uri);
-//        //如果是忽略token的放行
-//        if ( UrlUtil.matches(uri, permitAll)) {
-//            log.info("--the request uri is ignore token");
-//            filterChain.doFilter(httpServletRequest, httpServletResponse);
-//            return;
-//        }
-//        //校验 token 是否合法
-//        if(tokenManager.checkToken(httpServletRequest)){
-//            filterChain.doFilter(httpServletRequest, httpServletResponse);
-//            return;
-//        }
-//        //响应错误
-//        log.info("--the request valid fail");
-//        ServletUtil.renderJSON(httpServletResponse, R.fail(ResponseCodesEnum.L0005));
-//    }
-//}

src/main/java/com/szwl/manager/TokenManager.java

@@ -33,6 +33,7 @@ public class TokenManager {
         UserDetailBO details = getUserDetails(token);
         if (null!= details) {
             threadLocal.set(details);
+            updateAuthenticationExpire(token);
             return true;
         }
         //登陆凭证已过期或不可用