diff --git a/game/src/main/java/com/ccsens/game/service/RabbitMQListener.java b/game/src/main/java/com/ccsens/game/service/RabbitMQListener.java index be5b21c4..2fddb19a 100644 --- a/game/src/main/java/com/ccsens/game/service/RabbitMQListener.java +++ b/game/src/main/java/com/ccsens/game/service/RabbitMQListener.java @@ -3,7 +3,6 @@ package com.ccsens.game.service; import com.ccsens.game.bean.dto.message.GameMessageWithChangeStatusOut; import com.ccsens.util.JacksonUtil; -import com.ccsens.util.config.RabbitMQConfig; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,7 +15,7 @@ import java.io.IOException; @Slf4j @Component -@RabbitListener(queues = RabbitMQConfig.GAME_STATUS) +@RabbitListener(queues = "${gameMqName:}") public class RabbitMQListener { private Logger logger = LoggerFactory.getLogger(RabbitMQListener.class); @Autowired diff --git a/game/src/main/resources/application-dev.yml b/game/src/main/resources/application-dev.yml index b7584d95..fbf23059 100644 --- a/game/src/main/resources/application-dev.yml +++ b/game/src/main/resources/application-dev.yml @@ -29,6 +29,7 @@ swagger: gatewayUrl: https://test.tall.wiki/gateway/ notGatewayUrl: https://test.tall.wiki/ +gameMqName: game_status_dev file: qrCode: https://test.tall.wiki/gateway/tall/uploads/ openWX: 0 diff --git a/game/src/main/resources/application-prod.yml b/game/src/main/resources/application-prod.yml index de83d673..2fd95e7f 100644 --- a/game/src/main/resources/application-prod.yml +++ b/game/src/main/resources/application-prod.yml @@ -36,6 +36,7 @@ eureka: gatewayUrl: https://www.tall.wiki/gateway/ notGatewayUrl: https://www.tall.wiki/ +gameMqName: game_status_www file: qrCode: https://www.tall.wiki/gateway/tall/v1.0/uploads/ openWX: 1 \ No newline at end of file diff --git a/game/src/main/resources/application-prodsd.yml b/game/src/main/resources/application-prodsd.yml index 7cf0c946..820e1cda 100644 --- a/game/src/main/resources/application-prodsd.yml +++ b/game/src/main/resources/application-prodsd.yml @@ -35,6 +35,7 @@ eureka: gatewayUrl: https://www.tall.wiki/gateway/ notGatewayUrl: https://www.tall.wiki/ +gameMqName: game_status_sd file: qrCode: https://www.tall.wiki/gateway/tall/v1.0/uploads/ openWX: 1 \ No newline at end of file diff --git a/game/src/main/resources/application.yml b/game/src/main/resources/application.yml index 5c2cd5c4..d082c0ea 100644 --- a/game/src/main/resources/application.yml +++ b/game/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev - include: common, util-dev \ No newline at end of file + active: prod + include: common, util-prod \ No newline at end of file diff --git a/util/src/main/java/com/ccsens/util/PropUtil.java b/util/src/main/java/com/ccsens/util/PropUtil.java index 7ca41f38..5d03e025 100644 --- a/util/src/main/java/com/ccsens/util/PropUtil.java +++ b/util/src/main/java/com/ccsens/util/PropUtil.java @@ -23,8 +23,12 @@ public class PropUtil { public static String smsCode; public static String openWx; public static String signUpUrl; + public static String gameMqName; - + @Value("${gameMqName:}") + public void setGameMqName(String gameMqName) { + PropUtil.gameMqName = gameMqName; + } @Value("${gatewayUrl:}") public void setGatewayUrl(String gatewayUrl) { PropUtil.gatewayUrl = gatewayUrl; 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 f4d8045a..c014410f 100644 --- a/util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java +++ b/util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java @@ -1,5 +1,6 @@ package com.ccsens.util.config; +import com.ccsens.util.PropUtil; import org.springframework.amqp.core.Binding; import org.springframework.amqp.core.BindingBuilder; import org.springframework.amqp.core.FanoutExchange; @@ -13,12 +14,12 @@ public class RabbitMQConfig { private static final String RabbitMQ_QUEUE_NAME = "Queue_Anyring"; private static final String TALL_MESSAGE_1 = "tall_message_1"; private static final String TALL_MESSAGE_2 = "tall_message_2"; - public static final String GAME_STATUS = "game_status"; + public static final String GAME_STATUS = PropUtil.gameMqName; private static final String GAME_STATUS_DELAY_SEND_QUEUE = "gameStatusDelaySendQueue"; private static final String GAME_STATUS_DELAY_SEND_EXCHANGE = "gameStatusDelaySendExchange"; private static final String GAME_STATUS_DELAY_SEND_ROUTING_KEY = "gameStatusDelaySendRoutingKey"; - public static final String GAME_MQ_A = "gameMqA"; + public static final String GAME_MQ_A = "gameMqB"; /**消息队列发送*/ @@ -30,7 +31,7 @@ public class RabbitMQConfig { @Bean public Queue queue_game (){ - return new Queue(GAME_STATUS); + return new Queue(PropUtil.gameMqName); } @Bean public Queue queue(){ @@ -50,10 +51,10 @@ public class RabbitMQConfig { return new Queue(GAME_SCORE); } - @Bean - public Queue queueGame(){ - return new Queue(GAME_MQ_A); - } +// @Bean +// public Queue queueGame(){ +// return new Queue(GAME_MQ_A); +// } // /** // * 延时发送队列 @@ -92,8 +93,8 @@ public class RabbitMQConfig { } //将对列绑定到Fanout交换器 @Bean - Binding bindingExchangeA(Queue queueGame, FanoutExchange fanoutExchange) { - return BindingBuilder.bind(queueGame).to(fanoutExchange); + Binding bindingExchangeA(Queue queue_game, FanoutExchange fanoutExchange) { + return BindingBuilder.bind(queue_game).to(fanoutExchange); }