From 4e5f0d8148f939ef6273a9049f6356cd473d7739 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Tue, 4 Aug 2020 16:56:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9session=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/manage/controller/FontController.java     |  4 ++++
 .../com/manage/interceptor/LoginInterceptor.java  | 15 ++++++++++++++-
 .../src/main/resources/config/config.properties   |  4 ++--
 .../src/main/resources/config/jdbc.properties     |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/power-admin/src/main/java/com/manage/controller/FontController.java b/power-admin/src/main/java/com/manage/controller/FontController.java
index abd0f04..515023b 100644
--- a/power-admin/src/main/java/com/manage/controller/FontController.java
+++ b/power-admin/src/main/java/com/manage/controller/FontController.java
@@ -268,6 +268,10 @@ public class FontController {
                 if (cache == null) {
                     return Msg.fail("token已过期或不存在");
                 }
+				//更新过期时间
+                Power_UserVo user = (Power_UserVo) cache.getValue();
+                String date = String.valueOf(DateUtils.getDate());
+                CacheManager.putCache(token,new Cache(date,user,TOKEN_EXPIRE_TIME));
             }else{
                 return Msg.fail("token不能为空");
             }
diff --git a/power-admin/src/main/java/com/manage/interceptor/LoginInterceptor.java b/power-admin/src/main/java/com/manage/interceptor/LoginInterceptor.java
index d9c7f41..a3f89f4 100644
--- a/power-admin/src/main/java/com/manage/interceptor/LoginInterceptor.java
+++ b/power-admin/src/main/java/com/manage/interceptor/LoginInterceptor.java
@@ -7,8 +7,11 @@ import com.manage.service.cache.Cache;
 import com.manage.service.cache.CacheManager;
 import com.manage.service.Power_UserService;
 import com.manage.util.Constant;
+import com.manage.util.DateUtils;
+import com.manage.vo.Power_UserVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.PathMatcher;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -19,9 +22,12 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.Properties;
 
 public class    LoginInterceptor implements HandlerInterceptor {
+	@Value("${TOKEN_EXPIRE_TIME}")
+    private long TOKEN_EXPIRE_TIME;
     @Autowired
     Power_UserService powerUserService;
 
+    @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object o) throws Exception {
         String ctx = request.getServletContext().getContextPath();
         String url = request.getRequestURI();
@@ -46,6 +52,12 @@ public class    LoginInterceptor implements HandlerInterceptor {
                 token = MD5.JM(Base64.decode(token));
                 Cache cache = CacheManager.getCacheInfo(token);
                 if (cache != null) {
+					if(!"/getSessionRemainingTime".equals(parentUrl)) {
+                        //更新过期时间
+                        Power_UserVo user = (Power_UserVo) cache.getValue();
+                        String date = String.valueOf(DateUtils.getDate());
+                        CacheManager.putCache(token, new Cache(date, user, TOKEN_EXPIRE_TIME));
+                    }
                     return true;
                 }
             }
@@ -77,8 +89,9 @@ public class    LoginInterceptor implements HandlerInterceptor {
             String[] values = value.split(",");
             PathMatcher matcher =  new AntPathMatcher();
             for(String v : values){
-                if(matcher.match(v,url))
+                if(matcher.match(v,url)) {
                     return true;
+                }
             }
         }else if(value.equals(url)){
             return true;
diff --git a/power-admin/src/main/resources/config/config.properties b/power-admin/src/main/resources/config/config.properties
index 8761d84..652fb47 100644
--- a/power-admin/src/main/resources/config/config.properties
+++ b/power-admin/src/main/resources/config/config.properties
@@ -5,11 +5,11 @@ releaseRequest = /login,/logout,/services,/font,/refuse,/swagger-ui.html,/webjar
 ajaxRequest = none
 
 #session过期时间
-TOKEN_EXPIRE_TIME = 1200000
+TOKEN_EXPIRE_TIME = 3600000
 
 ##################################################服务器ip##########################################################
 #通用服务器IP与通用服务器端口
-SERVER_IP = localhost
+SERVER_IP = 192.168.1.101
 SERVER_PORT = 8081
 
 #power权限系统ip
diff --git a/power-admin/src/main/resources/config/jdbc.properties b/power-admin/src/main/resources/config/jdbc.properties
index ac65c0c..a51355d 100644
--- a/power-admin/src/main/resources/config/jdbc.properties
+++ b/power-admin/src/main/resources/config/jdbc.properties
@@ -1,5 +1,5 @@
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc\:mysql\://localhost\:3306/qfpower?useUnicode\=true&characterEncoding\=utf-8
+jdbc.url=jdbc\:mysql\://192.168.1.3\:3306/qfpower?useUnicode\=true&characterEncoding\=utf-8
 jdbc.username=root
 jdbc.password=docus702