lxm_library_java/justauth-spring-boot-starter
1
0
Fork 0
mirror of synced 2025-12-21 22:38:04 +08:00
Code Issues Projects Releases Wiki Activity

🚑 紧急修复Oauth列表空指针BUG

Browse Source
This commit is contained in:
Yangkai.Shen
2019-10-12 17:28:37 +08:00
parent 585edda9fa
commit 011ad64fea
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/xkcoding/justauth/AuthRequestFactory.java
View File

@@ -33,6 +33,7 @@ import me.zhyd.oauth.enums.AuthResponseStatus;
import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.exception.AuthException;
import me.zhyd.oauth.request.*; import me.zhyd.oauth.request.*;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -61,11 +62,16 @@ public class AuthRequestFactory {
public List<String> oauthList() { public List<String> oauthList() {
// 默认列表 // 默认列表
List<String> defaultList = properties.getType().keySet().stream().map(Enum::name).collect(Collectors.toList()); List<String> defaultList = properties.getType().keySet().stream().map(Enum::name).collect(Collectors.toList());
// 扩展列表
Class enumClass = properties.getExtend().getEnumClass(); List<String> extendList = new ArrayList<>();
ExtendProperties extend = properties.getExtend();
if (null != extend){
Class enumClass = extend.getEnumClass();
List<String> names = EnumUtil.getNames(enumClass); List<String> names = EnumUtil.getNames(enumClass);
// 扩展列表 // 扩展列表
List<String> extendList = properties.getExtend().getConfig().keySet().stream().filter(x -> names.contains(x.toUpperCase())).map(String::toUpperCase).collect(Collectors.toList()); extendList = extend.getConfig().keySet().stream().filter(x -> names.contains(x.toUpperCase())).map(String::toUpperCase).collect(Collectors.toList());
}
// 合并 // 合并
return (List<String>) CollUtil.addAll(defaultList, extendList); return (List<String>) CollUtil.addAll(defaultList, extendList);
} }