From 94db6e9d3b8b7e305d210acb95a62c60410c9d1d Mon Sep 17 00:00:00 2001 From: yyb <1416014977@qq.com> Date: Tue, 6 Jan 2026 11:41:52 +0800 Subject: [PATCH] =?UTF-8?q?update=20m2pool=20=E6=B3=A8=E9=94=80=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=88=A0=E9=99=A4api,=E6=8C=96=E7=9F=BF=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E7=AD=89=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95=E9=80=9A?= =?UTF-8?q?=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../m2pool/system/api/RemotePoolService.java | 4 +++- .../m2pool/system/api/RemoteUserService.java | 2 +- .../api/factory/RemotePoolFallbackFactory.java | 2 +- .../api/factory/RemoteUserFallbackFactory.java | 2 +- .../m2pool/auth/controller/TokenController.java | 1 + .../m2pool/auth/service/SysLoginService.java | 17 ++++++++++------- .../chat/service/impl/ChatRoomServiceImpl.java | 1 - .../m2pool/pool/controller/UserController.java | 5 +++-- .../m2pool/pool/service/UserMinserService.java | 3 ++- .../pool/service/impl/UserMinerServiceImpl.java | 6 ++++-- .../resources/mapper/pool/GoogleAuthMapper.xml | 2 +- .../system/service/impl/SysUserServiceImpl.java | 4 +++- 12 files changed, 30 insertions(+), 19 deletions(-) diff --git a/m2pool-api/api-system/src/main/java/com/m2pool/system/api/RemotePoolService.java b/m2pool-api/api-system/src/main/java/com/m2pool/system/api/RemotePoolService.java index e5298a2..7841687 100644 --- a/m2pool-api/api-system/src/main/java/com/m2pool/system/api/RemotePoolService.java +++ b/m2pool-api/api-system/src/main/java/com/m2pool/system/api/RemotePoolService.java @@ -2,6 +2,7 @@ package com.m2pool.system.api; import com.m2pool.common.core.Result.R; +import com.m2pool.common.core.constant.SecurityConstants; import com.m2pool.common.core.constant.ServiceNameConstants; import com.m2pool.system.api.entity.SysUser; import com.m2pool.system.api.factory.RemotePoolFallbackFactory; @@ -9,6 +10,7 @@ import com.m2pool.system.api.factory.RemoteUserFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; /** * @Description 矿池服务 @@ -19,7 +21,7 @@ import org.springframework.web.bind.annotation.RequestBody; public interface RemotePoolService { @PostMapping("/user/deleteUserDataAndPutTemporaryTable") - R deleteUserDataAndPutTemporaryTable(); + R deleteUserDataAndPutTemporaryTable(@RequestBody SysUser sysUser,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/m2pool-api/api-system/src/main/java/com/m2pool/system/api/RemoteUserService.java b/m2pool-api/api-system/src/main/java/com/m2pool/system/api/RemoteUserService.java index 5797390..d1a6b0f 100644 --- a/m2pool-api/api-system/src/main/java/com/m2pool/system/api/RemoteUserService.java +++ b/m2pool-api/api-system/src/main/java/com/m2pool/system/api/RemoteUserService.java @@ -99,6 +99,6 @@ public interface RemoteUserService { * @return 结果 */ @PostMapping("/user/closeAccount") - R closeAccount(@RequestBody SysUser sysUser); + R closeAccount(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/m2pool-api/api-system/src/main/java/com/m2pool/system/api/factory/RemotePoolFallbackFactory.java b/m2pool-api/api-system/src/main/java/com/m2pool/system/api/factory/RemotePoolFallbackFactory.java index b77ef8f..2e0b6c5 100644 --- a/m2pool-api/api-system/src/main/java/com/m2pool/system/api/factory/RemotePoolFallbackFactory.java +++ b/m2pool-api/api-system/src/main/java/com/m2pool/system/api/factory/RemotePoolFallbackFactory.java @@ -28,7 +28,7 @@ public class RemotePoolFallbackFactory implements FallbackFactory deleteUserDataAndPutTemporaryTable() { + public R deleteUserDataAndPutTemporaryTable(SysUser sysUser,String source) { return R.fail("注销账户失败," + cause.getMessage()); } }; diff --git a/m2pool-api/api-system/src/main/java/com/m2pool/system/api/factory/RemoteUserFallbackFactory.java b/m2pool-api/api-system/src/main/java/com/m2pool/system/api/factory/RemoteUserFallbackFactory.java index 91dc0c6..4a2ef39 100644 --- a/m2pool-api/api-system/src/main/java/com/m2pool/system/api/factory/RemoteUserFallbackFactory.java +++ b/m2pool-api/api-system/src/main/java/com/m2pool/system/api/factory/RemoteUserFallbackFactory.java @@ -71,7 +71,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory closeAccount(SysUser sysUser) { + public R closeAccount(SysUser sysUser, String source) { return R.fail("注销用户失败:" + cause.getMessage()); } diff --git a/m2pool-auth/src/main/java/com/m2pool/auth/controller/TokenController.java b/m2pool-auth/src/main/java/com/m2pool/auth/controller/TokenController.java index de88537..7ec23ca 100644 --- a/m2pool-auth/src/main/java/com/m2pool/auth/controller/TokenController.java +++ b/m2pool-auth/src/main/java/com/m2pool/auth/controller/TokenController.java @@ -105,6 +105,7 @@ public class TokenController { */ @PostMapping("/closeAccount") @ApiOperation(value = "用户注销") + @RequiresLogin public R closeAccount(@RequestBody @Valid CloseAccountVo closeAccountVo){ return sysLoginService.closeAccount(closeAccountVo); } 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 c7f1640..0cecba4 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 @@ -10,10 +10,7 @@ import com.m2pool.common.core.constant.UserConstants; import com.m2pool.common.core.enums.UserStatus; import com.m2pool.common.core.exception.ServiceException; import com.m2pool.common.core.text.Convert; -import com.m2pool.common.core.utils.DateUtils; -import com.m2pool.common.core.utils.GoogleAuthenticator; -import com.m2pool.common.core.utils.ServletUtils; -import com.m2pool.common.core.utils.StringUtils; +import com.m2pool.common.core.utils.*; import com.m2pool.common.core.utils.ip.IpUtils; import com.m2pool.common.core.utils.sign.RsaUtils; import com.m2pool.common.core.web.Result.AjaxResult; @@ -35,6 +32,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; +import static com.m2pool.common.core.RedisTransKey.getTokenKey; + /** * @Description 登录校验方法 @@ -578,7 +577,6 @@ public class SysLoginService { throw new ServiceException("邮箱为必填项"); } String closeAccountKey = RedisTransKey.getCloseAccountKey(email); - System.out.println("redis 的 key"+closeAccountKey); //校验谷歌验证码和邮箱验证码 if(redisService.hasKey(closeAccountKey)){ Object o = redisService.getCacheObject(closeAccountKey);//user:emailCode:email @@ -602,13 +600,18 @@ public class SysLoginService { if (R.FAIL == userInfo.getCode()) { throw new ServiceException("服务器请求失败请稍后再试"); } - SysUser sysUser = userInfo.getData().getSysUser(); + + LoginUser loginUser = userInfo.getData(); + SysUser sysUser = loginUser.getSysUser(); sysUser.setDelFlag("2"); - R booleanR = remoteUserService.closeAccount(sysUser); + R booleanR = remoteUserService.closeAccount(sysUser, SecurityConstants.INNER); + System.out.println("用户邮箱"+booleanR.getData()+"---" + booleanR.getMsg()+"--"+booleanR.getCode() ); if (R.FAIL == booleanR.getCode()) { throw new ServiceException("服务器请求失败请稍后再试"); } + String userKey = getTokenKey(loginUser.getToken()); + redisService.deleteObject(userKey); return booleanR; } diff --git a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/ChatRoomServiceImpl.java b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/ChatRoomServiceImpl.java index 63664d5..2beab78 100644 --- a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/ChatRoomServiceImpl.java +++ b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/ChatRoomServiceImpl.java @@ -92,7 +92,6 @@ public class ChatRoomServiceImpl extends ServiceImpl i //1.查询当前用户与对应用户是否已存在创建的聊天室 String userEmail = roomVo.getEmail(); ChatRoomDto roomByUserEmail = chatRoomMapper.findRoomByUserEmail(userEmail); - System.out.println("bby-用户邮箱"+roomByUserEmail); //获取nacos中配置的客服邮箱列表,这个列表中的邮箱实际可能不是客服角色，但能够行驶客服角色功能 List customerEmails = new ArrayList<>(Arrays.asList(webSocketConfig.getDefaultCustomerEmail().split(","))); int i = random.nextInt(customerEmails.size()); diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/controller/UserController.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/controller/UserController.java index a981cda..5a2ef26 100644 --- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/controller/UserController.java +++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/controller/UserController.java @@ -15,6 +15,7 @@ import com.m2pool.pool.service.UserMinserService; import com.m2pool.pool.vo.*; import com.m2pool.system.api.RemoteUserService; import com.m2pool.system.api.entity.CloseAccountVo; +import com.m2pool.system.api.entity.SysUser; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -250,8 +251,8 @@ public class UserController extends BaseController { @InnerAuth @PostMapping("/deleteUserDataAndPutTemporaryTable") @ApiOperation(value = "用户注销--删除用户(邮箱)对应相关信息并存入临时表") - public R deleteUserDataAndPutTemporaryTable(){ - return umService.deleteUserDataAndPutTemporaryTable(); + public R deleteUserDataAndPutTemporaryTable(@RequestBody SysUser sysUser){ + return umService.deleteUserDataAndPutTemporaryTable(sysUser); } } diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/UserMinserService.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/UserMinserService.java index 78e2f58..bf78308 100644 --- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/UserMinserService.java +++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/UserMinserService.java @@ -5,6 +5,7 @@ import com.m2pool.common.core.Result.R; import com.m2pool.common.core.web.Result.AjaxResult; import com.m2pool.pool.dto.UserApiDto; import com.m2pool.pool.vo.*; +import com.m2pool.system.api.entity.SysUser; import java.util.List; @@ -63,5 +64,5 @@ public interface UserMinserService { * 用户注销--删除用户(邮箱)对应相关信息并存入临时表 * return */ - R deleteUserDataAndPutTemporaryTable(); + R deleteUserDataAndPutTemporaryTable(SysUser sysUser); } diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/UserMinerServiceImpl.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/UserMinerServiceImpl.java index afbf064..0670d67 100644 --- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/UserMinerServiceImpl.java +++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/UserMinerServiceImpl.java @@ -26,6 +26,7 @@ import com.m2pool.pool.utils.EnumUtils; import com.m2pool.common.core.utils.GoogleAuthenticator; import com.m2pool.pool.utils.NodeRpc; import com.m2pool.pool.vo.*; +import com.m2pool.system.api.entity.SysUser; import com.m2pool.system.api.model.OpenApiKeyInfo; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -766,8 +767,9 @@ public class UserMinerServiceImpl implements UserMinserService { @Override @Transactional - public R deleteUserDataAndPutTemporaryTable() { - String username = SecurityUtils.getUsername(); + public R deleteUserDataAndPutTemporaryTable(SysUser sysUser) { + String username = sysUser.getUserName(); + System.out.println("用户邮箱2"+ username); //删除挖矿账户 uaMapper.deleteUserAccount(username); uaMapper.deleteUserBalance(username); 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 6e19570..ab5c246 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 @@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"