yonge 5 gadi atpakaļ
vecāks
revīzija
c139b4390e

+ 7 - 0
edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/config/WebMvcConfig.java

@@ -13,6 +13,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import com.keao.edu.common.config.EnumConverterFactory;
 import com.keao.edu.common.config.LocalFastJsonHttpMessageConverter;
+import com.keao.edu.common.tenant.TenantInterceptor;
 import com.keao.edu.datasource.interceptor.DataSourceInterceptor;
 
 @Configuration
@@ -30,12 +31,18 @@ public class WebMvcConfig implements WebMvcConfigurer {
 	public void addInterceptors(InterceptorRegistry registry) {
 
 		registry.addInterceptor(getDataSrouceInterceptor()).addPathPatterns("/**");
+		registry.addInterceptor(getTenantInterceptor()).addPathPatterns("/**");
 	}
 
 	@Bean
 	public DataSourceInterceptor getDataSrouceInterceptor() {
 		return new DataSourceInterceptor();
 	}
+
+	@Bean
+	public TenantInterceptor getTenantInterceptor() {
+		return new TenantInterceptor();
+	}
 	
 	@Bean
     public HttpMessageConverters fastJsonHttpMessageConverters(){

+ 5 - 0
edu-cms/pom.xml

@@ -21,6 +21,11 @@
 		</dependency>
 		
 		<dependency>
+			<groupId>com.keao.edu</groupId>
+			<artifactId>edu-datasource</artifactId>
+		</dependency>
+		
+		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>

+ 20 - 0
edu-cms/src/main/java/com/keao/edu/cms/config/WebMvcConfig.java

@@ -8,10 +8,13 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.http.MediaType;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import com.keao.edu.common.config.EnumConverterFactory;
 import com.keao.edu.common.config.LocalFastJsonHttpMessageConverter;
+import com.keao.edu.common.tenant.TenantInterceptor;
+import com.keao.edu.datasource.interceptor.DataSourceInterceptor;
 
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
@@ -23,6 +26,23 @@ public class WebMvcConfig implements WebMvcConfigurer {
 	public void addFormatters(FormatterRegistry registry) {
 		registry.addConverterFactory(new EnumConverterFactory());
 	}
+
+	@Override
+	public void addInterceptors(InterceptorRegistry registry) {
+
+		registry.addInterceptor(getDataSrouceInterceptor()).addPathPatterns("/**");
+		registry.addInterceptor(getTenantInterceptor()).addPathPatterns("/**");
+	}
+
+	@Bean
+	public DataSourceInterceptor getDataSrouceInterceptor() {
+		return new DataSourceInterceptor();
+	}
+
+	@Bean
+	public TenantInterceptor getTenantInterceptor() {
+		return new TenantInterceptor();
+	}
 	
 	@Bean
     public HttpMessageConverters fastJsonHttpMessageConverters(){

+ 8 - 1
edu-user/edu-user-server/src/main/java/com/keao/edu/user/config/WebMvcConfig.java

@@ -3,7 +3,6 @@ package com.keao.edu.user.config;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.keao.edu.datasource.interceptor.DataSourceInterceptor;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -14,6 +13,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import com.keao.edu.common.config.EnumConverterFactory;
 import com.keao.edu.common.config.LocalFastJsonHttpMessageConverter;
+import com.keao.edu.common.tenant.TenantInterceptor;
+import com.keao.edu.datasource.interceptor.DataSourceInterceptor;
 
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
@@ -30,12 +31,18 @@ public class WebMvcConfig implements WebMvcConfigurer {
 	public void addInterceptors(InterceptorRegistry registry) {
 
 		registry.addInterceptor(getDataSrouceInterceptor()).addPathPatterns("/**");
+		registry.addInterceptor(getTenantInterceptor()).addPathPatterns("/**");
 	}
 
 	@Bean
 	public DataSourceInterceptor getDataSrouceInterceptor() {
 		return new DataSourceInterceptor();
 	}
+
+	@Bean
+	public TenantInterceptor getTenantInterceptor() {
+		return new TenantInterceptor();
+	}
 	
 	@Bean
     public HttpMessageConverters fastJsonHttpMessageConverters(){