Bladeren bron

修复异常

crazycat 10 maanden geleden
bovenliggende
commit
f0c14ae893
2 gewijzigde bestanden met toevoegingen van 9 en 9 verwijderingen
  1. 8 8
      src/main/java/com/welampiot/dto/UserDTO.java
  2. 1 1
      src/main/resources/mapper/UserMapper.xml

+ 8 - 8
src/main/java/com/welampiot/dto/UserDTO.java

@@ -2,15 +2,15 @@ package com.welampiot.dto;
 
 import lombok.Data;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
+@Component
 @Data
 public class UserDTO implements UserDetails, Serializable {
     private Integer id;
@@ -46,12 +46,12 @@ public class UserDTO implements UserDetails, Serializable {
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
         List<GrantedAuthority> grantedAuthorities = new ArrayList<>();
-        List<String> list = Arrays.asList(getPrivilegeList().split(","));
-        // 声明用户授权
-        list.forEach(sysPermission -> {
-            GrantedAuthority grantedAuthority = new SimpleGrantedAuthority(sysPermission);
-            grantedAuthorities.add(grantedAuthority);
-        });
+//        List<String> list = Arrays.asList(getPrivilegeList().split(","));
+//        // 声明用户授权
+//        list.forEach(sysPermission -> {
+//            GrantedAuthority grantedAuthority = new SimpleGrantedAuthority(sysPermission);
+//            grantedAuthorities.add(grantedAuthority);
+//        });
         return grantedAuthorities;
     }
 

+ 1 - 1
src/main/resources/mapper/UserMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.welampiot.dao.UserDao">
     <select id="getUserByUserName" resultType="com.welampiot.dto.UserDTO" parameterType="com.welampiot.vo.LoginVO">
-        select username,privilege_list privilegeList from user where username=#{username,jdbcType=VARCHAR}
+        select username,privilege_list privilegeList,id,role,zone_list as zoneList from user where username=#{username,jdbcType=VARCHAR}
         and password=#{password,jdbcType=VARCHAR} and status=1
     </select>
     <select id="loadUserByUsername" resultType="com.welampiot.dto.UserDTO">