Merge branch 'develop' of https://github.com/fizzgate/fizz-gateway-node into feature/v3.0.0

Conflicts: fizz-core/src/main/java/com/fizzgate/filter/AggregateFilter.java fizz-core/src/main/java/com/fizzgate/fizz/ConfigLoader.java fizz-core/src/main/java/com/fizzgate/fizz/Pipeline.java fizz-core/src/main/java/com/fizzgate/fizz/function/CommonFunc.java fizz-core/src/main/java/com/fizzgate/fizz/function/FuncExecutor.java fizz-core/src/main/java/com/fizzgate/fizz/function/ListFunc.java fizz-core/src/main/java/com/fizzgate/proxy/CallbackService.java fizz-core/src/test/java/com/fizzgate/fizz/function/CommonFuncTests.java fizz-core/src/test/java/com/fizzgate/fizz/function/ListFuncTests.java
2023-06-06 18:00:40 +08:00
parent d9e937a2d4 64597d250e
commit af480bec7e
6 changed files with 83 additions and 59 deletions
--- a/README.md
+++ b/README.md
@@ -20,16 +20,23 @@
 ## FizzGate是什么？

 An Aggregation API Gateway in Java . FizzGate 是一个基于 Java开发的微服务聚合网关，是拥有自主知识产权的应用网关国产化替代方案，能够实现热服务编排聚合、自动授权选择、线上服务脚本编码、在线测试、高性能路由、API审核管理、回调管理等目的，拥有强大的自定义插件系统可以自行扩展，并且提供友好的图形化配置界面，能够快速帮助企业进行API服务治理、减少中间层胶水代码以及降低编码投入、提高 API 服务的稳定性和安全性。
+## 官方网站
+
+https://www.fizzgate.com/
+
+备用地址：https://www.fizzcrm.com/

 ## 演示环境（Demo）

-http://demo.fizzgate.com/
+https://demo.fizzgate.com/
+
+备用站点：https://demo.fizzcrm.com/

 账号/密码:`admin`/`Aa123!`

-健康检查地址：http://demo.fizzgate.com/admin/health (线上版本请限制admin路径的外网访问)
+健康检查地址：https://demo.fizzgate.com/admin/health (线上版本请限制admin路径的外网访问)

-API地址：http://demo.fizzgate.com/proxy/[服务名]/[API_Path]
+API地址：https://demo.fizzgate.com/proxy/[服务名]/[API_Path]

 ## FizzGate的设计

--- a/fizz-bootstrap/pom.xml
+++ b/fizz-bootstrap/pom.xml
@@ -14,11 +14,11 @@

    <properties>
        <!--<java.version>1.8</java.version>
-        <spring-framework.version>5.2.23.RELEASE</spring-framework.version>
+        <spring-framework.version>5.2.24.RELEASE</spring-framework.version>
        <spring-session-bom.version>Dragonfruit-SR3</spring-session-bom.version>
        <reactor-bom.version>Dysprosium-SR25</reactor-bom.version>
        <lettuce.version>5.3.7.RELEASE</lettuce.version>
-        <netty.version>4.1.91.Final</netty.version>
+        <netty.version>4.1.93.Final</netty.version>
        <httpcore.version>4.4.16</httpcore.version>
        <log4j2.version>2.17.2</log4j2.version>
        <slf4j.version>1.7.36</slf4j.version>
@@ -32,7 +32,7 @@
        <commons-codec.version>1.15</commons-codec.version>
        <commons-pool2.version>2.11.1</commons-pool2.version>
        <gson.version>2.8.9</gson.version>
-        <netty-tcnative.version>2.0.59.Final</netty-tcnative.version>
+        <netty-tcnative.version>2.0.61.Final</netty-tcnative.version>
        <spring-cloud.version>2.2.9.RELEASE</spring-cloud.version>
        <snakeyaml.version>1.33</snakeyaml.version>
        <spring-data-releasetrain.version>Moore-SR13</spring-data-releasetrain.version>-->
--- a/fizz-core/src/main/java/com/fizzgate/filter/CallbackFilter.java
+++ b/fizz-core/src/main/java/com/fizzgate/filter/CallbackFilter.java
@@ -17,6 +17,25 @@

 package com.fizzgate.filter;

+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.annotation.Order;
+import org.springframework.data.redis.core.ReactiveStringRedisTemplate;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.stereotype.Component;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilterChain;
+
 import com.alibaba.fastjson.JSON;
 import com.fizzgate.config.AggregateRedisConfig;
 import com.fizzgate.plugin.auth.ApiConfig;
@@ -27,33 +46,15 @@ import com.fizzgate.proxy.CallbackService;
 import com.fizzgate.proxy.DiscoveryClientUriSelector;
 import com.fizzgate.proxy.ServiceInstance;
 import com.fizzgate.service_registry.RegistryCenterService;
+import com.fizzgate.spring.http.server.reactive.ext.FizzServerHttpRequestDecorator;
+import com.fizzgate.spring.web.server.ext.FizzServerWebExchangeDecorator;
 import com.fizzgate.util.Consts;
 import com.fizzgate.util.NettyDataBufferUtils;
 import com.fizzgate.util.ThreadContext;
 import com.fizzgate.util.WebUtils;

-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.annotation.Order;
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.DataBufferUtils;
-import org.springframework.core.io.buffer.PooledDataBuffer;
-import org.springframework.data.redis.core.ReactiveStringRedisTemplate;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.stereotype.Component;
-import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.WebFilterChain;
 import reactor.core.publisher.Mono;

-import javax.annotation.Resource;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.List;
-
 /**
 * @author hongqiaowei
 */
@@ -89,34 +90,49 @@ public class CallbackFilter extends FizzWebFilter {
    @Resource
    private GatewayGroupService gatewayGroupService;

+
    @Override
-    public Mono<Void> doFilter(ServerWebExchange exchange, WebFilterChain chain) {
+    public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
+    	String traceId = WebUtils.getTraceId(exchange);
+    	org.apache.logging.log4j.ThreadContext.put(Consts.TRACE_ID, traceId);

-        FilterResult pfr = WebUtils.getPrevFilterResult(exchange);
-        if (!pfr.success) {
-            return WebUtils.getDirectResponse(exchange);
+        ServerHttpRequest req = exchange.getRequest();
+        if (req instanceof FizzServerHttpRequestDecorator) {
+            return doFilter(exchange, chain);
        }
-
+        return
+                NettyDataBufferUtils.join(req.getBody()).defaultIfEmpty(NettyDataBufferUtils.EMPTY_DATA_BUFFER)
+                        .flatMap(
+                                body -> {
+                                    FizzServerHttpRequestDecorator requestDecorator = new FizzServerHttpRequestDecorator(req);
+                                    if (body != NettyDataBufferUtils.EMPTY_DATA_BUFFER) {
+                                        try {
+                                            requestDecorator.setBody(body);
+                                        } finally {
+                                            NettyDataBufferUtils.release(body);
+                                        }
+                                    }
+                                    ServerWebExchange mutatedExchange = exchange.mutate().request(requestDecorator).build();
+                                    ServerWebExchange newExchange = mutatedExchange;
+                                    MediaType contentType = req.getHeaders().getContentType();
+                                    if (MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(contentType)) {
+                                        newExchange = new FizzServerWebExchangeDecorator(mutatedExchange);
+                                    }
+                                    return doFilter(newExchange, chain);
+                                }
+                        );
+    }
+    
+    public Mono<Void> doFilter(ServerWebExchange exchange, WebFilterChain chain) {
+    	String traceId = WebUtils.getTraceId(exchange);
+    	org.apache.logging.log4j.ThreadContext.put(Consts.TRACE_ID, traceId);
+        
        ApiConfig ac = WebUtils.getApiConfig(exchange);
        if (ac != null && ac.type == ApiConfig.Type.CALLBACK) {
            CallbackConfig cc = ac.callbackConfig;
-            ServerHttpRequest req = exchange.getRequest();
-            return
-                    DataBufferUtils.join(req.getBody()).defaultIfEmpty(NettyDataBufferUtils.EMPTY_DATA_BUFFER)
-                            .flatMap(
-                                    b -> {
-                                        DataBuffer body = null;
-                                        if (b != NettyDataBufferUtils.EMPTY_DATA_BUFFER) {
-                                            if (b instanceof PooledDataBuffer) {
-                                                try {
-                                                    body = NettyDataBufferUtils.copy2heap(b);
-                                                } finally {
-                                                    NettyDataBufferUtils.release(b);
-                                                }
-                                            } else {
-                                                body = b;
-                                            }
-                                        }
+            FizzServerHttpRequestDecorator req = (FizzServerHttpRequestDecorator) exchange.getRequest();
+            return req.getBody().defaultIfEmpty(NettyDataBufferUtils.EMPTY_DATA_BUFFER).single().flatMap(b -> {
+            							String body = b.toString(StandardCharsets.UTF_8);
                                        HashMap<String, ServiceInstance> service2instMap = getService2instMap(ac);
                                        HttpHeaders headers = WebUtils.mergeAppendHeaders(exchange);
                                        pushReq2manager(exchange, headers, body, service2instMap, cc.id, ac.gatewayGroups.iterator().next());
@@ -175,7 +191,7 @@ 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, Object body, HashMap<String, ServiceInstance> service2instMap, int callbackConfigId,
                                 String gatewayGroup) {

        ServerHttpRequest req = exchange.getRequest();
@@ -215,7 +231,8 @@ public class CallbackFilter extends FizzWebFilter {

        if (body != null) {
                                                                                                                                   b.append(Consts.S.COMMA);
-        String bodyStr = body.toString(StandardCharsets.UTF_8);
+//        String bodyStr = body.toString(StandardCharsets.UTF_8);
+        String bodyStr = body.toString();
        MediaType contentType = req.getHeaders().getContentType();
        if (contentType != null && contentType.getSubtype().equalsIgnoreCase(json)) {
        b.append(_body);                   b.append(JSON.toJSONString(bodyStr));
--- a/fizz-core/src/main/java/com/fizzgate/proxy/CallbackService.java
+++ b/fizz-core/src/main/java/com/fizzgate/proxy/CallbackService.java
@@ -21,7 +21,6 @@ import com.fizzgate.aggregate.web.loader.BaseAggregateResult;
 import com.fizzgate.aggregate.web.service.AggregateService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.server.reactive.ServerHttpRequest;
@@ -81,7 +80,7 @@ public class CallbackService {
 		aggrConfigPrefix = systemConfig.getGatewayPrefix() + '/';
 	}

-	public Mono<Void> requestBackends(ServerWebExchange exchange, HttpHeaders headers, DataBuffer body, CallbackConfig cc, Map<String, ServiceInstance> service2instMap) {
+	public Mono<Void> requestBackends(ServerWebExchange exchange, HttpHeaders headers, String body, CallbackConfig cc, Map<String, ServiceInstance> service2instMap) {
 		ServerHttpRequest req = exchange.getRequest();
 		String traceId = WebUtils.getTraceId(exchange);
 		HttpMethod method = req.getMethod();
@@ -140,21 +139,21 @@ public class CallbackService {
 				   ;
 	}

-	private Function<Throwable, Mono<? extends ClientResponse>> crError(ServerWebExchange exchange, Receiver r, HttpMethod method, HttpHeaders headers, DataBuffer body) {
+	private Function<Throwable, Mono<? extends ClientResponse>> crError(ServerWebExchange exchange, Receiver r, HttpMethod method, HttpHeaders headers, String body) {
 		return t -> {
 			log(exchange, r, method, headers, body, t);
 			return Mono.just(new FizzFailClientResponse(t));
 		};
 	}

-	private Function<Throwable, Mono<? extends BaseAggregateResult>> arError(ServerWebExchange exchange, Receiver r, HttpMethod method, HttpHeaders headers, DataBuffer body) {
+	private Function<Throwable, Mono<? extends BaseAggregateResult>> arError(ServerWebExchange exchange, Receiver r, HttpMethod method, HttpHeaders headers, String body) {
 		return t -> {
 			log(exchange, r, method, headers, body, t);
 			return Mono.just(new FailAggregateResult(t));
 		};
 	}

-	private void log(ServerWebExchange exchange, Receiver r, HttpMethod method, HttpHeaders headers, DataBuffer body, Throwable t) {
+	private void log(ServerWebExchange exchange, Receiver r, HttpMethod method, HttpHeaders headers, String body, Throwable t) {
 		StringBuilder b = ThreadContext.getStringBuilder();
 		WebUtils.request2stringBuilder(exchange, b);
 		b.append(Consts.S.LINE_SEPARATOR).append(callback).append(Consts.S.LINE_SEPARATOR);
--- a/fizz-core/src/test/java/com/fizzgate/proxy/CallbackServiceTests.java
+++ b/fizz-core/src/test/java/com/fizzgate/proxy/CallbackServiceTests.java
@@ -100,7 +100,8 @@ public class CallbackServiceTests {
                )
        );

-        Mono<Void> vm = callbackService.requestBackends(exchange, headers, body, callbackConfig, Collections.EMPTY_MAP);
+        // Mono<Void> vm = callbackService.requestBackends(exchange, headers, body, callbackConfig, Collections.EMPTY_MAP);
+        Mono<Void> vm = callbackService.requestBackends(exchange, headers, null, callbackConfig, Collections.EMPTY_MAP);
        vm.subscribe();
        Thread.sleep(2000);

--- a/pom.xml
+++ b/pom.xml
@@ -6,11 +6,11 @@
 	<properties>
 		<!--<java.version>1.8</java.version>-->
 		<spring-boot.version>2.2.13.RELEASE</spring-boot.version>
-		<spring-framework.version>5.2.23.RELEASE</spring-framework.version>
+		<spring-framework.version>5.2.24.RELEASE</spring-framework.version>
 		<reactor-bom.version>Dysprosium-SR25</reactor-bom.version>
 		<lettuce.version>5.3.7.RELEASE</lettuce.version>
 		<nacos.cloud.version>2.2.7.RELEASE</nacos.cloud.version>
-		<netty.version>4.1.91.Final</netty.version>
+		<netty.version>4.1.93.Final</netty.version>
 		<httpcore.version>4.4.16</httpcore.version>
 		<log4j2.version>2.17.2</log4j2.version>
 		<slf4j.version>1.7.36</slf4j.version>
@@ -22,7 +22,7 @@
 		<r2dbc-mysql.version>0.8.2</r2dbc-mysql.version>
 		<reflections.version>0.9.11</reflections.version>
 		<commons-pool2.version>2.11.1</commons-pool2.version>
-		<netty-tcnative.version>2.0.59.Final</netty-tcnative.version>
+		<netty-tcnative.version>2.0.61.Final</netty-tcnative.version>
 		<spring-cloud.version>2.2.9.RELEASE</spring-cloud.version>
 		<snakeyaml.version>1.33</snakeyaml.version>
 		<spring-data-releasetrain.version>Moore-SR13</spring-data-releasetrain.version>