refactor(tenant): 移除租户数据源及数据源级隔离适配代码

continew-server/src/main/java/top/continew/admin/config/tenant/TenantDataSourceSwitchAspect.java

@@ -1,80 +0,0 @@
-/*
- * 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.config.tenant;
-
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import lombok.RequiredArgsConstructor;
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.stereotype.Component;
-import top.continew.admin.common.constant.SysConstants;
-import top.continew.admin.tenant.annotation.ConditionalOnEnabledTenant;
-import top.continew.starter.extension.tenant.context.TenantContextHolder;
-import top.continew.starter.extension.tenant.enums.TenantIsolationLevel;
-
-/**
- * 租户主数据源切面
- * 
- * @author 小熊
- * @author Charles7c
- * @since 2025/1/15 16:02
- */
-@Aspect
-@Component
-@ConditionalOnEnabledTenant
-@RequiredArgsConstructor
-public class TenantDataSourceSwitchAspect {
-
-    @Pointcut("""
-        execution(* top.continew.admin.tenant.mapper..*(..))
-        || execution(* top.continew.admin.tenant.service..*(..))
-        || execution(* top.continew.admin.system.mapper.ClientMapper.*(..))
-        || execution(* top.continew.admin.system.service.ClientService.*(..))
-        || execution(* top.continew.admin.system.mapper.DictMapper.*(..))
-        || execution(* top.continew.admin.system.service.DictService.*(..))
-        || execution(* top.continew.admin.system.mapper.DictItemMapper.*(..))
-        || execution(* top.continew.admin.system.service.DictItemService.*(..))
-        || execution(* top.continew.admin.system.mapper.OptionMapper.*(..))
-        || execution(* top.continew.admin.system.service.OptionService.*(..))
-        || execution(* top.continew.admin.system.mapper.StorageMapper.*(..))
-        || execution(* top.continew.admin.system.service.StorageService.*(..))
-        """)
-    public void masterDataSourceMethods() {
-    }
-
-    /**
-     * 切换到主数据源
-     */
-    @Before("masterDataSourceMethods()")
-    public void switchToMasterDataSource() {
-        if (TenantContextHolder.getIsolationLevel() == TenantIsolationLevel.DATASOURCE) {
-            DynamicDataSourceContextHolder.push(SysConstants.DEFAULT_TENANT_DATASOURCE);
-        }
-    }
-
-    /**
-     * 清空数据源
-     */
-    @After("masterDataSourceMethods()")
-    public void clearDataSourceContext() {
-        if (TenantContextHolder.getIsolationLevel() == TenantIsolationLevel.DATASOURCE) {
-            DynamicDataSourceContextHolder.poll();
-        }
-    }
-}

continew-server/src/main/java/top/continew/admin/controller/common/CommonController.java

@@ -35,10 +35,6 @@ import top.continew.admin.system.enums.OptionCategoryEnum;
 import top.continew.admin.system.model.query.*;
 import top.continew.admin.system.model.resp.file.FileUploadResp;
 import top.continew.admin.system.service.*;
-import top.continew.admin.tenant.model.query.DatasourceQuery;
-import top.continew.admin.tenant.model.query.PackageQuery;
-import top.continew.admin.tenant.service.DatasourceService;
-import top.continew.admin.tenant.service.PackageService;
 import top.continew.starter.core.util.validation.ValidationUtils;
 import top.continew.starter.extension.crud.model.query.SortQuery;
 import top.continew.starter.extension.crud.model.resp.LabelValueResp;
@@ -66,8 +62,6 @@ public class CommonController {
     private final MenuService menuService;
     private final UserService userService;
     private final RoleService roleService;
-    private final PackageService packageService;
-    private final DatasourceService datasourceService;
     private final DictItemService dictItemService;
     private final OptionService optionService;
 
@@ -110,18 +104,6 @@ public class CommonController {
         return roleService.listDict(query, sortQuery);
     }
 
-    @Operation(summary = "查询套餐字典", description = "查询套餐字典列表")
-    @GetMapping("/dict/package")
-    public List<LabelValueResp> listPackageDict(PackageQuery query, SortQuery sortQuery) {
-        return packageService.listDict(query, sortQuery);
-    }
-
-    @Operation(summary = "查询数据源字典", description = "查询数据源字典列表")
-    @GetMapping("/dict/datasource")
-    public List<LabelValueResp> listDatasourceDict(DatasourceQuery query, SortQuery sortQuery) {
-        return datasourceService.listDict(query, sortQuery);
-    }
-
     @Operation(summary = "查询字典", description = "查询字典列表")
     @Parameter(name = "code", description = "字典编码", example = "notice_type", in = ParameterIn.PATH)
     @GetMapping("/dict/{code}")