refactor: 暂时注释无用mail服务

web/src/main/java/seecoder/devcloud/web/service/impl/user/MailServiceImpl.java

@@ -1,86 +1,86 @@
-package seecoder.devcloud.web.service.impl.user;
-
-
-import lombok.extern.apachecommons.CommonsLog;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import org.springframework.mail.MailException;
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.javamail.MimeMessageHelper;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-import org.springframework.web.servlet.ModelAndView;
-import org.thymeleaf.TemplateEngine;
-import org.thymeleaf.context.Context;
-import seecoder.devcloud.api.ApplicationProperties;
-import seecoder.devcloud.web.service.user.MailService;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import java.io.UnsupportedEncodingException;
-import java.util.Locale;
-import java.util.concurrent.CompletableFuture;
-
-@Service
-@CommonsLog
-public class MailServiceImpl implements MailService {
-	private final TemplateEngine templateEngine;
-	private final JavaMailSender mailSender;
-
-	private final String from;
-	private final String personal;
-
-	@Autowired
-	public MailServiceImpl(TemplateEngine templateEngine, JavaMailSender mailSender, ApplicationProperties properties) {
-		this.templateEngine = templateEngine;
-		this.mailSender = mailSender;
-
-		ApplicationProperties.Mail mail = properties.getMail();
-		this.from = mail.getFrom();
-		this.personal = mail.getPersonal();
-	}
-
-	@Override
-	@Async
-	public void send(String to, String personal, String subject, ModelAndView modelAndView) {
-		if (StringUtils.isBlank(from)) return;
-		MimeMessage message = mailSender.createMimeMessage();
-		MimeMessageHelper helper = new MimeMessageHelper(message);
-		try {
-			try {
-				helper.setFrom(from, this.personal);
-			} catch (UnsupportedEncodingException e) {
-				helper.setFrom(from);
-			}
-			try {
-				helper.setTo(new InternetAddress(to, personal));
-			} catch (UnsupportedEncodingException e) {
-				helper.setTo(to);
-			}
-			helper.setSubject(subject);
-			helper.setText(templateEngine.process(modelAndView.getViewName(), new Context(Locale.CHINA, modelAndView.getModel())), true);
-		} catch (MessagingException e) {
-			log.warn("生成发送给[" + to + "(" + personal + ")]的邮件[" + subject + "]时发生异常：" + e.getMessage());
-			return;
-		}
-		try {
-			mailSender.send(message);
-		} catch (MailException e) {
-			log.warn("投递发送给[" + to + "(" + personal + ")]的邮件[" + subject + "]时发生异常：" + e.getMessage());
-		}
-	}
-
-	@Async
-	public CompletableFuture<Void> send(String text, String subject, String... to) {
-		SimpleMailMessage message = new SimpleMailMessage();
-		message.setFrom(this.from);
-		message.setTo(to);
-		message.setSubject(subject);
-		message.setText(text);
-		mailSender.send(message);
-		return null;
-	}
-}
+//package seecoder.devcloud.web.service.impl.user;
+//
+//
+//import lombok.extern.apachecommons.CommonsLog;
+//import org.apache.commons.lang3.StringUtils;
+//import org.springframework.beans.factory.annotation.Autowired;
+//
+//import org.springframework.mail.MailException;
+//import org.springframework.mail.SimpleMailMessage;
+//import org.springframework.mail.javamail.JavaMailSender;
+//import org.springframework.mail.javamail.MimeMessageHelper;
+//import org.springframework.scheduling.annotation.Async;
+//import org.springframework.stereotype.Service;
+//import org.springframework.web.servlet.ModelAndView;
+//import org.thymeleaf.TemplateEngine;
+//import org.thymeleaf.context.Context;
+//import seecoder.devcloud.api.ApplicationProperties;
+//import seecoder.devcloud.web.service.user.MailService;
+//
+//import javax.mail.MessagingException;
+//import javax.mail.internet.InternetAddress;
+//import javax.mail.internet.MimeMessage;
+//import java.io.UnsupportedEncodingException;
+//import java.util.Locale;
+//import java.util.concurrent.CompletableFuture;
+//
+//@Service
+//@CommonsLog
+//public class MailServiceImpl implements MailService {
+//	private final TemplateEngine templateEngine;
+//	private final JavaMailSender mailSender;
+//
+//	private final String from;
+//	private final String personal;
+//
+//	@Autowired
+//	public MailServiceImpl(TemplateEngine templateEngine, JavaMailSender mailSender, ApplicationProperties properties) {
+//		this.templateEngine = templateEngine;
+//		this.mailSender = mailSender;
+//
+//		ApplicationProperties.Mail mail = properties.getMail();
+//		this.from = mail.getFrom();
+//		this.personal = mail.getPersonal();
+//	}
+//
+//	@Override
+//	@Async
+//	public void send(String to, String personal, String subject, ModelAndView modelAndView) {
+//		if (StringUtils.isBlank(from)) return;
+//		MimeMessage message = mailSender.createMimeMessage();
+//		MimeMessageHelper helper = new MimeMessageHelper(message);
+//		try {
+//			try {
+//				helper.setFrom(from, this.personal);
+//			} catch (UnsupportedEncodingException e) {
+//				helper.setFrom(from);
+//			}
+//			try {
+//				helper.setTo(new InternetAddress(to, personal));
+//			} catch (UnsupportedEncodingException e) {
+//				helper.setTo(to);
+//			}
+//			helper.setSubject(subject);
+//			helper.setText(templateEngine.process(modelAndView.getViewName(), new Context(Locale.CHINA, modelAndView.getModel())), true);
+//		} catch (MessagingException e) {
+//			log.warn("生成发送给[" + to + "(" + personal + ")]的邮件[" + subject + "]时发生异常：" + e.getMessage());
+//			return;
+//		}
+//		try {
+//			mailSender.send(message);
+//		} catch (MailException e) {
+//			log.warn("投递发送给[" + to + "(" + personal + ")]的邮件[" + subject + "]时发生异常：" + e.getMessage());
+//		}
+//	}
+//
+//	@Async
+//	public CompletableFuture<Void> send(String text, String subject, String... to) {
+//		SimpleMailMessage message = new SimpleMailMessage();
+//		message.setFrom(this.from);
+//		message.setTo(to);
+//		message.setSubject(subject);
+//		message.setText(text);
+//		mailSender.send(message);
+//		return null;
+//	}
+//}

web/src/test/java/seecoder/devcloud/web/service/user/MailServiceTest.java

@@ -1,48 +1,48 @@
-package seecoder.devcloud.web.service.user;
-
-import org.junit.Assert;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.javamail.MimeMessageHelper;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.test.context.junit4.SpringRunner;
-import seecoder.devcloud.common.exceptions.ServiceException;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-
-import java.util.concurrent.CompletableFuture;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * @author PuHong Weng
- * @date 2021/3/3
- * @description:
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest
-@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
-class MailServiceTest {
-
-    @Autowired
-    MailService mailService;
-
-    @Autowired
-    JavaMailSender javaMailSender;
-    @Test
-    void send() {
-        try {
-            CompletableFuture<Void> result = mailService.send( "你的课程作业","按时","2717718789@qq.com");
-            CompletableFuture.allOf(result).join();
-        } catch (Exception e) {
-            e.printStackTrace();
-            Assert.fail(e.getMessage());
-        }
-    }
-}
+//package seecoder.devcloud.web.service.user;
+//
+//import org.junit.Assert;
+//import org.junit.jupiter.api.Test;
+//import org.junit.runner.RunWith;
+//import org.mybatis.spring.annotation.MapperScan;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.context.annotation.ComponentScan;
+//import org.springframework.mail.javamail.JavaMailSender;
+//import org.springframework.mail.javamail.MimeMessageHelper;
+//import org.springframework.scheduling.annotation.EnableAsync;
+//import org.springframework.test.context.junit4.SpringRunner;
+//import seecoder.devcloud.common.exceptions.ServiceException;
+//
+//import javax.mail.MessagingException;
+//import javax.mail.internet.MimeMessage;
+//
+//import java.util.concurrent.CompletableFuture;
+//
+//import static org.junit.jupiter.api.Assertions.*;
+//
+///**
+// * @author PuHong Weng
+// * @date 2021/3/3
+// * @description:
+// */
+//@RunWith(SpringRunner.class)
+//@SpringBootTest
+//@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
+//class MailServiceTest {
+//
+//    @Autowired
+//    MailService mailService;
+//
+//    @Autowired
+//    JavaMailSender javaMailSender;
+//    @Test
+//    void send() {
+//        try {
+//            CompletableFuture<Void> result = mailService.send( "你的课程作业","按时","2717718789@qq.com");
+//            CompletableFuture.allOf(result).join();
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            Assert.fail(e.getMessage());
+//        }
+//    }
+//}