单账号登录限制取消

src/main/java/com/zhiwei/brandkbs2/auth/AuthAspect.java

@@ -92,9 +92,9 @@ public class AuthAspect {
                 } else {
                     String uid = tokenInfo.get(GenericAttribute.USER_ID).toString();
                     // session单账号登录限制校验
-                    if (!checkSession(request, uid)){
-                        return joinPoint.proceed();
-                    }
+//                    if (!checkSession(request, uid)){
+//                        return joinPoint.proceed();
+//                    }
                     UserInfo userInfo = UserService.queryUserInfo(uid, request.getHeader("pid"));
                     if (null == userInfo) {
                         userInfo = new UserInfo().setUserId(uid).setProjectId(request.getHeader("pid"));

src/main/java/com/zhiwei/brandkbs2/service/impl/UserServiceImpl.java

@@ -381,8 +381,8 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public boolean checkUserRoles() {
-        String uid = saveLoginUserSession();
-        User user = userDao.findOneById(uid);
+//        String uid = saveLoginUserSession();
+        User user = userDao.findOneById(UserThreadLocal.getUserId());
         if (null == user) {
             return false;
         }