调整代码逻辑优化

Author: MentosL

arex-instrumentation/mq/arex-integration-mqtt/src/main/java/io/arex/inst/mqtt/MessageQueueExtractor.java

@@ -9,6 +9,7 @@
 import org.springframework.messaging.MessageHeaders;
 
 import java.util.Base64;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -37,31 +38,35 @@ public void execute() {
             if (!ContextManager.needRecordOrReplay()) {
                 return;
             }
+            executeBeforeProcess();
             doExecute();
-            executePostProcess();
+            executeAfterProcess();
         } catch (Exception e) {
             LogUtil.warn("MessageQueue.execute", e);
         }
     }
 
-    private void executePostProcess() {
+    private void executeBeforeProcess() {
         if (ContextManager.needRecord()) {
             adapter.addHeader(messageChannel,message, ArexConstants.RECORD_ID,ContextManager.currentContext().getCaseId());
         }
         if (ContextManager.needReplay()) {
             adapter.addHeader(messageChannel,message, ArexConstants.REPLAY_ID,ContextManager.currentContext().getReplayId());
         }
+    }
+    private void executeAfterProcess(){
         // Think about other ways to replace the head
         adapter.resetMsg(message);
     }
 
     private void doExecute() {
         Mocker mocker = MockUtils.createMqttConsumer(adapter.getHeader(messageChannel,message,"mqtt_receivedTopic"));
         MessageHeaders header = adapter.getHeader(messageChannel, message);
-        Map<String, Object> requestAttributes = new HashMap<>();
+        Map<String, Object> requestOrigin = new HashMap<>();
         for (Map.Entry<String, Object> entry : header.entrySet()) {
-            requestAttributes.put(entry.getKey(), entry.getValue());
+            requestOrigin.put(entry.getKey(), entry.getValue());
         }
+        Map<String, Object> requestAttributes = Collections.singletonMap("Headers", requestOrigin);
         mocker.getTargetRequest().setAttributes(requestAttributes);
         mocker.getTargetRequest().setBody(Base64.getEncoder().encodeToString(adapter.getMsg(messageChannel,message)));
         if (ContextManager.needReplay()) {