|
@@ -9,11 +9,18 @@ import com.miniframe.generate.business.system.model.A00001BaseModel;
|
|
|
import com.miniframe.model.system.SysUser;
|
|
|
import com.miniframe.model.system.SysUserSQLBuilder;
|
|
|
import com.miniframe.model.system.dao.SysUserMapper;
|
|
|
+import com.miniframe.spring.mail.MFMailProperties;
|
|
|
import com.miniframe.tools.msg.IdentifyingCodeUtil;
|
|
|
import com.miniframe.utils.MFServiceUtils;
|
|
|
import org.springframework.boot.autoconfigure.mail.MailProperties;
|
|
|
+import org.springframework.mail.javamail.JavaMailSender;
|
|
|
+import org.springframework.mail.javamail.MimeMessageHelper;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
+import org.thymeleaf.TemplateEngine;
|
|
|
+import org.thymeleaf.context.Context;
|
|
|
|
|
|
+import javax.mail.MessagingException;
|
|
|
+import javax.mail.internet.MimeMessage;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -96,11 +103,35 @@ public class A00001Service extends A00001BaseModel implements ExecProcessFlow {
|
|
|
System.out.println("您的邮箱验证码:"+code);
|
|
|
// MFServiceUtils.getMailService()
|
|
|
// .sendSimpleMail(this.getA_a00001().getMailOrPhone(), "验证码", "您的邮箱验证码:" + code);
|
|
|
+ MFMailProperties mfMailProperties =UtilTools.getBean(MFMailProperties.class);
|
|
|
+ MailProperties mailProperties =UtilTools.getBean(MailProperties.class);
|
|
|
+ TemplateEngine templateEngine =UtilTools.getBean(TemplateEngine.class);
|
|
|
+ JavaMailSender mailSenderEngine =UtilTools.getBean(JavaMailSender.class);
|
|
|
+ String userName =mailProperties.getUsername();
|
|
|
+ String nickname= mfMailProperties.getNickname();
|
|
|
+
|
|
|
Map<String, Object> var3 =new HashMap<>();
|
|
|
var3.put("username","用户");
|
|
|
var3.put("verification_code",code);
|
|
|
- MFServiceUtils.getMailService()
|
|
|
- .sendTemplateMail(this.getA_a00001().getMailOrPhone(), this.getA_a00001().getMailOrPhone(), var3,"mail_script");
|
|
|
+ Context context = new Context();
|
|
|
+ context.setVariables(var3);
|
|
|
+ String emailContent = templateEngine.process("mail_script", context);
|
|
|
+ MimeMessage message = mailSenderEngine.createMimeMessage();
|
|
|
+ try {
|
|
|
+ MimeMessageHelper messageHelper = new MimeMessageHelper(message, true);
|
|
|
+ messageHelper.setFrom(nickname + '<' +userName + '>');
|
|
|
+ messageHelper.setTo(this.getA_a00001().getMailOrPhone());
|
|
|
+ message.setSubject("验证码");
|
|
|
+ messageHelper.setText(emailContent, true);
|
|
|
+ mailSenderEngine.send(message);
|
|
|
+ } catch (MessagingException var7) {
|
|
|
+ var7.printStackTrace();
|
|
|
+ }
|
|
|
+// Map<String, Object> var3 =new HashMap<>();
|
|
|
+// var3.put("username","用户");
|
|
|
+// var3.put("verification_code",code);
|
|
|
+// MFServiceUtils.getMailService()
|
|
|
+// .sendTemplateMail(this.getA_a00001().getMailOrPhone(), this.getA_a00001().getMailOrPhone(), var3,"mail_script");
|
|
|
}else if(this.getA_a00001().getChannel().equals(MessageChannel.phone.getIndex())){
|
|
|
IdentifyingCodeUtil.sendSMSAli(this.getA_a00001().getMailOrPhone(),code);
|
|
|
}
|