From 011ad64fea623277656a8cbcf70d68a89c3f81c0 Mon Sep 17 00:00:00 2001 From: "Yangkai.Shen" <237497819@qq.com> Date: Sat, 12 Oct 2019 17:28:37 +0800 Subject: [PATCH] =?UTF-8?q?:ambulance:=20=E7=B4=A7=E6=80=A5=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DOauth=E5=88=97=E8=A1=A8=E7=A9=BA=E6=8C=87=E9=92=88BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xkcoding/justauth/AuthRequestFactory.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/xkcoding/justauth/AuthRequestFactory.java b/src/main/java/com/xkcoding/justauth/AuthRequestFactory.java index ab29d1f..dcffd96 100644 --- a/src/main/java/com/xkcoding/justauth/AuthRequestFactory.java +++ b/src/main/java/com/xkcoding/justauth/AuthRequestFactory.java @@ -33,6 +33,7 @@ import me.zhyd.oauth.enums.AuthResponseStatus; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.request.*; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -61,11 +62,16 @@ public class AuthRequestFactory { public List oauthList() { // 默认列表 List defaultList = properties.getType().keySet().stream().map(Enum::name).collect(Collectors.toList()); - - Class enumClass = properties.getExtend().getEnumClass(); - List names = EnumUtil.getNames(enumClass); // 扩展列表 - List extendList = properties.getExtend().getConfig().keySet().stream().filter(x -> names.contains(x.toUpperCase())).map(String::toUpperCase).collect(Collectors.toList()); + List extendList = new ArrayList<>(); + ExtendProperties extend = properties.getExtend(); + if (null != extend){ + Class enumClass = extend.getEnumClass(); + List names = EnumUtil.getNames(enumClass); + // 扩展列表 + extendList = extend.getConfig().keySet().stream().filter(x -> names.contains(x.toUpperCase())).map(String::toUpperCase).collect(Collectors.toList()); + } + // 合并 return (List) CollUtil.addAll(defaultList, extendList); }