diff --git a/tall/src/main/resources/application-prod.yml b/tall/src/main/resources/application-prod.yml index 46ef7920..38ccf4af 100644 --- a/tall/src/main/resources/application-prod.yml +++ b/tall/src/main/resources/application-prod.yml @@ -4,8 +4,8 @@ server: context-path: /v1.0 spring: snowflake: - datacenterId: 2 - workerId: 2 + datacenterId: 1 + workerId: 1 application: name: tall datasource: diff --git a/util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java b/util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java index 9ccda900..f6cf5760 100644 --- a/util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java +++ b/util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java @@ -1,12 +1,9 @@ package com.ccsens.util.config; -import org.springframework.amqp.core.*; +import org.springframework.amqp.core.Queue; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import java.util.HashMap; -import java.util.Map; - @Configuration public class RabbitMQConfig { public static final String RabbitMQ_QUEUE_NAME = "Queue_Anyring"; @@ -34,34 +31,34 @@ public class RabbitMQConfig { return new Queue(TALL_MESSAGE_2); } - /** - * 延时发送队列 - * @return - */ - @Bean - public Queue delayQueue(){ -// return QueueBuilder.durable(GAME_STATUS_DELAY_SEND_QUEUE).build(); - return new Queue(GAME_STATUS_DELAY_SEND_QUEUE,true); - } - - /** - * 延时交换机 - * @return - */ - @Bean - public CustomExchange delayExchange(){ - Map args = new HashMap<>(); - args.put("x-delayed-type", "direct"); - return new CustomExchange(GAME_STATUS_DELAY_SEND_EXCHANGE, "x-delayed-message", true, false, args); - } - - /** - * 绑定 - */ - @Bean - Binding queueBinding(Queue delayQueue, CustomExchange customExchange) { - return BindingBuilder.bind(delayQueue).to(customExchange).with(GAME_STATUS_DELAY_SEND_ROUTING_KEY).noargs(); - } +// /** +// * 延时发送队列 +// * @return +// */ +// @Bean +// public Queue delayQueue(){ +//// return QueueBuilder.durable(GAME_STATUS_DELAY_SEND_QUEUE).build(); +// return new Queue(GAME_STATUS_DELAY_SEND_QUEUE,true); +// } +// +// /** +// * 延时交换机 +// * @return +// */ +// @Bean +// public CustomExchange delayExchange(){ +// Map args = new HashMap<>(); +// args.put("x-delayed-type", "direct"); +// return new CustomExchange(GAME_STATUS_DELAY_SEND_EXCHANGE, "x-delayed-message", true, false, args); +// } +// +// /** +// * 绑定 +// */ +// @Bean +// Binding queueBinding(Queue delayQueue, CustomExchange customExchange) { +// return BindingBuilder.bind(delayQueue).to(customExchange).with(GAME_STATUS_DELAY_SEND_ROUTING_KEY).noargs(); +// } } diff --git a/util/src/main/java/com/ccsens/util/mq/DelayConsumer.java b/util/src/main/java/com/ccsens/util/mq/DelayConsumer.java index 6e1b4e94..1e6e57a7 100644 --- a/util/src/main/java/com/ccsens/util/mq/DelayConsumer.java +++ b/util/src/main/java/com/ccsens/util/mq/DelayConsumer.java @@ -1,33 +1,33 @@ -package com.ccsens.util.mq; - -import com.ccsens.util.config.RabbitMQConfig; -import com.rabbitmq.client.Channel; -import org.springframework.amqp.rabbit.annotation.RabbitHandler; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.amqp.support.AmqpHeaders; -import org.springframework.messaging.handler.annotation.Headers; -import org.springframework.messaging.handler.annotation.Payload; -import org.springframework.stereotype.Component; - -import java.io.IOException; -import java.util.Date; -import java.util.Map; - -/** - * @description: - * @author: wuHuiJuan - * @create: 2019/12/27 15:40 - */ -@Component -public class DelayConsumer { - @RabbitListener(queues = RabbitMQConfig.GAME_STATUS_DELAY_SEND_QUEUE) - @RabbitHandler - public void receive(@Payload Object msg, @Headers Map headers, Channel channel ) throws IOException { - System.out.println("接收到的消息:"+msg +"||" + new Date()); - - //ACK 手工签收,通知rabbitMQ,消费端消费成功 - Long deliveryTag = (Long)headers.get(AmqpHeaders.DELIVERY_TAG); - channel.basicAck(deliveryTag,false); - } - -} +//package com.ccsens.util.mq; +// +//import com.ccsens.util.config.RabbitMQConfig; +//import com.rabbitmq.client.Channel; +//import org.springframework.amqp.rabbit.annotation.RabbitHandler; +//import org.springframework.amqp.rabbit.annotation.RabbitListener; +//import org.springframework.amqp.support.AmqpHeaders; +//import org.springframework.messaging.handler.annotation.Headers; +//import org.springframework.messaging.handler.annotation.Payload; +//import org.springframework.stereotype.Component; +// +//import java.io.IOException; +//import java.util.Date; +//import java.util.Map; +// +///** +// * @description: +// * @author: wuHuiJuan +// * @create: 2019/12/27 15:40 +// */ +//@Component +//public class DelayConsumer { +// @RabbitListener(queues = RabbitMQConfig.GAME_STATUS_DELAY_SEND_QUEUE) +// @RabbitHandler +// public void receive(@Payload Object msg, @Headers Map headers, Channel channel ) throws IOException { +// System.out.println("接收到的消息:"+msg +"||" + new Date()); +// +// //ACK 手工签收,通知rabbitMQ,消费端消费成功 +// Long deliveryTag = (Long)headers.get(AmqpHeaders.DELIVERY_TAG); +// channel.basicAck(deliveryTag,false); +// } +// +//} diff --git a/util/src/main/java/com/ccsens/util/mq/DelayProducer.java b/util/src/main/java/com/ccsens/util/mq/DelayProducer.java index f4c371a6..58f05d74 100644 --- a/util/src/main/java/com/ccsens/util/mq/DelayProducer.java +++ b/util/src/main/java/com/ccsens/util/mq/DelayProducer.java @@ -1,54 +1,54 @@ -package com.ccsens.util.mq; - -import com.ccsens.util.config.RabbitMQConfig; -import lombok.extern.slf4j.Slf4j; -import org.springframework.amqp.rabbit.connection.CorrelationData; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * @description: - * @author: wuHuiJuan - * @create: 2019/12/27 15:16 - */ -@Slf4j -@Component -public class DelayProducer { - @Autowired - private RabbitTemplate rabbitTemplate; - - //消息发送后的回调函数 - /** - * 生产者回调函数:confirm确认消息投递成功 - */ - final RabbitTemplate.ConfirmCallback confirmCallback = (correlationData, ack, cause) -> { - - String messageId = correlationData.getId(); - if (ack) { - System.out.println("消息发送成功" + correlationData); - log.info("消息投递成功,{}",messageId); - //进行消息记录的数据库更新 - - }else{ - log.info("消息投递失败"); - } - - }; - - /** - * 通过延迟消息插件发动延迟消息 - * @param msg - * @param expiration - */ - public void sendDelayMessage(Object msg, Long expiration){ - - //绑定异步监听回调函数 - rabbitTemplate.setConfirmCallback(confirmCallback); - - rabbitTemplate.convertAndSend(RabbitMQConfig.GAME_STATUS_DELAY_SEND_EXCHANGE,RabbitMQConfig.GAME_STATUS_DELAY_SEND_ROUTING_KEY, msg,(message)->{ - message.getMessageProperties().setHeader("x-delay", expiration);//设置延迟时间 - return message; - }, new CorrelationData("123")); - } -} +//package com.ccsens.util.mq; +// +//import com.ccsens.util.config.RabbitMQConfig; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.amqp.rabbit.connection.CorrelationData; +//import org.springframework.amqp.rabbit.core.RabbitTemplate; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Component; +// +///** +// * @description: +// * @author: wuHuiJuan +// * @create: 2019/12/27 15:16 +// */ +//@Slf4j +//@Component +//public class DelayProducer { +// @Autowired +// private RabbitTemplate rabbitTemplate; +// +// //消息发送后的回调函数 +// /** +// * 生产者回调函数:confirm确认消息投递成功 +// */ +// final RabbitTemplate.ConfirmCallback confirmCallback = (correlationData, ack, cause) -> { +// +// String messageId = correlationData.getId(); +// if (ack) { +// System.out.println("消息发送成功" + correlationData); +// log.info("消息投递成功,{}",messageId); +// //进行消息记录的数据库更新 +// +// }else{ +// log.info("消息投递失败"); +// } +// +// }; +// +// /** +// * 通过延迟消息插件发动延迟消息 +// * @param msg +// * @param expiration +// */ +// public void sendDelayMessage(Object msg, Long expiration){ +// +// //绑定异步监听回调函数 +// rabbitTemplate.setConfirmCallback(confirmCallback); +// +// rabbitTemplate.convertAndSend(RabbitMQConfig.GAME_STATUS_DELAY_SEND_EXCHANGE,RabbitMQConfig.GAME_STATUS_DELAY_SEND_ROUTING_KEY, msg,(message)->{ +// message.getMessageProperties().setHeader("x-delay", expiration);//设置延迟时间 +// return message; +// }, new CorrelationData("123")); +// } +//}