fizzgate/fizz-gateway-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix gateway prefix problem

Browse Source
This commit is contained in:
hongqiaowei
2023-02-16 14:53:08 +08:00
parent 8f190b3877
commit 82e929f03b
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fizz-core/src/main/java/com/fizzgate/filter/FlowControlFilter.java
View File

@@ -128,7 +128,12 @@ public class FlowControlFilter extends FizzWebFilter {
String gatewayPrefix = systemConfig.getGatewayPrefix(); String gatewayPrefix = systemConfig.getGatewayPrefix();
if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) { if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) {
service = Consts.S.FORWARD_SLASH_STR; int secFS = path.indexOf(Consts.S.FORWARD_SLASH, 1);
if (secFS == -1) {
service = path.substring(1);
} else {
service = path.substring(1, secFS);
}
} else { } else {
int secFS = path.indexOf(Consts.S.FORWARD_SLASH, 1); int secFS = path.indexOf(Consts.S.FORWARD_SLASH, 1);
if (secFS == -1) { if (secFS == -1) {

8
fizz-core/src/main/java/com/fizzgate/util/WebUtils.java
View File

@@ -241,7 +241,11 @@ public abstract class WebUtils {
if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) { if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) {
if (SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX.equals(prefix)) { if (SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX.equals(prefix)) {
int trdFS = p.indexOf(Consts.S.FORWARD_SLASH, secFS + 1); int trdFS = p.indexOf(Consts.S.FORWARD_SLASH, secFS + 1);
if (trdFS == -1) {
svc = p.substring(secFS + 1);
} else {
svc = p.substring(secFS + 1, trdFS); svc = p.substring(secFS + 1, trdFS);
}
} else { } else {
svc = p.substring(1, secFS); svc = p.substring(1, secFS);
} }
@@ -386,7 +390,11 @@ public abstract class WebUtils {
if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) { if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) {
if (SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX.equals(prefix)) { if (SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX.equals(prefix)) {
int trdFS = p.indexOf(Consts.S.FORWARD_SLASH, secFS + 1); int trdFS = p.indexOf(Consts.S.FORWARD_SLASH, secFS + 1);
if (trdFS == -1) {
p = Consts.S.FORWARD_SLASH_STR;
} else {
p = p.substring(trdFS); p = p.substring(trdFS);
}
} else { } else {
p = p.substring(secFS); p = p.substring(secFS);
} }