From 267c79152cf9e56a59732e9a5e053f1ac782d267 Mon Sep 17 00:00:00 2001 From: yyb <1416014977@qq.com> Date: Fri, 9 Jan 2026 13:36:11 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E8=B0=B7=E6=AD=8C=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../m2pool/lease/config/LoginInterceptor.java | 7 +- .../impl/LeaseOrderInfoServiceImpl.java | 36 +++++----- .../service/impl/LeaseProductServiceImpl.java | 5 +- .../service/impl/LeaseShopServiceImpl.java | 31 ++++---- .../service/impl/LeaseUserServiceImpl.java | 72 +++++++++---------- src/main/resources/bootstrap-test.yml | 6 +- .../mapper/lease/LeaseUserMapper.xml | 4 +- 7 files changed, 75 insertions(+), 86 deletions(-) diff --git a/src/main/java/com/m2pool/lease/config/LoginInterceptor.java b/src/main/java/com/m2pool/lease/config/LoginInterceptor.java index 7f34fbc..598e8f6 100644 --- a/src/main/java/com/m2pool/lease/config/LoginInterceptor.java +++ b/src/main/java/com/m2pool/lease/config/LoginInterceptor.java @@ -48,11 +48,10 @@ public class LoginInterceptor implements HandlerInterceptor { if (loginRequired == null) { loginRequired = handlerMethod.getBeanType().getAnnotation(LoginRequired.class); } - + String token = request.getHeader(AUTHENTICATION); // 如果没有注解或者注解值为true，则校验token - if (loginRequired == null || loginRequired.value()) { - String token = request.getHeader(AUTHENTICATION); - if (token == null || !isValidToken(token)) { + if (loginRequired == null || loginRequired.value() || token != null) { + if (!isValidToken(token)) { throw new AuthException("用户未登录"); } } diff --git a/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java b/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java index 9a4702a..9aaa32b 100644 --- a/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java +++ b/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java @@ -20,10 +20,7 @@ import com.m2pool.lease.netty.handler.ChannelManager; import com.m2pool.lease.netty.message.ClientMessage; import com.m2pool.lease.redis.service.RedisService; import com.m2pool.lease.service.*; -import com.m2pool.lease.utils.DateUtils; -import com.m2pool.lease.utils.SecurityUtils; -import com.m2pool.lease.utils.UuidGeneratorUtil; -import com.m2pool.lease.utils.WalletRuleCheckUtils; +import com.m2pool.lease.utils.*; import com.m2pool.lease.vo.*; import com.m2pool.lease.vo.v2.CoinAndAlgorithmVo; import org.springframework.stereotype.Service; @@ -106,14 +103,14 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl addOrders(OrderAndCodeVo orderAndCodeVo ) { String userEmail = SecurityUtils.getUsername(); GoogleInfo googleInfo = leaseUserMapper.getGoogleInfoByEmail(userEmail); - //TODO 开发环境 - //if(googleInfo == null || StringUtils.isBlank(googleInfo.getSecret())){ - // //未绑定定谷歌验证器 - // return Result.fail("您的账号未开启双重验证,请先开启验证!"); - //} - //if(!GoogleAuthenticator.checkCode(googleInfo.getSecret(), orderAndCodeVo.getCode(), System.currentTimeMillis())){ - // return Result.fail("谷歌验证码错误"); - //} + + if(googleInfo == null || StringUtils.isBlank(googleInfo.getSecret())){ + //未绑定定谷歌验证器 + return Result.fail("您的账号未开启双重验证,请先开启验证!"); + } + if(!GoogleAuthenticator.checkCode(googleInfo.getSecret(), orderAndCodeVo.getCode(), System.currentTimeMillis())){ + return Result.fail("谷歌验证码错误"); + } List orderInfoVoList = orderAndCodeVo.getOrderInfoVoList(); @@ -710,14 +707,13 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl userAndMinerMap = orderMiningInfoDtoList.stream().collect(Collectors.toMap(OrderMiningInfoDto::getMachineId, Function.identity())); GoogleInfo googleInfo = leaseUserMapper.getGoogleInfoByEmail(userEmail); - //TODO 开发环境 - //if(googleInfo == null || StringUtils.isBlank(googleInfo.getSecret())){ - // //未绑定定谷歌验证器 - // return Result.fail("您的账号未开启双重验证,请先开启验证!"); - //} - //if(!GoogleAuthenticator.checkCode(googleInfo.getSecret(), orderAndCodeVo.getCode(), System.currentTimeMillis())){ - // return Result.fail("谷歌验证码错误"); - //} + if(googleInfo == null || StringUtils.isBlank(googleInfo.getSecret())){ + //未绑定定谷歌验证器 + return Result.fail("您的账号未开启双重验证,请先开启验证!"); + } + if(!GoogleAuthenticator.checkCode(googleInfo.getSecret(), orderAndCodeVo.getCode(), System.currentTimeMillis())){ + return Result.fail("谷歌验证码错误"); + } Map collect1 = orderInfoVoList.stream() .collect(Collectors.toMap(OrderInfoVo::getMachineId,Function.identity())); List machineList = leaseMachineMapper.selectBatchIds(collect1.keySet()); diff --git a/src/main/java/com/m2pool/lease/service/impl/LeaseProductServiceImpl.java b/src/main/java/com/m2pool/lease/service/impl/LeaseProductServiceImpl.java index 61e1efd..3704290 100644 --- a/src/main/java/com/m2pool/lease/service/impl/LeaseProductServiceImpl.java +++ b/src/main/java/com/m2pool/lease/service/impl/LeaseProductServiceImpl.java @@ -461,7 +461,7 @@ public class LeaseProductServiceImpl extends ServiceImpl() .select(LeaseShop::getId) - .eq(LeaseShop::getUserEmail, SecurityUtils.getUsername()) + .eq(LeaseShop::getUserEmail,SecurityUtils.getUsername()) .eq(LeaseShop::getDel, false)); return leaseShop.getId(); } @@ -474,7 +474,8 @@ public class LeaseProductServiceImpl extends ServiceImpl() - .eq(LeaseShop::getAuthId, SecurityUtils.getUserId())); + .eq(LeaseShop::getAuthId, SecurityUtils.getUserId()) + .eq(LeaseShop::getDel, false)); boolean check = checkHashWalletInfo(leaseShop.getId(),chain,address, payCoinsList); if (!check){ return Result.fail("绑定钱包失败,钱包格式不正确或该链和币种钱包已绑定过"); diff --git a/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java b/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java index bb7219e..51224a3 100644 --- a/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java +++ b/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java @@ -631,14 +631,13 @@ public class LeaseShopServiceImpl extends ServiceImpl() .eq(LeaseShopConfig::getPayAddress, shopWalletInfoVo.getPayAddress()) diff --git a/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java b/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java index 22887f1..13c7502 100644 --- a/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java +++ b/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java @@ -342,14 +342,13 @@ public class LeaseUserServiceImpl extends ServiceImpl().eq(LeaseShop::getUserEmail, userEmail) @@ -752,15 +750,14 @@ public class LeaseUserServiceImpl extends ServiceImpl