fizzgate/fizz-gateway-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: some bug

Browse Source
This commit is contained in:
hongqiaowei
2021-02-07 15:40:46 +08:00
parent 6391c0e1eb
commit 04c36ff1fe
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/we/filter/CallbackFilter.java
View File

@@ -108,7 +108,7 @@ public class CallbackFilter extends FizzWebFilter {
}
HashMap<String, ServiceInstance> service2instMap = getService2instMap(ac);
HttpHeaders headers = WebUtils.mergeAppendHeaders(exchange);
pushReq2manager(exchange, headers, body[0], service2instMap, cc.id);
pushReq2manager(exchange, headers, body[0], service2instMap, cc.id, ac.gatewayGroups.iterator().next());
if (cc.type == CallbackConfig.Type.ASYNC || StringUtils.isNotBlank(cc.respBody)) {
return directResponse(exchange, cc);
} else {
@@ -164,7 +164,8 @@ public class CallbackFilter extends FizzWebFilter {
private static final String _receivers = "\"receivers\":";
private static final String _gatewayGroup = "\"gatewayGroup\":";
private void pushReq2manager(ServerWebExchange exchange, HttpHeaders headers, DataBuffer body, HashMap<String, ServiceInstance> service2instMap, int callbackConfigId) {
private void pushReq2manager(ServerWebExchange exchange, HttpHeaders headers, DataBuffer body, HashMap<String, ServiceInstance> service2instMap, int callbackConfigId,
String gatewayGroup) {
ServerHttpRequest req = exchange.getRequest();
StringBuilder b = ThreadContext.getStringBuilder();
@@ -198,8 +199,8 @@ public class CallbackFilter extends FizzWebFilter {
b.append(_receivers); b.append(rs); b.append(Constants.Symbol.COMMA);
}
String gg = gatewayGroupService.currentGatewayGroupSet.iterator().next();
b.append(_gatewayGroup); toJsonStringValue(b, gg);
// String gg = gatewayGroupService.currentGatewayGroupSet.iterator().next();
b.append(_gatewayGroup); toJsonStringValue(b, gatewayGroup);
if (body != null) {
b.append(Constants.Symbol.COMMA);

6
src/main/java/we/proxy/CallbackReplayReq.java
View File

@@ -79,11 +79,11 @@ public class CallbackReplayReq {
}
public void setReceivers(String rs) {
String s = JacksonUtils.readValue(rs, String.class);
// String s = JacksonUtils.readValue(rs, String.class);
try {
receivers = JacksonUtils.getObjectMapper().readValue(s, new TypeReference<Map<String, ServiceInstance>>(){});
receivers = JacksonUtils.getObjectMapper().readValue(rs, new TypeReference<Map<String, ServiceInstance>>(){});
} catch (JsonProcessingException e) {
throw Utils.runtimeExceptionWithoutStack(s + " receivers str invalid");
throw Utils.runtimeExceptionWithoutStack(rs + " receivers str invalid");
}
}

6
src/main/java/we/proxy/CallbackService.java
View File

@@ -197,9 +197,9 @@ public class CallbackService {
return Mono.just(ReactiveResult.fail("no api config for " + req.path));
}
CallbackConfig cc = ac.callbackConfig;
if (req.headers.getContentType().getSubtype().equalsIgnoreCase("json")) {
req.body = JSON.parseObject(req.body, String.class);
}
// if (req.headers.getContentType().getSubtype().equalsIgnoreCase("json")) {
// req.body = JSON.parseObject(req.body, String.class);
// }
List<Mono<Object>> sends = new ArrayList<>(); Mono send;

2
src/main/java/we/util/ReactiveResult.java
View File

@@ -91,6 +91,6 @@ public class ReactiveResult<D> extends Result<D> {
super.toStringBuilder(b);
b.append(',');
b.append("context:") .append(context).append(',');
b.append("throwable:").append(t.getMessage());
b.append("throwable:").append(t == null ? t : t.getMessage());
}
}