提交

src/main/java/cn/ezhizao/project/business/email/controller/BizEmailController.java

@@ -81,6 +81,12 @@ public class BizEmailController extends BaseController
     public AjaxResult add(@RequestBody BizEmail bizEmail) throws NoSuchFieldException, IllegalAccessException
     {
         setTenantId(bizEmail);
+        if (bizEmail.getType().equals(0)) {
+            // 查询发送邮箱
+            List<BizEmail> bizEmails = bizEmailService.query().eq("is_stop", 0).eq("type", 0).list();
+            bizEmails.forEach(l -> l.setIsStop(1));
+            bizEmailService.updateBatchById(bizEmails);
+        }
         return toAjax(bizEmailService.save(bizEmail));
     }
 
@@ -93,6 +99,12 @@ public class BizEmailController extends BaseController
     public AjaxResult edit(@RequestBody BizEmail bizEmail) throws NoSuchFieldException, IllegalAccessException
     {
         setTenantId(bizEmail);
+        if (bizEmail.getType().equals(0)) {
+            // 查询发送邮箱
+            List<BizEmail> bizEmails = bizEmailService.query().ne("id", bizEmail.getId()).eq("is_stop", 0).eq("type", 0).list();
+            bizEmails.forEach(l -> l.setIsStop(1));
+            bizEmailService.updateBatchById(bizEmails);
+        }
         return toAjax(bizEmailService.updateById(bizEmail));
     }
 

src/main/java/cn/ezhizao/project/business/email/domain/BizEmail.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.experimental.Accessors;
 
 /**
  * 提醒邮件配置文件对象 biz_email

src/main/java/cn/ezhizao/project/tool/email/service/EmailService.java

@@ -20,15 +20,15 @@ public class EmailService {
     @Value("${spring.mail.username}")
     private String from;
     private JavaMailSenderImpl javaMailSenderImpl;
-//    @Autowired
-    private final BizEmailMapper bizEmailMapper;
+    @Autowired
+    private BizEmailMapper bizEmailMapper;
     @Resource
     private JavaMailSender javaMailSender;
 
     @Autowired
     public EmailService(BizEmailMapper bizEmailMapper) {
         this.bizEmailMapper = bizEmailMapper;
-        setEmailSender();
+//        setEmailSender();
     }
 
     public void setEmailSender() {
@@ -55,6 +55,7 @@ public class EmailService {
     }
 
     public void sendEmail(String to, String subject, String text) {
+        setEmailSender();
         try {
             SimpleMailMessage message = new SimpleMailMessage();
             message.setTo(to);
@@ -67,7 +68,7 @@ public class EmailService {
             SimpleMailMessage error = new SimpleMailMessage();
             error.setTo(to);
             error.setSubject(subject);
-            error.setText(text);
+            error.setText(e.getMessage());
             error.setFrom(from);
             javaMailSender.send(error);
         }

src/main/resources/mybatis/business/email/BizEmailMapper.xml

@@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             deleted = 0
             <if test="type != null "> AND type = #{type}</if>
             <if test="isStop != null "> AND is_stop = #{isStop}</if>
-            <if test="emailAddress != null  and emailAddress != ''"> AND email_address = #{emailAddress}</if>
+            <if test="emailAddress != null  and emailAddress != ''"> AND email_address like concat('%', #{emailAddress}, '%')</if>
             <if test="authCode != null  and authCode != ''"> AND auth_code = #{authCode}</if>
             <if test="port != null  and port != ''"> AND port = #{port}</if>
             <if test="protocol != null  and protocol != ''"> AND protocol = #{protocol}</if>