Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Eladmin
Commits
7fbefa9a
Commit
7fbefa9a
authored
Mar 01, 2019
by
zhengjie
Browse files
Remove the ROLE_ prefix
parent
b5b30565
Changes
3
Hide whitespace changes
Inline
Side-by-side
eladmin-system/src/main/java/me/zhengjie/modules/security/config/SecurityConfig.java
View file @
7fbefa9a
...
...
@@ -12,9 +12,9 @@ import org.springframework.security.authentication.AuthenticationManager;
import
org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder
;
import
org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity
;
import
org.springframework.security.config.annotation.web.builders.HttpSecurity
;
import
org.springframework.security.config.annotation.web.builders.WebSecurity
;
import
org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
;
import
org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter
;
import
org.springframework.security.config.core.GrantedAuthorityDefaults
;
import
org.springframework.security.config.http.SessionCreationPolicy
;
import
org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
;
import
org.springframework.security.crypto.password.PasswordEncoder
;
...
...
@@ -50,6 +50,12 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
.
passwordEncoder
(
passwordEncoderBean
());
}
@Bean
GrantedAuthorityDefaults
grantedAuthorityDefaults
()
{
// Remove the ROLE_ prefix
return
new
GrantedAuthorityDefaults
(
""
);
}
@Bean
public
PasswordEncoder
passwordEncoderBean
()
{
return
new
BCryptPasswordEncoder
();
...
...
eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtUser.java
View file @
7fbefa9a
...
...
@@ -5,12 +5,10 @@ import lombok.AllArgsConstructor;
import
lombok.Getter
;
import
org.springframework.security.core.GrantedAuthority
;
import
org.springframework.security.core.userdetails.UserDetails
;
import
java.sql.Timestamp
;
import
java.util.Collection
;
import
java.util.Date
;
import
java.util.LinkedHashSet
;
import
java.util.Set
;
import
java.util.stream.Collectors
;
/**
* @author jie
...
...
@@ -71,15 +69,7 @@ public class JwtUser implements UserDetails {
return
enabled
;
}
/**
* 在我们保存权限的时候加上了前缀ROLE_,因此在这里需要处理下数据
* @return
*/
public
Collection
getRoles
()
{
Set
<
String
>
roles
=
new
LinkedHashSet
<>();
for
(
GrantedAuthority
authority
:
authorities
)
{
roles
.
add
(
authority
.
getAuthority
().
substring
(
5
));
}
return
roles
;
return
authorities
.
stream
().
map
(
GrantedAuthority:
:
getAuthority
).
collect
(
Collectors
.
toSet
());
}
}
eladmin-system/src/main/java/me/zhengjie/modules/security/service/JwtUserDetailsService.java
View file @
7fbefa9a
...
...
@@ -80,7 +80,7 @@ public class JwtUserDetailsService implements UserDetailsService {
}
return
permissions
.
stream
()
.
map
(
permission
->
new
SimpleGrantedAuthority
(
"ROLE_"
+
permission
.
getName
()))
.
map
(
permission
->
new
SimpleGrantedAuthority
(
permission
.
getName
()))
.
collect
(
Collectors
.
toList
());
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment