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

update m2pool 注销功能删除api,挖矿账户等功能测试通过

Browse Source
This commit is contained in:
yyb
2026-01-06 11:41:52 +08:00
parent 6de94fb487
commit 94db6e9d3b
12 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/ChatRoomServiceImpl.java
View File

@@ -92,7 +92,6 @@ public class ChatRoomServiceImpl extends ServiceImpl<ChatRoomMapper, ChatRoom> i
//1.查询当前用户与对应用户是否已存在创建的聊天室
String userEmail = roomVo.getEmail();
ChatRoomDto roomByUserEmail = chatRoomMapper.findRoomByUserEmail(userEmail);
System.out.println("bby-用户邮箱"+roomByUserEmail);
//获取nacos中配置的客服邮箱列表,这个列表中的邮箱实际可能不是客服角色，但能够行驶客服角色功能
List<String> customerEmails = new ArrayList<>(Arrays.asList(webSocketConfig.getDefaultCustomerEmail().split(",")));
int i = random.nextInt(customerEmails.size());

5
m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/controller/UserController.java
View File

@@ -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);
}
}

3
m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/UserMinserService.java
View File

@@ -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);
}

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

@@ -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);

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

@@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<select id="checkIfBindByEmail" resultType="java.lang.Boolean">
select COUNT(google_auth) from sys_user where email = #{email} and google_status=1
select COUNT(google_auth) from sys_user where email = #{email} and google_status = 1 and del_flag = 0
</select>
<select id="getGoogleInfoByEmail" resultType="com.m2pool.pool.entity.GoogleInfo">

4
m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/service/impl/SysUserServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.m2pool.system.service.impl;
import com.m2pool.common.core.Result.R;
import com.m2pool.common.core.constant.SecurityConstants;
import com.m2pool.common.core.constant.UserConstants;
import com.m2pool.common.core.exception.ServiceException;
import com.m2pool.common.core.utils.GoogleAuthenticator;
@@ -453,8 +454,9 @@ public class SysUserServiceImpl implements SysUserService {
@Override
@Transactional
public boolean closeAccount(SysUser sysUser) {
System.out.println("用户邮箱2："+sysUser.getUserName());
//删除用户相关信息
R<Boolean> booleanR = remotePoolService.deleteUserDataAndPutTemporaryTable();
R<Boolean> booleanR = remotePoolService.deleteUserDataAndPutTemporaryTable(sysUser,SecurityConstants.INNER);
if (R.FAIL == booleanR.getCode()){
throw new ServiceException("服务器请求失败请稍后再试");
}