1
0
mirror of synced 2025-12-15 02:38:11 +08:00

4 Commits
1.2.0 ... 1.2.1

Author SHA1 Message Date
Yangkai.Shen
0b00363336 📝 更新 README.md 2019-10-12 17:37:23 +08:00
Yangkai.Shen
70e9fc0af9 🔖 发布 1.2.1 2019-10-12 17:30:04 +08:00
Yangkai.Shen
2e723b2c51 📝 添加 CHANGELOG 2019-10-12 17:29:57 +08:00
Yangkai.Shen
011ad64fea 🚑 紧急修复Oauth列表空指针BUG 2019-10-12 17:28:37 +08:00
4 changed files with 17 additions and 7 deletions

View File

@@ -1,5 +1,9 @@
## 版本更新记录
### 【1.2.1】2019-10-12
- 紧急修复Oauth列表空指针BUG
### 【1.2.0】2019-10-09
- 升级 `JustAuth` 版本1.12.0,支持 `饿了么``美团`

View File

@@ -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版本
![https://img.shields.io/badge/snapshots-1.2.0--SNAPSHOT-green](https://img.shields.io/badge/snapshots-1.2.0--SNAPSHOT-green)如果需要体验快照版本,可以在你的 `pom.xml`进行如下配置:
![https://img.shields.io/badge/snapshots-1.2.1--SNAPSHOT-green](https://img.shields.io/badge/snapshots-1.2.1--SNAPSHOT-green)如果需要体验快照版本,可以在你的 `pom.xml`进行如下配置:
```xml
<repositories>

View File

@@ -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>

View File

@@ -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);
}