From 9904fbeb24b6e04e5e5f00537c4bdc0b3ba7dca6 Mon Sep 17 00:00:00 2001 From: yyb <1416014977@qq.com> Date: Wed, 28 May 2025 16:26:52 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=B9=B8=E8=BF=90=E5=80=BC90=E5=A4=A9?= =?UTF-8?q?=E9=99=90=E5=AE=9A=E4=B8=BA7=E5=A4=A9bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- m2pool-gateway/pom.xml | 5 ----- .../m2pool/chat/service/impl/StompServiceImpl.java | 2 ++ m2pool-modules/m2pool-pool/pom.xml | 6 ------ .../main/java/com/m2pool/pool/task/DataTask.java | 14 +++++++------- .../src/main/resources/mapper/pool/PoolMapper.xml | 6 +++--- 5 files changed, 12 insertions(+), 21 deletions(-) diff --git a/m2pool-gateway/pom.xml b/m2pool-gateway/pom.xml index 1abd3a1..1a8180d 100644 --- a/m2pool-gateway/pom.xml +++ b/m2pool-gateway/pom.xml @@ -118,11 +118,6 @@ common-core - - com.github.xiaoymin - knife4j-spring-boot-starter - 3.0.3 - diff --git a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/StompServiceImpl.java b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/StompServiceImpl.java index 5144bec..3d2e575 100644 --- a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/StompServiceImpl.java +++ b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/StompServiceImpl.java @@ -216,6 +216,8 @@ public class StompServiceImpl implements StompService { * @return */ public void customerCloseRoom(String userName){ + //目前配置只配置了一个客服，如果多个关闭消息，需同时发送多个客服 + System.out.println("当前配置的客服"+webSocketConfig.getDefaultCustomerEmail()); messagingTemplate.convertAndSendToUser( webSocketConfig.getDefaultCustomerEmail(), Destination.QUEUE_CLOSE_ROOM + webSocketConfig.getDefaultCustomerEmail(),userName); diff --git a/m2pool-modules/m2pool-pool/pom.xml b/m2pool-modules/m2pool-pool/pom.xml index e7dd67d..ac7963f 100644 --- a/m2pool-modules/m2pool-pool/pom.xml +++ b/m2pool-modules/m2pool-pool/pom.xml @@ -132,12 +132,6 @@ 1.0 - - commons-codec - commons-codec - 1.10 - - com.google.zxing javase diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/task/DataTask.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/task/DataTask.java index 21834de..6c55fa3 100644 --- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/task/DataTask.java +++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/task/DataTask.java @@ -456,7 +456,7 @@ public class DataTask { } //90天幸运值 - useAggregated = blockPerDays.get(blockPerDays.size()-1).getDate().before(start7d); + useAggregated = blockPerDays.get(blockPerDays.size()-1).getDate().before(start90d); blockData = blockDataContext.getBlockData("nexa",start90d, end,blockPerDays, useAggregated); throreticalBlocks= getTheoreticalBlocks("nexa",PoolUnits.NEXA.gethRate(),start90d, end, blockData); @@ -894,7 +894,7 @@ public class DataTask { } //90天幸运值 - useAggregated = blockPerDays.get(blockPerDays.size()-1).getDate().before(start7d); + useAggregated = blockPerDays.get(blockPerDays.size()-1).getDate().before(start90d); blockData = blockDataContext.getBlockData("grs",start90d, end,blockPerDays, useAggregated); throreticalBlocks= getTheoreticalBlocks("grs",PoolUnits.GRS.gethRate(),start90d, end, blockData); actualBlocks = poolMapper.selectPoolBlock(start90d, end,"grs",90); @@ -1308,7 +1308,7 @@ public class DataTask { } //90天幸运值 - useAggregated = blockPerDays.get(blockPerDays.size()-1).getDate().before(start7d); + useAggregated = blockPerDays.get(blockPerDays.size()-1).getDate().before(start90d); blockData = blockDataContext.getBlockData("mona",start90d, end,blockPerDays, useAggregated); throreticalBlocks= getTheoreticalBlocks("mona",PoolUnits.MONA.gethRate(),start90d, end, blockData); @@ -1723,7 +1723,7 @@ public class DataTask { } //90天幸运值 - useAggregated = blockPerDays.get(blockPerDays.size()-1).getDate().before(start7d); + useAggregated = blockPerDays.get(blockPerDays.size()-1).getDate().before(start90d); blockData = blockDataContext.getBlockData("dgbo",start90d, end,blockPerDays, useAggregated); throreticalBlocks= getTheoreticalBlocks("dgbo",PoolUnits.MONA.gethRate(),start90d, end, blockData); @@ -2136,7 +2136,7 @@ public class DataTask { } //90天幸运值 - useAggregated = blockPerDays.get(blockPerDays.size()-1).getDate().before(start7d); + useAggregated = blockPerDays.get(blockPerDays.size()-1).getDate().before(start90d); blockData = blockDataContext.getBlockData("dgbq",start90d, end,blockPerDays, useAggregated); throreticalBlocks= getTheoreticalBlocks("dgbq",PoolUnits.MONA.gethRate(),start90d, end, blockData); @@ -2547,7 +2547,7 @@ public class DataTask { } //90天幸运值 - useAggregated = blockPerDays.get(blockPerDays.size()-1).getDate().before(start7d); + useAggregated = blockPerDays.get(blockPerDays.size()-1).getDate().before(start90d); blockData = blockDataContext.getBlockData("dgbs",start90d, end,blockPerDays, useAggregated); throreticalBlocks= getTheoreticalBlocks("dgbs",PoolUnits.MONA.gethRate(),start90d, end, blockData); @@ -2949,7 +2949,7 @@ public class DataTask { } //90天幸运值 - useAggregated = blockPerDays.get(blockPerDays.size()-1).getDate().before(start7d); + useAggregated = blockPerDays.get(blockPerDays.size()-1).getDate().before(start90d); blockData = blockDataContext.getBlockData("rxd",start90d, end,blockPerDays, useAggregated); throreticalBlocks= getTheoreticalBlocks("rxd",PoolUnits.RXD.gethRate(),start90d, end, blockData); diff --git a/m2pool-modules/m2pool-pool/src/main/resources/mapper/pool/PoolMapper.xml b/m2pool-modules/m2pool-pool/src/main/resources/mapper/pool/PoolMapper.xml index a964b16..9b08429 100644 --- a/m2pool-modules/m2pool-pool/src/main/resources/mapper/pool/PoolMapper.xml +++ b/m2pool-modules/m2pool-pool/src/main/resources/mapper/pool/PoolMapper.xml @@ -886,7 +886,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into ${tableName} (`height`) values(#{height}) ON DUPLICATE KEY UPDATE `height` = VALUES(`height`) - insert into nexa_dgb_total_block (`height`) values(#{height}) ON DUPLICATE KEY UPDATE `height` = VALUES(`height`) + insert into dgb_total_block (`height`) values(#{height}) ON DUPLICATE KEY UPDATE `height` = VALUES(`height`)