reghao 5 роки тому
батько
коміт
149567133a

+ 1 - 2
common/src/main/java/cn/reghao/autodop/common/mq/RabbitProducer.java

@@ -51,8 +51,7 @@ public class RabbitProducer {
             return null;
         } else {
             log.info("RPC 调用成功 -> {}", result);
-            return null;
-            //return (RpcResult) JsonConverter.jsonToObject(result, RpcResult.class);
+            return (RpcResult) JsonConverter.jsonToObject(result, RpcResult.class);
         }
     }
 }

+ 1 - 0
common/src/main/java/cn/reghao/autodop/common/mq/protocol/MQMessage.java

@@ -12,4 +12,5 @@ public class MQMessage {
     private String msgType;
     private long sendTime;
     private String payload;
+    private boolean isRpc;
 }

+ 6 - 4
dmaster/src/test/java/cn/reghao/autodop/common/mq/RabbitProducerTest.java

@@ -25,16 +25,17 @@ class RabbitProducerTest {
     void send() throws InterruptedException {
         String queueName = "dagent";
         MQMessage mqMessage = new MQMessage();
-        mqMessage.setMachineId("1234567890");
+        mqMessage.setMachineId("5d1a727991f34d3a9c1220a1899e6ebd");
         mqMessage.setMsgType(MessageType.machine.name());
         mqMessage.setSendTime(System.currentTimeMillis());
         mqMessage.setPayload("test test");
+        mqMessage.setRpc(false);
 
-        /*while (true) {
-            Thread.sleep(100);
+        while (true) {
+            Thread.sleep(1000);
             rabbitProducer.send(queueName, mqMessage);
             log.info("发送消息...");
-        }*/
+        }
     }
 
     @Test
@@ -45,6 +46,7 @@ class RabbitProducerTest {
         mqMessage.setMsgType(MessageType.app.name());
         mqMessage.setSendTime(System.currentTimeMillis());
         mqMessage.setPayload("test test");
+        mqMessage.setRpc(true);
 
         RpcResult rpcResult = rabbitProducer.callRemote(queueName, mqMessage);
         System.out.println();