diff --git a/.gitignore b/.gitignore index ae3f179..8666725 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,11 @@ hs_err_pid* # exclude idea files .idea *.iml -*.sh +bin/codecov.sh +bin/deploy.sh +bin/docsify-cli.sh +bin/push.sh +bin/push-dev.sh -target \ No newline at end of file +target +/pom.xml.versionsBackup diff --git a/README.en-US.md b/README.en-US.md index 4db8a44..d4c51dc 100644 --- a/README.en-US.md +++ b/README.en-US.md @@ -6,7 +6,7 @@
-
+
@@ -15,7 +15,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
@@ -15,7 +15,7 @@
-
+
@@ -97,7 +97,7 @@ JustAuth,如你所见,它仅仅是一个**第三方授权登录**的**工具
| [AuthOschinaRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthOschinaRequest.java) | 参考文档 |
|
| [AuthAlipayRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java) | 参考文档 |
|
| [AuthQqRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java) | 参考文档 |
-|
| [AuthWeChatRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java) | 参考文档 |
+|
| [AuthWeChatOpenRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthWeChatOpenRequest.java) | 参考文档 |
+|
| [AuthWeChatMpRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java) | 参考文档 |
+|
| [AuthWeChatEnterpriseRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseRequest.java) | 参考文档 |
|
| [AuthTaobaoRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java) | 参考文档 |
|
| [AuthGoogleRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java) | 参考文档 |
|
| [AuthFacebookRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java) | 参考文档 |
@@ -160,7 +162,6 @@ authRequest.login(callback);
|
| [AuthPinterestRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthPinterestRequest.java) | 参考文档 |
|
| [AuthStackOverflowRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthStackOverflowRequest.java) | 参考文档 |
|
| [AuthHuaweiRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java) | 参考文档 |
-|
| [AuthWeChatEnterpriseRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseRequest.java) | 参考文档 |
|
| [AuthKujialeRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthKujialeRequest.java) | 参考文档 |
|
| [AuthGitlabRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthGitlabRequest.java) | 参考文档 |
|
| [AuthMeituanRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthMeituanRequest.java) | 参考文档 |
diff --git a/bin/repVersion.sh b/bin/repVersion.sh
new file mode 100644
index 0000000..2277e8e
--- /dev/null
+++ b/bin/repVersion.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+#-----------------------------------------------------------
+# 参考自 hutool 工具
+# 此脚本用于每次升级justauth时替换相应位置的版本号
+#-----------------------------------------------------------
+pwd=$(pwd)
+echo "当前路径:$pwd"
+
+if [ -n "$1" ];then
+ new_version="$1"
+ old_version=`cat $pwd/bin/version.txt`
+ echo "$old_version 替换为新版本 $new_version"
+else
+ # 参数错误,退出
+ echo "ERROR: 请指定新版本!"
+ exit
+fi
+
+if [ ! -n "$old_version" ]; then
+ echo "ERROR: 旧版本不存在,请确认bin/version.txt中信息正确"
+ exit
+fi
+
+# 替换README.md等文件中的版本
+sed -i "s/${old_version}/${new_version}/g" $pwd/README.md
+sed -i "s/${old_version}/${new_version}/g" $pwd/README.en-US.md
+sed -i "s/${old_version}/${new_version}/g" $pwd/docs/README.md
+sed -i "s/${old_version}/${new_version}/g" $pwd/docs/_coverpage.md
+
+# 替换pom.xml中的版本
+sed -i "s/${old_version}/${new_version}/g" $pwd/pom.xml
+
+# 保留新版本号
+echo "$new_version" > $pwd/bin/version.txt
diff --git a/bin/updVersion.sh b/bin/updVersion.sh
new file mode 100644
index 0000000..07d3987
--- /dev/null
+++ b/bin/updVersion.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+#------------------------------------------------
+# 参考自 hutool 工具
+# 升级justauth版本,包括:
+# 1. 升级pom.xml中的版本号
+# 2. 替换README.md中的版本号
+#------------------------------------------------
+
+if [ ! -n "$1" ]; then
+ echo "ERROR: 新版本不存在,请指定参数1"
+ exit
+fi
+
+# 替换所有模块pom.xml中的版本
+mvn versions:set -DnewVersion=$1
+
+# 替换其它地方的版本
+source $(pwd)/bin/repVersion.sh "$1"
diff --git a/bin/version.txt b/bin/version.txt
new file mode 100644
index 0000000..61ce01b
--- /dev/null
+++ b/bin/version.txt
@@ -0,0 +1 @@
+1.13.2
diff --git a/docs/README.md b/docs/README.md
index 35ed7cf..1ce1f84 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -9,7 +9,7 @@
-
+
@@ -18,7 +18,7 @@
-
+
@@ -63,8 +63,8 @@ JustAuth,如你所见,它仅仅是一个**第三方授权登录**的**工具
| :computer: 平台 | :coffee: API类 | :page_facing_up: SDK |
|:------:|:-------:|:-------:|
|
| [AuthGiteeRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java) | 参考文档 |
-|
| [AuthGithubRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java) | 参考文档 |
-|
| [AuthWeiboRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java) | 参考文档 |
+|
| [AuthGithubRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java) | 参考文档 |
+|
| [AuthWeiboRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java) | 参考文档 |
|
| [AuthDingTalkRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthDingTalkRequest.java) | 参考文档 |
|
| [AuthBaiduRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java) | 参考文档 |
|
| [AuthCodingRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java) | 参考文档 |
@@ -72,7 +72,9 @@ JustAuth,如你所见,它仅仅是一个**第三方授权登录**的**工具
|
| [AuthOschinaRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthOschinaRequest.java) | 参考文档 |
|
| [AuthAlipayRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java) | 参考文档 |
|
| [AuthQqRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java) | 参考文档 |
-|
| [AuthWeChatRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java) | 参考文档 |
+|
| [AuthWeChatOpenRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthWeChatOpenRequest.java) | 参考文档 |
+|
| [AuthWeChatMpRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java) | 参考文档 |
+|
| [AuthWeChatEnterpriseRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseRequest.java) | 参考文档 |
|
| [AuthTaobaoRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java) | 参考文档 |
|
| [AuthGoogleRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java) | 参考文档 |
|
| [AuthFacebookRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java) | 参考文档 |
@@ -86,7 +88,6 @@ JustAuth,如你所见,它仅仅是一个**第三方授权登录**的**工具
|
| [AuthPinterestRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthPinterestRequest.java) | 参考文档 |
|
| [AuthStackOverflowRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthStackOverflowRequest.java) | 参考文档 |
|
| [AuthHuaweiRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java) | 参考文档 |
-|
| [AuthWeChatEnterpriseRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseRequest.java) | 参考文档 |
|
| [AuthKujialeRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthKujialeRequest.java) | 参考文档 |
|
| [AuthGitlabRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthGitlabRequest.java) | 参考文档 |
|
| [AuthMeituanRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthMeituanRequest.java) | 参考文档 |
diff --git a/docs/_404.md b/docs/_404.md
new file mode 100644
index 0000000..e5dcca7
--- /dev/null
+++ b/docs/_404.md
@@ -0,0 +1,27 @@
+**非常感谢您对JustAuth的关注**,您现在查询的内容,资料库中暂时没有,我们后续会补充上。
+
+您可能还会需要以下文档:
+
+- [OAuth的授权流程是什么样的?](https://docs.justauth.whnb.wang/#/oauth)
+- [如何使用JustAuth?](https://docs.justauth.whnb.wang/#/how-to-use)
+- [提问与回答?](https://docs.justauth.whnb.wang/#/Q&A)
+- [如何集成Github?](https://docs.justauth.whnb.wang/#/oauth/github)
+- [如何集成Gitee?](https://docs.justauth.whnb.wang/#/oauth/gitee)
+- [如何集成支付宝?](https://docs.justauth.whnb.wang/#/oauth/alipay)
+- [如何自定义state?](https://docs.justauth.whnb.wang/#/customize-the-state-cache)
+- [如何自定义接入自己搭建的oauth平台?](https://docs.justauth.whnb.wang/#/customize-the-oauth)
+- [有哪些配套项目?](https://docs.justauth.whnb.wang/#/supporting)
+
+### 如果还是没有您想要的内容,您可以:
+
+1. (建议) 提Issue: 【[github](https://github.com/justauth/JustAuth/issues)】 | 【[gitee](https://gitee.com/yadong.zhang/JustAuth/issues)】
+2. 本页面底部直接留言
+3. 关注公众号(公众号会不定期推送相关内容),扫下方二维码关注公众号:
+
+
+
+4. 加微信群(群内有各个优秀开源项目的作者和技术大神),微信扫下方二维码后加我好友(**注:一定要备注JustAUth,无备注的一律不加**):
+
+
+
+5. 加QQ群:QQ搜索`230017570`(该QQ群为JustAuth官方技术讨论群,禁止群内打广告!)
\ No newline at end of file
diff --git a/docs/_coverpage.md b/docs/_coverpage.md
index 8bfd85f..582d69a 100644
--- a/docs/_coverpage.md
+++ b/docs/_coverpage.md
@@ -1,6 +1,6 @@

-# JustAuth 1.13.1
+# JustAuth 1.13.2
史上最全的整合第三方登录的开源库
diff --git a/docs/_media/oauth/alipay_01.png b/docs/_media/oauth/alipay_01.png
new file mode 100644
index 0000000..9edb2ca
Binary files /dev/null and b/docs/_media/oauth/alipay_01.png differ
diff --git a/docs/_media/oauth/alipay_02.png b/docs/_media/oauth/alipay_02.png
new file mode 100644
index 0000000..88fecef
Binary files /dev/null and b/docs/_media/oauth/alipay_02.png differ
diff --git a/docs/_media/oauth/alipay_03.png b/docs/_media/oauth/alipay_03.png
new file mode 100644
index 0000000..52a6e51
Binary files /dev/null and b/docs/_media/oauth/alipay_03.png differ
diff --git a/docs/_media/oauth/alipay_04.png b/docs/_media/oauth/alipay_04.png
new file mode 100644
index 0000000..c068f7b
Binary files /dev/null and b/docs/_media/oauth/alipay_04.png differ
diff --git a/docs/_media/oauth/alipay_05.png b/docs/_media/oauth/alipay_05.png
new file mode 100644
index 0000000..556b90e
Binary files /dev/null and b/docs/_media/oauth/alipay_05.png differ
diff --git a/docs/_media/oauth/alipay_06.png b/docs/_media/oauth/alipay_06.png
new file mode 100644
index 0000000..071a862
Binary files /dev/null and b/docs/_media/oauth/alipay_06.png differ
diff --git a/docs/_media/oauth/alipay_07.png b/docs/_media/oauth/alipay_07.png
new file mode 100644
index 0000000..8f2b4d1
Binary files /dev/null and b/docs/_media/oauth/alipay_07.png differ
diff --git a/docs/_media/oauth/alipay_08.png b/docs/_media/oauth/alipay_08.png
new file mode 100644
index 0000000..13c67a0
Binary files /dev/null and b/docs/_media/oauth/alipay_08.png differ
diff --git a/docs/_media/oauth/alipay_09.png b/docs/_media/oauth/alipay_09.png
new file mode 100644
index 0000000..ee5135c
Binary files /dev/null and b/docs/_media/oauth/alipay_09.png differ
diff --git a/docs/_media/oauth/alipay_10.png b/docs/_media/oauth/alipay_10.png
new file mode 100644
index 0000000..8757288
Binary files /dev/null and b/docs/_media/oauth/alipay_10.png differ
diff --git a/docs/_media/oauth/alipay_11.png b/docs/_media/oauth/alipay_11.png
new file mode 100644
index 0000000..76d5844
Binary files /dev/null and b/docs/_media/oauth/alipay_11.png differ
diff --git a/docs/_media/oauth/alipay_12.png b/docs/_media/oauth/alipay_12.png
new file mode 100644
index 0000000..87cde9a
Binary files /dev/null and b/docs/_media/oauth/alipay_12.png differ
diff --git a/docs/_media/oauth/alipay_13.png b/docs/_media/oauth/alipay_13.png
new file mode 100644
index 0000000..61378a2
Binary files /dev/null and b/docs/_media/oauth/alipay_13.png differ
diff --git a/docs/_media/oauth/alipay_14.png b/docs/_media/oauth/alipay_14.png
new file mode 100644
index 0000000..1c52d1e
Binary files /dev/null and b/docs/_media/oauth/alipay_14.png differ
diff --git a/docs/_media/oauth/alipay_15.png b/docs/_media/oauth/alipay_15.png
new file mode 100644
index 0000000..38e47f0
Binary files /dev/null and b/docs/_media/oauth/alipay_15.png differ
diff --git a/docs/_media/oauth/qq_01.png b/docs/_media/oauth/qq_01.png
new file mode 100644
index 0000000..aca44b6
Binary files /dev/null and b/docs/_media/oauth/qq_01.png differ
diff --git a/docs/_media/oauth/wechat_01.png b/docs/_media/oauth/wechat_01.png
new file mode 100644
index 0000000..fa3fdb2
Binary files /dev/null and b/docs/_media/oauth/wechat_01.png differ
diff --git a/docs/_media/oauth/wechat_02.png b/docs/_media/oauth/wechat_02.png
new file mode 100644
index 0000000..d434c08
Binary files /dev/null and b/docs/_media/oauth/wechat_02.png differ
diff --git a/docs/_media/oauth/wechat_03.png b/docs/_media/oauth/wechat_03.png
new file mode 100644
index 0000000..10fd90c
Binary files /dev/null and b/docs/_media/oauth/wechat_03.png differ
diff --git a/docs/_media/oauth/wechat_04.png b/docs/_media/oauth/wechat_04.png
new file mode 100644
index 0000000..91afa07
Binary files /dev/null and b/docs/_media/oauth/wechat_04.png differ
diff --git a/docs/_media/oauth/wechat_05.png b/docs/_media/oauth/wechat_05.png
new file mode 100644
index 0000000..7d4066f
Binary files /dev/null and b/docs/_media/oauth/wechat_05.png differ
diff --git a/docs/_media/oauth/wechat_06.png b/docs/_media/oauth/wechat_06.png
new file mode 100644
index 0000000..8d27839
Binary files /dev/null and b/docs/_media/oauth/wechat_06.png differ
diff --git a/docs/_media/oauth/wechat_07.png b/docs/_media/oauth/wechat_07.png
new file mode 100644
index 0000000..8a86a6d
Binary files /dev/null and b/docs/_media/oauth/wechat_07.png differ
diff --git a/docs/_media/oauth/weibo_01.png b/docs/_media/oauth/weibo_01.png
new file mode 100644
index 0000000..9c29038
Binary files /dev/null and b/docs/_media/oauth/weibo_01.png differ
diff --git a/docs/_media/oauth/weibo_02.png b/docs/_media/oauth/weibo_02.png
new file mode 100644
index 0000000..4b39e41
Binary files /dev/null and b/docs/_media/oauth/weibo_02.png differ
diff --git a/docs/_media/oauth/weibo_03.png b/docs/_media/oauth/weibo_03.png
new file mode 100644
index 0000000..43e8a38
Binary files /dev/null and b/docs/_media/oauth/weibo_03.png differ
diff --git a/docs/_media/oauth/weibo_04.png b/docs/_media/oauth/weibo_04.png
new file mode 100644
index 0000000..88c2687
Binary files /dev/null and b/docs/_media/oauth/weibo_04.png differ
diff --git a/docs/_media/oauth/weibo_05.png b/docs/_media/oauth/weibo_05.png
new file mode 100644
index 0000000..1d227a9
Binary files /dev/null and b/docs/_media/oauth/weibo_05.png differ
diff --git a/docs/_media/oauth/weibo_06.png b/docs/_media/oauth/weibo_06.png
new file mode 100644
index 0000000..c4e89c9
Binary files /dev/null and b/docs/_media/oauth/weibo_06.png differ
diff --git a/docs/_sidebar.md b/docs/_sidebar.md
index bec5bab..62f9f21 100644
--- a/docs/_sidebar.md
+++ b/docs/_sidebar.md
@@ -7,17 +7,17 @@
- [Q&A](Q&A.md)
- 集成第三方
- [√ Gitee登录](oauth/gitee.md)
- - [Github登录](oauth/github.md)
- - [qq登录](oauth/qq.md)
- - [微信登录](oauth/wechat.md)
- - [微博登录](oauth/weibo.md)
- - [支付宝登录](oauth/alipay.md)
+ - [√ Github登录](oauth/github.md)
+ - [√ qq登录](oauth/qq.md)
+ - [√ 微信开放平台登录](oauth/wechat_open.md)
+ - [√ 微博登录](oauth/weibo.md)
+ - [√ 支付宝登录](oauth/alipay.md)
- [百度登录](oauth/baidu.md)
- [Coding登录](oauth/coding.md)
- [钉钉登录](oauth/dingtalk.md)
- [开源中国登录](oauth/oschina.md)
- [淘宝登录](oauth/taobao.md)
- - [腾讯云登录](oauth/tenchentCloud.md)
+ - [腾讯云登录](oauth/tencentCloud.md)
- [Google登录](oauth/google.md)
- [Facebook登录](oauth/facebook.md)
- [抖音登录](oauth/douyin.md)
diff --git a/docs/how-to-use.md b/docs/how-to-use.md
index 519bc5e..7f47d3a 100644
--- a/docs/how-to-use.md
+++ b/docs/how-to-use.md
@@ -163,6 +163,6 @@ public Object revokeAuth(@PathVariable("source") String source, @PathVariable("t
- [Nutzboot版](https://github.com/EggsBlue/nutzboot-justauth-demo): NutzBoot集成JustAuth的demo by [蛋蛋](https://github.com/EggsBlue)
- [Blade版](https://github.com/justauth/blade-justauth-demo): Blade集成JustAuth的demo
-## springboot starter插件
+## starter插件
- [justauth-spring-boot-starter](https://github.com/xkcoding/justauth-spring-boot-starter): Spring Boot 集成 JustAuth 的最佳实践 by [xkcoding](https://github.com/xkcoding)
-- [justauth-spring-boot-starter-demo](https://github.com/justauth/justauth-spring-boot-starter-demo): Spring Boot 使用 justauth-spring-boot-starter 快速集成 JustAuth by [xkcoding](https://github.com/xkcoding)
+- [justauth-spring-security-starter](https://github.com/justauth/justauth-spring-security-starter): JustAuth整合Spring security的 starter依赖 by [luoqiz](https://github.com/luoqiz)
diff --git a/docs/index.html b/docs/index.html
index ab5ddbf..542a754 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -16,13 +16,18 @@
+
+