fix: EAL4 问题修改

2 files changed, 11 insertions, 5 deletions

diff --git a/src/main/java/net/geedge/confagent/controller/HealthyController.java b/src/main/java/net/geedge/confagent/controller/HealthyController.java
index ecb283d..39301d3 100644
--- a/src/main/java/net/geedge/confagent/controller/HealthyController.java
+++ b/src/main/java/net/geedge/confagent/controller/HealthyController.java
@@ -83,8 +83,10 @@ public class HealthyController extends BaseController{
             log.error("failed connect ",e);
             return "DOWN";
         }finally {
-            conn.disconnect();
-            conn = null;
+            if (conn != null) {
+                conn.disconnect();
+                conn = null;
+            }
         }
     }
 
diff --git a/src/main/java/net/geedge/confagent/controller/PrometheusController.java b/src/main/java/net/geedge/confagent/controller/PrometheusController.java
index bcc36e2..5b6a948 100644
--- a/src/main/java/net/geedge/confagent/controller/PrometheusController.java
+++ b/src/main/java/net/geedge/confagent/controller/PrometheusController.java
@@ -141,7 +141,8 @@ public class PrometheusController extends BaseController{
     }
 
     public void requestProm(String host, int port, String path, HttpServletRequest request, HttpServletResponse response)  {
-        String queryString = request.getQueryString();
+        // String queryString = request.getQueryString();
+        String queryString = ReflectUtil.invoke(request, "getQueryString");
         String url = UrlBuilder.create().setScheme("http").setHost(host).setPort(port).setPath(UrlPath.of(path, Charset.forName("UTF-8"))).toURL().toString() + "?" + queryString;
 
         log.debug("prometheus url: {}", url);
@@ -181,7 +182,8 @@ public class PrometheusController extends BaseController{
                 List<String> value = en.getValue();
                 ReflectUtil.invoke(response,"addHeader",key,Tool.StrUtil.join("; ",value));
             }
-            response.setStatus(responseCode, responseMessage);
+            // response.setStatus(responseCode, responseMessage);
+            ReflectUtil.invoke(response, "setStatus", responseCode, responseMessage);
 
             Tool.IoUtil.copy(connInputStream, resOutputStream);
             resOutputStream.flush();//flush 输出流
@@ -194,7 +196,9 @@ public class PrometheusController extends BaseController{
             log.error("request error : ",e);
         }finally {
             Tool.IoUtil.close(reqInputStream,resOutputStream,connOutputStream,connInputStream);
-            conn.disconnect();
+            if(conn != null){
+                conn.disconnect();
+            }
         }
     }