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

update m2pool 双重验证问题导致的无法添加挖矿账户问题修复

Browse Source
This commit is contained in:
yyb
2026-01-21 15:12:55 +08:00
parent ad379bfa58
commit 33231bed63
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/mapper/GoogleAuthMapper.java
View File

@@ -31,7 +31,7 @@ public interface GoogleAuthMapper {
* @param email * @param email
* @return * @return
*/ */
public GoogleInfo getGoogleInfoByEmail(@Param("email") String email); public GoogleInfo getGoogleInfoByEmail(@Param("email") String email, @Param("isClose") Integer isClose);
public UserGoogleAuthInfo getUserInfoByEmail(@Param("email") String email); public UserGoogleAuthInfo getUserInfoByEmail(@Param("email") String email);

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

@@ -82,7 +82,7 @@ public class GoogleAuthServiceImpl implements GoogleAuthService {
if(StringUtils.isNull(email)){ if(StringUtils.isNull(email)){
return AjaxResult.error("token解析异常"); return AjaxResult.error("token解析异常");
} }
GoogleInfo info = googleAuthMapper.getGoogleInfoByEmail(email); GoogleInfo info = googleAuthMapper.getGoogleInfoByEmail(email,0);
if (StringUtils.isNull(info)){ if (StringUtils.isNull(info)){
return AjaxResult.error("未能从token获取到所需内容,请勿擅自修改token"); return AjaxResult.error("未能从token获取到所需内容,请勿擅自修改token");
} }

12
m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/UserMinerServiceImpl.java
View File

@@ -135,8 +135,8 @@ public class UserMinerServiceImpl implements UserMinserService {
//查询是否开启双重验证 //查询是否开启双重验证
//谷歌验证码校验 //谷歌验证码校验
GoogleInfo googleInfo = googleAuthMapper.getGoogleInfoByEmail(username); GoogleInfo googleInfo = googleAuthMapper.getGoogleInfoByEmail(username,1);
if(StringUtils.isBlank(googleInfo.getSecret())){ if(googleInfo == null || StringUtils.isBlank(googleInfo.getSecret())){
//未绑定定谷歌验证器 //未绑定定谷歌验证器
return AjaxResult.error("您的账号未开启双重验证,请先开启验证!"); return AjaxResult.error("您的账号未开启双重验证,请先开启验证!");
} }
@@ -290,8 +290,8 @@ public class UserMinerServiceImpl implements UserMinserService {
//查询是否开启双重验证 //查询是否开启双重验证
//谷歌验证码校验 //谷歌验证码校验
GoogleInfo googleInfo = googleAuthMapper.getGoogleInfoByEmail(username); GoogleInfo googleInfo = googleAuthMapper.getGoogleInfoByEmail(username,1);
if(StringUtils.isBlank(googleInfo.getSecret())){ if(googleInfo == null || StringUtils.isBlank(googleInfo.getSecret())){
//未绑定定谷歌验证器 //未绑定定谷歌验证器
return AjaxResult.error("您的账号未开启双重验证,请先开启验证!"); return AjaxResult.error("您的账号未开启双重验证,请先开启验证!");
} }
@@ -341,8 +341,8 @@ public class UserMinerServiceImpl implements UserMinserService {
} }
double amount = PoolAmount.getAmountByCoin(dto.getCoin()); double amount = PoolAmount.getAmountByCoin(dto.getCoin());
GoogleInfo googleInfo = googleAuthMapper.getGoogleInfoByEmail(username); GoogleInfo googleInfo = googleAuthMapper.getGoogleInfoByEmail(username,1);
if(StringUtils.isBlank(googleInfo.getSecret())){ if(googleInfo == null || StringUtils.isBlank(googleInfo.getSecret())){
//未绑定定谷歌验证器 //未绑定定谷歌验证器
return AjaxResult.error("您的账号未开启双重验证,请先开启验证!"); return AjaxResult.error("您的账号未开启双重验证,请先开启验证!");
} }

2
m2pool-modules/m2pool-pool/src/main/resources/mapper/pool/GoogleAuthMapper.xml
View File

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from from
sys_user sys_user
where where
email = #{email} and google_status = 0 and del_flag = 0 email = #{email} and google_status = #{isClose} and del_flag = 0
limit 1 limit 1
</select> </select>