diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index d7ff9f955..86604e78e 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -11,6 +11,13 @@ *(MAXKEY-201010) 源代码增加LICENSE声明 *(MAXKEY-201020) 依赖jar引用、更新和升级 not-yet-commons-ssl 0.3.9 + log4j 2.14.0 + spring 5.3.1 + springBoot 2.4.0 + springSecurity 5.4.1 + springData 2.4.1 + springSession 2.4.1 + MaxKey v 2.3.0 GA 2020/11/12 *(MAXKEY-200901) 基于spring session的集群会话共享功能 diff --git a/gradle.properties b/gradle.properties index dec40f138..6b422c191 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,12 @@ version =2.4.0 vendor =https://www.maxkey.top author =maxkeyTop #Version For use jar -log4jVersion =2.13.3 -springVersion =5.2.9.RELEASE -springBootVersion =2.3.4.RELEASE -springSecurityVersion =5.4.0 -springDataVersion =2.3.4.RELEASE -springSessionVersion =2.3.1.RELEASE +log4jVersion =2.14.0 +springVersion =5.3.1 +springBootVersion =2.4.0 +springSecurityVersion =5.4.1 +springDataVersion =2.4.1 +springSessionVersion =2.4.1 hibernateVersion =6.1.5.Final slf4jVersion =1.7.30 jacksonVersion =2.11.2 diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java b/maxkey-authentications/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java index 3ca82d9e6..57aac9304 100644 --- a/maxkey-authentications/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java +++ b/maxkey-authentications/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java @@ -29,10 +29,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import org.springframework.web.servlet.AsyncHandlerInterceptor; - -public class BasicEntryPoint extends HandlerInterceptorAdapter { +public class BasicEntryPoint implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(BasicEntryPoint.class); boolean enable; diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java b/maxkey-authentications/src/main/java/org/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java index af6d06f1e..63e5310a5 100644 --- a/maxkey-authentications/src/main/java/org/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java +++ b/maxkey-authentications/src/main/java/org/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java @@ -28,10 +28,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import org.springframework.web.servlet.AsyncHandlerInterceptor; -public class HttpHeaderEntryPoint extends HandlerInterceptorAdapter { +public class HttpHeaderEntryPoint implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(HttpHeaderEntryPoint.class); String headerName; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java index 8914c1ef0..f52bf2ba2 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java @@ -31,10 +31,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; +import org.springframework.web.servlet.AsyncHandlerInterceptor; import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; /** * Contorller调用完成后进行日志操作 @@ -45,7 +44,7 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; * */ @Component -public class HistoryLogsAdapter extends HandlerInterceptorAdapter { +public class HistoryLogsAdapter implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(HistoryLogsAdapter.class); diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/Oauth20ApiPermissionAdapter.java b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/Oauth20ApiPermissionAdapter.java index ff8886adb..97b8cb510 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/Oauth20ApiPermissionAdapter.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/Oauth20ApiPermissionAdapter.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import org.springframework.web.servlet.AsyncHandlerInterceptor; /** * OAuth v2.0 accessToken认证Interceptor处理. @@ -40,7 +40,7 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; * */ @Component -public class Oauth20ApiPermissionAdapter extends HandlerInterceptorAdapter { +public class Oauth20ApiPermissionAdapter implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(Oauth20ApiPermissionAdapter.class); @Autowired diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java index 337e44f65..ff6cb8f5b 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import org.springframework.web.servlet.AsyncHandlerInterceptor; /** * 权限Interceptor处理 * 权限处理需在servlet.xml中配置 @@ -40,7 +40,7 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; * */ @Component -public class PermissionAdapter extends HandlerInterceptorAdapter { +public class PermissionAdapter implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(PermissionAdapter.class); //无需Interceptor url @Autowired diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/RestApiPermissionAdapter.java b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/RestApiPermissionAdapter.java index 23d5aa0bf..6d6966bf9 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/RestApiPermissionAdapter.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/RestApiPermissionAdapter.java @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import org.springframework.web.servlet.AsyncHandlerInterceptor; /** * basic认证Interceptor处理. @@ -39,7 +39,7 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; * */ @Component -public class RestApiPermissionAdapter extends HandlerInterceptorAdapter { +public class RestApiPermissionAdapter implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(RestApiPermissionAdapter.class); @Autowired diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java index 82c91ea2b..0f9578c0a 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java @@ -36,11 +36,11 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.security.core.Authentication; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.stereotype.Component; +import org.springframework.web.servlet.AsyncHandlerInterceptor; import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; @Component -public class HistoryLoginAppAdapter extends HandlerInterceptorAdapter { +public class HistoryLoginAppAdapter implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(HistoryLoginAppAdapter.class); @Autowired diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java index 3e713c796..02a850985 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java @@ -32,8 +32,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; +import org.springframework.web.servlet.AsyncHandlerInterceptor; import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; /** * Contorller调用完成后进行日志操作 @@ -43,7 +43,7 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; * */ @Component -public class HistoryLogsAdapter extends HandlerInterceptorAdapter { +public class HistoryLogsAdapter implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(HistoryLogsAdapter.class); diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java index 56d5fd007..22573271d 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java @@ -39,7 +39,7 @@ import org.springframework.security.web.savedrequest.HttpSessionRequestCache; import org.springframework.security.web.savedrequest.RequestCache; import org.springframework.security.web.savedrequest.SavedRequest; import org.springframework.stereotype.Component; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import org.springframework.web.servlet.AsyncHandlerInterceptor; /** * 权限Interceptor处理 权限处理需在servlet.xml中配置 mvc:interceptors permission @@ -48,7 +48,7 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; * */ @Component -public class PermissionAdapter extends HandlerInterceptorAdapter { +public class PermissionAdapter implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(PermissionAdapter.class); // 无需Interceptor url @Autowired diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PreLoginAppAdapter.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PreLoginAppAdapter.java index 524e2f731..b3d9e0905 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PreLoginAppAdapter.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PreLoginAppAdapter.java @@ -25,10 +25,10 @@ import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import org.springframework.web.servlet.AsyncHandlerInterceptor; @Component -public class PreLoginAppAdapter extends HandlerInterceptorAdapter { +public class PreLoginAppAdapter implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(PreLoginAppAdapter.class);