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

Code style

Browse Source
This commit is contained in:
hongqiaowei
2021-10-12 21:17:16 +08:00
parent 9373370ade
commit 7b78a85dd6
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
fizz-core/src/main/java/we/plugin/auth/ApiConfigService.java
View File

@@ -31,6 +31,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import we.Fizz;
import we.FizzAppContext; import we.FizzAppContext;
import we.config.AggregateRedisConfig; import we.config.AggregateRedisConfig;
import we.config.SystemConfig; import we.config.SystemConfig;
@@ -217,7 +218,7 @@ public class ApiConfigService {
.defaultIfEmpty(Collections.emptyList()) .defaultIfEmpty(Collections.emptyList())
.flatMap( .flatMap(
es -> { es -> {
if (FizzAppContext.appContext != null) { if (Fizz.context != null) {
for (Map.Entry<Object, Object> e : es) { for (Map.Entry<Object, Object> e : es) {
String json = (String) e.getValue(); String json = (String) e.getValue();
HashMap<?, ?> map = JacksonUtils.readValue(json, HashMap.class); HashMap<?, ?> map = JacksonUtils.readValue(json, HashMap.class);
@@ -225,8 +226,8 @@ public class ApiConfigService {
String pluginConfig = (String) map.get("fixedConfig"); String pluginConfig = (String) map.get("fixedConfig");
String currentPluginConfig = pluginConfigMap.get(plugin); String currentPluginConfig = pluginConfigMap.get(plugin);
if (currentPluginConfig == null || !currentPluginConfig.equals(pluginConfig)) { if (currentPluginConfig == null || !currentPluginConfig.equals(pluginConfig)) {
if (FizzAppContext.appContext.containsBean(plugin)) { if (Fizz.context.containsBean(plugin)) {
FizzPluginFilter pluginFilter = (FizzPluginFilter) FizzAppContext.appContext.getBean(plugin); FizzPluginFilter pluginFilter = (FizzPluginFilter) Fizz.context.getBean(plugin);
pluginFilter.init(pluginConfig); pluginFilter.init(pluginConfig);
pluginConfigMap.put(plugin, pluginConfig); pluginConfigMap.put(plugin, pluginConfig);
log.info("init {} with {}", plugin, pluginConfig); log.info("init {} with {}", plugin, pluginConfig);
@@ -266,7 +267,7 @@ public class ApiConfigService {
) )
.doOnNext( .doOnNext(
msg -> { msg -> {
if (FizzAppContext.appContext != null) { if (Fizz.context != null) {
String message = msg.getMessage(); String message = msg.getMessage();
try { try {
HashMap<?, ?> map = JacksonUtils.readValue(message, HashMap.class); HashMap<?, ?> map = JacksonUtils.readValue(message, HashMap.class);
@@ -274,8 +275,8 @@ public class ApiConfigService {
String pluginConfig = (String) map.get("fixedConfig"); String pluginConfig = (String) map.get("fixedConfig");
String currentPluginConfig = pluginConfigMap.get(plugin); String currentPluginConfig = pluginConfigMap.get(plugin);
if (currentPluginConfig == null || !currentPluginConfig.equals(pluginConfig)) { if (currentPluginConfig == null || !currentPluginConfig.equals(pluginConfig)) {
if (FizzAppContext.appContext.containsBean(plugin)) { if (Fizz.context.containsBean(plugin)) {
FizzPluginFilter pluginFilter = (FizzPluginFilter) FizzAppContext.appContext.getBean(plugin); FizzPluginFilter pluginFilter = (FizzPluginFilter) Fizz.context.getBean(plugin);
pluginFilter.init(pluginConfig); pluginFilter.init(pluginConfig);
pluginConfigMap.put(plugin, pluginConfig); pluginConfigMap.put(plugin, pluginConfig);
log.info("init {} with {} again", plugin, pluginConfig); log.info("init {} with {} again", plugin, pluginConfig);
@@ -359,7 +360,9 @@ public class ApiConfigService {
} }
List<ApiConfig> apiConfigs = sc.getApiConfigs(gatewayGroups, method, path); List<ApiConfig> apiConfigs = sc.getApiConfigs(gatewayGroups, method, path);
if (apiConfigs.isEmpty()) { if (apiConfigs.isEmpty()) {
return Result.fail(service + " don't have api config matching " + gatewayGroups + " group " + method + " method " + path + " path"); StringBuilder b = ThreadContext.getStringBuilder();
b.append(service).append(" don't have api config matching ").append(gatewayGroups).append(" group ").append(method).append(" method ").append(path).append(" path");
return Result.fail(b.toString());
} }
List<ApiConfig> appCanAccess = ThreadContext.getArrayList(macs); List<ApiConfig> appCanAccess = ThreadContext.getArrayList(macs);
for (int i = 0; i < apiConfigs.size(); i++) { for (int i = 0; i < apiConfigs.size(); i++) {
@@ -373,11 +376,13 @@ public class ApiConfigService {
} }
} }
if (appCanAccess.isEmpty()) { if (appCanAccess.isEmpty()) {
return Result.fail("app " + app + " can't access " + JacksonUtils.writeValueAsString(apiConfigs)); StringBuilder b = ThreadContext.getStringBuilder();
b.append("app ").append(app).append(" can't access ").append(JacksonUtils.writeValueAsString(apiConfigs));
return Result.fail(b.toString());
} }
ApiConfig bestOne = appCanAccess.get(0); ApiConfig bestOne = appCanAccess.get(0);
if (appCanAccess.size() != 1) { if (appCanAccess.size() != 1) {
appCanAccess.sort(new ApiConfigPathPatternComparator(path)); appCanAccess.sort(new ApiConfigPathPatternComparator(path)); // singleton ?
ApiConfig ac0 = appCanAccess.get(0); ApiConfig ac0 = appCanAccess.get(0);
bestOne = ac0; bestOne = ac0;
ApiConfig ac1 = appCanAccess.get(1); ApiConfig ac1 = appCanAccess.get(1);