taobao_model
tanghc 5 years ago
parent 62261dc107
commit d08ba46063
  1. 6
      sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/result/BaseExecutorAdapter.java

@ -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();

Loading…
Cancel
Save