From f0f9394807cc748c3439d1923b80e56b7321e0cb Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Fri, 9 Jan 2026 09:49:15 +0800
Subject: [PATCH] =?UTF-8?q?update=20m2pool=20=E6=B3=A8=E9=94=80=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=8E=A5=E5=8F=A3=E7=9B=B8=E5=85=B3=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9Edel=5Fflag=E6=9D=A1=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=B3=A8=E9=94=80=E7=94=A8=E6=88=B7=E8=B0=B7?=
 =?UTF-8?q?=E6=AD=8C=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/m2pool/auth/service/SysLoginService.java | 7 +++----
 .../src/main/resources/mapper/pool/GoogleAuthMapper.xml    | 4 ++--
 .../com/m2pool/system/service/impl/SysUserServiceImpl.java | 6 +-----
 .../src/main/resources/mapper/system/SysUserMapper.xml     | 2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/m2pool-auth/src/main/java/com/m2pool/auth/service/SysLoginService.java b/m2pool-auth/src/main/java/com/m2pool/auth/service/SysLoginService.java
index 02d2c5c..4584f28 100644
--- a/m2pool-auth/src/main/java/com/m2pool/auth/service/SysLoginService.java
+++ b/m2pool-auth/src/main/java/com/m2pool/auth/service/SysLoginService.java
@@ -591,10 +591,9 @@ public class SysLoginService {
             throw new ServiceException("验证码未获取或已过期，请重新获取验证码");
         }
         R<Boolean> booleanR1 = remoteUserService.checkGoogleCode(closeAccountVo, SecurityConstants.INNER);
-        System.out.println("谷歌验证码"+booleanR1);
-        //if(booleanR1 == null || !booleanR1.getData()){
-        //    throw new ServiceException("谷歌验证码错误");
-        //}
+        if(booleanR1 == null || !booleanR1.getData()){
+            throw new ServiceException("谷歌验证码错误");
+        }
 
         R<LoginUser> userInfo = remoteUserService.getUserInfo(SecurityUtils.getUsername(), SecurityConstants.INNER);
         if (R.FAIL == userInfo.getCode()) {
diff --git a/m2pool-modules/m2pool-pool/src/main/resources/mapper/pool/GoogleAuthMapper.xml b/m2pool-modules/m2pool-pool/src/main/resources/mapper/pool/GoogleAuthMapper.xml
index ab5c246..03812da 100644
--- a/m2pool-modules/m2pool-pool/src/main/resources/mapper/pool/GoogleAuthMapper.xml
+++ b/m2pool-modules/m2pool-pool/src/main/resources/mapper/pool/GoogleAuthMapper.xml
@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             google_auth = #{info.secret},
             google_status = #{info.status},
             update_time = sysdate()
-        where user_name = #{info.email}
+        where user_name = #{info.email} and del_flag = 0
     </update>
 
     <select id="checkIfBindByEmail" resultType="java.lang.Boolean">
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from
             sys_user
         where
-            email = #{email}
+            email = #{email} AND del_flag = 0
         limit 1
     </select>
 
diff --git a/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/service/impl/SysUserServiceImpl.java b/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/service/impl/SysUserServiceImpl.java
index 79ac653..41cd8ee 100644
--- a/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/service/impl/SysUserServiceImpl.java
+++ b/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/service/impl/SysUserServiceImpl.java
@@ -399,14 +399,10 @@ public class SysUserServiceImpl implements SysUserService {
         }
 
         //没有绑定谷歌验证器 校验直接通过
-        if(StringUtils.isBlank(info.getSecret())){
+        if(StringUtils.isBlank(info.getSecret()) || info.getStatus() == 0){
             return true;
         }
 
-        //没有绑定谷歌验证器 校验直接通过
-        if(info.getStatus() == 0){
-            return true;
-        }
 
         if(GoogleAuthenticator.checkCode(info.getSecret(), code, System.currentTimeMillis())){
             return true;
diff --git a/m2pool-modules/m2pool-system/src/main/resources/mapper/system/SysUserMapper.xml b/m2pool-modules/m2pool-system/src/main/resources/mapper/system/SysUserMapper.xml
index a6e198d..094a45d 100644
--- a/m2pool-modules/m2pool-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/m2pool-modules/m2pool-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -130,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from
             sys_user
         where
-            user_name = #{email}
+            user_name = #{email} AND del_flag = '0'
         limit 1
     </select>
     <select id="getCSList" resultType="com.m2pool.system.api.entity.SysUser">