update 幸运值90天限定为7天bug修改

m2pool-gateway/pom.xml

@@ -118,11 +118,6 @@
             <artifactId>common-core</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-            <version>3.0.3</version>
-        </dependency>
 
     </dependencies>
 

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

m2pool-modules/m2pool-pool/pom.xml

@@ -132,12 +132,6 @@
             <version>1.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.10</version>
-        </dependency>
-
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>javase</artifactId>

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

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>
     <insert id="insertDgbTotalHeight">
-        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`)
     </insert>
     <select id="selectNetBlock" resultType="com.m2pool.pool.dto.BlockInfoDto">
         SELECT `date`,height FROM ${tableName} WHERE `date` >= DATE_SUB(now(),INTERVAL 90 DAY) ORDER BY `date` DESC
@@ -906,10 +906,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by `date`,`user`
     </select>
     <select id="getDgbSeriesBlock" resultType="com.m2pool.pool.dto.BlockInfoDto">
-        select `date`, MAX(height) height from ${tableName};
+        select MAX(height) height from ${tableName};
      </select>
     <select id="getDgbTotalHeight" resultType="java.lang.Integer">
-        select height  from nexa_dgb_total_block order by `date` DESC LIMIT 1;
+        select height  from dgb_total_block order by `date` DESC LIMIT 1;
     </select>
 
 </mapper>