From dccbb10512e99d8ceffe6f09ff915826f38d3007 Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Sun, 4 Jan 2026 17:31:13 +0800
Subject: [PATCH] =?UTF-8?q?update=20m2pool=20=E6=B3=A8=E9=94=80=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=90=8E=E6=96=B0=E6=B3=A8=E5=86=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/m2pool/auth/service/SysLoginService.java     | 7 ++++---
 .../com/m2pool/system/controller/SysUserController.java   | 2 ++
 .../m2pool/system/service/impl/SysUserServiceImpl.java    | 2 +-
 .../src/main/resources/mapper/system/SysUserMapper.xml    | 8 ++++----
 4 files changed, 11 insertions(+), 8 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 1ce073e..4f33d19 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
@@ -593,9 +593,10 @@ public class SysLoginService {
             throw new ServiceException("验证码未获取或已过期，请重新获取验证码");
         }
         R<Boolean> booleanR1 = remoteUserService.checkGoogleCode(closeAccountVo, SecurityConstants.INNER);
-        if((booleanR1 != null && booleanR1.getData() == null) || !booleanR1.getData()){
-            throw new ServiceException("谷歌验证码错误");
-        }
+        System.out.println("谷歌验证码"+booleanR1);
+        //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-system/src/main/java/com/m2pool/system/controller/SysUserController.java b/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/controller/SysUserController.java
index 6c3989d..54f98f2 100644
--- a/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/controller/SysUserController.java
+++ b/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/controller/SysUserController.java
@@ -1,5 +1,6 @@
 package com.m2pool.system.controller;
 
+import com.alibaba.druid.support.json.JSONUtils;
 import com.m2pool.common.core.Result.R;
 import com.m2pool.common.core.constant.UserConstants;
 import com.m2pool.common.core.utils.StringUtils;
@@ -62,6 +63,7 @@ public class SysUserController extends BaseController {
 
         SysUser user = userService.selectUserByEmail(account);
 
+        System.out.println("用户信息"+ user);
         if (StringUtils.isNull(user))
         {
             return R.fail("邮箱未被注册");
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 45e98a2..87e3bc3 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
@@ -403,7 +403,7 @@ public class SysUserServiceImpl implements SysUserService {
         if(GoogleAuthenticator.checkCode(info.getSecret(), code, System.currentTimeMillis())){
             return true;
         }else {
-            throw new ServiceException("谷歌验证码错误");
+            return false;
         }
     }
 
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 ac4c74c..a6e198d 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
@@ -90,12 +90,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
-		where u.user_name = #{userName}
+		where u.user_name = #{userName} AND u.del_flag = '0'
 	</select>
 
     <select id="selectUserByEmail" parameterType="String" resultMap="SysUserResult">
         <include refid="selectUserVo"/>
-        where u.email = #{email}
+        where u.email = #{email} and u.del_flag = '0'
     </select>
 
     <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="checkUserNameUnique" parameterType="String" resultType="int">
-		select count(1) from sys_user where user_name = #{userName} limit 1
+		select count(1) from sys_user where user_name = #{userName} and del_flag = '0' limit 1
 	</select>
 
     <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
@@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
     <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, email from sys_user where email = #{email} limit 1
+		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
 
     <select id="checkEmailExist" parameterType="String" resultType="string">