|
|
@@ -127,7 +127,6 @@ public class WebFluxUserRequestInfoFilter implements GlobalFilter {
|
|
|
if (!list.isEmpty()) {
|
|
|
KeycloakUserDto user = list.get(0);
|
|
|
String userId = user.getId();
|
|
|
- log.info("userId:{}", userId);
|
|
|
ServerHttpRequest request = exchange.getRequest()
|
|
|
.mutate()
|
|
|
.header("userId", userId)
|
|
|
@@ -141,14 +140,11 @@ public class WebFluxUserRequestInfoFilter implements GlobalFilter {
|
|
|
String userRealTenant = StringUtils.hasText(userTenant) ? userTenant :
|
|
|
"/" + Arrays.stream(userOrg.split("/")).collect(Collectors.toList()).get(1);
|
|
|
String userRealOrg = Objects.isNull(userOrg) ? userTenant : userOrg;
|
|
|
- log.info("[微信小程序] userId:'{}, userOrg:{}, userTenant:{}, userRealTenant:{}, userRealOrg:{}", userId, userOrg, userTenant, userRealTenant,
|
|
|
- userRealOrg);
|
|
|
|
|
|
// 2、有urlOrg或者urlTenant时,才去做过滤,获取真实的urlRealTenant和urlRealOrg
|
|
|
String urlRealTenant = Objects.isNull(urlTenant) ?
|
|
|
"/" + Arrays.stream(urlOrg.split("/")).filter(s -> !s.isEmpty()).collect(Collectors.toList()).get(0) : urlTenant;
|
|
|
String urlRealOrg = Objects.isNull(urlOrg) ? urlTenant : urlOrg;
|
|
|
- log.info("[url信息] urlTenant:{}, urlOrg:{}, urlRealTenant:{}, urlRealOrg:{}", urlTenant, urlOrg, urlRealTenant, urlRealOrg);
|
|
|
|
|
|
// // 3、根据用户角色去做判断
|
|
|
// if (!userHasRole(userId, ROLE_SUPER_ADMIN) && userHasRole(userId, ROLE_ADMIN)) {
|
|
|
@@ -243,7 +239,6 @@ public class WebFluxUserRequestInfoFilter implements GlobalFilter {
|
|
|
String urlRealTenant = Objects.isNull(urlTenant) ?
|
|
|
"/" + Arrays.stream(urlOrg.split("/")).filter(s -> !s.isEmpty()).collect(Collectors.toList()).get(0) : urlTenant;
|
|
|
String urlRealOrg = Objects.isNull(urlOrg) ? urlTenant : urlOrg;
|
|
|
- log.info("[url信息] urlTenant:{}, urlOrg:{}, urlRealTenant:{}, urlRealOrg:{}", urlTenant, urlOrg, urlRealTenant, urlRealOrg);
|
|
|
|
|
|
// 根据token, 获取当前用户的角色 ROLE_SUPER_ADMIN -> 超管, ROLE_ADMIN -> 租户管理员,tenant已经获取,再获取org
|
|
|
com.nimbusds.jose.shaded.json.JSONObject realmAccess = (com.nimbusds.jose.shaded.json.JSONObject)jwsObject.getPayload().toJSONObject().get("realm_access");
|
|
|
@@ -258,7 +253,6 @@ public class WebFluxUserRequestInfoFilter implements GlobalFilter {
|
|
|
String userRealTenant = Objects.isNull(userTenant) ?
|
|
|
"/" + Arrays.stream(userOrg.split("/")).filter(s -> !s.isEmpty()).collect(Collectors.toList()).get(0) : userTenant;
|
|
|
String userRealOrg = "null".equalsIgnoreCase(userOrg) ? userTenant : userOrg ;
|
|
|
- log.info("[用户信息] userOrg:{}, userTenant:{}, userRealTenant:{}, userRealOrg:{}", userOrg, userTenant, userRealTenant, userRealOrg);
|
|
|
|
|
|
// // 2、根据用户角色去做判断(tenant一定有,org不一定有)
|
|
|
// if (Boolean.FALSE.equals(roles.contains(ROLE_SUPER_ADMIN)) && Boolean.TRUE.equals(roles.contains(ROLE_ADMIN))) {
|
|
|
@@ -337,6 +331,7 @@ public class WebFluxUserRequestInfoFilter implements GlobalFilter {
|
|
|
private boolean isEncryptedRequest(ServerHttpRequest request) {
|
|
|
String sign = request.getHeaders().getFirst("sign");
|
|
|
String time = request.getHeaders().getFirst("time");
|
|
|
+ log.info("鉴权sign:{}, time:{}", sign, time);
|
|
|
return isValidTime(time) && md5(time).equals(sign);
|
|
|
}
|
|
|
|