|
@@ -25,7 +25,8 @@ public class MarkInterceptor extends SessionInterceptor {
|
|
|
private MarkerService markerService;
|
|
|
|
|
|
@Override
|
|
|
- public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
|
|
|
+ public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
|
|
|
+ throws Exception {
|
|
|
WebUser wu = buildUser(request);
|
|
|
if (wu != null) {
|
|
|
if (wu.getUser().getLastLoginTime() == null && request.getServletPath().startsWith("/mark/reset")) {
|
|
@@ -37,10 +38,9 @@ public class MarkInterceptor extends SessionInterceptor {
|
|
|
}
|
|
|
return true;
|
|
|
}
|
|
|
- if (request.getServletPath().startsWith("/mark/subject-select")
|
|
|
- || request.getServletPath().startsWith("/mark/index")
|
|
|
- || request.getServletPath().startsWith("/mark/rest")
|
|
|
- || request.getServletPath().startsWith("/mark/logout")) {
|
|
|
+ if (request.getServletPath().startsWith("/mark/subject-select") || request.getServletPath()
|
|
|
+ .startsWith("/mark/index") || request.getServletPath().startsWith("/mark/reset") || request
|
|
|
+ .getServletPath().startsWith("/mark/logout")) {
|
|
|
return sessionExpire(request, response, "/mark-login");
|
|
|
}
|
|
|
return sessionExpireAjax(request, response, "/mark-login");
|