From 6c40dca2d0f3c19d3b21f56fc1b98e869f24c6e0 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Sat, 9 Mar 2019 11:21:03 +0800
Subject: [PATCH] :tada: 2.1.0.RELEASE

---
 .../core/boot/tenant}/BladeTenantHandler.java |  2 +-
 .../core/boot/tenant}/BladeTenantId.java      |  2 +-
 .../boot/tenant}/BladeTenantProperties.java   |  2 +-
 .../boot/tenant}/TenantConfiguration.java     |  2 +-
 .../core/boot/tenant}/TenantId.java           |  5 ++--
 .../core/mp/base}/TenantEntity.java           |  3 +--
 blade-core-tenant/pom.xml                     | 25 -------------------
 pom.xml                                       |  1 -
 8 files changed, 8 insertions(+), 34 deletions(-)
 rename {blade-core-tenant/src/main/java/org.springblade.core.tenant => blade-core-boot/src/main/java/org/springblade/core/boot/tenant}/BladeTenantHandler.java (97%)
 rename {blade-core-tenant/src/main/java/org.springblade.core.tenant => blade-core-boot/src/main/java/org/springblade/core/boot/tenant}/BladeTenantId.java (95%)
 rename {blade-core-tenant/src/main/java/org.springblade.core.tenant => blade-core-boot/src/main/java/org/springblade/core/boot/tenant}/BladeTenantProperties.java (96%)
 rename {blade-core-tenant/src/main/java/org.springblade.core.tenant => blade-core-boot/src/main/java/org/springblade/core/boot/tenant}/TenantConfiguration.java (98%)
 rename {blade-core-tenant/src/main/java/org.springblade.core.tenant => blade-core-boot/src/main/java/org/springblade/core/boot/tenant}/TenantId.java (92%)
 rename {blade-core-tenant/src/main/java/org.springblade.core.tenant/mp => blade-core-mybatis/src/main/java/org/springblade/core/mp/base}/TenantEntity.java (91%)
 delete mode 100644 blade-core-tenant/pom.xml

diff --git a/blade-core-tenant/src/main/java/org.springblade.core.tenant/BladeTenantHandler.java b/blade-core-boot/src/main/java/org/springblade/core/boot/tenant/BladeTenantHandler.java
similarity index 97%
rename from blade-core-tenant/src/main/java/org.springblade.core.tenant/BladeTenantHandler.java
rename to blade-core-boot/src/main/java/org/springblade/core/boot/tenant/BladeTenantHandler.java
index 5b14b90..8d9dd59 100644
--- a/blade-core-tenant/src/main/java/org.springblade.core.tenant/BladeTenantHandler.java
+++ b/blade-core-boot/src/main/java/org/springblade/core/boot/tenant/BladeTenantHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springblade.core.tenant;
+package org.springblade.core.boot.tenant;
 
 import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler;
 import lombok.AllArgsConstructor;
diff --git a/blade-core-tenant/src/main/java/org.springblade.core.tenant/BladeTenantId.java b/blade-core-boot/src/main/java/org/springblade/core/boot/tenant/BladeTenantId.java
similarity index 95%
rename from blade-core-tenant/src/main/java/org.springblade.core.tenant/BladeTenantId.java
rename to blade-core-boot/src/main/java/org/springblade/core/boot/tenant/BladeTenantId.java
index 890e60d..2f5e801 100644
--- a/blade-core-tenant/src/main/java/org.springblade.core.tenant/BladeTenantId.java
+++ b/blade-core-boot/src/main/java/org/springblade/core/boot/tenant/BladeTenantId.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springblade.core.tenant;
+package org.springblade.core.boot.tenant;
 
 import org.springblade.core.tool.utils.RandomType;
 import org.springblade.core.tool.utils.StringUtil;
diff --git a/blade-core-tenant/src/main/java/org.springblade.core.tenant/BladeTenantProperties.java b/blade-core-boot/src/main/java/org/springblade/core/boot/tenant/BladeTenantProperties.java
similarity index 96%
rename from blade-core-tenant/src/main/java/org.springblade.core.tenant/BladeTenantProperties.java
rename to blade-core-boot/src/main/java/org/springblade/core/boot/tenant/BladeTenantProperties.java
index dcaa647..0ce0d57 100644
--- a/blade-core-tenant/src/main/java/org.springblade.core.tenant/BladeTenantProperties.java
+++ b/blade-core-boot/src/main/java/org/springblade/core/boot/tenant/BladeTenantProperties.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springblade.core.tenant;
+package org.springblade.core.boot.tenant;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/blade-core-tenant/src/main/java/org.springblade.core.tenant/TenantConfiguration.java b/blade-core-boot/src/main/java/org/springblade/core/boot/tenant/TenantConfiguration.java
similarity index 98%
rename from blade-core-tenant/src/main/java/org.springblade.core.tenant/TenantConfiguration.java
rename to blade-core-boot/src/main/java/org/springblade/core/boot/tenant/TenantConfiguration.java
index 515ddcc..7e5cd82 100644
--- a/blade-core-tenant/src/main/java/org.springblade.core.tenant/TenantConfiguration.java
+++ b/blade-core-boot/src/main/java/org/springblade/core/boot/tenant/TenantConfiguration.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springblade.core.tenant;
+package org.springblade.core.boot.tenant;
 
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.parser.ISqlParser;
diff --git a/blade-core-tenant/src/main/java/org.springblade.core.tenant/TenantId.java b/blade-core-boot/src/main/java/org/springblade/core/boot/tenant/TenantId.java
similarity index 92%
rename from blade-core-tenant/src/main/java/org.springblade.core.tenant/TenantId.java
rename to blade-core-boot/src/main/java/org/springblade/core/boot/tenant/TenantId.java
index c0a447b..931d15b 100644
--- a/blade-core-tenant/src/main/java/org.springblade.core.tenant/TenantId.java
+++ b/blade-core-boot/src/main/java/org/springblade/core/boot/tenant/TenantId.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springblade.core.tenant;
+package org.springblade.core.boot.tenant;
 
 /**
  * 租户id生成器
@@ -24,7 +24,8 @@ public interface TenantId {
 
 	/**
 	 * 生成自定义租户id
-	 * @return
+	 *
+	 * @return string
 	 */
 	String generate();
 
diff --git a/blade-core-tenant/src/main/java/org.springblade.core.tenant/mp/TenantEntity.java b/blade-core-mybatis/src/main/java/org/springblade/core/mp/base/TenantEntity.java
similarity index 91%
rename from blade-core-tenant/src/main/java/org.springblade.core.tenant/mp/TenantEntity.java
rename to blade-core-mybatis/src/main/java/org/springblade/core/mp/base/TenantEntity.java
index 1ea7d3c..587fbab 100644
--- a/blade-core-tenant/src/main/java/org.springblade.core.tenant/mp/TenantEntity.java
+++ b/blade-core-mybatis/src/main/java/org/springblade/core/mp/base/TenantEntity.java
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springblade.core.tenant.mp;
+package org.springblade.core.mp.base;
 
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springblade.core.mp.base.BaseEntity;
 
 /**
  * 租户基础实体类
diff --git a/blade-core-tenant/pom.xml b/blade-core-tenant/pom.xml
deleted file mode 100644
index 6e56be6..0000000
--- a/blade-core-tenant/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blade-tool</artifactId>
-        <groupId>org.springblade</groupId>
-        <version>2.1.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blade-core-tenant</artifactId>
-    <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-core-mybatis</artifactId>
-            <version>${blade.tool.version}</version>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/pom.xml b/pom.xml
index 8002927..e3607d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,6 @@
         <module>blade-core-mybatis</module>
         <module>blade-core-swagger</module>
         <module>blade-core-cloud</module>
-        <module>blade-core-tenant</module>
     </modules>
 
     <dependencyManagement>