Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-28 06f455915bb9d11caa8829942f9007809ee9ae3d

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java

@@ -2,9 +2,12 @@

import com.alibaba.fastjson.JSON;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.service.AppUserService;
import com.ruoyi.common.core.constant.TokenConstants;
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;
@@ -32,7 +35,7 @@

   @Lazy
   @Resource
   private IAppUserService appUserService;
   private AppUserService appUserService;

   @Lazy
   @Resource
@@ -71,7 +74,7 @@
      //小程序用户
      if ("applet".equals(userType)) {
         AppUser appUser = appUserService.getById(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;