From 2601a95150d86f6626d6af477bc1d5ccf8d1a0b8 Mon Sep 17 00:00:00 2001
From: wyb <1977763549@qq.com>
Date: Fri, 30 Jun 2023 14:53:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=BC=82=E5=B8=B8=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-config/ws-message-forward-config.json                     | 2 +-
 .../docus/server/message/{result => enums}/ParametersEnum.java | 2 +-
 src/main/java/com/docus/server/message/result/ResultUtil.java  | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename src/main/java/com/docus/server/message/{result => enums}/ParametersEnum.java (95%)

diff --git a/data-config/ws-message-forward-config.json b/data-config/ws-message-forward-config.json
index 4d440e4..0e3f128 100644
--- a/data-config/ws-message-forward-config.json
+++ b/data-config/ws-message-forward-config.json
@@ -2,7 +2,7 @@
   {
     "method": "WS_RECORD_SUBMIT",
     "urls": ["http://127.0.0.1:9312/message/receive1/wsRecordSubmit/do"],
-    "errorResult": "<Response><RetInfo><RetCode>1</RetCode><RetCon>系统错误!</RetCon></RetInfo></Response>",
+    "errorResult": "<Response><RetInfo><RetCode>${{system:STANDARD_NO_CONNECT}} ${{xpath:/A/B/C/@val}}</RetCode><RetCon>系统错误!</RetCon></RetInfo></Response>",
     "messageDataType": 1
   }
 ]
\ No newline at end of file
diff --git a/src/main/java/com/docus/server/message/result/ParametersEnum.java b/src/main/java/com/docus/server/message/enums/ParametersEnum.java
similarity index 95%
rename from src/main/java/com/docus/server/message/result/ParametersEnum.java
rename to src/main/java/com/docus/server/message/enums/ParametersEnum.java
index 9716be9..0b66453 100644
--- a/src/main/java/com/docus/server/message/result/ParametersEnum.java
+++ b/src/main/java/com/docus/server/message/enums/ParametersEnum.java
@@ -1,4 +1,4 @@
-package com.docus.server.message.result;
+package com.docus.server.message.enums;
 
 import com.docus.core.util.DateUtil;
 import com.docus.core.util.Func;
diff --git a/src/main/java/com/docus/server/message/result/ResultUtil.java b/src/main/java/com/docus/server/message/result/ResultUtil.java
index 2e57971..5bbaac2 100644
--- a/src/main/java/com/docus/server/message/result/ResultUtil.java
+++ b/src/main/java/com/docus/server/message/result/ResultUtil.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.docus.core.util.Func;
 import com.docus.server.message.dto.Message;
 import com.docus.server.message.enums.DataFormatEnum;
+import com.docus.server.message.enums.ParametersEnum;
 import com.docus.server.message.util.XmlUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -67,7 +68,7 @@ public class ResultUtil {
 
     private static String dynamicParameterReplaceFromJsonMessage(String message, String result) {
         JSONObject jsonObject = Func.readJson(message, JSONObject.class);
-        List<PlaceHolder> jsonPlaceHolderList = findAllJsonPlaceHolder(message);
+        List<PlaceHolder> jsonPlaceHolderList = findAllJsonPlaceHolder(result);
         for (PlaceHolder placeHolder : jsonPlaceHolderList) {
             String newPlaceHolder = getVal(jsonObject, placeHolder.getPath());
             newPlaceHolder = newPlaceHolder == null ? "" : newPlaceHolder;