diff --git a/.classpath b/.classpath index b7188c9c2..eb19361b5 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + diff --git a/docs/authn/kerberos.md b/docs/authn/kerberos.md index 44f486d7b..390b951b4 100644 --- a/docs/authn/kerberos.md +++ b/docs/authn/kerberos.md @@ -2,6 +2,14 @@ MaxKey未提供基于Kerberos的认证,但是提供JWT的接入方式,可以通过Kerberos认证完成,然后使用JWT的实现MaxKey的自动登录。 -建议参考spring-security-kerberos的实现 +建议参考 -https://github.com/spring-projects/spring-security-kerberos \ No newline at end of file +1)spring-security-kerberos的实现 + +https://github.com/spring-projects/spring-security-kerberos + +2)SPNEGO 实现 + +Integrated Windows Authentication and Authorization in Java + +http://spnego.sourceforge.net/ \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 2014b75d4..8043d401c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group =org.maxkey -version =1.2.2.RELEASE +version =1.3.RELEASE vendor =https://github.com/shimingxy/MaxKey author =shimingxy #Version For use jar diff --git a/maxkey-core/src/main/java/org/maxkey/web/InitApplicationContext.java b/maxkey-core/src/main/java/org/maxkey/web/InitApplicationContext.java index a5adeb9a5..29206971e 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/InitApplicationContext.java +++ b/maxkey-core/src/main/java/org/maxkey/web/InitApplicationContext.java @@ -164,7 +164,7 @@ public class InitApplicationContext extends HttpServlet { public void showLicense(){ _logger.info("----------------------------------------------------------------------------------------------------"); _logger.info("+ Single Sign On ( SSO ) "); - _logger.info("+ MaxKey Version v1.2.2 GA"); + _logger.info("+ MaxKey Version v1.3 GA"); _logger.info(""); _logger.info("+ Apache License 2.0"); _logger.info("+ https://github.com/shimingxy/MaxKey"); diff --git a/maxkey-web-manage/src/main/resources/application.properties b/maxkey-web-manage/src/main/resources/application.properties index 54d56d4b8..f8bb9df2e 100644 --- a/maxkey-web-manage/src/main/resources/application.properties +++ b/maxkey-web-manage/src/main/resources/application.properties @@ -7,7 +7,7 @@ server.servlet.context-path=/maxkey-mgt application.name=MaxKey-Mgt #message.properties global.application.version is need to update -application.formatted-version=v1.2.2 GA +application.formatted-version=v1.3 GA #for freemarker spring.freemarker.template-loader-path=classpath:/templates/views diff --git a/maxkey-web-maxkey/src/main/resources/application.properties b/maxkey-web-maxkey/src/main/resources/application.properties index 7429ca04b..177acfc8f 100644 --- a/maxkey-web-maxkey/src/main/resources/application.properties +++ b/maxkey-web-maxkey/src/main/resources/application.properties @@ -15,7 +15,7 @@ server.servlet.context-path=/maxkey application.name=MaxKey #message.properties global.application.version is need to update -application.formatted-version=v1.2.2 GA +application.formatted-version=v1.3 GA #for freemarker spring.freemarker.template-loader-path=classpath:/templates/views