From c72336de478364f02ddd28400e024c8447d639fc Mon Sep 17 00:00:00 2001 From: yyb <1416014977@qq.com> Date: Fri, 9 Jan 2026 10:40:51 +0800 Subject: [PATCH] =?UTF-8?q?update=20m2pool=20=E8=B0=B7=E6=AD=8C=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=92=8C=E8=B0=B7=E6=AD=8C=E8=A7=A3=E7=BB=91=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E6=94=B9=E7=94=A8html=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GoogleAuthServiceImpl.java | 49 ++++++++++++------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/GoogleAuthServiceImpl.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/GoogleAuthServiceImpl.java index 37d7727..9f1c939 100644 --- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/GoogleAuthServiceImpl.java +++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/GoogleAuthServiceImpl.java @@ -21,11 +21,14 @@ import com.m2pool.pool.vo.GoogleCloseVo; import com.m2pool.system.api.RemoteMailService; import com.m2pool.system.api.entity.EmailCodeEntity; import com.m2pool.system.api.entity.EmailEntity; +import com.m2pool.system.api.entity.EmailTemplateEntity; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.util.HashMap; +import java.util.Map; import java.util.concurrent.TimeUnit; /** @@ -334,14 +337,19 @@ public class GoogleAuthServiceImpl implements GoogleAuthService { } public AjaxResult sendEmail(String email,String code){ - String text = "您正在绑定谷歌验证器！\n" + - "您的邮箱验证验证码是:\n\t"+code + - "\n此验证码10分钟有效。"; - EmailEntity emailEntity = new EmailEntity(); - emailEntity.setEmail(email); - emailEntity.setSubject("[M2Pool] 邮箱验证码"); - emailEntity.setText(text); - R r = mailService.sendTextMail(emailEntity); + //String text = "您正在绑定谷歌验证器！\n" + + // "您的邮箱验证验证码是:\n\t"+code + + // "\n此验证码10分钟有效。"; + //EmailEntity emailEntity = new EmailEntity(); + //emailEntity.setEmail(email); + //emailEntity.setSubject("[M2Pool] 邮箱验证码"); + //emailEntity.setText(text); + + Map content = new HashMap<>(); + content.put("code",code); + content.put("text"," verification code is valid for 10 minutes,email verification code"); + EmailTemplateEntity entity = new EmailTemplateEntity(email,"You are binding Google Authenticator","emailCode-en",content); + R r = mailService.sendHtmlMailMessage(entity); if(r.getCode() == 200){ return AjaxResult.success(); }else { @@ -351,16 +359,23 @@ public class GoogleAuthServiceImpl implements GoogleAuthService { + public AjaxResult sendCloseEmail(String email,String code){ - String text = "M2Pool:\n" + - "您正在解绑谷歌验证器！\n" + - "您的邮箱验证验证码是:\n\t"+code + - "\n此验证码10分钟有效。"; - EmailEntity emailEntity = new EmailEntity(); - emailEntity.setEmail(email); - emailEntity.setSubject("[M2Pool] 邮箱验证码"); - emailEntity.setText(text); - R r = mailService.sendTextMail(emailEntity); + //String text = "M2Pool:\n" + + // "您正在解绑谷歌验证器！\n" + + // "您的邮箱验证验证码是:\n\t"+code + + // "\n此验证码10分钟有效。"; + //EmailEntity emailEntity = new EmailEntity(); + //emailEntity.setEmail(email); + //emailEntity.setSubject("[M2Pool] 邮箱验证码"); + //emailEntity.setText(text); + + Map content = new HashMap<>(); + content.put("code",code); + content.put("text"," verification code is valid for 10 minutes,email verification code"); + EmailTemplateEntity entity = new EmailTemplateEntity(email,"You are unbinding Google Authenticator","emailCode-en",content); + + R r = mailService.sendHtmlMailMessage(entity); if(r.getCode() == 200){ return AjaxResult.success(); }else {