From 09f50ea63441e0c77125efd2ba7677b7873a2549 Mon Sep 17 00:00:00 2001
From: haoxin963 <525899665@qq.com>
Date: Thu, 24 Jun 2021 20:07:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=A8=A1=E5=9D=97=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xtoon-common/pom.xml                          |  1 +
 xtoon-common/xtoon-common-tenant/pom.xml      | 27 +++++++++++++++++++
 .../common/tenant/config/WebConfigurer.java   | 26 ++++++++++++++++++
 .../util/TenantHandlerInterceptor.java        |  2 +-
 .../main/resources/META-INF/spring.factories  |  3 +++
 .../xtoon-sys/xtoon-sys-server/pom.xml        |  5 ++++
 6 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 xtoon-common/xtoon-common-tenant/pom.xml
 create mode 100644 xtoon-common/xtoon-common-tenant/src/main/java/com/xtoon/cloud/common/tenant/config/WebConfigurer.java
 rename xtoon-common/{xtoon-common-web/src/main/java/com/xtoon/cloud/common/web => xtoon-common-tenant/src/main/java/com/xtoon/cloud/common/tenant}/util/TenantHandlerInterceptor.java (95%)
 create mode 100755 xtoon-common/xtoon-common-tenant/src/main/resources/META-INF/spring.factories

diff --git a/xtoon-common/pom.xml b/xtoon-common/pom.xml
index 7c89f03..a911308 100644
--- a/xtoon-common/pom.xml
+++ b/xtoon-common/pom.xml
@@ -21,6 +21,7 @@
         <module>xtoon-common-web</module>
         <module>xtoon-common-log</module>
         <module>xtoon-common-swagger</module>
+        <module>xtoon-common-tenant</module>
     </modules>
 
 
diff --git a/xtoon-common/xtoon-common-tenant/pom.xml b/xtoon-common/xtoon-common-tenant/pom.xml
new file mode 100644
index 0000000..82111a3
--- /dev/null
+++ b/xtoon-common/xtoon-common-tenant/pom.xml
@@ -0,0 +1,27 @@
+<?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>xtoon-common</artifactId>
+        <groupId>com.xtoon.cloud</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>xtoon-common-tenant</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.xtoon.cloud</groupId>
+            <artifactId>xtoon-common-core</artifactId>
+            <version>${xtoon-cloud.version}</version>
+        </dependency>
+    </dependencies>
+
+
+</project>
\ No newline at end of file
diff --git a/xtoon-common/xtoon-common-tenant/src/main/java/com/xtoon/cloud/common/tenant/config/WebConfigurer.java b/xtoon-common/xtoon-common-tenant/src/main/java/com/xtoon/cloud/common/tenant/config/WebConfigurer.java
new file mode 100644
index 0000000..02924c9
--- /dev/null
+++ b/xtoon-common/xtoon-common-tenant/src/main/java/com/xtoon/cloud/common/tenant/config/WebConfigurer.java
@@ -0,0 +1,26 @@
+package com.xtoon.cloud.common.tenant.config;
+
+import com.xtoon.cloud.common.tenant.util.TenantHandlerInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+/**
+ * 类描述
+ *
+ * @author haoxin
+ * @date 2021-06-24
+ **/
+@Configuration
+public class WebConfigurer extends WebMvcConfigurerAdapter {
+
+    @Autowired
+    private TenantHandlerInterceptor tenantHandlerInterceptor;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(tenantHandlerInterceptor)
+                .excludePathPatterns("/auth/*");
+    }
+}
diff --git a/xtoon-common/xtoon-common-web/src/main/java/com/xtoon/cloud/common/web/util/TenantHandlerInterceptor.java b/xtoon-common/xtoon-common-tenant/src/main/java/com/xtoon/cloud/common/tenant/util/TenantHandlerInterceptor.java
similarity index 95%
rename from xtoon-common/xtoon-common-web/src/main/java/com/xtoon/cloud/common/web/util/TenantHandlerInterceptor.java
rename to xtoon-common/xtoon-common-tenant/src/main/java/com/xtoon/cloud/common/tenant/util/TenantHandlerInterceptor.java
index ac17f02..bd9f984 100644
--- a/xtoon-common/xtoon-common-web/src/main/java/com/xtoon/cloud/common/web/util/TenantHandlerInterceptor.java
+++ b/xtoon-common/xtoon-common-tenant/src/main/java/com/xtoon/cloud/common/tenant/util/TenantHandlerInterceptor.java
@@ -1,4 +1,4 @@
-package com.xtoon.cloud.common.web.util;
+package com.xtoon.cloud.common.tenant.util;
 
 import com.xtoon.cloud.common.core.constant.CommonConstant;
 import com.xtoon.cloud.common.core.util.TenantContext;
diff --git a/xtoon-common/xtoon-common-tenant/src/main/resources/META-INF/spring.factories b/xtoon-common/xtoon-common-tenant/src/main/resources/META-INF/spring.factories
new file mode 100755
index 0000000..e553b67
--- /dev/null
+++ b/xtoon-common/xtoon-common-tenant/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,3 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+    com.xtoon.cloud.common.tenant.util.TenantHandlerInterceptor,\
+    com.xtoon.cloud.common.tenant.config.WebConfigurer
\ No newline at end of file
diff --git a/xtoon-service/xtoon-sys/xtoon-sys-server/pom.xml b/xtoon-service/xtoon-sys/xtoon-sys-server/pom.xml
index e41f499..ff1ee9d 100644
--- a/xtoon-service/xtoon-sys/xtoon-sys-server/pom.xml
+++ b/xtoon-service/xtoon-sys/xtoon-sys-server/pom.xml
@@ -41,6 +41,11 @@
             <artifactId>xtoon-common-mybatis</artifactId>
             <version>${xtoon-cloud.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.xtoon.cloud</groupId>
+            <artifactId>xtoon-common-tenant</artifactId>
+            <version>${xtoon-cloud.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.xtoon.cloud</groupId>
             <artifactId>xtoon-common-log</artifactId>