mirror of
https://gitee.com/dromara/MaxKey.git
synced 2025-12-06 17:08:29 +08:00
v 2.9.0 & 企业微信&钉钉扫描登录
v 2.9.0 & 企业微信&钉钉扫描登录
This commit is contained in:
MaxKey
parent
c8244038b9
commit
c70b44ca87
@ -1,4 +1,42 @@
|
||||
MaxKey v 2.8.1 GA 2021/06/25
|
||||
MaxKey v 2.9.0 GA 2021/08/**
|
||||
*(MAXKEY-210601) 企业微信扫描登录
|
||||
*(MAXKEY-210602) 钉钉扫描登录
|
||||
*(MAXKEY-210603) 第三方登录异常问题修复
|
||||
*(MAXKEY-210604) 新建maxkey-webs目录，包含maxkey-web-maxkey、maxkey-web-mgt、maxkey-web-resources
|
||||
*(MAXKEY-210605) 静态文件的合并到maxkey-web-resources
|
||||
*(MAXKEY-210606) 腾讯企业邮箱适配器优化
|
||||
*(MAXKEY-210607) 移除*.xml的spring配置文件
|
||||
*(MAXKEY-210608) 后台管理员自动生成密码的问题修复
|
||||
*(MAXKEY-210609) 密码重置接口的优化
|
||||
*(MAXKEY-210610) KAFKA数据同步接口优化，重新定义同步TOPIC
|
||||
*(MAXKEY-210611) LDAP及ActiveDirectory属性和连接的优化
|
||||
*(MAXKEY-210612) Synchronizers同步器的模块化，分成activedirectory、ldap、dingding、workweixin
|
||||
*(MAXKEY-210613) Synchronizers增加定时同步功能
|
||||
*(MAXKEY-210614) 后台用户和机构查询排序优化
|
||||
*(MAXKEY-210615) 增加连接器日志查询
|
||||
*(MAXKEY-210616) 增加同步器日志查询
|
||||
*(MAXKEY-210617) 应用配置适配器不生效修复
|
||||
*(MAXKEY-210618) FormBased认证功能的优化
|
||||
*(MAXKEY-210619) FormBased密码首次初始化问题修复
|
||||
*(MAXKEY-210620) 重新登录地址优化
|
||||
*(MAXKEY-210621) 实体类型的ID全部调整为雪花ID
|
||||
*(MAXKEY-210622) 后台报表优化
|
||||
*(MAXKEY-210623) 底层数据库mybatis-jpa-extra优化及问题修复
|
||||
*(MAXKEY-210624) 登录模块的模块化
|
||||
*(MAXKEY-210625) LDAP登录成功，密码自动同步到MaxKey
|
||||
*(MAXKEY-210626) 社交账号企业微信LOGO
|
||||
*(MAXKEY-210627) 找回密码时密码不匹配问题修复
|
||||
*(MAXKEY-210628) SHELL脚本优化
|
||||
*(MAXKEY-210629) 官方网站优化
|
||||
*(MAXKEY-210630) 依赖jar引用、更新和升级
|
||||
spring 5.3.9
|
||||
springBoot 2.5.3
|
||||
springSession 2.5.1
|
||||
tomcat 9.0.50
|
||||
JustAuth 1.16.2
|
||||
|
||||
|
||||
MaxKey v 2.8.1 GA 2021/06/25
|
||||
*(MAXKEY-210501) 官方网站内容优化
|
||||
*(MAXKEY-210502) 修复同步器LDAP保存保存问题
|
||||
*(MAXKEY-210503) ReadMe内容优化
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#maxkey properties
|
||||
group =maxkey.top
|
||||
version =2.8.2
|
||||
version =2.9.0
|
||||
vendor =https://www.maxkey.top
|
||||
author =MaxKeyTop
|
||||
#maxkey used jars version
|
||||
@ -87,7 +87,7 @@ jcipannotationsVersion =1.0
|
||||
minidevjsonsmartVersion =2.3
|
||||
minidevasmVersion =1.0.2
|
||||
simplehttpVersion =1.0.3
|
||||
JustAuthVersion =1.16.1
|
||||
JustAuthVersion =1.16.2
|
||||
javassistVersion =3.23.0-GA
|
||||
esapiVersion =2.2.0.0
|
||||
javaxmailVersion =1.6.2
|
||||
|
||||
@ -36,6 +36,7 @@ public class SocialSignOnProvider {
|
||||
private String lastLoginTime;
|
||||
private String state;
|
||||
private int sortOrder;
|
||||
private boolean hidden;
|
||||
|
||||
private boolean userBind;
|
||||
|
||||
@ -159,6 +160,14 @@ public class SocialSignOnProvider {
|
||||
this.state = state;
|
||||
}
|
||||
|
||||
public boolean isHidden() {
|
||||
return hidden;
|
||||
}
|
||||
|
||||
public void setHidden(boolean hidden) {
|
||||
this.hidden = hidden;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder builder = new StringBuilder();
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
|
||||
package org.maxkey.authn.support.socialsignon.service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
@ -34,7 +35,7 @@ import me.zhyd.oauth.request.*;
|
||||
public class SocialSignOnProviderService{
|
||||
private static Logger _logger = LoggerFactory.getLogger(SocialSignOnProviderService.class);
|
||||
|
||||
List<SocialSignOnProvider> socialSignOnProviders;
|
||||
List<SocialSignOnProvider> socialSignOnProviders = new ArrayList<SocialSignOnProvider>();
|
||||
|
||||
HashMap<String ,SocialSignOnProvider>socialSignOnProviderMaps=new HashMap<String ,SocialSignOnProvider>();
|
||||
|
||||
@ -136,13 +137,15 @@ public class SocialSignOnProviderService{
|
||||
public void setSocialSignOnProviders(
|
||||
List<SocialSignOnProvider> socialSignOnProviders) {
|
||||
|
||||
this.socialSignOnProviders = socialSignOnProviders;
|
||||
|
||||
for(SocialSignOnProvider socialSignOnProvider : socialSignOnProviders){
|
||||
socialSignOnProviderMaps.put(socialSignOnProvider.getProvider(), socialSignOnProvider);
|
||||
|
||||
if(!socialSignOnProvider.isHidden()) {
|
||||
this.socialSignOnProviders.add(socialSignOnProvider);
|
||||
}
|
||||
}
|
||||
|
||||
_logger.debug(""+socialSignOnProviders);
|
||||
_logger.debug(""+this.socialSignOnProviders);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -58,6 +58,7 @@ public class SocialSignOnAutoConfiguration implements InitializingBean {
|
||||
String clientSecret=applicationProperty.getProperty("maxkey.socialsignon."+provider+".client.secret");
|
||||
String sortOrder = applicationProperty.getProperty("maxkey.socialsignon."+provider+".sortorder");
|
||||
String agentId = applicationProperty.getProperty("maxkey.socialsignon."+provider+".agent.id");
|
||||
String hidden = applicationProperty.getProperty("maxkey.socialsignon."+provider+".hidden");
|
||||
|
||||
SocialSignOnProvider socialSignOnProvider = new SocialSignOnProvider();
|
||||
socialSignOnProvider.setProvider(provider);
|
||||
@ -68,6 +69,12 @@ public class SocialSignOnAutoConfiguration implements InitializingBean {
|
||||
socialSignOnProvider.setSortOrder(Integer.valueOf(sortOrder));
|
||||
socialSignOnProvider.setAgentId(agentId);
|
||||
|
||||
if(hidden == null || hidden.equalsIgnoreCase("false")) {
|
||||
socialSignOnProvider.setHidden(false);
|
||||
}else if(hidden.equalsIgnoreCase("true")){
|
||||
socialSignOnProvider.setHidden(true);
|
||||
}
|
||||
|
||||
_logger.debug("socialSignOnProvider " + socialSignOnProvider.getProvider()
|
||||
+ "(" + socialSignOnProvider.getProviderName()+")");
|
||||
_logger.trace("socialSignOnProvider " + socialSignOnProvider);
|
||||
|
||||
@ -360,6 +360,7 @@ maxkey.socialsignon.gitee.icon=images/social/gitee.png
|
||||
maxkey.socialsignon.gitee.client.id=ee6fdc484b3398d17e77d6ff37fd8b9fe502106398c7b22bf5522d3c01303f45
|
||||
maxkey.socialsignon.gitee.client.secret=d6c3558f295f044df538c966a9084166f9a877c7a7392543184007a5faccdbad
|
||||
maxkey.socialsignon.gitee.account.id=id
|
||||
maxkey.socialsignon.gitee.hidden=false
|
||||
maxkey.socialsignon.gitee.sortorder=1
|
||||
#wechat
|
||||
maxkey.socialsignon.wechatopen.provider=wechatopen
|
||||
@ -368,6 +369,7 @@ maxkey.socialsignon.wechatopen.icon=images/social/wechat.png
|
||||
maxkey.socialsignon.wechatopen.client.id=ee6fdc484b3398d17e7
|
||||
maxkey.socialsignon.wechatopen.client.secret=7a5faccdbad
|
||||
maxkey.socialsignon.wechatopen.account.id=id
|
||||
maxkey.socialsignon.wechatopen.hidden=false
|
||||
maxkey.socialsignon.wechatopen.sortorder=2
|
||||
#work weixin
|
||||
maxkey.socialsignon.workweixin.provider=workweixin
|
||||
@ -377,6 +379,7 @@ maxkey.socialsignon.workweixin.client.id=wx00d052e8f417f8f9
|
||||
maxkey.socialsignon.workweixin.client.secret=lIy40iP0z4D65eJaWDNoe-vSlttmqY2WGJBygbM0TlY
|
||||
maxkey.socialsignon.workweixin.agent.id=1000002
|
||||
maxkey.socialsignon.workweixin.account.id=id
|
||||
maxkey.socialsignon.workweixin.hidden=true
|
||||
maxkey.socialsignon.workweixin.sortorder=2
|
||||
#sina weibo
|
||||
maxkey.socialsignon.sinaweibo.provider=sinaweibo
|
||||
@ -385,6 +388,7 @@ maxkey.socialsignon.sinaweibo.icon=images/social/weibo.png
|
||||
maxkey.socialsignon.sinaweibo.client.id=3379757634
|
||||
maxkey.socialsignon.sinaweibo.client.secret=1adfdf9800299037bcab9d1c238664ba
|
||||
maxkey.socialsignon.sinaweibo.account.id=id
|
||||
maxkey.socialsignon.sinaweibo.hidden=false
|
||||
maxkey.socialsignon.sinaweibo.sortorder=3
|
||||
#Google
|
||||
maxkey.socialsignon.google.provider=google
|
||||
@ -393,6 +397,7 @@ maxkey.socialsignon.google.icon=images/social/google.png
|
||||
maxkey.socialsignon.google.client.id=519914515488.apps.googleusercontent.com
|
||||
maxkey.socialsignon.google.client.secret=3aTW3Iw7e11QqMnHxciCaXTt
|
||||
maxkey.socialsignon.google.account.id=id
|
||||
maxkey.socialsignon.google.hidden=false
|
||||
maxkey.socialsignon.google.sortorder=4
|
||||
#dingtalk
|
||||
maxkey.socialsignon.dingtalk.provider=dingtalk
|
||||
@ -401,6 +406,7 @@ maxkey.socialsignon.dingtalk.icon=images/social/dingtalk.png
|
||||
maxkey.socialsignon.dingtalk.client.id=dingoawf2jyiwh2uzqnphg
|
||||
maxkey.socialsignon.dingtalk.client.secret=Crm7YJbMKfRlvG2i1SHpg4GHVpqF_oXiEjhmRQyiSiuzNRWpbFh9i0UjDTfhOoN9
|
||||
maxkey.socialsignon.dingtalk.account.id=openid
|
||||
maxkey.socialsignon.dingtalk.hidden=false
|
||||
maxkey.socialsignon.dingtalk.sortorder=5
|
||||
#QQ
|
||||
maxkey.socialsignon.qq.provider=qq
|
||||
@ -409,6 +415,7 @@ maxkey.socialsignon.qq.icon=images/social/qq.png
|
||||
maxkey.socialsignon.qq.client.id=101225363
|
||||
maxkey.socialsignon.qq.client.secret=8577d75e0eb4a91ac549cc8be3371bfd
|
||||
maxkey.socialsignon.qq.account.id=openid
|
||||
maxkey.socialsignon.qq.hidden=false
|
||||
maxkey.socialsignon.qq.sortorder=6
|
||||
#Microsoft
|
||||
maxkey.socialsignon.microsoft.provider=microsoft
|
||||
@ -417,6 +424,7 @@ maxkey.socialsignon.microsoft.icon=images/social/microsoft.png
|
||||
maxkey.socialsignon.microsoft.client.id=24aa73b6-7928-4e64-bd64-d8682e650f95
|
||||
maxkey.socialsignon.microsoft.client.secret=PF[_AthtjVrtWVO2mNy@CJxY1@Z8FNf5
|
||||
maxkey.socialsignon.microsoft.account.id=id
|
||||
maxkey.socialsignon.microsoft.hidden=false
|
||||
maxkey.socialsignon.microsoft.sortorder=7
|
||||
#facebook
|
||||
maxkey.socialsignon.facebook.provider=facebook
|
||||
@ -425,6 +433,7 @@ maxkey.socialsignon.facebook.icon=images/social/facebook.png
|
||||
maxkey.socialsignon.facebook.client.id=appKey
|
||||
maxkey.socialsignon.facebook.client.secret=appSecret
|
||||
maxkey.socialsignon.facebook.account.id=id
|
||||
maxkey.socialsignon.facebook.hidden=false
|
||||
maxkey.socialsignon.facebook.sortorder=8
|
||||
|
||||
############################################################################
|
||||
|
||||
@ -353,6 +353,7 @@ maxkey.socialsignon.gitee.icon=images/social/gitee.png
|
||||
maxkey.socialsignon.gitee.client.id=ee6fdc484b3398d17e77d6ff37fd8b9fe502106398c7b22bf5522d3c01303f45
|
||||
maxkey.socialsignon.gitee.client.secret=d6c3558f295f044df538c966a9084166f9a877c7a7392543184007a5faccdbad
|
||||
maxkey.socialsignon.gitee.account.id=id
|
||||
maxkey.socialsignon.gitee.hidden=false
|
||||
maxkey.socialsignon.gitee.sortorder=1
|
||||
#wechat
|
||||
maxkey.socialsignon.wechatopen.provider=wechatopen
|
||||
@ -361,6 +362,7 @@ maxkey.socialsignon.wechatopen.icon=images/social/wechat.png
|
||||
maxkey.socialsignon.wechatopen.client.id=ee6fdc484b3398d17e7
|
||||
maxkey.socialsignon.wechatopen.client.secret=7a5faccdbad
|
||||
maxkey.socialsignon.wechatopen.account.id=id
|
||||
maxkey.socialsignon.wechatopen.hidden=false
|
||||
maxkey.socialsignon.wechatopen.sortorder=2
|
||||
#work weixin
|
||||
maxkey.socialsignon.workweixin.provider=workweixin
|
||||
@ -370,6 +372,7 @@ maxkey.socialsignon.workweixin.client.id=ww61ca142e1fe5b8ca
|
||||
maxkey.socialsignon.workweixin.client.secret=CfWEoALuKdSKzXiV-QWXeGSD5zPd6Svze3GR_gB5eFs
|
||||
maxkey.socialsignon.workweixin.agent.id=1000002
|
||||
maxkey.socialsignon.workweixin.account.id=id
|
||||
maxkey.socialsignon.workweixin.hidden=true
|
||||
maxkey.socialsignon.workweixin.sortorder=2
|
||||
#sina weibo
|
||||
maxkey.socialsignon.sinaweibo.provider=sinaweibo
|
||||
@ -378,6 +381,7 @@ maxkey.socialsignon.sinaweibo.icon=images/social/weibo.png
|
||||
maxkey.socialsignon.sinaweibo.client.id=3379757634
|
||||
maxkey.socialsignon.sinaweibo.client.secret=1adfdf9800299037bcab9d1c238664ba
|
||||
maxkey.socialsignon.sinaweibo.account.id=id
|
||||
maxkey.socialsignon.sinaweibo.hidden=false
|
||||
maxkey.socialsignon.sinaweibo.sortorder=3
|
||||
#Google
|
||||
maxkey.socialsignon.google.provider=google
|
||||
@ -386,6 +390,7 @@ maxkey.socialsignon.google.icon=images/social/google.png
|
||||
maxkey.socialsignon.google.client.id=519914515488.apps.googleusercontent.com
|
||||
maxkey.socialsignon.google.client.secret=3aTW3Iw7e11QqMnHxciCaXTt
|
||||
maxkey.socialsignon.google.account.id=id
|
||||
maxkey.socialsignon.google.hidden=false
|
||||
maxkey.socialsignon.google.sortorder=4
|
||||
#dingtalk
|
||||
maxkey.socialsignon.dingtalk.provider=dingtalk
|
||||
@ -394,6 +399,7 @@ maxkey.socialsignon.dingtalk.icon=images/social/dingtalk.png
|
||||
maxkey.socialsignon.dingtalk.client.id=dingoawf2jyiwh2uzqnphg
|
||||
maxkey.socialsignon.dingtalk.client.secret=Crm7YJbMKfRlvG2i1SHpg4GHVpqF_oXiEjhmRQyiSiuzNRWpbFh9i0UjDTfhOoN9
|
||||
maxkey.socialsignon.dingtalk.account.id=openid
|
||||
maxkey.socialsignon.dingtalk.hidden=false
|
||||
maxkey.socialsignon.dingtalk.sortorder=5
|
||||
#QQ
|
||||
maxkey.socialsignon.qq.provider=qq
|
||||
@ -402,6 +408,7 @@ maxkey.socialsignon.qq.icon=images/social/qq.png
|
||||
maxkey.socialsignon.qq.client.id=101225363
|
||||
maxkey.socialsignon.qq.client.secret=8577d75e0eb4a91ac549cc8be3371bfd
|
||||
maxkey.socialsignon.qq.account.id=openid
|
||||
maxkey.socialsignon.qq.hidden=false
|
||||
maxkey.socialsignon.qq.sortorder=6
|
||||
#Microsoft
|
||||
maxkey.socialsignon.microsoft.provider=microsoft
|
||||
@ -410,6 +417,7 @@ maxkey.socialsignon.microsoft.icon=images/social/microsoft.png
|
||||
maxkey.socialsignon.microsoft.client.id=24aa73b6-7928-4e64-bd64-d8682e650f95
|
||||
maxkey.socialsignon.microsoft.client.secret=PF[_AthtjVrtWVO2mNy@CJxY1@Z8FNf5
|
||||
maxkey.socialsignon.microsoft.account.id=id
|
||||
maxkey.socialsignon.microsoft.hidden=false
|
||||
maxkey.socialsignon.microsoft.sortorder=7
|
||||
#facebook
|
||||
maxkey.socialsignon.facebook.provider=facebook
|
||||
@ -418,6 +426,7 @@ maxkey.socialsignon.facebook.icon=images/social/facebook.png
|
||||
maxkey.socialsignon.facebook.client.id=appKey
|
||||
maxkey.socialsignon.facebook.client.secret=appSecret
|
||||
maxkey.socialsignon.facebook.account.id=id
|
||||
maxkey.socialsignon.facebook.hidden=false
|
||||
maxkey.socialsignon.facebook.sortorder=8
|
||||
|
||||
############################################################################
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
############################################################################
|
||||
application.title=MaxKey
|
||||
application.name=MaxKey
|
||||
application.formatted-version=v2.8.2 GA
|
||||
application.formatted-version=v2.9.0 GA
|
||||
|
||||
############################################################################
|
||||
#spring.profiles.active https/http; default https #
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
############################################################################
|
||||
application.title=MaxKey
|
||||
application.name=MaxKey-Mgt
|
||||
application.formatted-version=v2.8.2 GA
|
||||
application.formatted-version=v2.9.0 GA
|
||||
|
||||
############################################################################
|
||||
#spring.profiles.active http; default http #
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1014 B After Width: | Height: | Size: 1.2 KiB |
Loading…
x
Reference in New Issue
Block a user