From 796b44ea813a1133beae4f3a67f1c0263510c0c7 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 17 十一月 2024 09:45:07 +0800
Subject: [PATCH] 1

---
 src/main/java/com/moon/server/helper/HttpHelper.java |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/moon/server/helper/HttpHelper.java b/src/main/java/com/moon/server/helper/HttpHelper.java
index 001a069..b31e8d7 100644
--- a/src/main/java/com/moon/server/helper/HttpHelper.java
+++ b/src/main/java/com/moon/server/helper/HttpHelper.java
@@ -26,10 +26,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Enumeration;
 
-/**
- * Http甯姪绫�
- * @author WWW
- */
+@SuppressWarnings("ALL")
 public class HttpHelper {
     private final static String HTTP_SLASH2 = "://";
 
@@ -270,6 +267,10 @@
         if (null == entity) {
             return;
         }
+        if (null == res) {
+            entity.writeTo(response.getOutputStream());
+            return;
+        }
 
         switch (res.getCategory()) {
             case 2:
@@ -297,16 +298,21 @@
 
         int index = str.indexOf(StaticData.QUERYABLE);
         while (index > -1) {
-            int start = str.indexOf("<Name>", index) + StaticData.I6;
             int end = str.indexOf("</Layer>", index) + StaticData.I8;
+            int nameStart = str.indexOf("<Name>", index);
+            int nameEnd = str.indexOf("</Name>", nameStart);
 
-            String name = ":" + str.substring(start, str.indexOf("</Name>", start));
-            if (!res.getTab().contains(name)) {
+            String name = ":" + str.substring(nameStart + StaticData.I6, nameEnd);
+            int idx = res.getTab().indexOf(name);
+            if (idx > -1) {
+                int preIdx = res.getTab().lastIndexOf(",", idx) + 1;
+                String prefix = res.getTab().substring(preIdx, idx);
+                str = str.substring(0, nameStart + StaticData.I6) + prefix + name + str.substring(nameEnd);
+                index = str.indexOf(StaticData.QUERYABLE, end);
+            } else {
                 end = str.indexOf("<", end);
                 str = str.substring(0, index) + str.substring(end);
                 index = str.indexOf(StaticData.QUERYABLE, index);
-            } else {
-                index = str.indexOf(StaticData.QUERYABLE, end);
             }
         }
 

--
Gitblit v1.9.3