Github
/
OASys
mirror of
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

🐛 解决网关 ”blockOptional() is blocking, which is not supported in thread“报错

This commit is contained in:
wangxiaoyang 2022-03-02 23:07:16 +08:00
parent 65374a6923
commit f554bdabcf
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
oasys-gateway/src/main/java/cn/linter/oasys/gateway/manager/AuthorizationManager.java
View File

@ -1,8 +1,7 @@
package cn.linter.oasys.gateway.manager;
import cn.linter.oasys.common.entity.Result;
import cn.linter.oasys.gateway.dto.PermissionRoleDTO;
import cn.linter.oasys.gateway.dto.PermissionDTO;
import cn.linter.oasys.gateway.dto.PermissionRoleDTO;
import cn.linter.oasys.gateway.dto.RoleDTO;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
@ -23,8 +22,10 @@ import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Mono;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
/**
* 认证管理器
@ -56,13 +57,13 @@ public class AuthorizationManager implements ReactiveAuthorizationManager<Author
List<PermissionRoleDTO> permissionRoleDTOList = new ArrayList<>();
String cacheValue = stringRedisTemplate.opsForValue().get("permission-role::resource");
if (cacheValue == null) {
Optional<Result<List<PermissionRoleDTO>>> optionalResult = webClientBuilder.build()
.get().uri("http://user-service/permissions/roles").retrieve()
.bodyToMono(new ParameterizedTypeReference<Result<List<PermissionRoleDTO>>>() {
})
.blockOptional();
if (optionalResult.isPresent()) {
permissionRoleDTOList = optionalResult.get().getData();
try {
CompletableFuture.supplyAsync(() ->
webClientBuilder.build().get().uri("http://user-service/permissions/roles").retrieve()
.bodyToMono(new ParameterizedTypeReference<List<PermissionRoleDTO>>() {
}).blockOptional().orElse(Collections.emptyList())).get();
} catch (InterruptedException | ExecutionException e) {
log.error("获取权限角色信息失败", e);
}
} else {
try {

4
oasys-service/oasys-user/src/main/java/cn/linter/oasys/user/controller/PermissionController.java
View File

@ -32,8 +32,8 @@ public class PermissionController {
}
@GetMapping("roles")
public Result<List<PermissionRoleDTO>> listRole() {
return Result.of(ResultStatus.SUCCESS, permissionService.listRoleByType(Permission.Type.resource));
public List<PermissionRoleDTO> listRole() {
return permissionService.listRoleByType(Permission.Type.resource);
}
@PostMapping