Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/SysUserFeignService.java

@@ -3,6 +3,7 @@ package com.ym.mec.auth.api.client;
 import java.util.List;
 
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

mec-biz/src/main/java/com/ym/mec/biz/service/TenantInfoService.java

@@ -67,8 +67,6 @@ public interface TenantInfoService extends IService<TenantInfo> {
      */
     TenantInfo queryTenantInfoByOrgan(Integer organId);
 
-    Boolean testEmail();
-
     void updatePhone(String newPhone, String oldPhone);
 
     void checkTenantState();

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupMemberServiceImpl.java

@@ -15,6 +15,7 @@ import com.ym.mec.im.entity.GroupModel;
 import com.ym.mec.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupServiceImpl.java

@@ -8,6 +8,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.common.entity.ImUserModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -915,20 +915,4 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         return baseMapper.queryTenantInfoByOrgan(organId);
     }
 
-    @Override
-    public Boolean testEmail() {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        Map<Integer, String> receivers = new HashMap<>();
-        receivers.put(user.getId(), "yanite1234@sina.com");
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.EMAIL_TENANT_ACTIVATION_SUCCESSFUL, receivers, null, 0, null, "SYSTEM", "小风乐团1", "xiaofeng", "this is password");
-
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.EMAIL_TENANT_RENEWAL_SUCCESSFUL, receivers, null, 0, null, "SYSTEM", "小风乐团2", "xiaofeng", "this is password");
-
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.EMAIL_TENANT_EXPIRATION_REMINDERS, receivers, null, 0, null, "SYSTEM", "小风乐团3", "xiaofeng", "this is password");
-
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.EMAIL_TENANT_INSUFFICIENT_BALANCE, receivers, null, 0, null, "SYSTEM", "小风乐团4", "xiaofeng", "this is password");
-
-        return false;
-    }
-
 }

mec-im/src/main/java/com/ym/interceptor/TenantInterceptor.java

@@ -3,6 +3,7 @@ package com.ym.interceptor;
 import com.ym.mec.biz.service.TenantInfoService;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -13,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
 public class TenantInterceptor extends HandlerInterceptorAdapter {
 
 	@Autowired
+	@Lazy
 	private TenantInfoService tenantInfoService;
 
 	@Override

mec-student/src/main/java/com/ym/mec/student/interceptor/TenantInterceptor.java

@@ -3,6 +3,7 @@ package com.ym.mec.student.interceptor;
 import com.ym.mec.biz.service.TenantInfoService;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -13,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
 public class TenantInterceptor extends HandlerInterceptorAdapter {
 
 	@Autowired
+	@Lazy
 	private TenantInfoService tenantInfoService;
 
 	@Override

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

@@ -1,16 +1,7 @@
 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;
@@ -18,32 +9,13 @@ 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 {

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ImGroupController.java

@@ -8,6 +8,7 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

mec-teacher/src/main/java/com/ym/mec/teacher/interceptor/TenantInterceptor.java

@@ -3,6 +3,7 @@ package com.ym.mec.teacher.interceptor;
 import com.ym.mec.biz.service.TenantInfoService;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -13,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
 public class TenantInterceptor extends HandlerInterceptorAdapter {
 
 	@Autowired
+	@Lazy
 	private TenantInfoService tenantInfoService;
 
 	@Override

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() {

mec-web/src/main/java/com/ym/mec/web/interceptor/TenantInterceptor.java

@@ -3,6 +3,7 @@ package com.ym.mec.web.interceptor;
 import com.ym.mec.biz.service.TenantInfoService;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -13,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
 public class TenantInterceptor extends HandlerInterceptorAdapter {
 
 	@Autowired
+	@Lazy
 	private TenantInfoService tenantInfoService;
 
 	@Override