diff --git a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/config/WebSocketBrokerConfig.java b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/config/WebSocketBrokerConfig.java index 6db9177..9b2f08c 100644 --- a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/config/WebSocketBrokerConfig.java +++ b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/config/WebSocketBrokerConfig.java @@ -67,7 +67,7 @@ public class WebSocketBrokerConfig implements WebSocketMessageBrokerConfigurer { public void configureMessageBroker(MessageBrokerRegistry config) { config.enableSimpleBroker(Destination.TOPIC, Destination.QUEUE_USER,Destination.QUEUE_CUSTOMER,Destination.QUEUE_CLOSE_ROOM) - .setHeartbeatValue(new long[] {10000, 10000}) + .setHeartbeatValue(new long[] {20000, 20000}) .setTaskScheduler(new DefaultManagedTaskScheduler()); config.setApplicationDestinationPrefixes(Destination.SEND_PREFIX); 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 a8d39f6..7d0d595 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 @@ -79,6 +79,8 @@ public class StompServiceImpl implements StompService { // handleImage(userMessageVo.getEmail()+principal.getName(),userMessageVo.getContent()); //} + //TODO 多端情况下,需要把消息发送给自己 + messagingTemplate.convertAndSendToUser(userMessageVo.getEmail(), Destination.QUEUE_USER + "/" + userMessageVo.getEmail(),build); executeTran(principal, userMessageVo, chatRoom); return AjaxResult.success("成功"); @@ -104,6 +106,9 @@ public class StompServiceImpl implements StompService { //}else{ // handleImage(userMessageVo.getEmail()+principal.getName(),userMessageVo.getContent()); //} + + //TODO 多端情况下,需要把消息发送给 + messagingTemplate.convertAndSendToUser(userMessageVo.getEmail(), Destination.QUEUE_CUSTOMER + "/" + userMessageVo.getEmail(),build); executeTran(principal, userMessageVo, chatRoom); 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 6c55fa3..56214d8 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 @@ -2531,7 +2531,7 @@ public class DataTask { useAggregated = blockPerDays.get(blockPerDays.size()-1).getDate().before(start7d); blockData = blockDataContext.getBlockData("dgbs",start7d, end,blockPerDays, useAggregated); - throreticalBlocks= getTheoreticalBlocks("dgbs",PoolUnits.MONA.gethRate(),start7d, end, blockData); + throreticalBlocks= getTheoreticalBlocks("dgbs",PoolUnits.DGBS.gethRate(),start7d, end, blockData); actualBlocks = poolMapper.selectPoolBlock(start7d, end,"dgbs",7); if(!BigDecimal.ZERO.equals(throreticalBlocks)){ dto.setLuck7d(BigDecimal.valueOf(actualBlocks).multiply(BigDecimal.valueOf(100)).divide(throreticalBlocks,2, RoundingMode.HALF_UP).doubleValue()); @@ -2540,7 +2540,7 @@ public class DataTask { useAggregated = blockPerDays.get(blockPerDays.size()-1).getDate().before(start30d); blockData = blockDataContext.getBlockData("dgbs",start30d, end,blockPerDays, useAggregated); - throreticalBlocks= getTheoreticalBlocks("dgbs",PoolUnits.MONA.gethRate(),start30d, end, blockData); + throreticalBlocks= getTheoreticalBlocks("dgbs",PoolUnits.DGBS.gethRate(),start30d, end, blockData); actualBlocks = poolMapper.selectPoolBlock(start30d, end,"dgbs",30); if(!BigDecimal.ZERO.equals(throreticalBlocks)){ dto.setLuck30d(BigDecimal.valueOf(actualBlocks).multiply(BigDecimal.valueOf(100)).divide(throreticalBlocks,2, RoundingMode.HALF_UP).doubleValue()); @@ -2550,7 +2550,7 @@ public class DataTask { 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); + throreticalBlocks= getTheoreticalBlocks("dgbs",PoolUnits.DGBS.gethRate(),start90d, end, blockData); actualBlocks = poolMapper.selectPoolBlock(start90d, end,"dgbs",90); if(!BigDecimal.ZERO.equals(throreticalBlocks)){ dto.setLuck90d(BigDecimal.valueOf(actualBlocks).multiply(BigDecimal.valueOf(100)).divide(throreticalBlocks,2, RoundingMode.HALF_UP).doubleValue()); diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/utils/NodeRpc.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/utils/NodeRpc.java index acbad8f..a4f6ebc 100644 --- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/utils/NodeRpc.java +++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/utils/NodeRpc.java @@ -129,7 +129,7 @@ public class NodeRpc{ public static boolean checkAddress(String coin,String address) { //不同币种要单独设置验证方法 String[] params = {address}; - String result = getResult(coin, "validateaddress", params); + String result = getResultTest(coin, "validateaddress", params); //处理result if(StringUtils.isBlank(result)){ throw new RuntimeException("当前请求接口的用户过多,请稍后再试"); @@ -138,7 +138,6 @@ public class NodeRpc{ throw new RuntimeException("当前请求接口的用户过多,请稍后再试"); } if(result.contains("error:")){ - System.out.println("验证地址包含错误:"+result + "钱包地址"+address); return false; }else { JSONObject jsonObject = JSON.parseObject(result); diff --git a/m2pool-modules/m2pool-pool/src/main/resources/bootstrap-test.yml b/m2pool-modules/m2pool-pool/src/main/resources/bootstrap-test.yml index 8f65d35..c19015a 100644 --- a/m2pool-modules/m2pool-pool/src/main/resources/bootstrap-test.yml +++ b/m2pool-modules/m2pool-pool/src/main/resources/bootstrap-test.yml @@ -67,7 +67,7 @@ spring: group: m2_test_group servlet: multipart: - max-file-size: 2MB + max-file-size: 5MB max-request-size: 8MB myenv: