From 7e626ea2193d39217fa7321a865bfab014c5ea69 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 22 五月 2022 13:07:36 +0800
Subject: [PATCH] update xxl-job 2.3.0 => 2.3.1
---
ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java | 68 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java
index 5202c29..13e53b2 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java
@@ -6,7 +6,7 @@
import com.xxl.job.admin.service.LoginService;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import org.springframework.web.servlet.AsyncHandlerInterceptor;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -18,42 +18,42 @@
* @author xuxueli 2015-12-12 18:09:04
*/
@Component
-public class PermissionInterceptor extends HandlerInterceptorAdapter {
+public class PermissionInterceptor implements AsyncHandlerInterceptor {
- @Resource
- private LoginService loginService;
+ @Resource
+ private LoginService loginService;
- @Override
- public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-
- if (!(handler instanceof HandlerMethod)) {
- return super.preHandle(request, response, handler);
- }
+ @Override
+ public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
- // if need login
- boolean needLogin = true;
- boolean needAdminuser = false;
- HandlerMethod method = (HandlerMethod)handler;
- PermissionLimit permission = method.getMethodAnnotation(PermissionLimit.class);
- if (permission!=null) {
- needLogin = permission.limit();
- needAdminuser = permission.adminuser();
- }
+ if (!(handler instanceof HandlerMethod)) {
+ return true; // proceed with the next interceptor
+ }
- if (needLogin) {
- XxlJobUser loginUser = loginService.ifLogin(request, response);
- if (loginUser == null) {
- response.setStatus(302);
- response.setHeader("location", request.getContextPath()+"/toLogin");
- return false;
- }
- if (needAdminuser && loginUser.getRole()!=1) {
- throw new RuntimeException(I18nUtil.getString("system_permission_limit"));
- }
- request.setAttribute(LoginService.LOGIN_IDENTITY_KEY, loginUser);
- }
+ // if need login
+ boolean needLogin = true;
+ boolean needAdminuser = false;
+ HandlerMethod method = (HandlerMethod) handler;
+ PermissionLimit permission = method.getMethodAnnotation(PermissionLimit.class);
+ if (permission != null) {
+ needLogin = permission.limit();
+ needAdminuser = permission.adminuser();
+ }
- return super.preHandle(request, response, handler);
- }
-
+ if (needLogin) {
+ XxlJobUser loginUser = loginService.ifLogin(request, response);
+ if (loginUser == null) {
+ response.setStatus(302);
+ response.setHeader("location", request.getContextPath() + "/toLogin");
+ return false;
+ }
+ if (needAdminuser && loginUser.getRole() != 1) {
+ throw new RuntimeException(I18nUtil.getString("system_permission_limit"));
+ }
+ request.setAttribute(LoginService.LOGIN_IDENTITY_KEY, loginUser);
+ }
+
+ return true; // proceed with the next interceptor
+ }
+
}
--
Gitblit v1.9.3