From 7778bc7cd4df351e7edc81704e2d39ef25ee3efd Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 21 May 2021 11:00:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8C=85=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/plugin/context/InitDataSourceService.java | 4 ++-- .../context/strategy/DynamicDataSourceServiceImpl.java | 6 +++--- .../plugin/{biz => }/dao/DatasourceConfigMapper.java | 2 +- .../datasource/plugin/{biz => }/dao/InitDatabaseMapper.java | 2 +- .../plugin/{biz => }/dao/TenantDatasourceConfigMapper.java | 2 +- .../plugin/{biz => }/service/DatasourceConfigService.java | 2 +- .../{biz => }/service/TenantDatasourceConfigService.java | 2 +- .../{biz => }/service/impl/DatasourceConfigServiceImpl.java | 6 +++--- .../service/impl/TenantDatasourceConfigServiceImpl.java | 6 +++--- .../resources/mapper/defaults/DatasourceConfigMapper.xml | 2 +- .../main/resources/mapper/defaults/InitDatabaseMapper.xml | 2 +- .../mapper/defaults/TenantDatasourceConfigMapper.xml | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) rename saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/{biz => }/dao/DatasourceConfigMapper.java (96%) rename saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/{biz => }/dao/InitDatabaseMapper.java (94%) rename saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/{biz => }/dao/TenantDatasourceConfigMapper.java (91%) rename saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/{biz => }/service/DatasourceConfigService.java (91%) rename saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/{biz => }/service/TenantDatasourceConfigService.java (85%) rename saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/{biz => }/service/impl/DatasourceConfigServiceImpl.java (91%) rename saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/{biz => }/service/impl/TenantDatasourceConfigServiceImpl.java (70%) diff --git a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/context/InitDataSourceService.java b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/context/InitDataSourceService.java index 8cef9b8..dfed189 100644 --- a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/context/InitDataSourceService.java +++ b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/context/InitDataSourceService.java @@ -2,8 +2,8 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; -import com.dwi.basic.datasource.plugin.biz.dao.DatasourceConfigMapper; -import com.dwi.basic.datasource.plugin.biz.dao.InitDatabaseMapper; +import com.dwi.basic.datasource.plugin.dao.DatasourceConfigMapper; +import com.dwi.basic.datasource.plugin.dao.InitDatabaseMapper; import com.dwi.basic.datasource.plugin.domain.entity.DatasourceConfig; import com.dwi.basic.datasource.plugin.domain.enumeration.TenantConnectTypeEnum; import com.dwi.basic.datasource.plugin.domain.enumeration.TenantStatusEnum; diff --git a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/context/strategy/DynamicDataSourceServiceImpl.java b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/context/strategy/DynamicDataSourceServiceImpl.java index 84bca89..134cbeb 100644 --- a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/context/strategy/DynamicDataSourceServiceImpl.java +++ b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/context/strategy/DynamicDataSourceServiceImpl.java @@ -11,14 +11,14 @@ import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.druid.DruidConfig; import com.dwi.basic.database.mybatis.conditions.Wraps; import com.dwi.basic.database.properties.DatabaseProperties; -import com.dwi.basic.datasource.plugin.biz.dao.InitDatabaseMapper; -import com.dwi.basic.datasource.plugin.biz.service.DatasourceConfigService; -import com.dwi.basic.datasource.plugin.biz.service.TenantDatasourceConfigService; import com.dwi.basic.datasource.plugin.context.DataSourceService; +import com.dwi.basic.datasource.plugin.dao.InitDatabaseMapper; import com.dwi.basic.datasource.plugin.domain.dto.DataSourcePropertyDTO; import com.dwi.basic.datasource.plugin.domain.entity.DatasourceConfig; import com.dwi.basic.datasource.plugin.domain.entity.TenantDatasourceConfig; import com.dwi.basic.datasource.plugin.domain.enumeration.TenantConnectTypeEnum; +import com.dwi.basic.datasource.plugin.service.DatasourceConfigService; +import com.dwi.basic.datasource.plugin.service.TenantDatasourceConfigService; import com.dwi.basic.exception.BizException; import com.dwi.basic.utils.StrPool; diff --git a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/dao/DatasourceConfigMapper.java b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/dao/DatasourceConfigMapper.java similarity index 96% rename from saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/dao/DatasourceConfigMapper.java rename to saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/dao/DatasourceConfigMapper.java index 77b775c..5e770ff 100644 --- a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/dao/DatasourceConfigMapper.java +++ b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/dao/DatasourceConfigMapper.java @@ -1,4 +1,4 @@ -package com.dwi.basic.datasource.plugin.biz.dao; +package com.dwi.basic.datasource.plugin.dao; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.dwi.basic.base.mapper.SuperMapper; diff --git a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/dao/InitDatabaseMapper.java b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/dao/InitDatabaseMapper.java similarity index 94% rename from saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/dao/InitDatabaseMapper.java rename to saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/dao/InitDatabaseMapper.java index 2cabc80..b63d58c 100644 --- a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/dao/InitDatabaseMapper.java +++ b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/dao/InitDatabaseMapper.java @@ -1,4 +1,4 @@ -package com.dwi.basic.datasource.plugin.biz.dao; +package com.dwi.basic.datasource.plugin.dao; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import org.apache.ibatis.annotations.Param; diff --git a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/dao/TenantDatasourceConfigMapper.java b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/dao/TenantDatasourceConfigMapper.java similarity index 91% rename from saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/dao/TenantDatasourceConfigMapper.java rename to saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/dao/TenantDatasourceConfigMapper.java index 75cf20f..c2f8d2e 100644 --- a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/dao/TenantDatasourceConfigMapper.java +++ b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/dao/TenantDatasourceConfigMapper.java @@ -1,4 +1,4 @@ -package com.dwi.basic.datasource.plugin.biz.dao; +package com.dwi.basic.datasource.plugin.dao; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.dwi.basic.base.mapper.SuperMapper; diff --git a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/service/DatasourceConfigService.java b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/service/DatasourceConfigService.java similarity index 91% rename from saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/service/DatasourceConfigService.java rename to saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/service/DatasourceConfigService.java index 9bcd0a3..77b5809 100644 --- a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/service/DatasourceConfigService.java +++ b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/service/DatasourceConfigService.java @@ -1,4 +1,4 @@ -package com.dwi.basic.datasource.plugin.biz.service; +package com.dwi.basic.datasource.plugin.service; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; import com.dwi.basic.base.service.SuperService; diff --git a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/service/TenantDatasourceConfigService.java b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/service/TenantDatasourceConfigService.java similarity index 85% rename from saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/service/TenantDatasourceConfigService.java rename to saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/service/TenantDatasourceConfigService.java index b07a278..b33262f 100644 --- a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/service/TenantDatasourceConfigService.java +++ b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/service/TenantDatasourceConfigService.java @@ -1,4 +1,4 @@ -package com.dwi.basic.datasource.plugin.biz.service; +package com.dwi.basic.datasource.plugin.service; import com.dwi.basic.base.service.SuperService; import com.dwi.basic.datasource.plugin.domain.entity.TenantDatasourceConfig; diff --git a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/service/impl/DatasourceConfigServiceImpl.java b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/service/impl/DatasourceConfigServiceImpl.java similarity index 91% rename from saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/service/impl/DatasourceConfigServiceImpl.java rename to saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/service/impl/DatasourceConfigServiceImpl.java index 55c43b0..2a0c71d 100644 --- a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/service/impl/DatasourceConfigServiceImpl.java +++ b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/service/impl/DatasourceConfigServiceImpl.java @@ -1,11 +1,11 @@ -package com.dwi.basic.datasource.plugin.biz.service.impl; +package com.dwi.basic.datasource.plugin.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; import com.dwi.basic.base.service.SuperServiceImpl; -import com.dwi.basic.datasource.plugin.biz.dao.DatasourceConfigMapper; -import com.dwi.basic.datasource.plugin.biz.service.DatasourceConfigService; +import com.dwi.basic.datasource.plugin.dao.DatasourceConfigMapper; import com.dwi.basic.datasource.plugin.domain.entity.DatasourceConfig; +import com.dwi.basic.datasource.plugin.service.DatasourceConfigService; import com.dwi.basic.exception.BizException; import lombok.RequiredArgsConstructor; diff --git a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/service/impl/TenantDatasourceConfigServiceImpl.java b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/service/impl/TenantDatasourceConfigServiceImpl.java similarity index 70% rename from saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/service/impl/TenantDatasourceConfigServiceImpl.java rename to saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/service/impl/TenantDatasourceConfigServiceImpl.java index 9c76216..9525332 100644 --- a/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/biz/service/impl/TenantDatasourceConfigServiceImpl.java +++ b/saas-datasource-plugin/src/main/java/com/dwi/basic/datasource/plugin/service/impl/TenantDatasourceConfigServiceImpl.java @@ -1,10 +1,10 @@ -package com.dwi.basic.datasource.plugin.biz.service.impl; +package com.dwi.basic.datasource.plugin.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.dwi.basic.base.service.SuperServiceImpl; -import com.dwi.basic.datasource.plugin.biz.dao.TenantDatasourceConfigMapper; -import com.dwi.basic.datasource.plugin.biz.service.TenantDatasourceConfigService; +import com.dwi.basic.datasource.plugin.dao.TenantDatasourceConfigMapper; import com.dwi.basic.datasource.plugin.domain.entity.TenantDatasourceConfig; +import com.dwi.basic.datasource.plugin.service.TenantDatasourceConfigService; import org.springframework.stereotype.Service; diff --git a/saas-datasource-plugin/src/main/resources/mapper/defaults/DatasourceConfigMapper.xml b/saas-datasource-plugin/src/main/resources/mapper/defaults/DatasourceConfigMapper.xml index 6d80470..a977799 100644 --- a/saas-datasource-plugin/src/main/resources/mapper/defaults/DatasourceConfigMapper.xml +++ b/saas-datasource-plugin/src/main/resources/mapper/defaults/DatasourceConfigMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/saas-datasource-plugin/src/main/resources/mapper/defaults/InitDatabaseMapper.xml b/saas-datasource-plugin/src/main/resources/mapper/defaults/InitDatabaseMapper.xml index b627fda..259a9f5 100644 --- a/saas-datasource-plugin/src/main/resources/mapper/defaults/InitDatabaseMapper.xml +++ b/saas-datasource-plugin/src/main/resources/mapper/defaults/InitDatabaseMapper.xml @@ -1,6 +1,6 @@ - + CREATE DATABASE IF NOT EXISTS ${database} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci diff --git a/saas-datasource-plugin/src/main/resources/mapper/defaults/TenantDatasourceConfigMapper.xml b/saas-datasource-plugin/src/main/resources/mapper/defaults/TenantDatasourceConfigMapper.xml index fc9f5d4..fdd011f 100644 --- a/saas-datasource-plugin/src/main/resources/mapper/defaults/TenantDatasourceConfigMapper.xml +++ b/saas-datasource-plugin/src/main/resources/mapper/defaults/TenantDatasourceConfigMapper.xml @@ -1,6 +1,6 @@ - +