From 7a2c223f68494be89301b23b34edb4868adfa78d Mon Sep 17 00:00:00 2001 From: Francis Dong Date: Thu, 2 Jun 2022 12:44:34 +0800 Subject: [PATCH 1/2] add file encoding parameter to boot script (cherry picked from commit 1b4cedd857cb719b15533bc8690e4c93fb21a917) --- 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 2421f28b1f0decd9d40bf267119de42435e34574 Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Mon, 6 Jun 2022 17:35:25 +0800 Subject: [PATCH 2/2] Release 2.6.4 --- README.en-us.md | 4 +++- README.md | 4 +++- docker-compose.yml | 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 +- 9 files changed, 15 insertions(+), 11 deletions(-) diff --git a/README.en-us.md b/README.en-us.md index cff5961..344cfae 100644 --- a/README.en-us.md +++ b/README.en-us.md @@ -4,7 +4,7 @@ English | [简体中文](./README.md)

- Version + Version Documentation @@ -123,6 +123,8 @@ Starting from v1.3.0, the frontend and backend of the management backend are mer | v2.6.0 | v2.6.0 | | v2.6.1 | v2.6.1 | | v2.6.2 | v2.6.2 | +| v2.6.3 | v2.6.3 | +| v2.6.4 | v2.6.4 | Please download the corresponding management backend version according to the version of the community version diff --git a/README.md b/README.md index 23901fb..9e76be7 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

- Version + Version Documentation @@ -121,6 +121,8 @@ API地址：http://demo.fizzgate.com/proxy/[服务名]/[API_Path] | v2.6.0 | v2.6.0 | | v2.6.1 | v2.6.1 | | v2.6.2 | v2.6.2 | +| v2.6.3 | v2.6.3 | +| v2.6.4 | v2.6.4 | 请根据社区版的版本下载对应的管理后台版本 diff --git a/docker-compose.yml b/docker-compose.yml index 0e3c0d0..b3e95b1 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.2" + image: "fizzgate/fizz-mysql:2.6.4" 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.2" + image: "fizzgate/fizz-gateway-community:2.6.4" 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.2" + image: "fizzgate/fizz-manager-professional:2.6.4" container_name: fizz-manager-professional restart: always hostname: fizz-manager-professional diff --git a/fizz-bootstrap/pom.xml b/fizz-bootstrap/pom.xml index 21ea75c..b504ac3 100644 --- a/fizz-bootstrap/pom.xml +++ b/fizz-bootstrap/pom.xml @@ -12,7 +12,7 @@ com.fizzgate fizz-bootstrap - 2.6.3 + 2.6.4 1.8 diff --git a/fizz-common/pom.xml b/fizz-common/pom.xml index 91ad0e9..afe40ab 100644 --- a/fizz-common/pom.xml +++ b/fizz-common/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.6.3 + 2.6.4 ../pom.xml 4.0.0 diff --git a/fizz-core/pom.xml b/fizz-core/pom.xml index 796448f..c5c5c0a 100644 --- a/fizz-core/pom.xml +++ b/fizz-core/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.6.3 + 2.6.4 ../pom.xml 4.0.0 diff --git a/fizz-plugin/pom.xml b/fizz-plugin/pom.xml index 227e564..5a08e35 100644 --- a/fizz-plugin/pom.xml +++ b/fizz-plugin/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.6.3 + 2.6.4 ../pom.xml 4.0.0 diff --git a/fizz-spring-boot-starter/pom.xml b/fizz-spring-boot-starter/pom.xml index fe5a637..65436cf 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.3 + 2.6.4 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 3d29380..18f31b2 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ fizz-gateway-community ${project.artifactId} fizz gateway community - 2.6.3 + 2.6.4 pom fizz-common