summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwangwenrui <[email protected]>2021-04-20 19:57:40 +0800
committerwangwenrui <[email protected]>2021-04-20 19:57:40 +0800
commitb0c38bfc9e37239cc03dc774f07e61ecf10af2fd (patch)
tree592432e9dc616adb164a3f1565ab533da0a5d559
parente30b44caea62f50eeda05408c2419fdafecc8f6e (diff)
fix:修复proxy接口token校验失败无返回内容的问题
-rw-r--r--src/main/java/net/geedge/confagent/controller/PrometheusController.java3
-rw-r--r--src/main/java/net/geedge/confagent/util/ConfagentUtil.java19
2 files changed, 20 insertions, 2 deletions
diff --git a/src/main/java/net/geedge/confagent/controller/PrometheusController.java b/src/main/java/net/geedge/confagent/controller/PrometheusController.java
index a894ec1..1c3c887 100644
--- a/src/main/java/net/geedge/confagent/controller/PrometheusController.java
+++ b/src/main/java/net/geedge/confagent/controller/PrometheusController.java
@@ -21,6 +21,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.io.Serializable;
import java.net.HttpURLConnection;
import java.util.*;
@@ -124,10 +125,12 @@ public class PrometheusController extends BaseController{
}
if(isQuery &&r.getCode() != RCode.SUCCESS.getCode()){
+ ConfagentUtil.writeResponse(response,r);
return;
}
if(!isQuery && r.getCode() != RCode.SUCCESS.getCode()){
+ ConfagentUtil.writeResponse(response,r);
return;
}
diff --git a/src/main/java/net/geedge/confagent/util/ConfagentUtil.java b/src/main/java/net/geedge/confagent/util/ConfagentUtil.java
index 962d022..58faacc 100644
--- a/src/main/java/net/geedge/confagent/util/ConfagentUtil.java
+++ b/src/main/java/net/geedge/confagent/util/ConfagentUtil.java
@@ -6,8 +6,8 @@ import org.springframework.context.EnvironmentAware;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
-import java.io.File;
-import java.io.FileNotFoundException;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
@@ -100,4 +100,19 @@ public class ConfagentUtil implements EnvironmentAware {
public void setEnvironment(Environment env) {
environment = env;
}
+
+ public static void writeResponse(HttpServletResponse response, Object o) {
+ OutputStream outputStream = null;
+
+ try {
+ outputStream = response.getOutputStream();
+
+ Tool.IoUtil.writeUtf8 (outputStream,true, Tool.JSONUtil.parseObj(o).toString());
+ outputStream.flush();
+ }catch (IOException e){
+ log.error("write response failed :",e);
+ }finally {
+ Tool.IoUtil.close(outputStream);
+ }
+ }
}