7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-12 07:02:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

3.1.0

Browse Source
This commit is contained in:
tanghc
2020-03-02 08:48:59 +08:00
parent 62261dc107
commit d08ba46063
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,7 +159,7 @@ public abstract class BaseExecutorAdapter<T, R> implements ResultExecutor<T, R>
*/ */
protected boolean isMergeResult(T request) { protected boolean isMergeResult(T request) {
ApiParam params = this.getApiParam(request); ApiParam params = this.getApiParam(request);
return params.fetchMergeResult(); return params != null && params.fetchMergeResult();
} }
protected String formatResult(String serviceResult) { protected String formatResult(String serviceResult) {
@@ -176,6 +176,10 @@ public abstract class BaseExecutorAdapter<T, R> implements ResultExecutor<T, R>
public String merge(T exchange, JSONObject responseData) { public String merge(T exchange, JSONObject responseData) {
JSONObject finalData = new JSONObject(true); JSONObject finalData = new JSONObject(true);
ApiParam params = this.getApiParam(exchange); ApiParam params = this.getApiParam(exchange);
if (params == null) {
params = new ApiParam();
params.setName("error");
}
ApiConfig apiConfig = ApiConfig.getInstance(); ApiConfig apiConfig = ApiConfig.getInstance();
// 点换成下划线 // 点换成下划线
DataNameBuilder dataNameBuilder = apiConfig.getDataNameBuilder(); DataNameBuilder dataNameBuilder = apiConfig.getDataNameBuilder();