Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0b00363336 | ||
|
|
70e9fc0af9 | ||
|
|
2e723b2c51 | ||
|
|
011ad64fea |
@@ -1,5 +1,9 @@
|
||||
## 版本更新记录
|
||||
|
||||
### 【1.2.1】2019-10-12
|
||||
|
||||
- 紧急修复Oauth列表空指针BUG
|
||||
|
||||
### 【1.2.0】2019-10-09
|
||||
|
||||
- 升级 `JustAuth` 版本:1.12.0,支持 `饿了么`、`美团`
|
||||
|
||||
@@ -28,7 +28,7 @@ https://github.com/xkcoding/justauth-spring-boot-starter-demo
|
||||
<dependency>
|
||||
<groupId>com.xkcoding</groupId>
|
||||
<artifactId>justauth-spring-boot-starter</artifactId>
|
||||
<version>1.2.0</version>
|
||||
<version>1.2.1</version>
|
||||
</dependency>
|
||||
```
|
||||
|
||||
@@ -432,7 +432,7 @@ justauth:
|
||||
|
||||
### 4.2. SNAPSHOT版本
|
||||
|
||||
如果需要体验快照版本,可以在你的 `pom.xml`进行如下配置:
|
||||
如果需要体验快照版本,可以在你的 `pom.xml`进行如下配置:
|
||||
|
||||
```xml
|
||||
<repositories>
|
||||
|
||||
2
pom.xml
2
pom.xml
@@ -23,7 +23,7 @@
|
||||
|
||||
<groupId>com.xkcoding</groupId>
|
||||
<artifactId>justauth-spring-boot-starter</artifactId>
|
||||
<version>1.2.0</version>
|
||||
<version>1.2.1</version>
|
||||
|
||||
<name>justauth-spring-boot-starter</name>
|
||||
<url>https://github.com/xkcoding/justauth-spring-boot-starter</url>
|
||||
|
||||
@@ -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<String> oauthList() {
|
||||
// 默认列表
|
||||
List<String> defaultList = properties.getType().keySet().stream().map(Enum::name).collect(Collectors.toList());
|
||||
|
||||
Class enumClass = properties.getExtend().getEnumClass();
|
||||
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());
|
||||
List<String> extendList = new ArrayList<>();
|
||||
ExtendProperties extend = properties.getExtend();
|
||||
if (null != extend){
|
||||
Class enumClass = extend.getEnumClass();
|
||||
List<String> names = EnumUtil.getNames(enumClass);
|
||||
// 扩展列表
|
||||
extendList = extend.getConfig().keySet().stream().filter(x -> names.contains(x.toUpperCase())).map(String::toUpperCase).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
// 合并
|
||||
return (List<String>) CollUtil.addAll(defaultList, extendList);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user