diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java index f86003f..24b7171 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java @@ -11,5 +11,7 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class OrganizationManage { +// private final + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/MenuManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/MenuManage.java index 2f9fb0c..3307485 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/MenuManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/MenuManage.java @@ -9,7 +9,7 @@ import com.ningdatech.pmapi.sys.entity.Menu; import com.ningdatech.pmapi.sys.entity.RoleMenu; import com.ningdatech.pmapi.sys.entity.vo.MenuRoleVO; import com.ningdatech.pmapi.sys.service.IRoleMenuService; -import com.ningdatech.pmapi.user.model.UserInfoDetails; +import com.ningdatech.pmapi.user.security.auth.model.UserInfoDetails; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/UserInfoDetails.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/UserInfoDetails.java deleted file mode 100644 index c5834a5..0000000 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/UserInfoDetails.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.ningdatech.pmapi.user.model; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; - -import com.ningdatech.basic.auth.AbstractLoginUser; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @author LiuXinXin - * @date 2022/8/1 下午3:32 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class UserInfoDetails extends AbstractLoginUser implements UserDetails { - - private static final long serialVersionUID = 1L; - - private String nickName; - - private String password; - - private List roleList; - - private Integer dataScope; - - private Long roleId; - - private Long companyId; - - private String companyName; - - private Long regionId; - - private String regionName; - - private List roleIdList; - - /** - * 获取用户权限 - */ - @Override - public Collection getAuthorities() { - return new ArrayList<>(); - } - - @Override - public boolean isAccountNonExpired() { - return true; - } - - @Override - public boolean isAccountNonLocked() { - return true; - } - - @Override - public boolean isCredentialsNonExpired() { - return true; - } - - @Override - public boolean isEnabled() { - return true; - } - -} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/util/LoginUserUtil.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/util/LoginUserUtil.java index 75d5215..090a9e5 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/util/LoginUserUtil.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/util/LoginUserUtil.java @@ -1,7 +1,7 @@ package com.ningdatech.pmapi.user.util; import com.ningdatech.basic.auth.AbstractLoginUserUtil; -import com.ningdatech.pmapi.user.model.UserInfoDetails; +import com.ningdatech.pmapi.user.security.auth.model.UserInfoDetails; /**