From dc4b4cde07c6662e65a20ec0d1f9140843a89b69 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 03 六月 2020 17:04:15 +0800
Subject: [PATCH] 优化输出格式调整
---
service-api/src/main/java/com/java110/api/listener/AbstractServiceApiPlusListener.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/AbstractServiceApiPlusListener.java b/service-api/src/main/java/com/java110/api/listener/AbstractServiceApiPlusListener.java
index 0ac06b9..1c46a7b 100644
--- a/service-api/src/main/java/com/java110/api/listener/AbstractServiceApiPlusListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/AbstractServiceApiPlusListener.java
@@ -4,9 +4,8 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.result.ResultVo;
import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.BeanConvertUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -14,6 +13,7 @@
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
@@ -84,7 +84,22 @@
ResponseEntity<String> responseEntity = this.callOrderService(dataFlowContext, paramIn);
+ //缁勮绗﹀悎瑕佹眰鎶ユ枃
+ ResultVo resultVo = null;
+
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ resultVo = new ResultVo(ResultVo.ORDER_ERROR, responseEntity.getBody());
+ } else {
+ String orderResult = responseEntity.getBody();
+ if (orderResult.startsWith("{")) {
+ resultVo = new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK, JSONObject.parse(orderResult));
+ } else {
+ resultVo = new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK, JSONArray.parse(orderResult));
+ }
+ }
+
if (dataFlowContext.getResponseEntity() == null) {
+ responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
dataFlowContext.setResponseEntity(responseEntity);
}
--
Gitblit v1.8.0