调整包结构

zmdldp · May 21, 2021 · 7778bc7 · 7778bc7
1 parent 233ab36
commit 7778bc7
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 19 deletions.
diff --git a/...e-plugin/src/main/java/com/dwi/basic/datasource/plugin/context/InitDataSourceService.java b/...e-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/...n/java/com/dwi/basic/datasource/plugin/context/strategy/DynamicDataSourceServiceImpl.java b/...n/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/...lugin/biz/dao/DatasourceConfigMapper.java → ...ce/plugin/dao/DatasourceConfigMapper.java b/...lugin/biz/dao/DatasourceConfigMapper.java → ...ce/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/...ce/plugin/biz/dao/InitDatabaseMapper.java → ...source/plugin/dao/InitDatabaseMapper.java b/...ce/plugin/biz/dao/InitDatabaseMapper.java → ...source/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/...biz/dao/TenantDatasourceConfigMapper.java → ...gin/dao/TenantDatasourceConfigMapper.java b/...biz/dao/TenantDatasourceConfigMapper.java → ...gin/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/.../biz/service/DatasourceConfigService.java → ...ugin/service/DatasourceConfigService.java b/.../biz/service/DatasourceConfigService.java → ...ugin/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/...ervice/TenantDatasourceConfigService.java → ...ervice/TenantDatasourceConfigService.java b/...ervice/TenantDatasourceConfigService.java → ...ervice/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/...ice/impl/DatasourceConfigServiceImpl.java → ...ice/impl/DatasourceConfigServiceImpl.java b/...ice/impl/DatasourceConfigServiceImpl.java → ...ice/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/...pl/TenantDatasourceConfigServiceImpl.java → ...pl/TenantDatasourceConfigServiceImpl.java b/...pl/TenantDatasourceConfigServiceImpl.java → ...pl/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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dwi.basic.datasource.plugin.biz.dao.DatasourceConfigMapper">
+<mapper namespace="com.dwi.basic.datasource.plugin.dao.DatasourceConfigMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dwi.basic.datasource.plugin.domain.entity.DatasourceConfig">

diff --git 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dwi.basic.datasource.plugin.biz.dao.InitDatabaseMapper">
+<mapper namespace="com.dwi.basic.datasource.plugin.dao.InitDatabaseMapper">
 
     <update id="createDatabase" parameterType="java.util.Map">
         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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dwi.basic.datasource.plugin.biz.dao.TenantDatasourceConfigMapper">
+<mapper namespace="com.dwi.basic.datasource.plugin.dao.TenantDatasourceConfigMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dwi.basic.datasource.plugin.domain.entity.TenantDatasourceConfig">