7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-11 21:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

3.2.1

Browse Source
This commit is contained in:
tanghc
2020-06-24 11:05:23 +08:00
parent 06229d6b90
commit cc8bb34bb0
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
changelog.md
View File

@@ -1,5 +1,9 @@
# changelog # changelog
## 3.2.1
- 强化RouteInterceptorContext，可获取微服务信息
## 3.2.0 ## 3.2.0
- 使用alibaba cloud - 使用alibaba cloud

7
sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/result/BaseExecutorAdapter.java
View File

@@ -150,6 +150,11 @@ public abstract class BaseExecutorAdapter<T, R> implements ResultExecutor<T, R>
} }
ErrorMeta errorMeta = errorEnum.getErrorMeta(); ErrorMeta errorMeta = errorEnum.getErrorMeta();
JSONObject responseData = JSON.parseObject(serviceResult); JSONObject responseData = JSON.parseObject(serviceResult);
ApiParam apiParam = this.getApiParam(request);
if (apiParam != null) {
// 全局请求id，方便追踪定位
responseData.put("request_id", apiParam.fetchRequestId());
}
responseData.put(GATEWAY_CODE_NAME, errorMeta.getCode()); responseData.put(GATEWAY_CODE_NAME, errorMeta.getCode());
responseData.put(GATEWAY_MSG_NAME, errorMeta.getError(getLocale(request)).getMsg()); responseData.put(GATEWAY_MSG_NAME, errorMeta.getError(getLocale(request)).getMsg());
return responseData; return responseData;
@@ -185,8 +190,6 @@ public abstract class BaseExecutorAdapter<T, R> implements ResultExecutor<T, R>
params = new ApiParam(); params = new ApiParam();
params.setName("error"); params.setName("error");
} }
// 全局请求id，方便追踪定位
finalData.put("request_id", params.fetchRequestId());
ApiConfig apiConfig = ApiConfig.getInstance(); ApiConfig apiConfig = ApiConfig.getInstance();
// 点换成下划线 // 点换成下划线
DataNameBuilder dataNameBuilder = apiConfig.getDataNameBuilder(); DataNameBuilder dataNameBuilder = apiConfig.getDataNameBuilder();