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

Special treatment for aggregate config when gateway.prefix set '/'.

Browse Source
This commit is contained in:
zhongjie
2022-03-22 11:41:54 +08:00
parent 2df96ab4d3
commit 55d603030f
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fizz-core/src/main/java/we/fizz/ConfigLoader.java
View File

@@ -44,6 +44,7 @@ import javax.annotation.Resource;
import static we.config.AggregateRedisConfig.AGGREGATE_REACTIVE_REDIS_TEMPLATE; import static we.config.AggregateRedisConfig.AGGREGATE_REACTIVE_REDIS_TEMPLATE;
import static we.util.Consts.S.FORWARD_SLASH; import static we.util.Consts.S.FORWARD_SLASH;
import static we.util.Consts.S.FORWARD_SLASH_STR;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@@ -206,7 +207,12 @@ public class ConfigLoader {
public synchronized void refreshLocalCache() throws Exception { public synchronized void refreshLocalCache() throws Exception {
if (formalPathPrefix == null) { if (formalPathPrefix == null) {
formalPathPrefix = appContext.getEnvironment().getProperty("gateway.prefix", "/proxy"); String formalPathPrefixTmp = appContext.getEnvironment().getProperty("gateway.prefix", "/proxy");
if (formalPathPrefixTmp.endsWith(FORWARD_SLASH_STR)) {
// remove the end slash
formalPathPrefixTmp = formalPathPrefixTmp.substring(0, formalPathPrefixTmp.length() - 1);
}
formalPathPrefix = formalPathPrefixTmp;
formalPathServiceNameStartIndex = formalPathPrefix.length() + 1; formalPathServiceNameStartIndex = formalPathPrefix.length() + 1;
} }
@@ -396,16 +402,16 @@ public class ConfigLoader {
private String extractServiceName(String path) { private String extractServiceName(String path) {
if (path != null) { if (path != null) {
if (path.startsWith(formalPathPrefix)) { if (path.startsWith(TEST_PATH_PREFIX)) {
int endIndex = path.indexOf(FORWARD_SLASH, formalPathServiceNameStartIndex);
if (endIndex > formalPathServiceNameStartIndex) {
return path.substring(formalPathServiceNameStartIndex, endIndex);
}
} else if (path.startsWith(TEST_PATH_PREFIX)) {
int endIndex = path.indexOf(FORWARD_SLASH, TEST_PATH_SERVICE_NAME_START_INDEX); int endIndex = path.indexOf(FORWARD_SLASH, TEST_PATH_SERVICE_NAME_START_INDEX);
if (endIndex > TEST_PATH_SERVICE_NAME_START_INDEX) { if (endIndex > TEST_PATH_SERVICE_NAME_START_INDEX) {
return path.substring(TEST_PATH_SERVICE_NAME_START_INDEX, endIndex); return path.substring(TEST_PATH_SERVICE_NAME_START_INDEX, endIndex);
} }
} else if (path.startsWith(formalPathPrefix)) {
int endIndex = path.indexOf(FORWARD_SLASH, formalPathServiceNameStartIndex);
if (endIndex > formalPathServiceNameStartIndex) {
return path.substring(formalPathServiceNameStartIndex, endIndex);
}
} }
} }
return null; return null;