修改配置文件

enterprise-service-manager/src/main/java/com/mortals/xhx/busiz/web/ProxyController.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.busiz.web;
 
 import com.alibaba.fastjson.JSON;
 import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.xhx.busiz.rsp.ApiResp;
 import com.mortals.xhx.common.code.ApiRespCodeEnum;
 import lombok.extern.slf4j.Slf4j;
@@ -95,8 +96,7 @@ public class ProxyController {
 
     @PostMapping("/post")
     @UnAuth
-    @CrossOrigin
-    public ResponseEntity<String> proxyPost(
+    public Rest<String> proxyPost(
             @RequestParam Map<String, String> params,   // 透传 Query Params
             @RequestBody(required = false) String body, // 透传 Body
             @RequestHeader Map<String, String> headers // 透传 Headers
@@ -108,7 +108,10 @@ public class ProxyController {
         if (ObjectUtils.isEmpty(path)) {
             rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
             rsp.setMsg("path is empty！");
-            return ResponseEntity.ok().body(JSON.toJSONString(rsp));
+
+            return Rest.fail(rsp.getMsg());
+
+           // return ResponseEntity.ok().body(JSON.toJSONString(rsp));
         }
 
         String method = params.getOrDefault("method", "post");
@@ -142,13 +145,17 @@ public class ProxyController {
             // 发送请求
             try (Response response = client.newCall(requestBuilder.build()).execute()) {
                 if (!response.isSuccessful()) {
-                    return ResponseEntity.status(response.code()).body(response.message());
+                    return  Rest.fail(response.code(), response.message());
+                   // return ResponseEntity.status(response.code()).body(response.message());
                 }
-                return ResponseEntity.status(response.code()).body(response.body().string());
+                return Rest.ok(response.body().string());
+
+               // return ResponseEntity.status(response.code()).body(response.body().string());
             } catch (IOException e) {
                 rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
                 rsp.setMsg("Proxy error: " + e.getMessage());
-                return ResponseEntity.ok().body(JSON.toJSONString(rsp));
+                return  Rest.fail(rsp.getMsg());
+               // return ResponseEntity.ok().body(JSON.toJSONString(rsp));
             }
         } else if ("get".equalsIgnoreCase(method)) {
             Request.Builder requestBuilder = new Request.Builder()
@@ -164,19 +171,23 @@ public class ProxyController {
             // 发送请求
             try (Response response = client.newCall(requestBuilder.build()).execute()) {
                 if (!response.isSuccessful()) {
-                    return ResponseEntity.status(response.code()).body(response.message());
+                    return  Rest.fail(response.code(), response.message());
+                    //return ResponseEntity.status(response.code()).body(response.message());
                 }
-                return ResponseEntity.status(response.code()).body(response.body().string());
+                return Rest.ok(response.body().string());
+             //   return ResponseEntity.status(response.code()).body(response.body().string());
             } catch (IOException e) {
                 rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
                 rsp.setMsg("Proxy error: " + e.getMessage());
-                return ResponseEntity.ok().body(JSON.toJSONString(rsp));
+                return Rest.fail(rsp.getMsg());
+               // return ResponseEntity.ok().body(JSON.toJSONString(rsp));
 
             }
         } else {
             rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
             rsp.setMsg("method is not support！");
-            return ResponseEntity.ok().body(JSON.toJSONString(rsp));
+            return Rest.fail(rsp.getMsg());
+           // return ResponseEntity.ok().body(JSON.toJSONString(rsp));
         }
 
     }