diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java index cfd4e3c80..3d4433af8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java @@ -145,6 +145,11 @@ public class XzRegistryServiceImpl extends ServiceImpl() + .eq(SystemUser::getAccount, xz.getAccount())); + if (su != null) { + return; + } String projectSns = r.getProjectSns(); String companySns = r.getCompanySns(); if (StringUtils.isBlank(projectSns) && StringUtils.isBlank(companySns)) { diff --git a/src/main/java/com/zhgd/xmgl/util/EmailUtils.java b/src/main/java/com/zhgd/xmgl/util/EmailUtils.java index cf2a4dedd..bea0a0a35 100644 --- a/src/main/java/com/zhgd/xmgl/util/EmailUtils.java +++ b/src/main/java/com/zhgd/xmgl/util/EmailUtils.java @@ -7,9 +7,11 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.FileSystemResource; +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 javax.mail.internet.InternetAddress; @@ -44,20 +46,25 @@ public class EmailUtils implements EmailService { * @param content 内容 */ @Override + @Async public void sendSimpleMail(String to, String subject, String content) { log.info("发送邮件,收件人:{},主题:{},内容:{}", to, subject, content); - //创建SimpleMailMessage对象 - SimpleMailMessage message = new SimpleMailMessage(); - //邮件发送人 - message.setFrom(from); - //邮件接收人 - message.setTo(to); - //邮件主题 - message.setSubject(subject); - //邮件内容 - message.setText(content); - //发送邮件 - mailSender.send(message); + try { + //创建SimpleMailMessage对象 + SimpleMailMessage message = new SimpleMailMessage(); + //邮件发送人 + message.setFrom(from); + //邮件接收人 + message.setTo(to); + //邮件主题 + message.setSubject(subject); + //邮件内容 + message.setText(content); + //发送邮件 + mailSender.send(message); + } catch (MailException e) { + log.error("发送邮件error", e); + } } /**