This commit is contained in:
2023-07-14 09:38:19 +08:00
parent 6ed1224410
commit 649f9ca6ed
2 changed files with 15 additions and 12 deletions

View File

@ -12,7 +12,6 @@ import com.qiaoba.common.base.constant.BaseConstant;
import com.qiaoba.common.base.enums.BaseEnum;
import com.qiaoba.common.base.enums.DataBaseEnum;
import com.qiaoba.common.base.exception.ServiceException;
import com.qiaoba.common.database.config.DynamicDataSourceConfig;
import com.qiaoba.common.database.context.BackupDatasourceContext;
import com.qiaoba.common.database.context.PrimaryDatasourceContext;
import com.qiaoba.common.database.entity.DynamicDataSource;
@ -136,10 +135,10 @@ public class SysTenantDatasourceServiceImpl implements SysTenantDatasourceServic
int result = updateById(datasource);
// 刷新PrimaryDatasourceMap
if (result > BaseConstant.HANDLE_ERROR) {
Object oldDataSource = PrimaryDatasourceContext.get(tenantId);
// 更新新得数据源为租户主要数据源
DatasourceUtil.changePrimaryDatasource(tenantId, dataSource);
// 将老的租户数据源设置为备用
Object oldDataSource = PrimaryDatasourceContext.get(tenantId);
if (Objects.nonNull(oldDataSource)) {
DruidDataSource druidDataSource = ((DruidDataSource) oldDataSource);
String ip = DataBaseEnum.getIp(druidDataSource.getUrl(), druidDataSource.getDriverClassName());
@ -153,11 +152,6 @@ public class SysTenantDatasourceServiceImpl implements SysTenantDatasourceServic
return result;
}
public int test(String tenantId, String datasourceId) {
List<DynamicDataSource> dataSources = BackupDatasourceContext.get(tenantId);
return 0;
}
@Override
public DynamicDataSource transform(SysTenantDatasource datasource) {
DynamicDataSource dynamicDataSource = BeanUtil.copyProperties(datasource, DynamicDataSource.class);