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 @@ xtoon-common-web xtoon-common-log xtoon-common-swagger + xtoon-common-tenant 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 @@ + + + + xtoon-common + com.xtoon.cloud + 1.0.0 + + 4.0.0 + + xtoon-common-tenant + + + org.springframework.boot + spring-boot-starter-web + true + + + com.xtoon.cloud + xtoon-common-core + ${xtoon-cloud.version} + + + + + \ 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 @@ xtoon-common-mybatis ${xtoon-cloud.version} + + com.xtoon.cloud + xtoon-common-tenant + ${xtoon-cloud.version} + com.xtoon.cloud xtoon-common-log