|
@@ -41,10 +41,9 @@ public class RabbitMqListener {
|
|
concurrency = "${maxThread.scene.upgrade-to-v4}"
|
|
concurrency = "${maxThread.scene.upgrade-to-v4}"
|
|
)
|
|
)
|
|
public void buildScenePreHandler(Channel channel, Message message) throws Exception {
|
|
public void buildScenePreHandler(Channel channel, Message message) throws Exception {
|
|
- Object correlation = message.getMessageProperties().getHeader("spring_returned_message_correlation");
|
|
|
|
- String correlationId = (String) correlation;
|
|
|
|
|
|
+ String messageId = message.getMessageProperties().getMessageId();
|
|
String msg = new String(message.getBody(), StandardCharsets.UTF_8);
|
|
String msg = new String(message.getBody(), StandardCharsets.UTF_8);
|
|
- log.info("场景升级开始,队列名:{},id:{},消息体:{}", upgradeToV4, correlationId, msg);
|
|
|
|
|
|
+ log.info("场景升级开始,队列名:{},id:{},消息体:{}", upgradeToV4, messageId, msg);
|
|
HashMap hashMap = null;
|
|
HashMap hashMap = null;
|
|
try {
|
|
try {
|
|
hashMap = JSON.parseObject(msg, HashMap.class);
|
|
hashMap = JSON.parseObject(msg, HashMap.class);
|
|
@@ -57,7 +56,7 @@ public class RabbitMqListener {
|
|
boolean reUpgrade = (boolean)hashMap.get("reUpgrade");
|
|
boolean reUpgrade = (boolean)hashMap.get("reUpgrade");
|
|
//迁移数据
|
|
//迁移数据
|
|
sceneUpgradeToV4Service.upgrade(sceneProId,reUpgrade);
|
|
sceneUpgradeToV4Service.upgrade(sceneProId,reUpgrade);
|
|
- log.info("场景升级结束,队列名:{},id:{}", upgradeToV4, correlationId);
|
|
|
|
|
|
+ log.info("场景升级结束,队列名:{},id:{}", upgradeToV4, messageId);
|
|
channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
|
|
channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
|
|
}
|
|
}
|
|
|
|
|