From 570b7e472836f95583408b736bc7e4d3c4b67c00 Mon Sep 17 00:00:00 2001
From: zywang <dev12101@linx-info.com>
Date: Mon, 30 Dec 2024 11:13:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6=E8=A1=8C?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mpms/controller/pkg/FileSystemController.java   | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/proxy/src/main/java/io/mpms/controller/pkg/FileSystemController.java b/proxy/src/main/java/io/mpms/controller/pkg/FileSystemController.java
index 1767bc4..446ecc9 100644
--- a/proxy/src/main/java/io/mpms/controller/pkg/FileSystemController.java
+++ b/proxy/src/main/java/io/mpms/controller/pkg/FileSystemController.java
@@ -199,5 +199,16 @@ public class FileSystemController {
         return "";
     }
 
-
+    private String mergeLines(String first, String second) {
+        StringBuilder result = new StringBuilder();
+        if (first.lastIndexOf("\n") != -1) {
+            result.append(first.substring(first.lastIndexOf("\n") + 1));
+        }
+        if (second.lastIndexOf("\n") != -1) {
+            result.append(second.substring(0, second.lastIndexOf("\n")));
+        } else {
+            result.append(second);
+        }
+        return result.toString();
+    }
 }
-- 
Gitee