Merge branch 'master' of http://103.249.252.109:90/lcy/education

src/main/java/org/rcisoft/core/util/JwtUserFactory.java

@@ -2,9 +2,6 @@ package org.rcisoft.core.util;
 
 import org.rcisoft.core.model.JwtUser;
 import org.rcisoft.sys.user.entity.SysUser;
-import org.springframework.security.core.GrantedAuthority;
-
-import java.util.ArrayList;
 
 /**
  * Created by lcy on 17/11/21.
@@ -21,21 +18,8 @@ public final class JwtUserFactory {
                 user.getBusinessId(),
                 user.getLoginName(),
                 user.getPassword(),
-                new ArrayList<GrantedAuthority>()
+                user.getSimpleAuthorities()
         );
     }
 
-    /**
-     * 讲User的List<SysRole>转换成JwtUser<GrantedAuthority>
-
-    private static List<GrantedAuthority> map2GrantedAuthorities(List<SysRole> authorities){
-        return authorities.stream()
-                .map(e -> role2SimpleGrantedAuthority(e))
-                .collect(Collectors.toList());
-    }
-
-    private static SimpleGrantedAuthority role2SimpleGrantedAuthority(SysRole role){
-        return new SimpleGrantedAuthority(role.getName());
-    }
-     */
 }

src/main/java/org/rcisoft/sys/user/entity/SysUser.java

 package org.rcisoft.sys.user.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.rcisoft.core.entity.IdEntity;
 import org.rcisoft.sys.role.entity.SysRole;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -37,4 +40,18 @@ public class SysUser extends IdEntity<SysUser> {
     @Transient
     private List<SysRole> roleList = Lists.newArrayList(); // 拥有角色列表
 
+    /**
+     * 权限列表
+     * @return
+     */
+    @JsonIgnore
+    public List<SimpleGrantedAuthority> getSimpleAuthorities(){
+        List<SimpleGrantedAuthority> authorities = new ArrayList<SimpleGrantedAuthority>();
+        SimpleGrantedAuthority auth = null;
+        for (SysRole sysRole: roleList) {
+            auth = new SimpleGrantedAuthority(sysRole.getCode());
+            authorities.add(auth);
+        }
+        return authorities;
+    }
 }