diff --git a/m2pool-modules/m2pool-pool/pom.xml b/m2pool-modules/m2pool-pool/pom.xml index e7dd67d..6b3ad59 100644 --- a/m2pool-modules/m2pool-pool/pom.xml +++ b/m2pool-modules/m2pool-pool/pom.xml @@ -201,7 +201,6 @@ org.springframework.boot spring-boot-maven-plugin - 2.5.6 diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/controller/ReadOnlyController.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/controller/ReadOnlyController.java index 274a954..c51280e 100644 --- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/controller/ReadOnlyController.java +++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/controller/ReadOnlyController.java @@ -69,7 +69,7 @@ public class ReadOnlyController extends BaseController { } @DeleteMapping("/delPage") - @ApiOperation(value = "修改只读页面 只能修改备注和权限") + @ApiOperation(value = "删除只读页面") @RequiresLogin public AjaxResult delPage(@Valid @RequestBody ReadOnlyKeyVo vo){ diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/MinerAccountServiceImpl.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/MinerAccountServiceImpl.java index 9929794..fd2d700 100644 --- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/MinerAccountServiceImpl.java +++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/MinerAccountServiceImpl.java @@ -546,7 +546,6 @@ public class MinerAccountServiceImpl implements MinerAccountService { List list = distributionMapper.getDayDistributionByMinerAccount(dto.getCoin(), dto.getAccount()); //查询挖矿账户每日0点的算力 查询结果需要-1 才能代表当天的算力 List mhsList = poolMapper.get24hAccountPowerListByAccount(dto.getCoin() + "_users_24h", dto.getAccount()); - //查询账号每日0点24h算力 List returnList = list.stream().map(e -> { IncomeDto income = new IncomeDto(); @@ -562,7 +561,16 @@ public class MinerAccountServiceImpl implements MinerAccountService { if(StringUtils.isNotNull(e.getProfit())){ income.setAmount(e.getProfit() .setScale(10,BigDecimal.ROUND_HALF_UP)); + //alph需要除以10的18次方 + if("aplh".equals(dto.getCoin())){ + income.setAmount(e.getProfit() + .divide(BigDecimal.valueOf(1000*1000)) + .divide(BigDecimal.valueOf(1000*1000)) + .divide(BigDecimal.valueOf(1000*1000)) + .setScale(10,BigDecimal.ROUND_HALF_UP)); + } } + return income; }).collect(Collectors.toList()); @@ -624,7 +632,15 @@ public class MinerAccountServiceImpl implements MinerAccountService { int limit = vo.getLimit() < 1 ? 1 : vo.getLimit(); List pageList = list.stream().skip((page - 1) * limit).limit(limit).collect(Collectors.toList()); - + if("aplh".equals(dto.getCoin())){ + pageList.stream().forEach(e ->{ + e.setAmount(BigDecimal.valueOf(e.getAmount()) + .divide(BigDecimal.valueOf(1000*1000)) + .divide(BigDecimal.valueOf(1000*1000)) + .divide(BigDecimal.valueOf(1000*1000)) + .setScale(10,BigDecimal.ROUND_HALF_UP).doubleValue()); + }); + } rspData.setRows(pageList); return rspData; diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/ReadOnlyServiceImpl.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/ReadOnlyServiceImpl.java index ed14673..7b71f72 100644 --- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/ReadOnlyServiceImpl.java +++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/ReadOnlyServiceImpl.java @@ -824,6 +824,14 @@ public class ReadOnlyServiceImpl implements ReadOnlyService { if(StringUtils.isNotNull(e.getProfit())){ income.setAmount(e.getProfit() .setScale(10,BigDecimal.ROUND_HALF_UP)); + //alph需要除以10的18次方 + if("aplh".equals(dto.getCoin())){ + income.setAmount(e.getProfit() + .divide(BigDecimal.valueOf(1000*1000)) + .divide(BigDecimal.valueOf(1000*1000)) + .divide(BigDecimal.valueOf(1000*1000)) + .setScale(10,BigDecimal.ROUND_HALF_UP)); + } } return income; }).collect(Collectors.toList()); @@ -903,6 +911,16 @@ public class ReadOnlyServiceImpl implements ReadOnlyService { int limit = vo.getLimit() < 1 ? 1 : vo.getLimit(); List pageList = list.stream().skip((page - 1) * limit).limit(limit).collect(Collectors.toList()); + if("aplh".equals(dto.getCoin())){ + pageList.stream().forEach(e ->{ + e.setAmount(BigDecimal.valueOf(e.getAmount()) + .divide(BigDecimal.valueOf(1000*1000)) + .divide(BigDecimal.valueOf(1000*1000)) + .divide(BigDecimal.valueOf(1000*1000)) + .setScale(10,BigDecimal.ROUND_HALF_UP).doubleValue()); + }); + } + rspData.setRows(pageList); 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 63b4523..7a6e990 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 @@ -621,6 +621,7 @@ public class UserMinerServiceImpl implements UserMinserService { @Override public AjaxResult updateApi(ApiKeyUpdateVo vo) { + System.out.println("入参："+vo); String user = SecurityUtils.getUsername(); if(StringUtils.isNotBlank(vo.getPerms())){ if(!vo.getPerms().equals(StringUtils.clean(vo.getPerms()))){ @@ -630,9 +631,11 @@ public class UserMinerServiceImpl implements UserMinserService { return AjaxResult.error("权限传参不能为空"); } + //todo 判断ip if(StringUtils.isBlank(vo.getIp())){ vo.setIp(IpUtils.getIpAddr(ServletUtils.getRequest())); + System.out.println("用户未传ip,默认使用本机ip："+vo.getIp()); } //ip字段格式校验 @@ -657,6 +660,7 @@ public class UserMinerServiceImpl implements UserMinserService { return AjaxResult.error("id未找到"); } OpenApiKeyInfo info = openApiService.getOpenApiKeyInfo(userApi.getKey()); + System.out.println("info:"+info); boolean result = uaMapper.updateApiKey(vo,user); if(result){ @@ -702,7 +706,11 @@ public class UserMinerServiceImpl implements UserMinserService { //执行删除 try { uaMapper.batchDeleteAPIByIdsAndUser(ids, email); - list.stream().forEach(e ->{openApiService.delOpenApiKey(e.getKey());}); + list.stream().forEach(e ->{ + if(ids.contains(Convert.toStr(e.getId()))){ + openApiService.delOpenApiKey(e.getKey()); + } + }); //redis删除api_key相关 return AjaxResult.success("删除成功"); diff --git a/m2pool-modules/m2pool-system/pom.xml b/m2pool-modules/m2pool-system/pom.xml index 467fe66..7ad4d1d 100644 --- a/m2pool-modules/m2pool-system/pom.xml +++ b/m2pool-modules/m2pool-system/pom.xml @@ -95,7 +95,6 @@ org.springframework.boot spring-boot-maven-plugin - 2.5.6