From b8f9b07913de4c088d86565c3b331b9263a9027c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 21 十一月 2024 10:40:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java
index 9cd72c2..b29ac94 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java
@@ -1,8 +1,8 @@
package com.ruoyi.account.filter;
import com.alibaba.fastjson.JSON;
-import com.ruoyi.account.api.model.TAppUser;
-import com.ruoyi.account.service.TAppUserService;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.service.IAppUserService;
import com.ruoyi.common.core.constant.TokenConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
@@ -11,7 +11,6 @@
import org.apache.logging.log4j.core.config.Order;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -36,7 +35,7 @@
@Lazy
@Resource
-// private TAppUserService appUserService;
+ private IAppUserService appUserService;
@Lazy
@Resource
@@ -74,8 +73,8 @@
}
//小程序用户
if ("applet".equals(userType)) {
- TAppUser appUser = appUserService.getById(userid);
- if(null == appUser || appUser.getDelFlag() || 3 == appUser.getStatus()){
+ AppUser appUser = appUserService.getById(userid);
+ if(null == appUser || appUser.getDelFlag() == 1 || 3 == appUser.getStatus()){
log.error("[账户异常处理]请求账户id:{}", userid);
unauthorizedResponse(response,"无效的账户");
return;
--
Gitblit v1.7.1