diff --git a/README.en-us.md b/README.en-us.md index 01fd306..281fa18 100644 --- a/README.en-us.md +++ b/README.en-us.md @@ -4,7 +4,7 @@ English | [简体中文](./README.md)

- Version + Version Documentation @@ -121,6 +121,7 @@ Starting from v1.3.0, the frontend and backend of the management backend are mer | v2.5.1 | v2.5.1 | | v2.5.2 | v2.5.2 | | v2.6.0 | v2.6.0 | +| v2.6.1 | v2.6.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 ad9d609..244fff9 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

- Version + Version Documentation @@ -119,6 +119,7 @@ API地址:http://demo.fizzgate.com/proxy/[服务名]/[API_Path] | v2.5.1 | v2.5.1 | | v2.5.2 | v2.5.2 | | v2.6.0 | v2.6.0 | +| v2.6.1 | v2.6.1 | 请根据社区版的版本下载对应的管理后台版本 diff --git a/fizz-bootstrap/pom.xml b/fizz-bootstrap/pom.xml index b01db33..ed36e52 100644 --- a/fizz-bootstrap/pom.xml +++ b/fizz-bootstrap/pom.xml @@ -12,11 +12,11 @@ com.fizzgate fizz-bootstrap - 2.6.0 + 2.6.1 1.8 - 5.2.19.RELEASE + 5.2.20.RELEASE Dragonfruit-SR3 Dysprosium-SR25 5.3.7.RELEASE diff --git a/fizz-common/pom.xml b/fizz-common/pom.xml index 6956281..c29ae7f 100644 --- a/fizz-common/pom.xml +++ b/fizz-common/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.6.0 + 2.6.1 ../pom.xml 4.0.0 diff --git a/fizz-core/pom.xml b/fizz-core/pom.xml index 1bc7940..8270d16 100644 --- a/fizz-core/pom.xml +++ b/fizz-core/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.6.0 + 2.6.1 ../pom.xml 4.0.0 diff --git a/fizz-core/src/main/java/we/service_registry/nacos/FizzNacosHelper.java b/fizz-core/src/main/java/we/service_registry/nacos/FizzNacosHelper.java index 6f1633f..1d93e0f 100644 --- a/fizz-core/src/main/java/we/service_registry/nacos/FizzNacosHelper.java +++ b/fizz-core/src/main/java/we/service_registry/nacos/FizzNacosHelper.java @@ -98,9 +98,9 @@ public abstract class FizzNacosHelper { fizzNacosProperties.init(); - NacosServiceRegistry nacosServiceRegistry = new NacosServiceRegistry(fizzNacosProperties); NacosServiceManager nacosServiceManager = new NacosServiceManager(); - ReflectionUtils.set(nacosServiceRegistry, "nacosServiceManager", nacosServiceManager); + NacosServiceRegistry nacosServiceRegistry = new NacosServiceRegistry(nacosServiceManager, fizzNacosProperties); +// ReflectionUtils.set(nacosServiceRegistry, "nacosServiceManager", nacosServiceManager); NacosRegistration nacosRegistration = new NacosRegistration(null, fizzNacosProperties, applicationContext); Properties nps = fizzNacosProperties.getNacosProperties(); NamingService namingService = nacosServiceManager.getNamingService(nps); diff --git a/fizz-core/src/main/java/we/util/WebUtils.java b/fizz-core/src/main/java/we/util/WebUtils.java index 4f27ffe..d7455f2 100644 --- a/fizz-core/src/main/java/we/util/WebUtils.java +++ b/fizz-core/src/main/java/we/util/WebUtils.java @@ -41,7 +41,7 @@ import we.proxy.Route; import java.io.UnsupportedEncodingException; import java.net.URI; -import java.net.URLEncoder; +import java.net.URLDecoder; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.Collections; @@ -644,11 +644,12 @@ public abstract class WebUtils { if (v != null) { b.append(Consts.S.EQUAL); if (!Consts.S.EMPTY.equals(v)) { - if (StringUtils.indexOfAny(v, Consts.S.LEFT_BRACE, Consts.S.FORWARD_SLASH, Consts.S.HASH, Consts.S.EQUAL) > -1) { + /*if (StringUtils.indexOfAny(v, Consts.S.LEFT_BRACE, Consts.S.FORWARD_SLASH, Consts.S.HASH, Consts.S.EQUAL) > -1) { b.append(URLEncoder.encode(v, Consts.C.UTF8)); } else { b.append(v); - } + }*/ + b.append(URLDecoder.decode(v, Consts.C.UTF8)); } } if ((++i) != vs) { diff --git a/fizz-plugin/pom.xml b/fizz-plugin/pom.xml index d622264..c739bf2 100644 --- a/fizz-plugin/pom.xml +++ b/fizz-plugin/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.6.0 + 2.6.1 ../pom.xml 4.0.0 diff --git a/fizz-spring-boot-starter/pom.xml b/fizz-spring-boot-starter/pom.xml index 0c201bb..4640af7 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.0 + 2.6.1 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index a927595..6ef2c0d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,10 +6,10 @@ 2.2.13.RELEASE - 5.2.19.RELEASE + 5.2.20.RELEASE Dysprosium-SR25 5.3.7.RELEASE - 2.2.6.RELEASE + 2.2.7.RELEASE 4.1.75.Final 4.4.15 2.17.2 @@ -37,7 +37,7 @@ fizz-gateway-community ${project.artifactId} fizz gateway community - 2.6.0 + 2.6.1 pom fizz-common