Merge branch 'master' of http://114.135.61.188:53000/UIMS/Code

message/src/main/java/com/huaxu/mq/DispatchMessage.java

@@ -52,9 +52,10 @@ public class DispatchMessage {
         MessageTemplate messageTemplate = messageTemplateMapper.selectById(messageTemplateId);
         MessageType messageType = messageTypeMapper.selectById(messageTypeId);
         MessageDto messageDto = new MessageDto();
-        if(messageTemplate!=null){
+        String receiveMessageContent=receiveMessage.getMessageContent();
+        if(messageTemplate!=null&&receiveMessageContent.contains("{")){
             String content = messageTemplate.getContent();
-            Map<String,String> param = JSONObject.parseObject(receiveMessage.getMessageContent(), Map.class);
+            Map<String,String> param = JSONObject.parseObject(receiveMessageContent, Map.class);
             String replaceContent = Parser.replaceAllClearBlanks(content, param);
             receiveMessage.setMessageContent(replaceContent);
         }

message/src/main/resources/application-sit.properties

@@ -59,6 +59,7 @@ user.connections=userConnection
 dispath.queue=dispathTest
 receive.queue.name=receiveTest
 receive.exchange.name=messageExchangeTest
-receive.routing.key=receiveKeyTest
 dispath.routing.key=dipathKeyTest
+receive.routing.key=receiveKeyTest
+
 spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848

operation_manager/src/main/resources/application-sit.properties

@@ -76,9 +76,9 @@ spring.rabbitmq.connection-timeout=15000
 spring.rabbitmq.publisher-confirm-type=correlated
 spring.rabbitmq.publisher-returns=true
 spring.rabbitmq.template.mandatory=true
-dispath.queue=dispath
-receive.exchange.name=messageExchange
-dispath.routing.key=dipathKey
+receive.exchange.name=messageExchangeTest
+dispath.routing.key=dipathKeyTest
+dispath.queue=dispathTest
 #nacos
 spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 UMIS.sys_config_path=/UMIS_USER_IMAGES/

sms_water/src/main/resources/application-sit.properties

@@ -115,6 +115,6 @@ spring.quartz.properties.org.quartz.threadPool.class=org.quartz.simpl.SimpleThre
 spring.quartz.properties.org.quartz.threadPool.threadCount=10
 spring.quartz.properties.org.quartz.threadPool.threadPriority=5
 spring.quartz.properties.org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread=true
-receive.exchange.name=messageExchange
-dispath.routing.key=dipathKey
+receive.exchange.name=messageExchangeTest
+dispath.routing.key=dipathKeyTest