Merge remote-tracking branch 'origin/dev' into dev

k94314517

2023-10-24 be4bfd2dac75cf4249ef30f85c4fbb07d0dcc67f

 server/platform/src/main/java/com/doumee/config/shiro/ShiroRealm.java

@@ -26,6 +26,7 @@

import java.util.Date;
import java.util.List;
import java.util.Objects;

/**
 * 自定义Realm，处理认证和权限
@@ -82,6 +83,9 @@
        if(user == null){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，账号或密码不正确！");
        }
        if(Objects.equals(user.getStatus(),Constants.ONE)){
            throw new AuthenticationException("用户已被禁用，请联系管理员");
        }
        // 获取登录用户信息
        List<SystemRole> roles = systemRoleService.findByUserId(user.getId());
        List<SystemPermission> permissions = systemPermissionService.findByUserId(user.getId());