From 1b4cedd857cb719b15533bc8690e4c93fb21a917 Mon Sep 17 00:00:00 2001 From: Francis Dong Date: Thu, 2 Jun 2022 12:44:34 +0800 Subject: [PATCH 01/15] add file encoding parameter to boot script --- fizz-bootstrap/sh/boot.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fizz-bootstrap/sh/boot.sh b/fizz-bootstrap/sh/boot.sh index 634c85a..ce2739b 100644 --- a/fizz-bootstrap/sh/boot.sh +++ b/fizz-bootstrap/sh/boot.sh @@ -109,9 +109,9 @@ start() { rm -f ${PID_FILE} 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} + ${JAVA_CMD} -jar ${JAVA_OPTS} -Dfile.encoding=UTF-8 -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 & + ${JAVA_CMD} -jar ${JAVA_OPTS} -Dfile.encoding=UTF-8 -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 From 1d15c3462d410450f2b39ccc7cdff01f99650061 Mon Sep 17 00:00:00 2001 From: dxfeng10 Date: Wed, 8 Jun 2022 09:51:40 +0800 Subject: [PATCH 02/15] Update README.md --- README.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/README.md b/README.md index 9e76be7..99c19bb 100644 --- a/README.md +++ b/README.md @@ -260,6 +260,29 @@ Fizz官方微信群（请加入群之后再询问群主） [高阶程序员必备技能：Fizz Gateway网关的二次开发](https://my.oschina.net/linwaiwai/blog/4696133) +[Fizz网关入门教程-安装](https://zhuanlan.zhihu.com/p/501305059) + +[Fizz网关入门教程-路由初体验](https://zhuanlan.zhihu.com/p/501381970) + +[Fizz网关入门教程-权限校验](https://zhuanlan.zhihu.com/p/501384396) + +[Fizz网关入门教程-快速聚合多接口，提高页面数据的加载速度](https://zhuanlan.zhihu.com/p/501387154) + +[Fizz网关入门教程-服务编排，祭出终结BFF层的大杀器](https://zhuanlan.zhihu.com/p/501389075) + +[企业级微服务API网关Fizz-常用插件介绍](https://zhuanlan.zhihu.com/p/513656382) + +[企业级微服务API网关Fizz-如何自定义插件](https://zhuanlan.zhihu.com/p/513662893) + +[企业级微服务API网关Fizz-服务编排内置函数](https://zhuanlan.zhihu.com/p/513404417) + +[Fizz企业级微服务API网关进阶系列教程-服务编排处理列表数据(上)-展开与合并](https://zhuanlan.zhihu.com/p/515056309) + +[Fizz企业级微服务API网关进阶系列教程-服务编排处理列表数据(中)-数据提取与数据关联](https://zhuanlan.zhihu.com/p/515070075) + +[Fizz企业级微服务API网关进阶系列教程-服务编排处理列表数据(下)-字段重命名&字段移除](https://zhuanlan.zhihu.com/p/515509832) + + ## 授权说明 1. 网关核心项目fizz-gateway-community社区版本以GNU v3的方式进行的开放，在遵循GNU协议的非商业化项目中可以免费使用。 From 3d51b6f2b526acce6ec0c6f5ef89b0e532407c74 Mon Sep 17 00:00:00 2001 From: dxfeng10 Date: Wed, 8 Jun 2022 09:52:29 +0800 Subject: [PATCH 03/15] Update README.en-us.md --- README.en-us.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/README.en-us.md b/README.en-us.md index 344cfae..0c54926 100644 --- a/README.en-us.md +++ b/README.en-us.md @@ -261,6 +261,28 @@ Fizz官方技术交流③群：512164278 [高阶程序员必备技能：Fizz Gateway网关的二次开发](https://my.oschina.net/linwaiwai/blog/4696133) +[Fizz网关入门教程-安装](https://zhuanlan.zhihu.com/p/501305059) + +[Fizz网关入门教程-路由初体验](https://zhuanlan.zhihu.com/p/501381970) + +[Fizz网关入门教程-权限校验](https://zhuanlan.zhihu.com/p/501384396) + +[Fizz网关入门教程-快速聚合多接口，提高页面数据的加载速度](https://zhuanlan.zhihu.com/p/501387154) + +[Fizz网关入门教程-服务编排，祭出终结BFF层的大杀器](https://zhuanlan.zhihu.com/p/501389075) + +[企业级微服务API网关Fizz-常用插件介绍](https://zhuanlan.zhihu.com/p/513656382) + +[企业级微服务API网关Fizz-如何自定义插件](https://zhuanlan.zhihu.com/p/513662893) + +[企业级微服务API网关Fizz-服务编排内置函数](https://zhuanlan.zhihu.com/p/513404417) + +[Fizz企业级微服务API网关进阶系列教程-服务编排处理列表数据(上)-展开与合并](https://zhuanlan.zhihu.com/p/515056309) + +[Fizz企业级微服务API网关进阶系列教程-服务编排处理列表数据(中)-数据提取与数据关联](https://zhuanlan.zhihu.com/p/515070075) + +[Fizz企业级微服务API网关进阶系列教程-服务编排处理列表数据(下)-字段重命名&字段移除](https://zhuanlan.zhihu.com/p/515509832) + ## Authorization instructions 1. The fizz-gateway-community community version of the gateway core project is opened in the form of GNU V3 and can be used free of charge in non-commercial projects following the GNU protocol. From 81750bc305111f34e6a61d982467760cd8adcf31 Mon Sep 17 00:00:00 2001 From: linwaiwai Date: Thu, 9 Jun 2022 14:53:00 +0800 Subject: [PATCH 04/15] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 99c19bb..65edd02 100644 --- a/README.md +++ b/README.md @@ -285,10 +285,11 @@ Fizz官方微信群（请加入群之后再询问群主） ## 授权说明 -1. 网关核心项目fizz-gateway-community社区版本以GNU v3的方式进行的开放，在遵循GNU协议的非商业化项目中可以免费使用。 +1. 网关核心项目fizz-gateway-community社区版本以GNU v3的方式进行的开放，在遵循GNU协议的个人非商业化项目中可以免费使用。 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) +3. 在选择Fizz Gateway之前，我们强烈建议您先试用一下我们的DEMO站点，试用我们的产品，并且思考与自身的业务结合，并且考虑产品推行落地方式，在查阅我们的官网价格(https://www.fizzgate.com)之后再进一步与我们联系。 ## 系统截图 From a7ce03bf0f3867d19240dedf13998d1846455919 Mon Sep 17 00:00:00 2001 From: linwaiwai Date: Thu, 7 Jul 2022 13:58:44 +0800 Subject: [PATCH 05/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fd3a799..4346e6b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ ## Fizz Gateway是什么？ -An Aggregation API Gateway in Java . Fizz Gateway 是一个基于 Java开发的微服务聚合网关，能够实现热服务编排聚合、自动授权选择、线上服务脚本编码、在线测试、高性能路由、API审核管理、回调管理等目的，拥有强大的自定义插件系统可以自行扩展，并且提供友好的图形化配置界面，能够快速帮助企业进行API服务治理、减少中间层胶水代码以及降低编码投入、提高 API 服务的稳定性和安全性。 +An Aggregation API Gateway in Java . Fizz Gateway 是一个基于 Java开发的微服务聚合网关，是拥有自主知识产权应用网关的的国产化替代方案，能够实现热服务编排聚合、自动授权选择、线上服务脚本编码、在线测试、高性能路由、API审核管理、回调管理等目的，拥有强大的自定义插件系统可以自行扩展，并且提供友好的图形化配置界面，能够快速帮助企业进行API服务治理、减少中间层胶水代码以及降低编码投入、提高 API 服务的稳定性和安全性。 ## 演示环境（Demo） From dd78e157a870a1c506f925529a6ec291fa21b2dc Mon Sep 17 00:00:00 2001 From: linwaiwai Date: Thu, 7 Jul 2022 13:59:13 +0800 Subject: [PATCH 06/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4346e6b..11c762b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ ## Fizz Gateway是什么？ -An Aggregation API Gateway in Java . Fizz Gateway 是一个基于 Java开发的微服务聚合网关，是拥有自主知识产权应用网关的的国产化替代方案，能够实现热服务编排聚合、自动授权选择、线上服务脚本编码、在线测试、高性能路由、API审核管理、回调管理等目的，拥有强大的自定义插件系统可以自行扩展，并且提供友好的图形化配置界面，能够快速帮助企业进行API服务治理、减少中间层胶水代码以及降低编码投入、提高 API 服务的稳定性和安全性。 +An Aggregation API Gateway in Java . Fizz Gateway 是一个基于 Java开发的微服务聚合网关，是拥有自主知识产权的应用网关国产化替代方案，能够实现热服务编排聚合、自动授权选择、线上服务脚本编码、在线测试、高性能路由、API审核管理、回调管理等目的，拥有强大的自定义插件系统可以自行扩展，并且提供友好的图形化配置界面，能够快速帮助企业进行API服务治理、减少中间层胶水代码以及降低编码投入、提高 API 服务的稳定性和安全性。 ## 演示环境（Demo） From 312a2504630524b083faa112f1770804513555fc Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Thu, 14 Jul 2022 17:08:16 +0800 Subject: [PATCH 07/15] MD5 sign timestamp validation and remove log4j2 kafka --- fizz-bootstrap/pom.xml | 12 ------ .../src/main/resources/log4j2-kafka.json | 38 ------------------- .../src/main/resources/log4j2-spring.xml | 29 -------------- fizz-common/pom.xml | 10 ----- .../src/main/java/we/config/SystemConfig.java | 13 +++++-- .../java/we/plugin/auth/ApiConfigService.java | 30 +++++++++------ .../src/test/resources/log4j2-kafka.json | 38 ------------------- fizz-core/src/test/resources/log4j2-test.xml | 13 ------- pom.xml | 12 ------ 9 files changed, 29 insertions(+), 166 deletions(-) delete mode 100644 fizz-bootstrap/src/main/resources/log4j2-kafka.json delete mode 100644 fizz-core/src/test/resources/log4j2-kafka.json diff --git a/fizz-bootstrap/pom.xml b/fizz-bootstrap/pom.xml index 59c1ae8..359b676 100644 --- a/fizz-bootstrap/pom.xml +++ b/fizz-bootstrap/pom.xml @@ -85,18 +85,6 @@ io.netty netty-tcnative-classes ${netty-tcnative.version} - - - - org.apache.logging.log4j - log4j-layout-template-json - ${log4j2.version} - - - - org.apache.kafka - kafka-clients - 2.0.1 --> diff --git a/fizz-bootstrap/src/main/resources/log4j2-kafka.json b/fizz-bootstrap/src/main/resources/log4j2-kafka.json deleted file mode 100644 index c540015..0000000 --- a/fizz-bootstrap/src/main/resources/log4j2-kafka.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "logTime": { - "$resolver": "timestamp", - "epoch": { - "unit": "millis", - "rounded": true - } - }, - "logLevel": { - "$resolver": "level", - "field": "name" - }, - "logMsg": { - "$resolver": "message", - "stringified": true - }, - "thread": { - "$resolver": "thread", - "field": "name" - }, - "loggerName": { - "$resolver": "logger", - "field": "name" - }, - "thrown": { - "message": { - "$resolver": "exception", - "field": "message" - }, - "extendedStackTrace": { - "$resolver": "exception", - "field": "stackTrace", - "stackTrace": { - "stringified": true - } - } - } -} \ No newline at end of file diff --git a/fizz-bootstrap/src/main/resources/log4j2-spring.xml b/fizz-bootstrap/src/main/resources/log4j2-spring.xml index 2e9a9d8..a6a93bf 100644 --- a/fizz-bootstrap/src/main/resources/log4j2-spring.xml +++ b/fizz-bootstrap/src/main/resources/log4j2-spring.xml @@ -4,7 +4,6 @@ fizz-bootstrap ${sys:APP_ROOT_DIR}/log - @@ -21,37 +20,13 @@ --> - - - @@ -60,19 +35,15 @@ - - - - diff --git a/fizz-common/pom.xml b/fizz-common/pom.xml index c003c53..6c61511 100644 --- a/fizz-common/pom.xml +++ b/fizz-common/pom.xml @@ -17,16 +17,6 @@ - - org.apache.logging.log4j - log4j-layout-template-json - - - - org.apache.kafka - kafka-clients - - org.openjdk.jol jol-core diff --git a/fizz-core/src/main/java/we/config/SystemConfig.java b/fizz-core/src/main/java/we/config/SystemConfig.java index 7965139..83ee4c5 100644 --- a/fizz-core/src/main/java/we/config/SystemConfig.java +++ b/fizz-core/src/main/java/we/config/SystemConfig.java @@ -76,17 +76,24 @@ public class SystemConfig { private boolean aggregateTestAuth = false; + @Value("${fizz.md5sign-timestamp-timeliness:300}") + private int fizzMD5signTimestampTimeliness = 300; // unit: sec + + public int fizzMD5signTimestampTimeliness() { + return fizzMD5signTimestampTimeliness; + } + @Value("${route-timeout:0}") private long routeTimeout = 0; @Value("${fizz-trace-id.header:X-Trace-Id}") - private String fizzTraceIdHeader; + private String fizzTraceIdHeader; @Value("${fizz-trace-id.value-strategy:requestId}") - private String fizzTraceIdValueStrategy; + private String fizzTraceIdValueStrategy; @Value("${fizz-trace-id.value-prefix:fizz}") - private String fizzTraceIdValuePrefix; + private String fizzTraceIdValuePrefix; @Value("${fizz.error.response.http-status.enable:true}") public void setFizzErrRespHttpStatusEnable(boolean fizzErrRespHttpStatusEnable) { diff --git a/fizz-core/src/main/java/we/plugin/auth/ApiConfigService.java b/fizz-core/src/main/java/we/plugin/auth/ApiConfigService.java index 8846ea9..9736d7b 100644 --- a/fizz-core/src/main/java/we/plugin/auth/ApiConfigService.java +++ b/fizz-core/src/main/java/we/plugin/auth/ApiConfigService.java @@ -40,6 +40,7 @@ import we.util.*; import javax.annotation.PostConstruct; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; @@ -515,22 +516,29 @@ public class ApiConfigService implements ApplicationListener> authSecretKey(App a, String sign, Result r) { if (StringUtils.isBlank(sign)) { r.code = Result.FAIL; diff --git a/fizz-core/src/test/resources/log4j2-kafka.json b/fizz-core/src/test/resources/log4j2-kafka.json deleted file mode 100644 index c540015..0000000 --- a/fizz-core/src/test/resources/log4j2-kafka.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "logTime": { - "$resolver": "timestamp", - "epoch": { - "unit": "millis", - "rounded": true - } - }, - "logLevel": { - "$resolver": "level", - "field": "name" - }, - "logMsg": { - "$resolver": "message", - "stringified": true - }, - "thread": { - "$resolver": "thread", - "field": "name" - }, - "loggerName": { - "$resolver": "logger", - "field": "name" - }, - "thrown": { - "message": { - "$resolver": "exception", - "field": "message" - }, - "extendedStackTrace": { - "$resolver": "exception", - "field": "stackTrace", - "stackTrace": { - "stringified": true - } - } - } -} \ No newline at end of file diff --git a/fizz-core/src/test/resources/log4j2-test.xml b/fizz-core/src/test/resources/log4j2-test.xml index b3b16f9..4148b77 100644 --- a/fizz-core/src/test/resources/log4j2-test.xml +++ b/fizz-core/src/test/resources/log4j2-test.xml @@ -8,26 +8,13 @@ - - - - diff --git a/pom.xml b/pom.xml index 1877aa2..4574206 100644 --- a/pom.xml +++ b/pom.xml @@ -70,18 +70,6 @@ - - org.apache.logging.log4j - log4j-layout-template-json - ${log4j2.version} - - - - org.apache.kafka - kafka-clients - 2.0.1 - - org.openjdk.jol jol-core From eedfbc4130656fa2218e288ac14a61dcf6e780e4 Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Thu, 14 Jul 2022 18:09:45 +0800 Subject: [PATCH 08/15] Release 2.6.6 --- 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 359b676..1df3a90 100644 --- a/fizz-bootstrap/pom.xml +++ b/fizz-bootstrap/pom.xml @@ -6,7 +6,7 @@ fizz-gateway-community com.fizzgate - 2.6.6-beta1 + 2.6.6 ../pom.xml diff --git a/fizz-common/pom.xml b/fizz-common/pom.xml index 6c61511..b0a7f37 100644 --- a/fizz-common/pom.xml +++ b/fizz-common/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.6.6-beta1 + 2.6.6 ../pom.xml 4.0.0 diff --git a/fizz-core/pom.xml b/fizz-core/pom.xml index 6b604ed..77191de 100644 --- a/fizz-core/pom.xml +++ b/fizz-core/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.6.6-beta1 + 2.6.6 ../pom.xml 4.0.0 diff --git a/fizz-plugin/pom.xml b/fizz-plugin/pom.xml index ccc57ae..eae5d53 100644 --- a/fizz-plugin/pom.xml +++ b/fizz-plugin/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.6.6-beta1 + 2.6.6 ../pom.xml 4.0.0 diff --git a/fizz-spring-boot-starter/pom.xml b/fizz-spring-boot-starter/pom.xml index e32654b..54ddfdf 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.6.6-beta1 + 2.6.6 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 4574206..1909d90 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ fizz-gateway-community ${project.artifactId} fizz gateway community - 2.6.6-beta1 + 2.6.6 pom fizz-common From 3af044de069c882e37af0c58b991f91e159180dd Mon Sep 17 00:00:00 2001 From: dxfeng10 Date: Fri, 15 Jul 2022 10:10:02 +0800 Subject: [PATCH 09/15] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 11c762b..f1d05c9 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

- Version + Version Documentation @@ -124,6 +124,7 @@ API地址：http://demo.fizzgate.com/proxy/[服务名]/[API_Path] | v2.6.3 | v2.6.3 | | v2.6.4 | v2.6.4 | | v2.6.5 | v2.6.5 | +| v2.6.6 | v2.6.6 | 请根据社区版的版本下载对应的管理后台版本 From 26f811d6cec6dc04130c923bd5dd4e2b368b3b5e Mon Sep 17 00:00:00 2001 From: dxfeng10 Date: Fri, 15 Jul 2022 10:10:45 +0800 Subject: [PATCH 10/15] Update README.en-us.md --- README.en-us.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.en-us.md b/README.en-us.md index 18be3cc..f5f22f4 100644 --- a/README.en-us.md +++ b/README.en-us.md @@ -4,7 +4,7 @@ English | [简体中文](./README.md)

- Version + Version Documentation @@ -126,6 +126,7 @@ Starting from v1.3.0, the frontend and backend of the management backend are mer | v2.6.3 | v2.6.3 | | v2.6.4 | v2.6.4 | | v2.6.5 | v2.6.5 | +| v2.6.6 | v2.6.6 | Please download the corresponding management backend version according to the version of the community version From 26b3004e2bd858d08eb585cf3b8538b2eabb8f5d Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Mon, 18 Jul 2022 15:32:29 +0800 Subject: [PATCH 11/15] Update docker-compose.yml --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 11ca443..326eb3c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.6" services: fizz-mysql: - image: "fizzgate/fizz-mysql:2.6.5" + image: "fizzgate/fizz-mysql:2.6.6" container_name: fizz-mysql restart: always hostname: fizz-mysql @@ -27,7 +27,7 @@ services: - fizz fizz-gateway-community: - image: "fizzgate/fizz-gateway-community:2.6.5" + image: "fizzgate/fizz-gateway-community:2.6.6" container_name: fizz-gateway-community restart: always hostname: fizz-gateway-community @@ -48,7 +48,7 @@ services: - fizz fizz-manager-professional: - image: "fizzgate/fizz-manager-professional:2.6.5" + image: "fizzgate/fizz-manager-professional:2.6.6" container_name: fizz-manager-professional restart: always hostname: fizz-manager-professional @@ -75,4 +75,4 @@ services: networks: fizz: - driver: bridge \ No newline at end of file + driver: bridge From 3c2c0d05582dc519fb8fb25069575c9033b6a84c Mon Sep 17 00:00:00 2001 From: dxfeng10 Date: Fri, 15 Jul 2022 10:10:02 +0800 Subject: [PATCH 12/15] Update README.md (cherry picked from commit 3af044de069c882e37af0c58b991f91e159180dd) --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 11c762b..f1d05c9 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

- Version + Version Documentation @@ -124,6 +124,7 @@ API地址：http://demo.fizzgate.com/proxy/[服务名]/[API_Path] | v2.6.3 | v2.6.3 | | v2.6.4 | v2.6.4 | | v2.6.5 | v2.6.5 | +| v2.6.6 | v2.6.6 | 请根据社区版的版本下载对应的管理后台版本 From 04888aea44ca25c880c8e1e562715ed1833fd9c8 Mon Sep 17 00:00:00 2001 From: dxfeng10 Date: Fri, 15 Jul 2022 10:10:45 +0800 Subject: [PATCH 13/15] Update README.en-us.md (cherry picked from commit 26f811d6cec6dc04130c923bd5dd4e2b368b3b5e) --- README.en-us.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.en-us.md b/README.en-us.md index 18be3cc..f5f22f4 100644 --- a/README.en-us.md +++ b/README.en-us.md @@ -4,7 +4,7 @@ English | [简体中文](./README.md)

- Version + Version Documentation @@ -126,6 +126,7 @@ Starting from v1.3.0, the frontend and backend of the management backend are mer | v2.6.3 | v2.6.3 | | v2.6.4 | v2.6.4 | | v2.6.5 | v2.6.5 | +| v2.6.6 | v2.6.6 | Please download the corresponding management backend version according to the version of the community version From ef641bfc60a688b55b26c8c1e99db95b171c1abb Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Mon, 18 Jul 2022 15:32:29 +0800 Subject: [PATCH 14/15] Update docker-compose.yml (cherry picked from commit 26b3004e2bd858d08eb585cf3b8538b2eabb8f5d) --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 11ca443..326eb3c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.6" services: fizz-mysql: - image: "fizzgate/fizz-mysql:2.6.5" + image: "fizzgate/fizz-mysql:2.6.6" container_name: fizz-mysql restart: always hostname: fizz-mysql @@ -27,7 +27,7 @@ services: - fizz fizz-gateway-community: - image: "fizzgate/fizz-gateway-community:2.6.5" + image: "fizzgate/fizz-gateway-community:2.6.6" container_name: fizz-gateway-community restart: always hostname: fizz-gateway-community @@ -48,7 +48,7 @@ services: - fizz fizz-manager-professional: - image: "fizzgate/fizz-manager-professional:2.6.5" + image: "fizzgate/fizz-manager-professional:2.6.6" container_name: fizz-manager-professional restart: always hostname: fizz-manager-professional @@ -75,4 +75,4 @@ services: networks: fizz: - driver: bridge \ No newline at end of file + driver: bridge From 2b88e1cd8a226aa4b774d7b4d3196dee8451fbd5 Mon Sep 17 00:00:00 2001 From: linwaiwai Date: Tue, 19 Jul 2022 17:08:46 +0800 Subject: [PATCH 15/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f1d05c9..106643e 100644 --- a/README.md +++ b/README.md @@ -291,7 +291,7 @@ Fizz官方微信群（请加入群之后再询问群主） 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) -3. 在选择Fizz Gateway之前，我们强烈建议您先试用一下我们的DEMO站点，试用我们的产品，并且思考与自身的业务结合，并且考虑产品推行落地方式，在查阅我们的官网价格(https://www.fizzgate.com)之后再进一步与我们联系。 +3. 在选择Fizz Gateway之前，我们强烈建议您先试用一下我们的DEMO站点，试用我们的产品，并且思考与自身的业务结合，并且考虑产品推行落地方式，在查阅我们的官网价格(https://www.fizzgate.com) 之后再进一步与我们联系。 ## 系统截图