From 04e8cfce7d83439ae2044f71a36e4df512a7fafd Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Wed, 9 Dec 2020 11:13:13 +0800
Subject: [PATCH] =?UTF-8?q?20201209=E6=B8=B8=E6=88=8F=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=EF=BC=88wps=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/game/api/DebugController.java  |  6 ---
 .../service/RabbitMQListenerGameTest.java     | 54 +++++++++----------
 .../java/com/ccsens/game/util/SendMsg.java    |  2 +-
 game/src/main/resources/application.yml       |  4 +-
 .../ccsens/util/config/RabbitMQConfig.java    |  2 +-
 5 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/game/src/main/java/com/ccsens/game/api/DebugController.java b/game/src/main/java/com/ccsens/game/api/DebugController.java
index f786be8c..5e62eb29 100644
--- a/game/src/main/java/com/ccsens/game/api/DebugController.java
+++ b/game/src/main/java/com/ccsens/game/api/DebugController.java
@@ -38,12 +38,6 @@ public class DebugController {
     })
     @RequestMapping(value="/game",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
     public JsonResponse testGameMq(HttpServletRequest request) throws Exception {
-            ServerMessage serverMessage = new ServerMessage();
-            serverMessage.setType("Ping");
-            InMessage inMessage = InMessage.newToServerMessage(MessageConstant.DomainType.Server,serverMessage);
-            String j = JacksonUtil.beanToJson(inMessage);
-            //FixMe 发送到消息队列
-            rabbitTemplate.convertAndSend("fanoutExchange","",j);
 
         return JsonResponse.newInstance().ok("测试");
     }
diff --git a/game/src/main/java/com/ccsens/game/service/RabbitMQListenerGameTest.java b/game/src/main/java/com/ccsens/game/service/RabbitMQListenerGameTest.java
index 77ba08ab..e4baaf31 100644
--- a/game/src/main/java/com/ccsens/game/service/RabbitMQListenerGameTest.java
+++ b/game/src/main/java/com/ccsens/game/service/RabbitMQListenerGameTest.java
@@ -1,27 +1,27 @@
-package com.ccsens.game.service;
-
-import com.ccsens.util.config.RabbitMQConfig;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-
-@Slf4j
-@Component
-@RabbitListener(queues = RabbitMQConfig.GAME_MQ_A)
-public class RabbitMQListenerGameTest {
-    private Logger logger = LoggerFactory.getLogger(RabbitMQListener.class);
-
-
-    @RabbitHandler
-    public void gameTest(String gameTest) throws IOException {
-        System.out.println("============================="+gameTest);
-//        List<GameMessageWithChangeStatusOut> gameMessageList = JacksonUtil.jsonToBean(messageJson,
-//                GameMessageWithChangeStatusOut.class, true);
-        log.info("测试游戏MQ消息 {}",gameTest);
-    }
-}
+//package com.ccsens.game.service;
+//
+//import com.ccsens.util.config.RabbitMQConfig;
+//import lombok.extern.slf4j.Slf4j;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+//import org.springframework.amqp.rabbit.annotation.RabbitListener;
+//import org.springframework.stereotype.Component;
+//
+//import java.io.IOException;
+//
+//@Slf4j
+//@Component
+//@RabbitListener(queues = RabbitMQConfig.GAME_MQ_A)
+//public class RabbitMQListenerGameTest {
+//    private Logger logger = LoggerFactory.getLogger(RabbitMQListener.class);
+//
+//
+//    @RabbitHandler
+//    public void gameTest(String gameTest) throws IOException {
+//        System.out.println("============================="+gameTest);
+////        List<GameMessageWithChangeStatusOut> gameMessageList = JacksonUtil.jsonToBean(messageJson,
+////                GameMessageWithChangeStatusOut.class, true);
+//        log.info("测试游戏MQ消息 {}",gameTest);
+//    }
+//}
diff --git a/game/src/main/java/com/ccsens/game/util/SendMsg.java b/game/src/main/java/com/ccsens/game/util/SendMsg.java
index 33e4922a..39282da2 100644
--- a/game/src/main/java/com/ccsens/game/util/SendMsg.java
+++ b/game/src/main/java/com/ccsens/game/util/SendMsg.java
@@ -69,7 +69,7 @@ public class SendMsg {
 
         });
         if (CollectionUtil.isNotEmpty(outs)) {
-            rabbitTemplate.convertAndSend(RabbitMQConfig.GAME_STATUS, JacksonUtil.beanToJson(outs));
+            rabbitTemplate.convertAndSend("fanoutExchange", "",JacksonUtil.beanToJson(outs));
             log.info("发送成功:{}", JacksonUtil.beanToJson(outs));
         }
 
diff --git a/game/src/main/resources/application.yml b/game/src/main/resources/application.yml
index d082c0ea..5c2cd5c4 100644
--- a/game/src/main/resources/application.yml
+++ b/game/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: prod
-    include: common, util-prod
\ No newline at end of file
+    active: dev
+    include: common, util-dev
\ No newline at end of file
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 c014410f..4efeca40 100644
--- a/util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java
+++ b/util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java
@@ -19,7 +19,7 @@ public class RabbitMQConfig {
     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 = "gameMqB";
+    public static final String GAME_MQ_A = "gameMqA";
 
 
     /**消息队列发送*/