Merge branch 'master' of https://github.com/shuzheng/zheng

zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/SSOController.java

@@ -102,8 +102,6 @@ public class SSOController extends BaseController {
 			}
 			_log.debug("认证中心帐号通过，带token回跳：{}", redirectUrl);
 			return "redirect:" + redirectUrl;
-		} else {
-			subject.logout();
 		}
 		return "/sso/login";
 	}

zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/shiro/UpmsSessionDao.java

@@ -132,12 +132,6 @@ public class UpmsSessionDao extends EnterpriseCacheSessionDAO {
     public int forceout(String ids) {
         String[] sessionIds = ids.split(",");
         for (String serverSessionId : sessionIds) {
-//            byte[] bytes = RedisUtil.get((ZHENG_UPMS_SHIRO_SESSION_ID + "_" + serverSessionId).getBytes());
-//            if(null != bytes && bytes.length > 0) {
-//                Session session = (Session) byteToSession(bytes);
-//                doDelete(session);
-//            }
-
             // 清空所有注册的局部会话和token
             // 当前全局会话token
             String token = RedisUtil.get(ZHENG_UPMS_SERVER_SESSION_ID + "_" + serverSessionId);

zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/shiro/UpmsSessionForceLogoutFilter.java

@@ -19,7 +19,8 @@ public class UpmsSessionForceLogoutFilter extends AccessControlFilter {
         if(session == null) {
             return true;
         }
-        return session.getAttribute("FORCE_LOGOUT") == null;
+        boolean forceout = session.getAttribute("FORCE_LOGOUT") == null;
+        return  forceout;
     }
 
     @Override

zheng-upms/zheng-upms-server/src/main/resources/applicationContext-shiro.xml

@@ -19,10 +19,11 @@
         </property>
         <property name="filterChainDefinitions">
             <value>
-                /swagger-ui.html = user
-                /druid/** = user
-                /manage/index = user
                 /manage/** = upmsSessionForceLogout,authc
+                /manage/index = user
+                /druid/** = user
+                /swagger-ui.html = user
+                /resources/** = anon
                 /** = anon
             </value>
         </property>