From f2d3ee1af979cf83186167cf9102036708212742 Mon Sep 17 00:00:00 2001
From: tanghc <thc8775@163.com>
Date: Fri, 13 Dec 2019 13:29:27 +0800
Subject: [PATCH] 2.5.7

---
 sop-admin/sop-admin-server/pom.xml            |  2 +-
 .../common/MyApiSessionManager.java           | 58 -------------------
 .../sop/adminserver/config/WebConfig.java     |  3 +-
 3 files changed, 2 insertions(+), 61 deletions(-)
 delete mode 100644 sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/common/MyApiSessionManager.java

diff --git a/sop-admin/sop-admin-server/pom.xml b/sop-admin/sop-admin-server/pom.xml
index 671563ac..0a5c6f60 100644
--- a/sop-admin/sop-admin-server/pom.xml
+++ b/sop-admin/sop-admin-server/pom.xml
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>net.oschina.durcframework</groupId>
 			<artifactId>easyopen-spring-boot-starter</artifactId>
-			<version>1.16.2</version>
+			<version>1.16.5</version>
 		</dependency>
 
 		<dependency>
diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/common/MyApiSessionManager.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/common/MyApiSessionManager.java
deleted file mode 100644
index 4a0dcd27..00000000
--- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/common/MyApiSessionManager.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.gitee.sop.adminserver.common;
-
-import com.gitee.easyopen.exception.ApiException;
-import com.gitee.easyopen.session.ApiSessionManager;
-import com.google.common.cache.LoadingCache;
-import lombok.extern.slf4j.Slf4j;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-
-/**
- * @author tanghc
- */
-@Slf4j
-public class MyApiSessionManager extends ApiSessionManager {
-
-    private volatile LoadingCache<String, HttpSession> cache;
-
-    @Override
-    public HttpSession getSession(String sessionId) {
-        if (sessionId == null) {
-            return this.createSession(sessionId);
-        }
-        try {
-            return getCache().get(sessionId);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            throw new ApiException("create session error");
-        }
-    }
-
-    /**
-     * 创建一个session
-     *
-     * @param sessionId 传null将返回一个新session
-     * @return 返回session
-     */
-    @Override
-    protected HttpSession createSession(String sessionId) {
-        ServletContext servletContext = getServletContext();
-        HttpSession session = this.newSession(sessionId, servletContext);
-        session.setMaxInactiveInterval(getSessionTimeout());
-        getCache().put(session.getId(), session);
-        return session;
-    }
-
-    public LoadingCache<String, HttpSession> getCache() {
-        if (cache == null) {
-            synchronized (ApiSessionManager.class) {
-                if (cache == null) {
-                    cache = buildCache();
-                }
-            }
-        }
-        return cache;
-    }
-
-}
diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/config/WebConfig.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/config/WebConfig.java
index 4ca883fc..2284a716 100644
--- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/config/WebConfig.java
+++ b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/config/WebConfig.java
@@ -8,7 +8,6 @@ import com.gitee.easyopen.ApiParamParser;
 import com.gitee.easyopen.ParamNames;
 import com.gitee.easyopen.interceptor.ApiInterceptor;
 import com.gitee.easyopen.session.ApiSessionManager;
-import com.gitee.sop.adminserver.common.MyApiSessionManager;
 import com.gitee.sop.adminserver.interceptor.LoginInterceptor;
 import com.gitee.sop.adminserver.service.RegistryService;
 import com.gitee.sop.adminserver.service.impl.RegistryServiceEurekaImpl;
@@ -49,7 +48,7 @@ public class WebConfig {
                 , SerializerFeature.WriteDateUseDateFormat)
         );
 
-        ApiSessionManager apiSessionManager = new MyApiSessionManager();
+        ApiSessionManager apiSessionManager = new ApiSessionManager();
         // session有效期
         int timeout = NumberUtils.toInt(accessTokenTimeout, 30);
         apiSessionManager.setSessionTimeout(timeout);