Bläddra i källkod

清除email发送方法已经逻辑

wangpenghui 1 år sedan
förälder
incheckning
87f9c32b19

+ 7 - 7
pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/AuthServiceImpl.java

@@ -13,7 +13,7 @@ import cn.kdan.pdf.tech.core.model.VppMember;
 import cn.kdan.pdf.tech.core.pojo.oauth2.TokenPOJO;
 import cn.kdan.pdf.tech.core.service.AuthService;
 import cn.kdan.pdf.tech.core.service.VppMemberService;
-import cn.kdan.pdf.tech.core.utils.EmailUtils;
+//import cn.kdan.pdf.tech.core.utils.EmailUtils;
 import cn.kdan.pdf.tech.core.utils.TokenUtils;
 import constant.CommonConstant;
 import enums.ValidStatusEnum;
@@ -58,9 +58,9 @@ public class AuthServiceImpl implements AuthService {
 
     @Autowired
     private SMSUtils smsUtils;
-
-    @Autowired
-    private EmailUtils emailUtils;
+//
+//    @Autowired
+//    private EmailUtils emailUtils;
 
     @Autowired
     private RedisUtils<String, String> redisUtils;
@@ -191,9 +191,9 @@ public class AuthServiceImpl implements AuthService {
                 if(action.value().equals(CaptchaActionEnum.USER_REGISTER.value())){
                     text = String.format(action.text(), receiver, code);
                 }
-                if (emailUtils.sendMail(action.subject(), text, Collections.singletonList(receiver))) {
-                    flag = true;
-                }
+//                if (emailUtils.sendMail(action.subject(), text, Collections.singletonList(receiver))) {
+//                    flag = true;
+//                }
                 break;
             default:
                 break;

+ 4 - 4
pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/VppDeviceServiceImpl.java

@@ -23,7 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
-import cn.kdan.pdf.tech.core.utils.EmailUtils;
+//import cn.kdan.pdf.tech.core.utils.EmailUtils;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -48,8 +48,8 @@ public class VppDeviceServiceImpl implements VppDeviceService {
     private VppMemberService memberService;
     @Resource
     private ProductService productService;
-    @Autowired
-    private EmailUtils emailUtils;
+//    @Autowired
+//    private EmailUtils emailUtils;
     @Resource
     private SubscriptionService subscriptionService;
     @Resource
@@ -162,7 +162,7 @@ public class VppDeviceServiceImpl implements VppDeviceService {
                 String text = String.format(CaptchaActionEnum.CANCEL_DEVICE_ASSIGN.text(),vppMember.getEmail(),devicesModel,product.getName(),product.getName(),devicesModel, helpLink);
                 // 替换图片动态地址和取消订阅链接
                 text = text.replace("emailImagesUrl", emailImagesUrl).replace("cancelEmailUrl", readerproUrl + "/unsubscribe?email=" + vppMember.getEmail());
-                emailUtils.sendMail(CaptchaActionEnum.CANCEL_DEVICE_ASSIGN.subject(), text, Collections.singletonList(vppMember.getEmail()));
+//                emailUtils.sendMail(CaptchaActionEnum.CANCEL_DEVICE_ASSIGN.subject(), text, Collections.singletonList(vppMember.getEmail()));
             }
         });
     }

+ 6 - 6
pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/VppLicenseCodeServiceImpl.java

@@ -29,7 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
-import cn.kdan.pdf.tech.core.utils.EmailUtils;
+//import cn.kdan.pdf.tech.core.utils.EmailUtils;
 
 import javax.annotation.Resource;
 import java.io.IOException;
@@ -61,8 +61,8 @@ public class VppLicenseCodeServiceImpl implements VppLicenseCodeService {
     private VppMemberService vppMemberService;
     @Resource
     private VppRTeamMemberRoleService vppRTeamMemberRoleService;
-    @Autowired
-    private EmailUtils emailUtils;
+//    @Autowired
+//    private EmailUtils emailUtils;
     @Autowired
     private ProductService productService;
     @Value("${ssoUrl}")
@@ -278,7 +278,7 @@ public class VppLicenseCodeServiceImpl implements VppLicenseCodeService {
                     vppMember.getEmail(), productName, cdKey, downloadUrl, helpUrl);
             // 替换图片动态地址和取消订阅链接
             content = content.replace("emailImagesUrl", emailImagesUrl).replace("cancelEmailUrl", readerproUrl + "/unsubscribe?email=" + vppMember.getEmail());
-            emailUtils.sendMail(CaptchaActionEnum.ASSIGN_LICENSE_CODE.subject(), content, Collections.singletonList(vppMember.getEmail()));
+//            emailUtils.sendMail(CaptchaActionEnum.ASSIGN_LICENSE_CODE.subject(), content, Collections.singletonList(vppMember.getEmail()));
         }
     }
 
@@ -380,7 +380,7 @@ public class VppLicenseCodeServiceImpl implements VppLicenseCodeService {
             String text = String.format(CaptchaActionEnum.CANCEL_LICENSE_ASSIGN.text(), vppMember.getEmail(), products.getName(), products.getName(), user.getEmail());
             // 替换图片动态地址和取消订阅链接
             text = text.replace("emailImagesUrl", emailImagesUrl).replace("cancelEmailUrl", readerproUrl + "/unsubscribe?email=" + vppMember.getEmail());
-            emailUtils.sendMail(CaptchaActionEnum.CANCEL_LICENSE_ASSIGN.subject(), text, Collections.singletonList(vppMember.getEmail()));
+//            emailUtils.sendMail(CaptchaActionEnum.CANCEL_LICENSE_ASSIGN.subject(), text, Collections.singletonList(vppMember.getEmail()));
         });
     }
 
@@ -468,7 +468,7 @@ public class VppLicenseCodeServiceImpl implements VppLicenseCodeService {
                         String text = String.format(CaptchaActionEnum.CANCEL_LICENSE_ASSIGN.text(), vppMember.getEmail(), product.getName(), product.getName(), user.getEmail());
                         // 替换图片动态地址和取消订阅链接
                         text = text.replace("emailImagesUrl", emailImagesUrl).replace("cancelEmailUrl", readerproUrl + "/unsubscribe?email=" + vppMember.getEmail());
-                        emailUtils.sendMail(CaptchaActionEnum.CANCEL_LICENSE_ASSIGN.subject(), text, Collections.singletonList(vppMember.getEmail()));
+//                        emailUtils.sendMail(CaptchaActionEnum.CANCEL_LICENSE_ASSIGN.subject(), text, Collections.singletonList(vppMember.getEmail()));
                     });
                 }
             }

+ 4 - 4
pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/VppMemberServiceImpl.java

@@ -35,7 +35,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import pojo.CustomUserDetails;
 import utils.CommonUtils;
-import cn.kdan.pdf.tech.core.utils.EmailUtils;
+//import cn.kdan.pdf.tech.core.utils.EmailUtils;
 import utils.RedisUtils;
 
 import javax.annotation.Resource;
@@ -62,8 +62,8 @@ public class VppMemberServiceImpl implements VppMemberService {
     private VppTeamService vppTeamService;
     @Resource
     private RedisUtils redisUtils;
-    @Autowired
-    private EmailUtils emailUtils;
+//    @Autowired
+//    private EmailUtils emailUtils;
     @Resource
     private VppRTeamMemberRoleService vppRTeamMemberRoleService;
 //    @Value("${webUrl}")
@@ -174,7 +174,7 @@ public class VppMemberServiceImpl implements VppMemberService {
             String text = String.format(CaptchaActionEnum.FORGET_PASSWORD.text(), member.getFullName(), member.getEmail(),newPassWord);
             // 替换图片动态地址和取消订阅链接
             text = text.replace("emailImagesUrl", emailImagesUrl).replace("cancelEmailUrl", readerproUrl + "/unsubscribe?email=" + params.getEmail());
-            emailUtils.sendMail(CaptchaActionEnum.FORGET_PASSWORD.subject(), text, Collections.singletonList(params.getEmail()));
+//            emailUtils.sendMail(CaptchaActionEnum.FORGET_PASSWORD.subject(), text, Collections.singletonList(params.getEmail()));
         });
         return false;
     }

+ 9 - 9
pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/VppRTeamMemberRoleServiceImpl.java

@@ -12,7 +12,7 @@ import cn.kdan.pdf.tech.core.pojo.vo.VppRTeamMemberRoleVO;
 import cn.kdan.pdf.tech.core.pojo.vo.VppTeamAdminVO;
 import cn.kdan.pdf.tech.core.pojo.vo.VppTeamMemberVO;
 import cn.kdan.pdf.tech.core.service.*;
-import cn.kdan.pdf.tech.core.utils.EmailUtils;
+//import cn.kdan.pdf.tech.core.utils.EmailUtils;
 import cn.kdan.pdf.tech.core.utils.ExcelUtils;
 import cn.kdan.pdf.tech.core.utils.FileUtil;
 import cn.kdan.pdf.tech.core.utils.ThreadPoolSingleUtil;
@@ -69,8 +69,8 @@ public class VppRTeamMemberRoleServiceImpl implements VppRTeamMemberRoleService
     @Autowired
     private ExtVppRTeamMemberRoleMapper extVppRTeamMemberRoleMapper;
 
-    @Autowired
-    private EmailUtils emailUtils;
+//    @Autowired
+//    private EmailUtils emailUtils;
     @Autowired
     private RedisUtils<String, String> redisUtils;
     @Autowired
@@ -157,9 +157,9 @@ public class VppRTeamMemberRoleServiceImpl implements VppRTeamMemberRoleService
             // 替换图片动态地址和取消订阅链接
             text = text.replace("emailImagesUrl", emailImagesUrl).replace("cancelEmailUrl", readerproUrl + "/unsubscribe?email=" + dto.getMemberEmail());
             String subject = String.format(actionEnum.subject(), user.getFullName());
-            if(emailUtils.sendMail(subject, text, Collections.singletonList(dto.getMemberEmail()))) {
-                redisUtils.hset(AuthConstant.VERIFY_CODE_KEY + actionEnum.value(), dto.getMemberEmail(), code, AuthConstant.INVITE_VERIFY_CODE_KEY_EXPIRE_TIME);
-            }
+//            if(emailUtils.sendMail(subject, text, Collections.singletonList(dto.getMemberEmail()))) {
+//                redisUtils.hset(AuthConstant.VERIFY_CODE_KEY + actionEnum.value(), dto.getMemberEmail(), code, AuthConstant.INVITE_VERIFY_CODE_KEY_EXPIRE_TIME);
+//            }
         });
     }
 
@@ -271,9 +271,9 @@ public class VppRTeamMemberRoleServiceImpl implements VppRTeamMemberRoleService
                     // 替换图片动态地址和取消订阅链接
                     text = text.replace("emailImagesUrl", emailImagesUrl).replace("cancelEmailUrl", readerproUrl + "/unsubscribe?email=" + memberEmail);
                     String subject = String.format(actionEnum.subject(), user.getFullName());
-                    if(emailUtils.sendMail(subject, text, Collections.singletonList(memberEmail))){
-                        redisUtils.hset(AuthConstant.VERIFY_CODE_KEY + actionEnum.value(), memberEmail, code, AuthConstant.INVITE_VERIFY_CODE_KEY_EXPIRE_TIME);
-                    }
+//                    if(emailUtils.sendMail(subject, text, Collections.singletonList(memberEmail))){
+//                        redisUtils.hset(AuthConstant.VERIFY_CODE_KEY + actionEnum.value(), memberEmail, code, AuthConstant.INVITE_VERIFY_CODE_KEY_EXPIRE_TIME);
+//                    }
                 });
             }
         } catch (IOException e) {

+ 12 - 12
pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/VppTeamServiceImpl.java

@@ -31,7 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import utils.CommonUtils;
-import cn.kdan.pdf.tech.core.utils.EmailUtils;
+//import cn.kdan.pdf.tech.core.utils.EmailUtils;
 import utils.RedisUtils;
 
 import javax.annotation.Resource;
@@ -56,8 +56,8 @@ public class VppTeamServiceImpl implements VppTeamService {
     private VppMemberService vppMemberService;
     @Resource
     private VppCompanyService vppCompanyService;
-    @Autowired
-    private EmailUtils emailUtils;
+//    @Autowired
+//    private EmailUtils emailUtils;
     @Resource
     private VppRTeamMemberRoleService vppRTeamMemberRoleService;
     @Resource
@@ -306,9 +306,9 @@ public class VppTeamServiceImpl implements VppTeamService {
             text = text.replace("emailImagesUrl", emailImagesUrl).replace("cancelEmailUrl", readerproUrl + "/unsubscribe?email=" + vppMember.getEmail());
             String finalText = text;
             ThreadPoolSingleUtil.getInstance().excute(() -> {
-                if(emailUtils.sendMail(actionEnum.subject(), finalText, Collections.singletonList(vppMember.getEmail()))){
-                    redisUtils.hset(AuthConstant.VERIFY_CODE_KEY + actionEnum.value(), vppMember.getEmail(), code, AuthConstant.INVITE_VERIFY_CODE_KEY_EXPIRE_TIME);
-                }
+//                if(emailUtils.sendMail(actionEnum.subject(), finalText, Collections.singletonList(vppMember.getEmail()))){
+//                    redisUtils.hset(AuthConstant.VERIFY_CODE_KEY + actionEnum.value(), vppMember.getEmail(), code, AuthConstant.INVITE_VERIFY_CODE_KEY_EXPIRE_TIME);
+//                }
             });
         }
     }
@@ -516,9 +516,9 @@ public class VppTeamServiceImpl implements VppTeamService {
             text = text.replace("emailImagesUrl", emailImagesUrl).replace("cancelEmailUrl", readerproUrl + "/unsubscribe?email=" + vppMember.getEmail());
             String finalText = text;
             ThreadPoolSingleUtil.getInstance().excute(() -> {
-                if(emailUtils.sendMail(actionEnum.subject(), finalText, Collections.singletonList(vppMember.getEmail()))){
-                    redisUtils.hset(AuthConstant.VERIFY_CODE_KEY + actionEnum.value(), vppMember.getEmail(), code, AuthConstant.INVITE_VERIFY_CODE_KEY_EXPIRE_TIME);
-                }
+//                if(emailUtils.sendMail(actionEnum.subject(), finalText, Collections.singletonList(vppMember.getEmail()))){
+//                    redisUtils.hset(AuthConstant.VERIFY_CODE_KEY + actionEnum.value(), vppMember.getEmail(), code, AuthConstant.INVITE_VERIFY_CODE_KEY_EXPIRE_TIME);
+//                }
             });
         }
     }
@@ -739,9 +739,9 @@ public class VppTeamServiceImpl implements VppTeamService {
         String finalText = text;
         SEND_MAIL_THREAD_POOL.submit(() -> {
             //发送邮件
-            if(emailUtils.sendMail(actionEnum.subject(), finalText, Collections.singletonList(account))){
-                redisUtils.hset(AuthConstant.VERIFY_CODE_KEY + actionEnum.value(), account, code, AuthConstant.INVITE_VERIFY_CODE_KEY_EXPIRE_TIME);
-            }
+//            if(emailUtils.sendMail(actionEnum.subject(), finalText, Collections.singletonList(account))){
+//                redisUtils.hset(AuthConstant.VERIFY_CODE_KEY + actionEnum.value(), account, code, AuthConstant.INVITE_VERIFY_CODE_KEY_EXPIRE_TIME);
+//            }
         });
     }
 

+ 144 - 144
pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/utils/EmailUtils.java

@@ -1,155 +1,155 @@
-package cn.kdan.pdf.tech.core.utils;
-
-import cn.kdan.pdf.tech.core.properties.MailProperties;
-import com.sun.mail.util.MailSSLSocketFactory;
-import constant.CommonConstant;
-import exception.BackendRuntimeException;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.mail.javamail.MimeMessageHelper;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.mail.*;
-import javax.mail.internet.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
-
-@Component
-@Slf4j
-public class EmailUtils {
-    @Resource
-    private MailProperties mailProperties;
-
+//package cn.kdan.pdf.tech.core.utils;
+//
+//import cn.kdan.pdf.tech.core.properties.MailProperties;
+//import com.sun.mail.util.MailSSLSocketFactory;
+//import constant.CommonConstant;
+//import exception.BackendRuntimeException;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.mail.javamail.MimeMessageHelper;
+//import org.springframework.stereotype.Component;
+//
+//import javax.annotation.Resource;
+//import javax.mail.*;
+//import javax.mail.internet.*;
+//import java.util.Date;
+//import java.util.List;
+//import java.util.Properties;
+//
+//@Component
+//@Slf4j
+//public class EmailUtils {
 //    @Resource
-//    private JavaMailSender mailSender;
-
-//    public boolean sendMail(String subject, String content, List<String> emails) {
+//    private MailProperties mailProperties;
+//
+////    @Resource
+////    private JavaMailSender mailSender;
+//
+////    public boolean sendMail(String subject, String content, List<String> emails) {
+////        try {
+////            MimeMessage mimeMessage = mailSender.createMimeMessage();
+////            for (String email : emails) {
+////                MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true);
+////                // 设置收件人邮箱
+////                messageHelper.setTo(email);
+////                messageHelper.setSubject(subject);
+////                messageHelper.setText(content, true);
+////                messageHelper.setSentDate(new Date());
+////                mailSender.send(mimeMessage);
+////            }
+////        } catch (Exception e) {
+////            log.error("send mail error : " + e.getMessage(), e);
+////            return false;
+////        }
+////        return true;
+////    }
+//
+//    public boolean sendMail(String subject,String text,List<String> emails){
+////        try {
+////        //用于读取配置文件
+////        Properties props=new Properties();
+////        //开启Debug调试
+////        props.setProperty("mail.debug", "true");
+////        //发送服务器需要身份验证
+////        props.setProperty("mail.smtp.auth", "true");
+////        //发送邮件服务器的主机名
+////        props.setProperty("mail.smtp.host", mailProperties.getHost());
+////        //端口号
+////        props.setProperty("mail.smtp.port", mailProperties.getPort());
+////        //发送邮件协议
+////        props.setProperty("mail.transport.protocol", mailProperties.getProtocol());
+////        //开启ssl加密(并不是所有的邮箱服务器都需要,但是qq邮箱服务器是必须的)
+////        MailSSLSocketFactory msf= new MailSSLSocketFactory();
+////        msf.setTrustAllHosts(true);
+////        props.put("mail.smtp.ssl.enable", "true");
+////        props.put("mail.smtp.ssl.socketFactory",msf);
+////        //获取Session会话实例(javamail Session与HttpSession的区别是Javamail的Session只是配置信息的集合)
+////        Session session=Session.getInstance(props,new javax.mail.Authenticator(){
+////            protected PasswordAuthentication getPasswordAuthentication(){
+////                //用户名密码验证(取得的授权吗)
+////                return new PasswordAuthentication (mailProperties.getUsername(),mailProperties.getPassword());
+////            }
+////        });
+////
+////        //抽象类MimeMessage为实现类 消息载体封装了邮件的所有消息
+////        MimeMessage message=new MimeMessage(session);
+////        //设置发件人地址
+////        message.setFrom(new InternetAddress(mailProperties.getUsername()));
+////        //此类的功能是发送邮件 又会话获得实例
+////        Transport transport=session.getTransport();
+////        //开启连接
+////        transport.connect();
+////        //设置收件人地址邮件信息
+////        for (int i = 0; i < emails.size(); i++) {
+////            MimeMessageHelper messageHelper = new MimeMessageHelper(message, true,"utf-8");
+////                // 设置收件人邮箱
+////            messageHelper.setTo(emails.get(i));
+////            messageHelper.setSubject(subject);
+////            messageHelper.setText(text, true);
+////            messageHelper.setSentDate(new Date());
+////            transport.sendMessage(message,new Address[]{new InternetAddress(emails.get(i))});
+////            //邮件发送后关闭信息
+////            transport.close();
+////        }
+////            return true;
 //        try {
-//            MimeMessage mimeMessage = mailSender.createMimeMessage();
-//            for (String email : emails) {
-//                MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true);
+//            //用于读取配置文件
+//            Properties props=new Properties();
+//            //发送服务器需要身份验证
+//            props.setProperty("mail.smtp.auth", "true");
+//            //发送邮件服务器的主机名
+//            props.setProperty("mail.smtp.host", mailProperties.getHost());
+//            //端口号
+//            props.setProperty("mail.smtp.port", mailProperties.getPort());
+//            //发送邮件协议
+//            props.setProperty("mail.transport.protocol",  mailProperties.getProtocol());
+//            props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
+//            props.put("mail.smtp.socketFactory.port", "465");
+//            props.put("mail.smtp.port", mailProperties.getPort());
+//
+//            //mailfrom 参数
+//            props.put("mail.smtp.from", mailProperties.getUsername());
+//            // 发件人的账号(在控制台创建的发信地址)
+//            props.put("mail.user", mailProperties.getUsername());
+//            // 发信地址的smtp密码(在控制台选择发信地址进行设置)
+//            props.put("mail.password", mailProperties.getPassword());
+//            // 构建授权信息,用于进行SMTP进行身份验证
+//            Authenticator authenticator = new Authenticator() {
+//                @Override
+//                protected PasswordAuthentication getPasswordAuthentication() {
+//                    // 用户名、密码
+//                    String userName = props.getProperty("mail.user");
+//                    String password = props.getProperty("mail.password");
+//                    return new PasswordAuthentication(userName, password);
+//                }
+//            };
+//            Session mailSession = Session.getInstance(props, authenticator);
+//            //开启debug模式
+//            mailSession.setDebug(true);
+//            //抽象类MimeMessage为实现类 消息载体封装了邮件的所有消息
+//            MimeMessage message = new MimeMessage(mailSession);
+//            //设置发件人地址
+//            //此类的功能是发送邮件 又会话获得实例
+//            Transport transport=mailSession.getTransport();
+//            //开启连接
+//            transport.connect();
+//            //设置收件人地址邮件信息
+//            for (int i = 0; i < emails.size(); i++) {
+//                MimeMessageHelper messageHelper = new MimeMessageHelper(message, true,"utf-8");
 //                // 设置收件人邮箱
-//                messageHelper.setTo(email);
+//                messageHelper.setTo(emails.get(i));
 //                messageHelper.setSubject(subject);
-//                messageHelper.setText(content, true);
+//                messageHelper.setText(text, true);
 //                messageHelper.setSentDate(new Date());
-//                mailSender.send(mimeMessage);
+//                transport.sendMessage(message,new Address[]{new InternetAddress(emails.get(i))});
+//                //邮件发送后关闭信息
+//                transport.close();
 //            }
+//            return true;
+//
 //        } catch (Exception e) {
 //            log.error("send mail error : " + e.getMessage(), e);
-//            return false;
+//            throw new BackendRuntimeException(CommonConstant.EXCEPTION_MSG_EMAIL_INVALID);
 //        }
-//        return true;
 //    }
-
-    public boolean sendMail(String subject,String text,List<String> emails){
-//        try {
-//        //用于读取配置文件
-//        Properties props=new Properties();
-//        //开启Debug调试
-//        props.setProperty("mail.debug", "true");
-//        //发送服务器需要身份验证
-//        props.setProperty("mail.smtp.auth", "true");
-//        //发送邮件服务器的主机名
-//        props.setProperty("mail.smtp.host", mailProperties.getHost());
-//        //端口号
-//        props.setProperty("mail.smtp.port", mailProperties.getPort());
-//        //发送邮件协议
-//        props.setProperty("mail.transport.protocol", mailProperties.getProtocol());
-//        //开启ssl加密(并不是所有的邮箱服务器都需要,但是qq邮箱服务器是必须的)
-//        MailSSLSocketFactory msf= new MailSSLSocketFactory();
-//        msf.setTrustAllHosts(true);
-//        props.put("mail.smtp.ssl.enable", "true");
-//        props.put("mail.smtp.ssl.socketFactory",msf);
-//        //获取Session会话实例(javamail Session与HttpSession的区别是Javamail的Session只是配置信息的集合)
-//        Session session=Session.getInstance(props,new javax.mail.Authenticator(){
-//            protected PasswordAuthentication getPasswordAuthentication(){
-//                //用户名密码验证(取得的授权吗)
-//                return new PasswordAuthentication (mailProperties.getUsername(),mailProperties.getPassword());
-//            }
-//        });
 //
-//        //抽象类MimeMessage为实现类 消息载体封装了邮件的所有消息
-//        MimeMessage message=new MimeMessage(session);
-//        //设置发件人地址
-//        message.setFrom(new InternetAddress(mailProperties.getUsername()));
-//        //此类的功能是发送邮件 又会话获得实例
-//        Transport transport=session.getTransport();
-//        //开启连接
-//        transport.connect();
-//        //设置收件人地址邮件信息
-//        for (int i = 0; i < emails.size(); i++) {
-//            MimeMessageHelper messageHelper = new MimeMessageHelper(message, true,"utf-8");
-//                // 设置收件人邮箱
-//            messageHelper.setTo(emails.get(i));
-//            messageHelper.setSubject(subject);
-//            messageHelper.setText(text, true);
-//            messageHelper.setSentDate(new Date());
-//            transport.sendMessage(message,new Address[]{new InternetAddress(emails.get(i))});
-//            //邮件发送后关闭信息
-//            transport.close();
-//        }
-//            return true;
-        try {
-            //用于读取配置文件
-            Properties props=new Properties();
-            //发送服务器需要身份验证
-            props.setProperty("mail.smtp.auth", "true");
-            //发送邮件服务器的主机名
-            props.setProperty("mail.smtp.host", mailProperties.getHost());
-            //端口号
-            props.setProperty("mail.smtp.port", mailProperties.getPort());
-            //发送邮件协议
-            props.setProperty("mail.transport.protocol",  mailProperties.getProtocol());
-            props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
-            props.put("mail.smtp.socketFactory.port", "465");
-            props.put("mail.smtp.port", mailProperties.getPort());
-
-            //mailfrom 参数
-            props.put("mail.smtp.from", mailProperties.getUsername());
-            // 发件人的账号(在控制台创建的发信地址)
-            props.put("mail.user", mailProperties.getUsername());
-            // 发信地址的smtp密码(在控制台选择发信地址进行设置)
-            props.put("mail.password", mailProperties.getPassword());
-            // 构建授权信息,用于进行SMTP进行身份验证
-            Authenticator authenticator = new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    // 用户名、密码
-                    String userName = props.getProperty("mail.user");
-                    String password = props.getProperty("mail.password");
-                    return new PasswordAuthentication(userName, password);
-                }
-            };
-            Session mailSession = Session.getInstance(props, authenticator);
-            //开启debug模式
-            mailSession.setDebug(true);
-            //抽象类MimeMessage为实现类 消息载体封装了邮件的所有消息
-            MimeMessage message = new MimeMessage(mailSession);
-            //设置发件人地址
-            //此类的功能是发送邮件 又会话获得实例
-            Transport transport=mailSession.getTransport();
-            //开启连接
-            transport.connect();
-            //设置收件人地址邮件信息
-            for (int i = 0; i < emails.size(); i++) {
-                MimeMessageHelper messageHelper = new MimeMessageHelper(message, true,"utf-8");
-                // 设置收件人邮箱
-                messageHelper.setTo(emails.get(i));
-                messageHelper.setSubject(subject);
-                messageHelper.setText(text, true);
-                messageHelper.setSentDate(new Date());
-                transport.sendMessage(message,new Address[]{new InternetAddress(emails.get(i))});
-                //邮件发送后关闭信息
-                transport.close();
-            }
-            return true;
-
-        } catch (Exception e) {
-            log.error("send mail error : " + e.getMessage(), e);
-            throw new BackendRuntimeException(CommonConstant.EXCEPTION_MSG_EMAIL_INVALID);
-        }
-    }
-
-}
+//}

+ 7 - 7
pdf-tech-core/src/main/resources/application-pro.yml

@@ -38,10 +38,10 @@ redis:
 #confirmAddUrl: /join-team
 #emailImagesUrl: https://store.pdfreaderpro.com
 
-mail:
-  username: no-reply@pdfreaderpro.com
-  password: 20231114$cc.$!xx
-  host: smtp.zoho.com
-  port: 465
-  protocol: smtp
-  default-encoding: UTF-8
+#mail:
+#  username: no-reply@pdfreaderpro.com
+#  password: 20231114$cc.$!xx
+#  host: smtp.zoho.com
+#  port: 465
+#  protocol: smtp
+#  default-encoding: UTF-8