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

Merge pull request #342 from wehotel/develop

Browse Source
This commit is contained in:
hongqiaowei
2021-10-14 11:17:44 +08:00
committed by GitHub
parent 9ae23ba5cb a58646cc22
commit 534fdef638
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
fizz-core/src/main/java/we/global_resource/GlobalResourceService.java
View File

@@ -90,29 +90,29 @@ public class GlobalResourceService {
}
private Mono<Result<?>> initGlobalResource() {
Flux<Map.Entry<Object, Object>> dicts = rt.opsForHash().entries("fizz_global_resource");
dicts.collectList()
.defaultIfEmpty(Collections.emptyList())
.flatMap(
es -> {
if (Fizz.context != null) {
for (Map.Entry<Object, Object> e : es) {
String json = (String) e.getValue();
GlobalResource r = JacksonUtils.readValue(json, GlobalResource.class);
resourceMap.put(r.key, r);
objectMap.put(r.key, r.originalVal);
log.info("init global resource {}", r.key);
Flux<Map.Entry<Object, Object>> resources = rt.opsForHash().entries("fizz_global_resource");
resources.collectList()
.defaultIfEmpty(Collections.emptyList())
.flatMap(
es -> {
if (Fizz.context != null) {
for (Map.Entry<Object, Object> e : es) {
String json = (String) e.getValue();
GlobalResource r = JacksonUtils.readValue(json, GlobalResource.class);
resourceMap.put(r.key, r);
objectMap.put(r.key, r.originalVal);
log.info("init global resource {}", r.key);
}
}
return Mono.empty();
}
return Mono.empty();
}
)
.doOnError(
t -> {
log.error("init global resource", t);
}
)
.block();
)
.doOnError(
t -> {
log.error("init global resource", t);
}
)
.block();
return Mono.just(Result.succ());
}
@@ -143,8 +143,8 @@ public class GlobalResourceService {
objectMap.remove(r.key);
log.info("remove global resource {}", r.key);
} else {
GlobalResource put = resourceMap.put(r.key, r);
objectMap.put(r.key, r.originalVal);
resourceMap.put(r.key, r);
objectMap.put(r.key, r.originalVal);
log.info("update global resource {}", r.key);
}
updateResNode();