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 @@ net.oschina.durcframework easyopen-spring-boot-starter - 1.16.2 + 1.16.5 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 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 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);