mirror of
				https://github.com/continew-org/continew-admin.git
				synced 2025-11-04 22:57:12 +08:00 
			
		
		
		
	refactor(tenant): 优化及修复租户相关部分代码
- 移动 TenantExtensionProperties 到 common 模块 - 修复 MenuController#tree 接口 setExcludeMenuIdList 方法判断非默认租户条件缺失 - 修复更新租户套餐菜单,没有及时更新在线用户数据权限(后面考虑重构 satoken 权限数据读取部分) - TenantService 接口 getByDomain => getIdByDomain、getByCode => getIdByCode - 移除 MenuService 中已废弃的方法 - LogDaoLocalImpl 还原(未测出租户用户操作,无租户 ID 问题) - 优化 pg 数据库脚本,移除菜单表的租户相关字段 - 其他代码优化
This commit is contained in:
		@@ -0,0 +1,60 @@
 | 
			
		||||
/*
 | 
			
		||||
 * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
 * you may not use this file except in compliance with the License.
 | 
			
		||||
 * You may obtain a copy of the License at
 | 
			
		||||
 *
 | 
			
		||||
 *     http://www.apache.org/licenses/LICENSE-2.0
 | 
			
		||||
 *
 | 
			
		||||
 * Unless required by applicable law or agreed to in writing, software
 | 
			
		||||
 * distributed under the License is distributed on an "AS IS" BASIS,
 | 
			
		||||
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
			
		||||
 * See the License for the specific language governing permissions and
 | 
			
		||||
 * limitations under the License.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
package top.continew.admin.common.config;
 | 
			
		||||
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
import org.springframework.boot.context.properties.ConfigurationProperties;
 | 
			
		||||
import top.continew.starter.core.constant.PropertiesConstants;
 | 
			
		||||
import top.continew.starter.extension.tenant.context.TenantContextHolder;
 | 
			
		||||
 | 
			
		||||
import java.util.List;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * 租户扩展配置属性
 | 
			
		||||
 *
 | 
			
		||||
 * @author 小熊
 | 
			
		||||
 * @author Charles7c
 | 
			
		||||
 * @since 2024/11/29 12:05
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
@ConfigurationProperties(prefix = PropertiesConstants.TENANT)
 | 
			
		||||
public class TenantExtensionProperties {
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 请求头中租户编码键名(默认:X-Tenant-Code)
 | 
			
		||||
     */
 | 
			
		||||
    private String tenantCodeHeader = "X-Tenant-Code";
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 默认租户 ID(默认:0)
 | 
			
		||||
     */
 | 
			
		||||
    private Long defaultTenantId = 0L;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 忽略菜单 ID(租户不能使用的菜单)
 | 
			
		||||
     */
 | 
			
		||||
    private List<Long> ignoreMenus;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 是否为默认租户
 | 
			
		||||
     *
 | 
			
		||||
     * @return 是否为默认租户
 | 
			
		||||
     */
 | 
			
		||||
    public boolean isDefaultTenant() {
 | 
			
		||||
        return defaultTenantId.equals(TenantContextHolder.getTenantId());
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user