Merge pull request #3 from liangshishen/master

一些BUG修正

hsweb-web-core/src/main/java/org/hsweb/web/core/session/siample/SimpleHttpSessionManager.java

@@ -1,13 +1,11 @@
-package org.hsweb.web.core.session.siample;
+package org.hsweb.web.core.session.simple;
 
 import org.hsweb.web.bean.po.user.User;
 import org.hsweb.web.core.session.AbstractHttpSessionManager;
-import org.hsweb.web.core.session.HttpSessionManager;
 import org.hsweb.web.core.utils.WebUtil;
 
 import javax.servlet.http.HttpSession;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -55,7 +53,7 @@ public class SimpleHttpSessionManager extends AbstractHttpSessionManager {
                 userSessionStorage.remove(userId);
                 return null;
             }
-            return user.getId();
+            return session.getId();
         }
         return null;
     }

hsweb-web-core/src/main/java/org/hsweb/web/core/session/siample/SimpleHttpSessionManagerAutoConfiguration.java

@@ -1,4 +1,4 @@
-package org.hsweb.web.core.session.siample;
+package org.hsweb.web.core.session.simple;
 
 import org.hsweb.web.core.session.HttpSessionManager;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

hsweb-web-core/src/main/java/org/hsweb/web/core/session/siample/UserLoginOutListener.java

@@ -1,39 +1,39 @@
-package org.hsweb.web.core.session.siample;
-
-import org.hsweb.web.bean.po.user.User;
-import org.hsweb.web.core.session.HttpSessionManager;
-import org.hsweb.web.core.utils.WebUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-
-public class UserLoginOutListener implements HttpSessionListener {
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    private HttpSessionManager httpSessionManager;
-
-    /* Session创建事件 */
-    public void sessionCreated(HttpSessionEvent se) {
-        logger.info("session created:" + se.getSession().getId());
-    }
-
-    /* Session失效事件 */
-    public void sessionDestroyed(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        try {
-            User user = WebUtil.getLoginUser(session);
-            if (user != null) {
-                httpSessionManager.removeUser(user.getId());
-            }
-        } catch (Exception e) {
-            logger.error("remove session or user error!", e);
-        }
-    }
-
-    public void setHttpSessionManager(HttpSessionManager httpSessionManager) {
-        this.httpSessionManager = httpSessionManager;
-    }
+package org.hsweb.web.core.session.simple;
+
+import org.hsweb.web.bean.po.user.User;
+import org.hsweb.web.core.session.HttpSessionManager;
+import org.hsweb.web.core.utils.WebUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
+
+public class UserLoginOutListener implements HttpSessionListener {
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    private HttpSessionManager httpSessionManager;
+
+    /* Session创建事件 */
+    public void sessionCreated(HttpSessionEvent se) {
+        logger.info("session created:" + se.getSession().getId());
+    }
+
+    /* Session失效事件 */
+    public void sessionDestroyed(HttpSessionEvent se) {
+        HttpSession session = se.getSession();
+        try {
+            User user = WebUtil.getLoginUser(session);
+            if (user != null) {
+                httpSessionManager.removeUser(user.getId());
+            }
+        } catch (Exception e) {
+            logger.error("remove session or user error!", e);
+        }
+    }
+
+    public void setHttpSessionManager(HttpSessionManager httpSessionManager) {
+        this.httpSessionManager = httpSessionManager;
+    }
 }