From e48cfab6e3f1b70017ee76d17aeed2a14b993849 Mon Sep 17 00:00:00 2001 From: linwaiwai Date: Tue, 8 Feb 2022 18:28:39 +0800 Subject: [PATCH 01/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2837a55..7cff9c5 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ API地址：http://demo.fizzgate.com/proxy/[服务名]/[API_Path] - 安全授权：支持内置的key-auth, JWT, basic-auth授权方式，并且可以方便控制。 - 服务编排：支持HTTP、Dubbo、gRPC、Soap协议热服务编排能力，支持前后端编码，支持JSON/XML输出，随时随地更新API。 - 负载均衡：支持round-robin负载均衡。 -- 服务发现：支持从Eureka或Nacos注册中心发现后端服务器。 +- 多注册中心：支持从Eureka或Nacos注册中心进行服务发现。 - 配置中心：支持接入apollo配置中心。 - HTTP反向代理：隐藏真实后端服务，支持 Rest API反向代理。 - 访问策略：支持不同策略访问不同的API、配置不同的鉴权等。 From 5844419fd5ab29cc7e2872104d2db33a34000c4e Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Fri, 11 Feb 2022 09:46:15 +0800 Subject: [PATCH 02/14] Add get(Object target, String field) to ReflectionUtils.java --- fizz-common/src/main/java/we/util/ReflectionUtils.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fizz-common/src/main/java/we/util/ReflectionUtils.java b/fizz-common/src/main/java/we/util/ReflectionUtils.java index f92c5e4..3c95b8a 100644 --- a/fizz-common/src/main/java/we/util/ReflectionUtils.java +++ b/fizz-common/src/main/java/we/util/ReflectionUtils.java @@ -33,4 +33,10 @@ public abstract class ReflectionUtils extends org.springframework.util.Reflectio makeAccessible(f); setField(f, target, value); } + + public static Object get(Object target, String field) { + Field f = findField(target.getClass(), field); + makeAccessible(f); + return getField(f, target); + } } From 1cabfabc8cbb887303432b7d8ba7f14426a1c3c7 Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Fri, 11 Feb 2022 09:52:06 +0800 Subject: [PATCH 03/14] Release 2.5.1 --- fizz-bootstrap/pom.xml | 2 +- fizz-common/pom.xml | 2 +- fizz-core/pom.xml | 2 +- fizz-plugin/pom.xml | 2 +- fizz-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fizz-bootstrap/pom.xml b/fizz-bootstrap/pom.xml index ee1e037..4ecc579 100644 --- a/fizz-bootstrap/pom.xml +++ b/fizz-bootstrap/pom.xml @@ -12,7 +12,7 @@ com.fizzgate fizz-bootstrap - 2.5.0 + 2.5.1 1.8 diff --git a/fizz-common/pom.xml b/fizz-common/pom.xml index d642c9d..7be459b 100644 --- a/fizz-common/pom.xml +++ b/fizz-common/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.5.0 + 2.5.1 ../pom.xml 4.0.0 diff --git a/fizz-core/pom.xml b/fizz-core/pom.xml index ea0a8e5..aca811d 100644 --- a/fizz-core/pom.xml +++ b/fizz-core/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.5.0 + 2.5.1 ../pom.xml 4.0.0 diff --git a/fizz-plugin/pom.xml b/fizz-plugin/pom.xml index a221448..03945e7 100644 --- a/fizz-plugin/pom.xml +++ b/fizz-plugin/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.5.0 + 2.5.1 ../pom.xml 4.0.0 diff --git a/fizz-spring-boot-starter/pom.xml b/fizz-spring-boot-starter/pom.xml index 0d04a09..55d773d 100644 --- a/fizz-spring-boot-starter/pom.xml +++ b/fizz-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.5.0 + 2.5.1 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index e885407..8bbe3a6 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ fizz-gateway-community ${project.artifactId} fizz gateway community - 2.5.0 + 2.5.1 pom fizz-common From ae0d3aa37e850abca1571eef00f9f3f6a0e4d50e Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Fri, 11 Feb 2022 09:58:38 +0800 Subject: [PATCH 04/14] Update README --- README.en-us.md | 3 ++- README.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.en-us.md b/README.en-us.md index d3887f1..c7e68a0 100644 --- a/README.en-us.md +++ b/README.en-us.md @@ -4,7 +4,7 @@ English | [简体中文](./README.md)

- Version + Version Documentation @@ -113,6 +113,7 @@ Starting from v1.3.0, the frontend and backend of the management backend are mer | v2.4.0 | v2.4.0 | | v2.4.1 | v2.4.1 | | v2.5.0 | v2.5.0 | +| v2.5.1 | v2.5.1 | Please download the corresponding management backend version according to the version of the community version diff --git a/README.md b/README.md index 7cff9c5..a41645e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

- Version + Version Documentation @@ -115,6 +115,7 @@ API地址：http://demo.fizzgate.com/proxy/[服务名]/[API_Path] | v2.4.0 | v2.4.0 | | v2.4.1 | v2.4.1 | | v2.5.0 | v2.5.0 | +| v2.5.1 | v2.5.1 | 请根据社区版的版本下载对应的管理后台版本 From e7efe0eb32a1f04d887c1f6c2832b7a02d62e252 Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Mon, 14 Feb 2022 09:38:11 +0800 Subject: [PATCH 05/14] Upgrade slf4j to 1.7.36 --- fizz-bootstrap/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fizz-bootstrap/pom.xml b/fizz-bootstrap/pom.xml index 4ecc579..ba5d38e 100644 --- a/fizz-bootstrap/pom.xml +++ b/fizz-bootstrap/pom.xml @@ -23,7 +23,7 @@ 4.1.74.Final 4.4.15 2.17.1 - 1.7.35 + 1.7.36 3.12.0 1.18.22 2.7.5 diff --git a/pom.xml b/pom.xml index 8bbe3a6..5630ce9 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 4.1.74.Final 4.4.15 2.17.1 - 1.7.35 + 1.7.36 2.7.5 1.16.1 3.4.6 From aac784e045cb6b0433be5e131613c5c5f51fecc8 Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Mon, 14 Feb 2022 18:11:15 +0800 Subject: [PATCH 06/14] Fix #391 --- fizz-core/src/main/java/we/util/WebUtils.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/fizz-core/src/main/java/we/util/WebUtils.java b/fizz-core/src/main/java/we/util/WebUtils.java index 29bee40..92885cb 100644 --- a/fizz-core/src/main/java/we/util/WebUtils.java +++ b/fizz-core/src/main/java/we/util/WebUtils.java @@ -275,30 +275,42 @@ public abstract class WebUtils { } public static Mono response(ServerHttpResponse clientResp, HttpStatus status, HttpHeaders headers, ByteBuffer body) { - DataBuffer dataBuffer = clientResp.bufferFactory().wrap(body); + DataBuffer dataBuffer = null; + if (body != null) { + dataBuffer = clientResp.bufferFactory().wrap(body); + } return response(clientResp, status, headers, dataBuffer); } public static Mono response(ServerHttpResponse clientResp, HttpStatus status, HttpHeaders headers, byte[] body) { - DataBuffer dataBuffer = clientResp.bufferFactory().wrap(body); + DataBuffer dataBuffer = null; + if (body != null) { + dataBuffer = clientResp.bufferFactory().wrap(body); + } return response(clientResp, status, headers, dataBuffer); } public static Mono response(ServerHttpResponse clientResp, HttpStatus status, HttpHeaders headers, String body) { - DataBuffer dataBuffer = clientResp.bufferFactory().wrap(body.getBytes(StandardCharsets.UTF_8)); + DataBuffer dataBuffer = null; + if (body != null) { + dataBuffer = clientResp.bufferFactory().wrap(body.getBytes(StandardCharsets.UTF_8)); + } return response(clientResp, status, headers, dataBuffer); } - public static Mono responseJson(ServerWebExchange exchange, HttpStatus status, HttpHeaders headers, Object object) { + public static Mono responseJson(ServerWebExchange exchange, HttpStatus status, HttpHeaders headers, Object body) { if (headers == null) { headers = new HttpHeaders(); } headers.setContentType(MediaType.APPLICATION_JSON); - byte[] bytes = JacksonUtils.writeValueAsBytes(object); + byte[] bytes = null; + if (body != null) { + bytes = JacksonUtils.writeValueAsBytes(body); + } return response(exchange.getResponse(), status, headers, bytes); } - public static Mono responseJson(ServerWebExchange exchange, HttpStatus status, HttpHeaders headers, String json) { + public static Mono responseJson(ServerWebExchange exchange, HttpStatus status, HttpHeaders headers, String json) { if (headers == null) { headers = new HttpHeaders(); } From fe0259e3504fb1bb198e025549ed22a31e3dd3b0 Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Thu, 17 Feb 2022 11:36:40 +0800 Subject: [PATCH 07/14] Upgrade hutool to 5.7.21 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5630ce9..de2f428 100644 --- a/pom.xml +++ b/pom.xml @@ -443,7 +443,7 @@ cn.hutool hutool-crypto - 5.7.20 + 5.7.21 From 93dd426059988f151be8c65bfb951efb2805938e Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Thu, 17 Feb 2022 17:33:30 +0800 Subject: [PATCH 08/14] Support authorization in eureka.serviceUrl --- .../eureka/FizzEurekaServiceRegistration.java | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/fizz-core/src/main/java/we/service_registry/eureka/FizzEurekaServiceRegistration.java b/fizz-core/src/main/java/we/service_registry/eureka/FizzEurekaServiceRegistration.java index cfa4a81..d714a12 100644 --- a/fizz-core/src/main/java/we/service_registry/eureka/FizzEurekaServiceRegistration.java +++ b/fizz-core/src/main/java/we/service_registry/eureka/FizzEurekaServiceRegistration.java @@ -63,16 +63,30 @@ public class FizzEurekaServiceRegistration extends FizzServiceRegistration { for (String serviceUrl : eurekaServerServiceUrls) { String vip; int port; - int begin = serviceUrl.indexOf('p') + 4; - int colon = serviceUrl.indexOf(':', begin); - if (colon > -1) { - int end = serviceUrl.indexOf('/', colon); - vip = serviceUrl.substring(begin, colon); - port = Integer.parseInt(serviceUrl.substring(colon + 1, end)); + int at = serviceUrl.indexOf('@'); + if (at > -1) { + int colon = serviceUrl.indexOf(':', at); + if (colon > -1) { + int slash = serviceUrl.indexOf('/', colon); + vip = serviceUrl.substring(at + 1, colon); + port = Integer.parseInt(serviceUrl.substring(colon + 1, slash)); + } else { + int slash = serviceUrl.indexOf('/', at); + vip = serviceUrl.substring(at + 1, slash); + port = 80; + } } else { - int end = serviceUrl.indexOf('/', begin); - vip = serviceUrl.substring(begin, end); - port = 80; + int begin = serviceUrl.indexOf('/') + 2; + int colon = serviceUrl.indexOf(':', begin); + if (colon > -1) { + int slash = serviceUrl.indexOf('/', colon); + vip = serviceUrl.substring(begin, colon); + port = Integer.parseInt(serviceUrl.substring(colon + 1, slash)); + } else { + int slash = serviceUrl.indexOf('/', begin); + vip = serviceUrl.substring(begin, slash); + port = 80; + } } registryCenterVip2port.put(vip, port); } From 24ec7bf19fe406e124f58ffe610a423a806c99cd Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Fri, 18 Feb 2022 09:58:51 +0800 Subject: [PATCH 09/14] Release 2.5.2 --- README.en-us.md | 36 +++++++++++++++++--------------- README.md | 13 ++++++++---- fizz-bootstrap/pom.xml | 2 +- fizz-common/pom.xml | 2 +- fizz-core/pom.xml | 2 +- fizz-plugin/pom.xml | 2 +- fizz-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 34 insertions(+), 27 deletions(-) diff --git a/README.en-us.md b/README.en-us.md index c7e68a0..b2393c2 100644 --- a/README.en-us.md +++ b/README.en-us.md @@ -4,7 +4,7 @@ English | [简体中文](./README.md)

- Version + Version Documentation @@ -44,18 +44,23 @@ API access：http://demo.fizzgate.com/proxy/[Service Name]/[API Path] ## Product Features - Cluster management: Fizz gateway nodes are stateless with configuration information that is automatically synchronized, and horizontal expansion of nodes and multi-cluster deployment are supported. -- Service aggregation: support hot http/dubbo/grpc service aggregation capabilities, support front-end and back-end coding, and update API anytime and anywhere. -- Load balancing: support round-robin load balancing. -- Service discovery: supports discovery of back-end servers from the Eureka registry. -- Configuration center: support access to apollo configuration center. -- HTTP reverse proxy: hide the real back-end services and support Rest API reverse proxy. -- Access strategy: support different strategies to access different APIs, configure different authentication, etc. -- IP black and white list: support the configuration of IP black and white list. -- Custom plug-in: powerful plug-in mechanism supports free expansion. -- Extensible: the easy-to-use plug-in mechanism facilitates the expansion of functions. -- High performance: the performance is excellent among many gateways. -- Version control: support release and multiple rollbacks of operations. -- Management backend: configure the gateway cluster through the management backend interface. +- Service aggregation: supports hot http/dubbo/grpc service aggregation capabilities, support front-end and back-end coding, and update API anytime and anywhere; +- Load balancing: supports round-robin load balancing; +- Multiple Registration Center: supports discovery of back-end servers from the Eureka or Nacos registry; +- Configuration center: supports access to apollo configuration center; +- HTTP reverse proxy: hide the real back-end services and support Rest API reverse proxy; +- Access strategy: support different strategies to access different APIs, configure different authentication, etc; +- IP black and white list: support the configuration of IP black and white list; +- Custom plug-in: powerful plug-in mechanism supports free expansion; +- Extensible: the easy-to-use plug-in mechanism facilitates the expansion of functions; +- High performance: the performance is excellent among many gateways; +- Version control: support release and multiple rollbacks of operations; +- Management backend: configure the gateway cluster through the management backend interface; +- Callback Managerment：supports managerment、subscription、replay and logging of callback; +- Multistage traffic limit：supports multisate traffic limit of fine-grain parallelism, according to service、interface、APP_ID or ip; +- Microservice document:open microservice document management of enterprise level, and more convenient system integration; +- Public network dedicated line：supports establishing a fully protected private connection channel in the public network; +- Policy fusing: multiple recovery policy fusing configurations are made according to the service or specific address. ## Benchmarks @@ -114,6 +119,7 @@ Starting from v1.3.0, the frontend and backend of the management backend are mer | v2.4.1 | v2.4.1 | | v2.5.0 | v2.5.0 | | v2.5.1 | v2.5.1 | +| v2.5.2 | v2.5.2 | Please download the corresponding management backend version according to the version of the community version @@ -236,10 +242,6 @@ Fizz官方技术交流③群：512164278 -Fizz offical wechat group - - - ## Related acticles [服务器减少50%，研发效率提高86%，我们的管理型网关Fizz自研之路](https://www.infoq.cn/article/9wdfiOILJ0CYsVyBQFpl) diff --git a/README.md b/README.md index a41645e..bebdc4a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

- Version + Version Documentation @@ -59,6 +59,7 @@ API地址：http://demo.fizzgate.com/proxy/[服务名]/[API_Path] - 多级限流：细颗粒度的限流方式包含服务限流，接口限流，APP_ID限流，IP限流。 - 微服务文档：企业级管理开放微服务文档管理，系统集成更方便。 - 公网专线：建立公网中受到完全保护的私有连接通道。 +- 策略熔断：根据服务或者具体地址进行多种恢复策略熔断配置。 ## 基准测试 @@ -116,6 +117,7 @@ API地址：http://demo.fizzgate.com/proxy/[服务名]/[API_Path] | v2.4.1 | v2.4.1 | | v2.5.0 | v2.5.0 | | v2.5.1 | v2.5.1 | +| v2.5.2 | v2.5.2 | 请根据社区版的版本下载对应的管理后台版本 @@ -228,17 +230,20 @@ docker run --rm -d -p 8600:8600 \ ## 官方技术交流群 +Fizz官方技术交流④群：170145598 (推荐) + Fizz官方技术交流①群（已满） Fizz官方技术交流②群（已满） Fizz官方技术交流③群：512164278 + + -Fizz官方微信群 +Fizz官方微信群（请加入群之后再询问群主） - ## 相关文章 @@ -258,7 +263,7 @@ Fizz官方微信群 1. 网关核心项目fizz-gateway-community社区版本以GNU v3的方式进行的开放，可以免费使用。 -2. 管理后台项目(fizz-manager-professional)作为商业版本仅开放二进制包 [免费下载](https://wj.qq.com/s2/8682608/8fe2/)，而商业项目请注明公司名称联系我们（sale@fizzgate.com）进行授权。 +2. 管理后台项目(fizz-manager-professional)作为商业版本仅开放二进制包 [免费下载](https://wj.qq.com/s2/8682608/8fe2/)，而商业项目请注明公司名称联系我们（sale@fizzgate.com）进行授权，了解商业授权规则请点击[商业授权规则](https://github.com/wehotel/fizz-gateway-community/wiki/%E5%95%86%E4%B8%9A%E6%8E%88%E6%9D%83) ## 系统截图 diff --git a/fizz-bootstrap/pom.xml b/fizz-bootstrap/pom.xml index ba5d38e..a33f800 100644 --- a/fizz-bootstrap/pom.xml +++ b/fizz-bootstrap/pom.xml @@ -12,7 +12,7 @@ com.fizzgate fizz-bootstrap - 2.5.1 + 2.5.2 1.8 diff --git a/fizz-common/pom.xml b/fizz-common/pom.xml index 7be459b..7ef725c 100644 --- a/fizz-common/pom.xml +++ b/fizz-common/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/fizz-core/pom.xml b/fizz-core/pom.xml index aca811d..b79cf0c 100644 --- a/fizz-core/pom.xml +++ b/fizz-core/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/fizz-plugin/pom.xml b/fizz-plugin/pom.xml index 03945e7..c6c0660 100644 --- a/fizz-plugin/pom.xml +++ b/fizz-plugin/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/fizz-spring-boot-starter/pom.xml b/fizz-spring-boot-starter/pom.xml index 55d773d..24aaee6 100644 --- a/fizz-spring-boot-starter/pom.xml +++ b/fizz-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index de2f428..549194c 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ fizz-gateway-community ${project.artifactId} fizz gateway community - 2.5.1 + 2.5.2 pom fizz-common From ace2d2bf1ef8c3c04752f1f64b929e4d850373a9 Mon Sep 17 00:00:00 2001 From: Francis Dong Date: Wed, 2 Mar 2022 17:37:15 +0800 Subject: [PATCH 10/14] update snapshots --- README.en-us.md | 18 ++++++++++++------ README.md | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/README.en-us.md b/README.en-us.md index b2393c2..9dd0ce1 100644 --- a/README.en-us.md +++ b/README.en-us.md @@ -264,14 +264,20 @@ Fizz官方技术交流③群：512164278 ## System screenshot -![](https://user-images.githubusercontent.com/6129661/104895987-84618880-59b1-11eb-9a73-a8569a7e6a69.png) +![homepage](https://user-images.githubusercontent.com/6129661/156333191-1b9901f5-e086-4514-84f0-4a74684fdf2d.png) -![](https://user-images.githubusercontent.com/184315/97131368-f5ace900-177e-11eb-9e00-24e73d4e24f5.png) +![aggr1](https://user-images.githubusercontent.com/6129661/156333163-e2aade71-081c-49f0-9c7b-deb19239be84.png) -![](https://user-images.githubusercontent.com/184315/97131376-f9407000-177e-11eb-8c17-4922b3df5d48.png) +![aggr2](https://user-images.githubusercontent.com/6129661/156333175-770ac66d-0295-43b1-948a-a91d9a1922dd.png) -![](https://user-images.githubusercontent.com/184315/97131378-f9d90680-177e-11eb-92b4-6fc67550daca.png) +![route](https://user-images.githubusercontent.com/6129661/156333194-9a4051a8-c59c-493f-8dd9-f004c364b8c4.png) -![](https://user-images.githubusercontent.com/184315/97131381-fba2ca00-177e-11eb-9e59-688dafa76aea.png) +![plugin](https://user-images.githubusercontent.com/6129661/156333193-b0bdfae3-4660-42a0-93e3-118333c5b246.png) -![](https://user-images.githubusercontent.com/6129661/104897563-7ca2e380-59b3-11eb-8288-39a2b181183d.png) +![appid](https://user-images.githubusercontent.com/6129661/156333180-55d4167b-1eba-4fde-900d-6499f971b97f.png) + +![breaker](https://user-images.githubusercontent.com/6129661/156333182-40986e36-0f80-46b7-aced-1c16406ba2ce.png) + +![flowcontrol](https://user-images.githubusercontent.com/6129661/156333189-0b209c2b-5026-4a6e-9880-9fc08ee72077.png) + +![doc](https://user-images.githubusercontent.com/6129661/156333188-6a2dae42-24b2-48c6-b401-1b6bbd9f6030.png) diff --git a/README.md b/README.md index bebdc4a..5fe0a09 100644 --- a/README.md +++ b/README.md @@ -268,14 +268,20 @@ Fizz官方微信群（请加入群之后再询问群主） ## 系统截图 -![](https://user-images.githubusercontent.com/6129661/104895987-84618880-59b1-11eb-9a73-a8569a7e6a69.png) +![homepage](https://user-images.githubusercontent.com/6129661/156333191-1b9901f5-e086-4514-84f0-4a74684fdf2d.png) -![](https://user-images.githubusercontent.com/184315/97131368-f5ace900-177e-11eb-9e00-24e73d4e24f5.png) +![aggr1](https://user-images.githubusercontent.com/6129661/156333163-e2aade71-081c-49f0-9c7b-deb19239be84.png) -![](https://user-images.githubusercontent.com/184315/97131376-f9407000-177e-11eb-8c17-4922b3df5d48.png) +![aggr2](https://user-images.githubusercontent.com/6129661/156333175-770ac66d-0295-43b1-948a-a91d9a1922dd.png) -![](https://user-images.githubusercontent.com/184315/97131378-f9d90680-177e-11eb-92b4-6fc67550daca.png) +![route](https://user-images.githubusercontent.com/6129661/156333194-9a4051a8-c59c-493f-8dd9-f004c364b8c4.png) -![](https://user-images.githubusercontent.com/184315/97131381-fba2ca00-177e-11eb-9e59-688dafa76aea.png) +![plugin](https://user-images.githubusercontent.com/6129661/156333193-b0bdfae3-4660-42a0-93e3-118333c5b246.png) -![](https://user-images.githubusercontent.com/6129661/104897563-7ca2e380-59b3-11eb-8288-39a2b181183d.png) +![appid](https://user-images.githubusercontent.com/6129661/156333180-55d4167b-1eba-4fde-900d-6499f971b97f.png) + +![breaker](https://user-images.githubusercontent.com/6129661/156333182-40986e36-0f80-46b7-aced-1c16406ba2ce.png) + +![flowcontrol](https://user-images.githubusercontent.com/6129661/156333189-0b209c2b-5026-4a6e-9880-9fc08ee72077.png) + +![doc](https://user-images.githubusercontent.com/6129661/156333188-6a2dae42-24b2-48c6-b401-1b6bbd9f6030.png) From dcbc2564ea0355c0cc8b33d483cc84759075d3ed Mon Sep 17 00:00:00 2001 From: Francis Dong Date: Mon, 7 Mar 2022 16:06:58 +0800 Subject: [PATCH 11/14] Support running in the foreground #406 --- fizz-bootstrap/sh/boot.sh | 10 +++++++++- fizz-bootstrap/sh/docker-entrypoint.sh | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fizz-bootstrap/sh/boot.sh b/fizz-bootstrap/sh/boot.sh index 4e69986..634c85a 100644 --- a/fizz-bootstrap/sh/boot.sh +++ b/fizz-bootstrap/sh/boot.sh @@ -35,6 +35,9 @@ if [ -z "$JAVA_HOME" ]; then fi fi +# Run in the foreground +PARAM_2=$2 + #进入脚本所在目录 cd `dirname $0` @@ -104,7 +107,12 @@ start() { else echo "starting $APP_NAME ..." rm -f ${PID_FILE} - ${JAVA_CMD} -jar ${JAVA_OPTS} -Dlogging.config=${APP_DEP_DIR}/log4j2-spring.xml -Dspring.profiles.active=$SPRING_PROFILES_ACTIVE -Denv=$APOLLO_ENV -Dapollo.meta=${APOLLO_META_SERVER} ${APP_DEP_DIR}/${APP_NAME} > ${APP_LOG_DIR}/${APP_NAME}.log 2>&1 & + if [[ ${PARAM_2} == "f" ]] + then + ${JAVA_CMD} -jar ${JAVA_OPTS} -Dlogging.config=${APP_DEP_DIR}/log4j2-spring.xml -Dspring.profiles.active=$SPRING_PROFILES_ACTIVE -Denv=$APOLLO_ENV -Dapollo.meta=${APOLLO_META_SERVER} ${APP_DEP_DIR}/${APP_NAME} + else + ${JAVA_CMD} -jar ${JAVA_OPTS} -Dlogging.config=${APP_DEP_DIR}/log4j2-spring.xml -Dspring.profiles.active=$SPRING_PROFILES_ACTIVE -Denv=$APOLLO_ENV -Dapollo.meta=${APOLLO_META_SERVER} ${APP_DEP_DIR}/${APP_NAME} > ${APP_LOG_DIR}/${APP_NAME}.log 2>&1 & + fi echo $! > ${PID_FILE} fi } diff --git a/fizz-bootstrap/sh/docker-entrypoint.sh b/fizz-bootstrap/sh/docker-entrypoint.sh index 4496dd2..ce5f016 100644 --- a/fizz-bootstrap/sh/docker-entrypoint.sh +++ b/fizz-bootstrap/sh/docker-entrypoint.sh @@ -2,4 +2,4 @@ # entrypoint for docker -/bin/bash ./boot.sh start && touch dummy.log && tail -f dummy.log \ No newline at end of file +/bin/bash ./boot.sh start f \ No newline at end of file From eb5fd549ac96ff2d3469c66c22de2f80ae107fd3 Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Mon, 7 Mar 2022 16:31:14 +0800 Subject: [PATCH 12/14] Release 2.5.3-beta1 --- fizz-bootstrap/pom.xml | 2 +- fizz-common/pom.xml | 2 +- fizz-core/pom.xml | 2 +- fizz-plugin/pom.xml | 2 +- fizz-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fizz-bootstrap/pom.xml b/fizz-bootstrap/pom.xml index a33f800..586d5f3 100644 --- a/fizz-bootstrap/pom.xml +++ b/fizz-bootstrap/pom.xml @@ -12,7 +12,7 @@ com.fizzgate fizz-bootstrap - 2.5.2 + 2.5.3-beta1 1.8 diff --git a/fizz-common/pom.xml b/fizz-common/pom.xml index 7ef725c..138eecc 100644 --- a/fizz-common/pom.xml +++ b/fizz-common/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.5.2 + 2.5.3-beta1 ../pom.xml 4.0.0 diff --git a/fizz-core/pom.xml b/fizz-core/pom.xml index b79cf0c..c7d986e 100644 --- a/fizz-core/pom.xml +++ b/fizz-core/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.5.2 + 2.5.3-beta1 ../pom.xml 4.0.0 diff --git a/fizz-plugin/pom.xml b/fizz-plugin/pom.xml index c6c0660..178f147 100644 --- a/fizz-plugin/pom.xml +++ b/fizz-plugin/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.5.2 + 2.5.3-beta1 ../pom.xml 4.0.0 diff --git a/fizz-spring-boot-starter/pom.xml b/fizz-spring-boot-starter/pom.xml index 24aaee6..9ba1fdc 100644 --- a/fizz-spring-boot-starter/pom.xml +++ b/fizz-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.5.2 + 2.5.3-beta1 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 549194c..adb00c8 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ fizz-gateway-community ${project.artifactId} fizz gateway community - 2.5.2 + 2.5.3-beta1 pom fizz-common From b41cad2cd3fc448a3e87b283cbe1c145fe647f35 Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Fri, 11 Mar 2022 09:48:51 +0800 Subject: [PATCH 13/14] Replace applicationContext.getApplicationName() with applicationContext.getEnvironment().getProperty("spring.application.name") --- .../java/we/service_registry/RegistryCenterService.java | 1 + .../java/we/service_registry/nacos/FizzNacosHelper.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fizz-core/src/main/java/we/service_registry/RegistryCenterService.java b/fizz-core/src/main/java/we/service_registry/RegistryCenterService.java index d62c3f7..2d82f22 100644 --- a/fizz-core/src/main/java/we/service_registry/RegistryCenterService.java +++ b/fizz-core/src/main/java/we/service_registry/RegistryCenterService.java @@ -143,6 +143,7 @@ public class RegistryCenterService implements ApplicationListener Date: Fri, 11 Mar 2022 09:57:34 +0800 Subject: [PATCH 14/14] Release 2.5.3-beta2 --- fizz-bootstrap/pom.xml | 2 +- fizz-common/pom.xml | 2 +- fizz-core/pom.xml | 2 +- fizz-plugin/pom.xml | 2 +- fizz-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fizz-bootstrap/pom.xml b/fizz-bootstrap/pom.xml index 586d5f3..78be69c 100644 --- a/fizz-bootstrap/pom.xml +++ b/fizz-bootstrap/pom.xml @@ -12,7 +12,7 @@ com.fizzgate fizz-bootstrap - 2.5.3-beta1 + 2.5.3-beta2 1.8 diff --git a/fizz-common/pom.xml b/fizz-common/pom.xml index 138eecc..def23f2 100644 --- a/fizz-common/pom.xml +++ b/fizz-common/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.5.3-beta1 + 2.5.3-beta2 ../pom.xml 4.0.0 diff --git a/fizz-core/pom.xml b/fizz-core/pom.xml index c7d986e..0dabc65 100644 --- a/fizz-core/pom.xml +++ b/fizz-core/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.5.3-beta1 + 2.5.3-beta2 ../pom.xml 4.0.0 diff --git a/fizz-plugin/pom.xml b/fizz-plugin/pom.xml index 178f147..ddb7d55 100644 --- a/fizz-plugin/pom.xml +++ b/fizz-plugin/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.5.3-beta1 + 2.5.3-beta2 ../pom.xml 4.0.0 diff --git a/fizz-spring-boot-starter/pom.xml b/fizz-spring-boot-starter/pom.xml index 9ba1fdc..849de6f 100644 --- a/fizz-spring-boot-starter/pom.xml +++ b/fizz-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.5.3-beta1 + 2.5.3-beta2 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index adb00c8..dd27eb9 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ fizz-gateway-community ${project.artifactId} fizz gateway community - 2.5.3-beta1 + 2.5.3-beta2 pom fizz-common