lizixuan/m2pool_web_backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update m2pool 谷歌绑定和谷歌解绑验证码改用html模版

Browse Source
This commit is contained in:
yyb
2026-01-09 10:40:51 +08:00
parent 2537d0dab4
commit c72336de47
1 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/GoogleAuthServiceImpl.java
View File

@@ -21,11 +21,14 @@ import com.m2pool.pool.vo.GoogleCloseVo;
import com.m2pool.system.api.RemoteMailService; import com.m2pool.system.api.RemoteMailService;
import com.m2pool.system.api.entity.EmailCodeEntity; import com.m2pool.system.api.entity.EmailCodeEntity;
import com.m2pool.system.api.entity.EmailEntity; import com.m2pool.system.api.entity.EmailEntity;
import com.m2pool.system.api.entity.EmailTemplateEntity;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
@@ -334,14 +337,19 @@ public class GoogleAuthServiceImpl implements GoogleAuthService {
} }
public AjaxResult sendEmail(String email,String code){ public AjaxResult sendEmail(String email,String code){
String text = "您正在绑定谷歌验证器！\n" + //String text = "您正在绑定谷歌验证器！\n" +
"您的邮箱验证验证码是:\n\t"+code + // "您的邮箱验证验证码是:\n\t"+code +
"\n此验证码10分钟有效。"; // "\n此验证码10分钟有效。";
EmailEntity emailEntity = new EmailEntity(); //EmailEntity emailEntity = new EmailEntity();
emailEntity.setEmail(email); //emailEntity.setEmail(email);
emailEntity.setSubject("[M2Pool] 邮箱验证码"); //emailEntity.setSubject("[M2Pool] 邮箱验证码");
emailEntity.setText(text); //emailEntity.setText(text);
R<?> r = mailService.sendTextMail(emailEntity);
Map<String, Object> 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){ if(r.getCode() == 200){
return AjaxResult.success(); return AjaxResult.success();
}else { }else {
@@ -351,16 +359,23 @@ public class GoogleAuthServiceImpl implements GoogleAuthService {
public AjaxResult sendCloseEmail(String email,String code){ public AjaxResult sendCloseEmail(String email,String code){
String text = "M2Pool:\n" + //String text = "M2Pool:\n" +
"您正在解绑谷歌验证器！\n" + // "您正在解绑谷歌验证器！\n" +
"您的邮箱验证验证码是:\n\t"+code + // "您的邮箱验证验证码是:\n\t"+code +
"\n此验证码10分钟有效。"; // "\n此验证码10分钟有效。";
EmailEntity emailEntity = new EmailEntity(); //EmailEntity emailEntity = new EmailEntity();
emailEntity.setEmail(email); //emailEntity.setEmail(email);
emailEntity.setSubject("[M2Pool] 邮箱验证码"); //emailEntity.setSubject("[M2Pool] 邮箱验证码");
emailEntity.setText(text); //emailEntity.setText(text);
R<?> r = mailService.sendTextMail(emailEntity);
Map<String, Object> 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){ if(r.getCode() == 200){
return AjaxResult.success(); return AjaxResult.success();
}else { }else {