清除多租户功能

msgpush-framework/msgpush-spring-boot-starter-security/src/main/java/com/njcn/msgpush/framework/security/core/LoginUser.java

@@ -35,10 +35,7 @@ public class LoginUser {
      * 额外的用户信息
      */
     private Map<String, String> info;
-    /**
-     * 租户编号
-     */
-    private Long tenantId;
+
     /**
      * 授权范围
      */
@@ -56,10 +53,6 @@ public class LoginUser {
      */
     @JsonIgnore
     private Map<String, Object> context;
-    /**
-     * 访问的租户编号
-     */
-    private Long visitTenantId;
 
     public void setContext(String key, Object value) {
         if (context == null) {

msgpush-framework/msgpush-spring-boot-starter-security/src/main/java/com/njcn/msgpush/framework/security/core/filter/TokenAuthenticationFilter.java

@@ -96,7 +96,6 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
             // 构建登录用户
             return new LoginUser().setId(accessToken.getUserId()).setUserType(accessToken.getUserType())
                     .setInfo(accessToken.getUserInfo()) // 额外的用户信息
-                    .setTenantId(accessToken.getTenantId()).setScopes(accessToken.getScopes())
                     .setExpiresTime(accessToken.getExpiresTime());
         } catch (ServiceException serviceException) {
             // 校验 Token 不通过时，考虑到一些接口是无需登录的，所以直接返回 null 即可
@@ -124,8 +123,7 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
         }
         // 构建模拟用户
         Long userId = Long.valueOf(token.substring(securityProperties.getMockSecret().length()));
-        return new LoginUser().setId(userId).setUserType(userType)
-                .setTenantId(WebFrameworkUtils.getTenantId(request));
+        return new LoginUser().setId(userId).setUserType(userType);
     }
 
     private LoginUser buildLoginUserByHeader(HttpServletRequest request) {

msgpush-framework/msgpush-spring-boot-starter-security/src/main/java/com/njcn/msgpush/framework/security/core/service/SecurityFrameworkServiceImpl.java

@@ -16,7 +16,6 @@ import java.util.List;
 
 import static com.njcn.msgpush.framework.common.util.cache.CacheUtils.buildCache;
 import static com.njcn.msgpush.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static com.njcn.msgpush.framework.security.core.util.SecurityFrameworkUtils.skipPermissionCheck;
 
 /**
  * 默认的 {@link SecurityFrameworkService} 实现类
@@ -64,11 +63,6 @@ public class SecurityFrameworkServiceImpl implements SecurityFrameworkService {
     @Override
     @SneakyThrows
     public boolean hasAnyPermissions(String... permissions) {
-        // 特殊：跨租户访问
-        if (skipPermissionCheck()) {
-            return true;
-        }
-
         // 权限校验
         Long userId = getLoginUserId();
         if (userId == null) {
@@ -85,11 +79,6 @@ public class SecurityFrameworkServiceImpl implements SecurityFrameworkService {
     @Override
     @SneakyThrows
     public boolean hasAnyRoles(String... roles) {
-        // 特殊：跨租户访问
-        if (skipPermissionCheck()) {
-            return true;
-        }
-
         // 权限校验
         Long userId = getLoginUserId();
         if (userId == null) {
@@ -105,11 +94,6 @@ public class SecurityFrameworkServiceImpl implements SecurityFrameworkService {
 
     @Override
     public boolean hasAnyScopes(String... scope) {
-        // 特殊：跨租户访问
-        if (skipPermissionCheck()) {
-            return true;
-        }
-
         // 权限校验
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
         if (user == null) {

msgpush-framework/msgpush-spring-boot-starter-security/src/main/java/com/njcn/msgpush/framework/security/core/util/SecurityFrameworkUtils.java

@@ -142,21 +142,5 @@ public class SecurityFrameworkUtils {
         return authenticationToken;
     }
 
-    /**
-     * 是否条件跳过权限校验，包括数据权限、功能权限
-     *
-     * @return 是否跳过
-     */
-    public static boolean skipPermissionCheck() {
-        LoginUser loginUser = getLoginUser();
-        if (loginUser == null) {
-            return false;
-        }
-        if (loginUser.getVisitTenantId() == null) {
-            return false;
-        }
-        // 重点：跨租户访问时，无法进行权限校验
-        return ObjUtil.notEqual(loginUser.getVisitTenantId(), loginUser.getTenantId());
-    }
 
 }