From fe7e44da8d454fe94d20483a71a0a9c5aed1f0e6 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Wed, 8 Jul 2020 09:39:47 +0800 Subject: [PATCH 1/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7011603a7..70aa7e55c 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ QQ交流群：434469201 | 邮箱EMAIL: shimingxy@163.com | 2 | 双因素认证 | | 3 | 短信认证 腾讯云短信/阿里云短信/网易云信 | | 4 | Google/Microsoft Authenticator/FreeOTP/支持TOTP或者HOTP | -| 5 | Kerberos/Spengo/AD域| +| 5 | Kerberos/SPNEGO/AD域| | 6 | 社交账号 微信/QQ/微博/钉钉/Google/Facebook/其他 | From 41846af1320302041a799308a47f2a16016c33b7 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Wed, 8 Jul 2020 09:40:51 +0800 Subject: [PATCH 2/5] Update navigation.html --- docs/_includes/navigation.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_includes/navigation.html b/docs/_includes/navigation.html index 9b0f5c552..5208ab631 100644 --- a/docs/_includes/navigation.html +++ b/docs/_includes/navigation.html @@ -20,7 +20,7 @@
  • 双因素认证MFA
  • 社交集成
  • TOTP/Google Authenticator
    • -
  • Kerberos/Spengo/AD
    • +
  • Kerberos/SPNEGO/AD
  • LDAP
  • 忘记密码(Forget Password)
    • From 7e3074bc6ad5318e3bb64ee937a5401ec716e64c Mon Sep 17 00:00:00 2001 From: MaxKey Date: Wed, 8 Jul 2020 09:41:47 +0800 Subject: [PATCH 3/5] Update kerberos.md --- docs/authn/kerberos.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/authn/kerberos.md b/docs/authn/kerberos.md index 390b951b4..d3e53a445 100644 --- a/docs/authn/kerberos.md +++ b/docs/authn/kerberos.md @@ -1,4 +1,4 @@ -

    基于Kerberos/Spengo/AD自动登录集成

    +

    基于Kerberos/SPNEGO/AD自动登录集成

    MaxKey未提供基于Kerberos的认证，但是提供JWT的接入方式，可以通过Kerberos认证完成，然后使用JWT的实现MaxKey的自动登录。 @@ -12,4 +12,4 @@ https://github.com/spring-projects/spring-security-kerberos Integrated Windows Authentication and Authorization in Java -http://spnego.sourceforge.net/ \ No newline at end of file +http://spnego.sourceforge.net/ From e9e30ea006a44e22a31cc5f5311573a557d1e634 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Wed, 8 Jul 2020 10:18:13 +0800 Subject: [PATCH 4/5] Update team.md --- docs/team.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/team.md b/docs/team.md index 94876c0d2..15f205199 100644 --- a/docs/team.md +++ b/docs/team.md @@ -63,20 +63,21 @@ 以下其他人员通过建议，补丁或文档的方式为该项目做出了贡献。 - + + - - - + + +
    名称头像github ID组织角色时区名称头像github ID组织角色时区问题
    QQ793732900(恍然如梦) contributorAsia/北京解决Maxkey在Chrome “您的连接不是私密连接” 问题
    其他贡献者 -https://github.com/shimingxy/MaxKey/graphs/contributors \ No newline at end of file +https://github.com/shimingxy/MaxKey/graphs/contributors From f0fe6bac21c0a4a98b5e0cbbdf549ae76d632fee Mon Sep 17 00:00:00 2001 From: MaxKey Date: Wed, 8 Jul 2020 15:29:51 +0800 Subject: [PATCH 5/5] Update welcome.md --- docs/welcome.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/welcome.md b/docs/welcome.md index 5b4c53ef4..e57a5a224 100644 --- a/docs/welcome.md +++ b/docs/welcome.md @@ -93,7 +93,7 @@ 5 - Kerberos/Spengo/AD域 + Kerberos/SPNEGO/AD域 6