From 06f455915bb9d11caa8829942f9007809ee9ae3d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 28 十一月 2024 16:37:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java
index 4a7fceb..d031fe8 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import org.apache.logging.log4j.core.config.Order;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,16 +32,16 @@
@Component
public class AuthFilter implements Filter {
private static final Logger log = LoggerFactory.getLogger(AuthFilter.class);
-
+
@Lazy
@Resource
private AppUserClient appUserClient;
-
+
@Lazy
@Resource
private SysUserClient sysUserClient;
-
-
+
+
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
HttpServletRequest request = (HttpServletRequest) servletRequest;
@@ -68,7 +69,7 @@
//小程序用户
if ("applet".equals(userType)) {
AppUser appUser = appUserClient.getAppUserById(Long.valueOf(userid));
- if(null == appUser || appUser.getDelFlag() == 1 || 3 == appUser.getStatus()){
+ if(null == appUser || appUser.getDelFlag() || 3 == appUser.getStatus()){
log.error("[账户异常处理]请求账户id:{}", userid);
unauthorizedResponse(response,"无效的账户");
return;
@@ -81,9 +82,9 @@
}
filterChain.doFilter(servletRequest, servletResponse);
}
-
-
-
+
+
+
private void unauthorizedResponse(HttpServletResponse response, String msg) {
response.setStatus(HttpStatus.OK.value());
response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE);
@@ -97,9 +98,9 @@
writer.flush();
writer.close();
}
-
-
-
+
+
+
/**
* 获取请求token
*/
@@ -111,6 +112,6 @@
}
return token;
}
-
-
+
+
}
--
Gitblit v1.7.1