merge develop branch

This commit is contained in:
Francis Dong
2020-12-24 09:22:40 +08:00

View File

@@ -114,20 +114,20 @@ public class PreFilter extends ProxyAggrFilter {
} }
private void afterAuth(ServerWebExchange exchange, ApiConfig ac) { private void afterAuth(ServerWebExchange exchange, ApiConfig ac) {
String bs = null, bp = null; String bs = null, bp;
if (ac == null) { if (ac == null) {
bs = WebUtils.getClientService(exchange); bs = WebUtils.getClientService(exchange);
bp = WebUtils.getClientReqPath(exchange); bp = WebUtils.getClientReqPath(exchange);
} else { } else {
if (ac.type != ApiConfig.Type.REVERSE_PROXY) { if (ac.type != ApiConfig.Type.REVERSE_PROXY) {
bs = ac.backendService; bs = ac.backendService;
bp = ac.transform(WebUtils.getClientReqPath(exchange));
} }
bp = ac.transform(WebUtils.getClientReqPath(exchange));
} }
if (bs != null) { if (bs != null) {
WebUtils.setBackendService(exchange, bs); WebUtils.setBackendService(exchange, bs);
WebUtils.setBackendPath(exchange, bp);
} }
WebUtils.setBackendPath(exchange, bp);
} }
private Mono chain(ServerWebExchange exchange, Mono m, PluginFilter pf) { private Mono chain(ServerWebExchange exchange, Mono m, PluginFilter pf) {