diff --git a/maxkey-core/src/main/resources/messages/passwordpolicy_message.properties b/maxkey-core/src/main/resources/messages/passwordpolicy_message.properties index ac8f2f77..59bc09b8 100644 --- a/maxkey-core/src/main/resources/messages/passwordpolicy_message.properties +++ b/maxkey-core/src/main/resources/messages/passwordpolicy_message.properties @@ -36,8 +36,8 @@ PasswordPolicy.OLD_PASSWORD_MATCH=\u65b0\u5bc6\u7801\u4e0d\u80fd\u4e0e\u65e7\u5b login.error.attempts={0}\u5c1d\u8bd5\u767b\u9646{1}\u6b21\u6570\u8fbe\u5230\u6700\u5927\u9650\u5236\uff0c\u8bf7\u7a0d\u540e\u518d\u767b\u9646. login.error.locked=\u7528\u6237\u88ab\u9501\u5b9a. login.error.inactive=\u7528\u6237\u975e\u6d3b\u52a8\u72b6\u6001. -login.error.password=\u767b\u5f55\u5bc6\u7801\u65e0\u6548. -login.error.username=\u7528\u6237\u540d\u65e0\u6548. +login.error.password=\u7528\u6237\u540D\u6216\u5bc6\u7801\u65e0\u6548. +login.error.username=\u7528\u6237\u540D\u6216\u5bc6\u7801\u65e0\u6548. login.error.username.null=\u7528\u6237\u540d\u4e0d\u80fd\u4e3a\u7a7a. login.error.email.null=\u767b\u5f55\u90ae\u7bb1\u4e0d\u80fd\u4e3a\u7a7a. login.error.password.null=\u5bc6\u7801\u4e0d\u80fd\u4e3a\u7a7a. diff --git a/maxkey-core/src/main/resources/messages/passwordpolicy_message_en.properties b/maxkey-core/src/main/resources/messages/passwordpolicy_message_en.properties index 914463a3..8e3ff85c 100644 --- a/maxkey-core/src/main/resources/messages/passwordpolicy_message_en.properties +++ b/maxkey-core/src/main/resources/messages/passwordpolicy_message_en.properties @@ -36,8 +36,8 @@ PasswordPolicy.OLD_PASSWORD_MATCH=new password match old password. login.error.attempts={0} login attempts the maximum number of {1} times, please login later. login.error.locked=The user is locked. login.error.inactive=User inactive state. -login.error.password=Invalid password. -login.error.username=Invalid username. +login.error.password=Invalid username or password. +login.error.username=Invalid username or password. login.error.username.null=username cannot be empty. login.error.email.null=email cannot be empty. login.error.password.null=Password cannot be empty. diff --git a/maxkey-core/src/main/resources/messages/passwordpolicy_message_zh_CN.properties b/maxkey-core/src/main/resources/messages/passwordpolicy_message_zh_CN.properties index d90d52b6..40eefb09 100644 --- a/maxkey-core/src/main/resources/messages/passwordpolicy_message_zh_CN.properties +++ b/maxkey-core/src/main/resources/messages/passwordpolicy_message_zh_CN.properties @@ -36,8 +36,8 @@ PasswordPolicy.OLD_PASSWORD_MATCH=\u65b0\u5bc6\u7801\u4e0d\u80fd\u4e0e\u65e7\u5b login.error.attempts={0}\u5c1d\u8bd5\u767b\u9646{1}\u6b21\u6570\u8fbe\u5230\u6700\u5927\u9650\u5236\uff0c\u8bf7\u7a0d\u540e\u518d\u767b\u9646. login.error.locked=\u7528\u6237\u88ab\u9501\u5b9a. login.error.inactive=\u7528\u6237\u975e\u6d3b\u52a8\u72b6\u6001. -login.error.password=\u767b\u5f55\u5bc6\u7801\u65e0\u6548. -login.error.username=\u7528\u6237\u540d\u65e0\u6548. +login.error.password=\u7528\u6237\u540D\u6216\u5bc6\u7801\u65e0\u6548. +login.error.username=\u7528\u6237\u540D\u6216\u5bc6\u7801\u65e0\u6548. login.error.username.null=\u7528\u6237\u540d\u4e0d\u80fd\u4e3a\u7a7a. login.error.email.null=\u767b\u5f55\u90ae\u7bb1\u4e0d\u80fd\u4e3a\u7a7a. login.error.password.null=\u5bc6\u7801\u4e0d\u80fd\u4e3a\u7a7a. diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties index 7720420e..0cbd24f0 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties @@ -194,7 +194,7 @@ maxkey.login.mfa.type=TimeBasedOtpAuthn #enable social sign on maxkey.login.socialsignon=true #social sign on providers -maxkey.login.socialsignon.providers=gitee,wechatopen,sinaweibo,google,qq,dingtalk,microsoft,facebook +maxkey.login.socialsignon.providers=gitee,wechatopen,sinaweibo,google,qq,dingtalk,microsoft,facebook,workweixin #Enable kerberos/SPNEGO maxkey.login.kerberos=true #wsFederation diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties index 53c7b0bb..90a934d8 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties @@ -195,7 +195,7 @@ maxkey.login.mfa.type=TimeBasedOtpAuthn #enable social sign on maxkey.login.socialsignon=true #social sign on providers -maxkey.login.socialsignon.providers=gitee,wechatopen,sinaweibo,google,qq,dingtalk,microsoft,facebook +maxkey.login.socialsignon.providers=gitee,wechatopen,sinaweibo,google,qq,dingtalk,microsoft,facebook,workweixin #Enable kerberos/SPNEGO maxkey.login.kerberos=true #wsFederation @@ -366,8 +366,8 @@ maxkey.socialsignon.wechatopen.sortorder=2 maxkey.socialsignon.workweixin.provider=workweixin maxkey.socialsignon.workweixin.provider.name=\u4F01\u4E1A\u5fae\u4fe1 maxkey.socialsignon.workweixin.icon=images/social/wechat_enterprise.png -maxkey.socialsignon.workweixin.client.id=wx00d052e8f417f8f9 -maxkey.socialsignon.workweixin.client.secret=lIy40iP0z4D65eJaWDNoe-vSlttmqY2WGJBygbM0TlY +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.sortorder=2 diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties index 0e8b06a6..059e394b 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties @@ -52,6 +52,7 @@ login.text.login.mobile.validTime.unit=\u79d2 login.text.login.twofactor=\u5b89\u5168\u8ba4\u8bc1 login.text.login.normal=\u57fa\u672c\u8ba4\u8bc1 login.text.login.mobile=\u624B\u673A\u767B\u5F55 +login.text.login.qrcode=\u626B\u7801\u767B\u5F55 login.text.username=\u7528\u6237\u540d login.text.mobile=\u624B\u673A\u53F7\u7801 diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message_en.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message_en.properties index e4dade41..474f68a5 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message_en.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message_en.properties @@ -52,6 +52,7 @@ login.text.login.mobile.validTime.unit=seconds login.text.login.twofactor=Two-Factors login.text.login.normal=Normal Login login.text.login.mobile=Mobile Login +login.text.login.qrcode=QRCode Login login.text.username=Username login.text.mobile=Phone Number diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties index 0e8b06a6..059e394b 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties @@ -52,6 +52,7 @@ login.text.login.mobile.validTime.unit=\u79d2 login.text.login.twofactor=\u5b89\u5168\u8ba4\u8bc1 login.text.login.normal=\u57fa\u672c\u8ba4\u8bc1 login.text.login.mobile=\u624B\u673A\u767B\u5F55 +login.text.login.qrcode=\u626B\u7801\u767B\u5F55 login.text.username=\u7528\u6237\u540d login.text.mobile=\u624B\u673A\u53F7\u7801 diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl index 1bbc41a8..55acaa25 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl @@ -153,6 +153,8 @@ <#--todo:send captcha--> captchaCountTimer=setInterval("getCaptchaCount()", 1000); }); + + }); @@ -192,6 +194,11 @@ <@locale code="login.text.login.mobile"/> +
  • + + <@locale code="login.text.login.qrcode"/> + +
    • @@ -206,6 +213,10 @@
    <#include "loginmobile.ftl">
    +
    + <#include "loginworkweixin.ftl"> + <#-- <#include "logindingtalk.ftl">--> +
    diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/logindingtalk.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/logindingtalk.ftl new file mode 100644 index 00000000..eb94a400 --- /dev/null +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/logindingtalk.ftl @@ -0,0 +1,41 @@ + + var dingtalkredirect_uri=""; + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginworkweixin.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginworkweixin.ftl new file mode 100644 index 00000000..f8280241 --- /dev/null +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginworkweixin.ftl @@ -0,0 +1,18 @@ + + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-resources/src/main/resources/static/css/base.css b/maxkey-webs/maxkey-web-resources/src/main/resources/static/css/base.css index 7501b56d..3aac5433 100644 --- a/maxkey-webs/maxkey-web-resources/src/main/resources/static/css/base.css +++ b/maxkey-webs/maxkey-web-resources/src/main/resources/static/css/base.css @@ -329,8 +329,8 @@ body{ vertical-align: top; } -#normalLogin,#tfaLogin,#mobileLogin{ - width :49%; +#normalLogin,#tfaLogin,#mobileLogin,#qrcodelogin{ + width :33.3%; } #div_tfaLogin , #div_mobileLogin{ diff --git a/maxkey-webs/maxkey-web-resources/src/main/resources/static/javascript/platform.common.js b/maxkey-webs/maxkey-web-resources/src/main/resources/static/javascript/platform.common.js index 15c2342f..8ffba659 100644 --- a/maxkey-webs/maxkey-web-resources/src/main/resources/static/javascript/platform.common.js +++ b/maxkey-webs/maxkey-web-resources/src/main/resources/static/javascript/platform.common.js @@ -38,22 +38,22 @@ $(function(){ } }); /** switch_tab*/ - $(".switch_tab_class").on("click",function(){ - if($(".switch_tab_current").attr("id")==(this.id)){ - return; - } - - $(".switch_tab .switch_tab_class").removeClass("switch_tab_current"); - $(this).addClass("switch_tab_current"); - $(".switch_tab li").each(function(){ - $("#"+$(this).attr("value")).hide(); - }); - - $("#"+$(this).attr("value")).show(); - if (typeof(switchTab) == "function"){ - switchTab($(this).attr("value"));//user define after switch Tab - } - }); + $(".switch_tab_class").on("click",function(){ + if($(".switch_tab_current").attr("id")==(this.id)){ + return; + } + + $(".switch_tab .switch_tab_class").removeClass("switch_tab_current"); + $(this).addClass("switch_tab_current"); + $(".switch_tab li").each(function(){ + $("#div_"+$(this).attr("id")).hide(); + }); + + $("#div_"+$(this).attr("id")).show(); + if (typeof(switchTab) == "function"){ + switchTab($(this).attr("id"));//user define after switch Tab + } + }); //document forward $.forward=function(config){