zouxuan 3 년 전
부모
커밋
f11fe8a31a

+ 7 - 36
mec-teacher/src/main/java/com/ym/mec/teacher/config/WebMvcConfig.java

@@ -1,49 +1,20 @@
 package com.ym.mec.teacher.config;
 
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
+import com.ym.mec.common.config.EnumConverterFactory;
+import com.ym.mec.common.config.LocalFastJsonHttpMessageConverter;
 import com.ym.mec.teacher.interceptor.MDCInterceptor;
 import com.ym.mec.teacher.interceptor.OperationLogInterceptor;
-import com.ym.mec.teacher.interceptor.TenantInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 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.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
-import com.ym.mec.common.config.EnumConverterFactory;
-import com.ym.mec.common.config.LocalFastJsonHttpMessageConverter;
-import com.ym.mec.common.enums.BaseEnum;
+import java.util.ArrayList;
+import java.util.List;
 
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
@@ -53,8 +24,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
 	@Autowired
 	private OperationLogInterceptor operationLogInterceptor;
-	@Autowired
-	private TenantInterceptor tenantInterceptor;
+//	@Autowired
+//	private TenantInterceptor tenantInterceptor;
 
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
@@ -62,7 +33,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		includePathPatterns.add("/**");
 		List<String> excludePathPatterns = new ArrayList<String>();
 		excludePathPatterns.add("/login");
-		registry.addInterceptor(tenantInterceptor).addPathPatterns("/**");
+//		registry.addInterceptor(tenantInterceptor).addPathPatterns("/**");
 		registry.addInterceptor(mdcInterceptor).addPathPatterns(includePathPatterns).excludePathPatterns(excludePathPatterns);
 
 //		registry.addInterceptor(operationLogInterceptor).addPathPatterns("/**").excludePathPatterns("/login");

+ 0 - 6
mec-web/src/main/java/com/ym/mec/web/controller/TenantInfoController.java

@@ -155,12 +155,6 @@ public class TenantInfoController extends BaseController {
         return succeed(tenantInfoService.rechargeCheck(orderNo));
     }
 
-//    @ApiOperation(value = "测试邮件")
-//    @GetMapping("/testEmail")
-//    public HttpResponseResult<Boolean> testEmail() {
-//        return succeed(tenantInfoService.testEmail());
-//    }
-
     @ApiOperation(value = "测试临期提醒")
     @GetMapping("/testCheck")
     public Object testCheck() {