gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.0.4】修改常量位置

pull/19/head
fengshuonan 2021-05-26 21:43:00 +08:00
parent 73bdf28e97
commit 82602ee0fe
5 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/RuleConstants.java
View File

@ -82,4 +82,9 @@ public interface RuleConstants {
*/
String CHINES_TRAN_LANGUAGE_CODE = "chinese";
/**
* 租户数据源标识前缀
*/
String TENANT_DB_PREFIX = "sys_tenant_db_";
}

8
kernel-d-db/db-api/pom.xml
View File

@ -46,14 +46,6 @@
<version>${roses.version}</version>
</dependency>
<!--数据源模块的api-->
<!--需要用到租户数据源名称的常量-->
<dependency>
<groupId>cn.stylefeng.roses</groupId>
<artifactId>ds-container-api</artifactId>
<version>${roses.version}</version>
</dependency>
</dependencies>
</project>

6
kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/util/DatabaseUtil.java
View File

@ -11,7 +11,7 @@ import cn.stylefeng.roses.kernel.db.api.sqladapter.database.CreateDatabaseSql;
import cn.stylefeng.roses.kernel.db.api.sqladapter.database.GetDatabasesSql;
import cn.stylefeng.roses.kernel.db.api.sqladapter.table.TableFieldListSql;
import cn.stylefeng.roses.kernel.db.api.sqladapter.table.TableListSql;
import cn.stylefeng.roses.kernel.dsctn.api.constants.DatasourceContainerConstants;
import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;
import lombok.extern.slf4j.Slf4j;
import java.sql.Connection;
@ -48,8 +48,8 @@ public class DatabaseUtil {
while (resultSet.next()) {
String database = resultSet.getString("database");
if (StrUtil.isNotBlank(database)) {
if (StrUtil.startWith(database, DatasourceContainerConstants.TENANT_DB_PREFIX)) {
database = database.replaceAll(DatasourceContainerConstants.TENANT_DB_PREFIX, "");
if (StrUtil.startWith(database, RuleConstants.TENANT_DB_PREFIX)) {
database = database.replaceAll(RuleConstants.TENANT_DB_PREFIX, "");
databasesList.add(database);
}
}

5
kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/constants/DatasourceContainerConstants.java
View File

@ -52,9 +52,4 @@ public interface DatasourceContainerConstants {
*/
int MULTI_DATA_SOURCE_EXCHANGE_AOP = 1;
/**
* 租户数据源标识前缀
*/
String TENANT_DB_PREFIX = "sys_tenant_db_";
}

4
kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java
View File

@ -40,6 +40,7 @@ import cn.stylefeng.roses.kernel.dsctn.modular.entity.DatabaseInfo;
import cn.stylefeng.roses.kernel.dsctn.modular.factory.DruidPropertiesFactory;
import cn.stylefeng.roses.kernel.dsctn.modular.mapper.DatabaseInfoMapper;
import cn.stylefeng.roses.kernel.dsctn.modular.service.DatabaseInfoService;
import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;
import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -56,7 +57,6 @@ import java.sql.SQLException;
import java.util.List;
import static cn.stylefeng.roses.kernel.dsctn.api.constants.DatasourceContainerConstants.MASTER_DATASOURCE_NAME;
import static cn.stylefeng.roses.kernel.dsctn.api.constants.DatasourceContainerConstants.TENANT_DB_PREFIX;
import static cn.stylefeng.roses.kernel.dsctn.api.exception.enums.DatasourceContainerExceptionEnum.*;
/**
@ -91,7 +91,7 @@ public class DatabaseInfoServiceImpl extends ServiceImpl<DatabaseInfoMapper, Dat
DatabaseInfo databaseInfo = this.queryDatabaseInfoById(databaseInfoRequest);
// 如果是租户数据库不能删除
if (databaseInfo.getDbName().startsWith(TENANT_DB_PREFIX)) {
if (databaseInfo.getDbName().startsWith(RuleConstants.TENANT_DB_PREFIX)) {
throw new DatasourceContainerException(TENANT_DATASOURCE_CANT_DELETE);
}