token 续期问题

src/main/java/com/liang/common/config/AuthFilter.java

@@ -0,0 +1,118 @@
+package com.liang.common.config;
+
+import com.liang.common.JsonTool;
+import com.liang.common.utils.SecurityUtil;
+import com.liang.common.utils.SystemConst;
+import com.liang.entity.SysUserInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.util.PathMatcher;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import static com.liang.common.utils.SecurityUtil.getSysUserInfo;
+
+/**
+ * Restful方式登录<br>
+ * 在参数中或者header里加参数login-token作为登录凭证<br>
+ * 参数值是登录成功后的返回值中获取
+ */
+
+@Slf4j
+@Component
+public class AuthFilter extends OncePerRequestFilter {
+
+    //     排除拦截地址
+    private static List<String> excludedPaths = new ArrayList<>();
+    static {
+        excludedPaths.add("/home/**");
+        excludedPaths.add("/login/**");
+        excludedPaths.add("/images/**");
+        excludedPaths.add("/api/**");
+        excludedPaths.add("/css/**");
+        excludedPaths.add("/excel/**");
+        excludedPaths.add("/js/**");
+        excludedPaths.add("/lib/**");
+    }
+    @Value("${KYGK.session-timeout}")
+    private int sessionTimeout;
+    private static String info = JsonTool.toJsonString(new ResponseInfo(HttpStatus.UNAUTHORIZED.value(), "token不存在或者过期"));
+    @Override
+    protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException {
+        String uri = request.getServletPath();
+        PathMatcher matcher = new AntPathMatcher();
+        Optional<String> excludedOptional = excludedPaths.stream().filter(excludePath -> matcher.match(excludePath, uri)).findAny();
+        return excludedOptional.isPresent();
+    }
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+        if (isAccessAllowed(request, response)) {
+            filterChain.doFilter(request, response);
+        } else {
+            writeResponse(response, request);
+        }
+    }
+
+    private boolean isAccessAllowed(ServletRequest request, ServletResponse response) {
+        if (HttpMethod.OPTIONS.name().equalsIgnoreCase(((HttpServletRequest) request).getMethod())) {
+            return Boolean.TRUE;
+        }
+
+
+        try {
+
+            SysUserInfo user = getSysUserInfo();
+            if (null != user) {
+                long timeout = SecurityUtil.getRedisUtil().getExpire(SystemConst.SYSTEM_USER_KEY + ":" + SecurityUtil.getUserKey());
+                if (timeout > 0) {
+                    SecurityUtil.getRedisUtil().set(SystemConst.SYSTEM_USER_KEY + ":" + SecurityUtil.getUserKey(), user, sessionTimeout);
+                }
+                return true;
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        return false;
+    }
+
+    private static void writeResponse(HttpServletResponse response, HttpServletRequest request) {
+        writeResponse(response, request, info);
+    }
+
+    public static void writeResponse(HttpServletResponse response, HttpServletRequest request,  String info) {
+        try {
+//            response.setStatus(status);
+//            response.setHeader("Access-Control-Allow-Origin", request.getHeader("Origin"));
+//            response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+//            response.setHeader("Access-Control-Allow-Credentials", "true");
+////            response.setContentType("application/json;charset=UTF-8");
+//            response.sendRedirect("/home/index");
+//            response.getWriter().write(info);
+
+            if("XMLHttpRequest".equals(request.getHeader("X-Requested-With"))){
+                //如果是ajax请求
+                response.setContentType("application/json;charset=UTF-8");
+                response.getWriter().write(info);
+                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+            }else{
+                response.sendRedirect("/home/index?loginStatus=redirect");
+            }
+
+        } catch (IOException e) {
+        }
+    }
+}

src/main/java/com/liang/common/config/ResponseInfo.java

@@ -0,0 +1,17 @@
+package com.liang.common.config;
+
+import lombok.*;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class ResponseInfo implements Serializable {
+
+	private static final long serialVersionUID = -4417715614021482064L;
+
+	private int code;
+	private String message;
+}

src/main/java/com/liang/common/utils/SecurityUtil.java

@@ -23,7 +23,7 @@ public class SecurityUtil {
 
     private static RedisUtil redisUtil;
 
-    private static RedisUtil getRedisUtil() {
+    public static RedisUtil getRedisUtil() {
         if (redisUtil == null) {
             redisUtil = SpringUtil.getBean("redisUtil");
         }

src/main/java/com/liang/controller/HomeController.java

@@ -66,34 +66,35 @@ public class HomeController extends BaseController {
     @RequestMapping(value = "/", method = RequestMethod.GET)
     public String home(Model model) {
         String account = getSysUserAccount();
-        if(account != null) {
+        if (account != null) {
             model.addAttribute("account", account);
             return "home/index";
-        }
-        else{
+        } else {
             return "login/login";
         }
-    }	
-	
-	@RequestMapping(value = "/login")
-    public String login()
-    {
-      return "login/login";
+    }
+
+    @RequestMapping(value = "/login")
+    public String login() {
+        return "login/login";
     }
 
 
     @RequestMapping(value = "/index", method = RequestMethod.GET)
-    public ModelAndView user(HttpServletRequest request,HttpSession session) {
+    public ModelAndView user(HttpServletRequest request, HttpSession session) {
         String account = getSysUserAccount();
-		if(account != null)
-        {
+        if (account != null) {
             ModelAndView mv = new ModelAndView();
             mv.addObject("account", account);
             mv.setViewName("home/index");
             return mv;
-        }
-        else{
+        } else {
+            String loginStatus = request.getParameter("loginStatus");
+
             ModelAndView mv = new ModelAndView();
+            if (StringUtils.isNotBlank(loginStatus)) {
+                mv.addObject("loginStatus", loginStatus);
+            }
             mv.setViewName("login/login");
             return mv;
         }
@@ -103,17 +104,17 @@ public class HomeController extends BaseController {
     @RequestMapping(value = "/doLogin", method = RequestMethod.POST)
     @ResponseBody
     public BaseResult doLogin(HttpSession session,
-                                @RequestParam(required = true, defaultValue = "", value = "username") String account,
-                                @RequestParam(required = true, defaultValue = "", value = "password") String password,
+                              @RequestParam(required = true, defaultValue = "", value = "username") String account,
+                              @RequestParam(required = true, defaultValue = "", value = "password") String password,
                               HttpServletRequest request,
-                              HttpServletResponse response){
+                              HttpServletResponse response) {
 
-        logger.info("account:"+account+" password:"+password);
+        logger.info("account:" + account + " password:" + password);
         SysUserInfo userInfo = sysUserInfoService.getUserByAccount(account);
 
         password = SHA256Utils.SHA256Encode(password);
 
-        if(userInfo!= null && userInfo.getPassword().equals(password)){
+        if (userInfo != null && userInfo.getPassword().equals(password)) {
             logger.info("LoginController - doLogin - {}登陆成功！", account);
             Map<String, Object> resultMap = new HashMap<>();
             String redisKey = IdGenerate.uuid();
@@ -134,10 +135,11 @@ public class HomeController extends BaseController {
 //            session.setAttribute("user", userInfo);
 
             return BaseResult.success("登录成功!");
-        }else{
+        } else {
             return BaseResult.success("登录失败!");
         }
     }
+
     /**
      * 查询页面初始化
      *
@@ -166,6 +168,7 @@ public class HomeController extends BaseController {
 
     /**
      * 基本资料
+     *
      * @param model
      * @return
      */
@@ -179,6 +182,7 @@ public class HomeController extends BaseController {
 
     /**
      * 获取菜单
+     *
      * @return
      */
     @RequestMapping(value = "/menuInit", method = RequestMethod.GET)
@@ -197,8 +201,8 @@ public class HomeController extends BaseController {
         int userId = getSysUserId();
 
         Map<String, Object> map = new HashMap<>(16);
-        Map<String,Object> home = new HashMap<>(16);
-        Map<String,Object> logo = new HashMap<>(16);
+        Map<String, Object> home = new HashMap<>(16);
+        Map<String, Object> logo = new HashMap<>(16);
 
         List<Map> menuList = sysPermissionInfoService.menuInit(userId);
 
@@ -222,7 +226,7 @@ public class HomeController extends BaseController {
 
         for (Map temp : menuList) {
             MenuVo menuVO = new MenuVo();
-            menuVO.setPermissionId((String)temp.get("permission_id"));
+            menuVO.setPermissionId((String) temp.get("permission_id"));
             menuVO.setParentId((String) temp.get("parent_id"));
             menuVO.setHref((String) temp.get("href"));
             menuVO.setTitle((String) temp.get("title"));
@@ -251,8 +255,9 @@ public class HomeController extends BaseController {
 
     /**
      * 获取菜单的树状结构（双重遍历法list转tree）
+     *
      * @param menuList 菜单列表
-     * @param topPid 顶级ID
+     * @param topPid   顶级ID
      * @return
      */
     private List<MenuVo> toTree(List<MenuVo> menuList, String topPid) {
@@ -282,11 +287,12 @@ public class HomeController extends BaseController {
 
     /**
      * 修改密码操作
+     *
      * @param old_password
      * @param new_password
      * @return
      */
-    @RequestMapping(value="/doUpdatePassword",method = RequestMethod.POST)
+    @RequestMapping(value = "/doUpdatePassword", method = RequestMethod.POST)
     @ResponseBody
     public BaseResult doUpdatePassword(@RequestParam("old_password") String old_password,
                                        @RequestParam("new_password") String new_password) {
@@ -307,7 +313,7 @@ public class HomeController extends BaseController {
             userInfo.setPassword(new_password);
 
             int num = sysUserInfoService.resetPass(userInfo);
-            if(num > 0)
+            if (num > 0)
                 return BaseResult.success("密码修改成功");
             else
                 return BaseResult.failure("修改密码失败");
@@ -318,9 +324,10 @@ public class HomeController extends BaseController {
 
     /**
      * 退出登录
+     *
      * @return
      */
-    @RequestMapping(value = "/outLogin",method = RequestMethod.GET)
+    @RequestMapping(value = "/outLogin", method = RequestMethod.GET)
     public String outLogin() {
         String userKey = SecurityUtil.getUserKey();
         // 先从redis里面拿出菜单信息，拿不到的话，再去手动查询
@@ -335,13 +342,14 @@ public class HomeController extends BaseController {
 
     /**
      * 修改用户信息
+     *
      * @return
      */
     @RequestMapping(value = "/doUpdate", method = RequestMethod.POST)
     @ResponseBody
     public BaseResult doUpdate(@RequestParam(value = "userId") Integer userId,
                                @RequestParam(value = "phone") String phone,
-                               @RequestParam(required = false, defaultValue = "", value = "email") String email){
+                               @RequestParam(required = false, defaultValue = "", value = "email") String email) {
 
         SysUserInfo userInfo = new SysUserInfo();
         userInfo.setUserId(userId);

src/main/resources/static/js/lay-config.js

@@ -109,16 +109,23 @@ $(document).on("click", "td div.laytable-cell-checkbox div.layui-form-checkbox",
  * 设置AJAX的全局默认选项，
  * 当AJAX请求会话过期时，跳转到登陆页面
  */
-// $.ajaxSetup({
-//     complete: function(XMLHttpRequest, textStatus){
-//         if (XMLHttpRequest.responseJSON.code === 401) {
-//             layer.alert('会话已过期，请重新登录', function(index){
-//                 layer.close(index);
-//                 window.location.href = AjaxUtil.ctx + "home/login";
-//             });
-//         }
-//     }
-// } );
+$.ajaxSetup({
+    complete: function (XMLHttpRequest, textStatus) {
+        console.log(XMLHttpRequest)
+        console.log("前端重定向")
+        if (XMLHttpRequest.responseJSON.code === 401) {
+            layer.alert('会话已过期，请重新登录', function (index) {
+                layer.close(index);
+                var win = window;
+                while (win != win.top) {
+                    win = win.top;
+                }
+                //重新跳转到 login.html
+                win.location.href = "/home/index";
+            });
+        }
+    }
+});
 
 /**
  * 配置layer.open的宽度和高度
@@ -385,14 +392,14 @@ function toDateString(time, format) {
  * @param length
  * @returns {string}
  */
-function digit(num, length){
+function digit(num, length) {
     var str = '';
     num = String(num);
     length = length || 2;
-    for(var i = num.length; i < length; i++){
+    for (var i = num.length; i < length; i++) {
         str += '0';
     }
-    return num < Math.pow(10, length) ? str + (num|0) : num;
+    return num < Math.pow(10, length) ? str + (num | 0) : num;
 }
 
 /**

src/main/resources/templates/login/login.html

@@ -315,11 +315,11 @@
                     <span class="bind-password icon icon-4"></span>
                 </div>
 
-<!--                <div id="validatePanel" class="item" style="width: 167px;">-->
-<!--                    <span class="icon icon-1"></span>-->
-<!--                    <input type="text" id="captcha" name="captcha" placeholder="请输入验证码" autocomplete="off" maxlength="4">-->
-<!--                    <img id="ver_btn" class="validateImg" alt="看不清? 点击刷新" title="看不清? 点击刷新"/>-->
-<!--                </div>-->
+                <!--                <div id="validatePanel" class="item" style="width: 167px;">-->
+                <!--                    <span class="icon icon-1"></span>-->
+                <!--                    <input type="text" id="captcha" name="captcha" placeholder="请输入验证码" autocomplete="off" maxlength="4">-->
+                <!--                    <img id="ver_btn" class="validateImg" alt="看不清? 点击刷新" title="看不清? 点击刷新"/>-->
+                <!--                </div>-->
 
             </div>
             <div class="tip">
@@ -350,11 +350,15 @@
     AjaxUtil.ctx = /*[[@{/}]]*/'';
     // 在页面加载完毕后调用拦截器函数
 
-    layui.use(['form', 'layNotify'], function () {
+    layui.use(['form', 'layNotify', 'layer'], function () {
 
         var form = layui.form,
             layNotify = layui.layNotify;
-
+        var layer = layui.layer;
+        var loginStatus = [[${loginStatus}]];
+        if (loginStatus === 'redirect') {
+            layer.alert("会话已过期，请重新登录")
+        }
         // 登录过期的时候，跳出ifram框架
         if (top.location != self.location) {
             top.location = self.location;
@@ -488,9 +492,10 @@
             }
         });
 
-        function redirection(){
+        function redirection() {
             window.location.replace("http://10.208.114.107:8081/home/")
         }
+
         // 登陆中
         function logining() {
             document.getElementById("btn_login").setAttribute("disabled", true);//设置不可点击
@@ -525,12 +530,9 @@
         // }
 
 
-
     });
 
 
-
-
 </script>
 
 </body>