From e6a149ea753350d3bebbd76ce40315a8b6016b4e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:04:47 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/auth/Oauth2AuthSuccessHandler.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/auth/Oauth2AuthSuccessHandler.java b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/auth/Oauth2AuthSuccessHandler.java
index 9a9c408..423809a 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/auth/Oauth2AuthSuccessHandler.java
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/auth/Oauth2AuthSuccessHandler.java
@@ -4,6 +4,7 @@
import com.kidgrow.common.constant.SecurityConstants;
import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.model.SysUser;
+import lombok.SneakyThrows;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.security.core.Authentication;
import org.springframework.security.oauth2.provider.OAuth2Authentication;
@@ -14,6 +15,7 @@
import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono;
+import java.net.URLEncoder;
import java.util.List;
/**
@@ -25,6 +27,7 @@
* @Author: <a href="4345453@kidgrow.com">liuke</a>
*/
public class Oauth2AuthSuccessHandler implements ServerAuthenticationSuccessHandler {
+ @SneakyThrows
@Override
public Mono<Void> onAuthenticationSuccess(WebFilterExchange webFilterExchange, Authentication authentication) {
MultiValueMap<String, String> headerValues = new LinkedMultiValueMap(4);
@@ -40,9 +43,9 @@
//如果有组织架构
if(organizations!=null && organizations.size()==2){
headerValues.add(SecurityConstants.USER_ORG_ID_HEADER,String.valueOf(organizations.get(0).getId()));
- headerValues.add(SecurityConstants.USER_ORG_NAME_HEADER,organizations.get(0).getOrgName());
+ headerValues.add(SecurityConstants.USER_ORG_NAME_HEADER, URLEncoder.encode(organizations.get(0).getOrgName(),"UTF-8"));
headerValues.add(SecurityConstants.USER_DEP_ID_HEADER,String.valueOf(organizations.get(1).getId()));
- headerValues.add(SecurityConstants.USER_DEP_NAME_HEADER,organizations.get(1).getOrgName());
+ headerValues.add(SecurityConstants.USER_DEP_NAME_HEADER,URLEncoder.encode(organizations.get(1).getOrgName(),"UTF-8"));
tenantId=String.valueOf(organizations.get(0).getId());
}
}
--
Gitblit v1.8.0