refactor: simplify body parsing by removing unnecessary unescape method

Author: lakernote

src/main/java/com/laker/postman/service/curl/CurlParser.java

@@ -93,8 +93,8 @@ else if (token.equals("-d") || token.equals("--data")
                     || token.equals("--data-raw") || token.equals("--data-binary")) {
                 if (i + 1 < tokens.size()) {
                     String rawBody = tokens.get(++i);
-                    // 处理 --data-raw 的转义字符，还原为正常 JSON
-                    req.body = unescapeJava(rawBody);
+                    // tokenize 方法已经处理了 shell 层面的转义，不需要再次 unescape
+                    req.body = rawBody;
                     if (req.method == null) req.method = "POST"; // 有 body 默认 POST
                     String contentType = req.headers.getOrDefault("Content-Type", "");
                     // 如果是 multipart/form-data 格式，解析表单数据
@@ -364,57 +364,6 @@ private static String escapeShellArg(String s) {
         }
     }
 
-    // 工具方法：将 \n、\t 等转义字符还原为真实字符
-    private static String unescapeJava(String str) {
-        if (str == null) return null;
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < str.length(); i++) {
-            char c = str.charAt(i);
-            if (c == '\\' && i + 1 < str.length()) {
-                char next = str.charAt(i + 1);
-                switch (next) {
-                    case 'n':
-                        sb.append('\n');
-                        i++;
-                        break;
-                    case 'r':
-                        sb.append('\r');
-                        i++;
-                        break;
-                    case 't':
-                        sb.append('\t');
-                        i++;
-                        break;
-                    case 'b':
-                        sb.append('\b');
-                        i++;
-                        break;
-                    case 'f':
-                        sb.append('\f');
-                        i++;
-                        break;
-                    case '\\':
-                        sb.append('\\');
-                        i++;
-                        break;
-                    case '\'':
-                        sb.append('\'');
-                        i++;
-                        break;
-                    case '"':
-                        sb.append('"');
-                        i++;
-                        break;
-                    default:
-                        sb.append(c);
-                        break;
-                }
-            } else {
-                sb.append(c);
-            }
-        }
-        return sb.toString();
-    }
 
     /**
      * 预处理 cURL 命令字符串，支持 Windows CMD 格式

src/test/java/com/laker/postman/service/curl/CurlParserTest.java

@@ -109,13 +109,16 @@ public void testParseFormDataRequest() {
 
     @Test(description = "解析带转义字符的数据")
     public void testParseDataWithEscapeCharacters() {
+        // 使用双引号来支持转义字符处理
         String curl = "curl -X POST https://api.example.com/data " +
-                "-d '{\"message\":\"Hello\\nWorld\\t!\",\"path\":\"C:\\\\Users\"}'";
+                "-d \"{\\\"message\\\":\\\"Hello\\nWorld\\t!\\\",\\\"path\\\":\\\"C:\\\\\\\\Users\\\"}\"";
         CurlRequest result = CurlParser.parse(curl);
 
         assertEquals(result.method, "POST");
+        // 在JSON字符串中，\n和\t会被处理为实际的换行和制表符
         assertTrue(result.body.contains("Hello\nWorld\t!"));
-        assertTrue(result.body.contains("C:\\Users"));
+        // 在JSON字符串中，\\\\ 会被处理为 \\（两个反斜杠变成一个）
+        assertTrue(result.body.contains("C:\\\\Users"));
     }
 
     @Test(description = "解析多行cURL命令")
@@ -395,7 +398,8 @@ public void testHttpMethodCaseConversion() {
 
     @Test(description = "测试转义字符处理")
     public void testEscapeCharacterHandling() {
-        String curl = "curl -d 'line1\\nline2\\tindented\\\\backslash\\\"quote' https://api.example.com";
+        // 使用 $'...' 格式来支持转义字符（ANSI-C quoting）
+        String curl = "curl -d $'line1\\nline2\\tindented\\\\backslash\\\"quote' https://api.example.com";
         CurlRequest result = CurlParser.parse(curl);
 
         String expectedBody = "line1\nline2\tindented\\backslash\"quote";
@@ -560,7 +564,8 @@ public void testWindowsCmdDoubleQuoteEscaping() {
 
         assertEquals(result.method, "POST");
         assertTrue(result.body.contains("Hello World!"));
-        assertTrue(result.body.contains("C:\\Users"));
+        // 在JSON字符串中，\\\\ 会被处理为 \\（两个反斜杠变成一个）
+        assertTrue(result.body.contains("C:\\\\Users"));
     }
 
     @Test(description = "测试Windows CMD格式的路径处理")
@@ -754,7 +759,7 @@ public void testParseProvidedCurlExample() {
                 curl 'http://127.0.0.1:8801/app-api/v1/ChangeClothes/getChangeClothesList' \
                   -H 'Accept: */*' \
                   -H 'Accept-Language: zh-CN,zh;q=0.9' \
-                  -H 'Authorization: bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxNTMyNjUyMjY1MyIsInNjb3BlIjpbImFsbCJdLCJleHAiOjE4MjA5MjMxMTcsImp0aSI6IlAwenZRQk5yT05RUF9zeU85ZFFjeU9qLU1icyIsImNsaWVudF9pZCI6Im1hbGwtd2VhcHAiLCJtZW1iZXJJZCI6IjdxNXIxajN6eGU4YTMzYjE5OHh2em15NSIsInVzZXJuYW1lIjoiMTUzMjY1MjI2NTMifQ.i12RSQz59sA9kjEcuXE0ljH11SJDSljaMHThzEnAdBTkUw3lt629f7bzBeD5P00xXBib8TrT2YI_Y0XLK36EMcQ3MUXhQlr_osKQgYpEWlypF4xOTnda_9fPPbjMWZvGUeDul86hX_S0Lxw1Fr9HhSbrL71pHmRtrh2KGYysbWIrXLoGxQKKg4-TuTSm-HNSLk_eX_Ob4aP1HXEhIiCEdG37b92BI5HBwmsMLl1Ir4IRmyjaos277wbL4NAr7ufBmvtduA6QeoK_PtoE5_iMRUe89WyCoCgMFa4PY2NEJteehuQ-stUyoDE9Y3g5nuJESi0xrg-WQjDbfUe2xNPZ_w' \
+                  -H 'Authorization: bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9' \
                   -H 'Cache-Control: no-cache' \
                   -H 'Connection: keep-alive' \
                   -H 'Content-Type: application/json' \
@@ -833,4 +838,14 @@ public void testParseRealCurlWithDollarQuote() {
         // 验证 body 不包含字面的 \n
         assertTrue(!result.body.contains("\\n"), "Body should not contain literal \\n");
     }
+
+    @Test
+    public void testActualUserCurl() {
+        // Actual curl from user (simplified version)
+        String curl = "curl 'https://www.doubao.com/samantha/chat/completion?aid=497858' \\\n" +
+                "  -H 'content-type: application/json' \\\n" +
+                "  --data-raw '{\"messages\":[{\"content\":\"{\\\"text\\\":\\\"1\\\"}\",\"content_type\":2001}],\"conversation_id\":\"24642138855619074\"}'";
+        CurlRequest result = CurlParser.parse(curl);
+        assertTrue(result.body.equals("{\"messages\":[{\"content\":\"{\\\"text\\\":\\\"1\\\"}\",\"content_type\":2001}],\"conversation_id\":\"24642138855619074\"}"));
+    }
 }