From 8f312c7407e26fbb30f0f4ac23a845a40dcd8688 Mon Sep 17 00:00:00 2001 From: lsy <18332763730@163.com> Date: Tue, 5 Dec 2017 10:18:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=BB=98=E8=AE=A4=E7=9A=84?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=8A=A0=E5=AF=86=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../browser/config/BrowserSecurityConfig.java | 4 +- .../browser/service/MsPasswordEncode.java | 39 ------------------- .../browser/service/MsUserDetialsService.java | 9 +++-- .../src/main/resources/application.yml | 1 + 4 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/service/MsPasswordEncode.java diff --git a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java index a8c66e4..e332eb6 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java +++ b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java @@ -1,10 +1,10 @@ package com.micro.fast.security.browser.config; -import com.micro.fast.security.browser.service.MsPasswordEncode; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; /** @@ -37,7 +37,7 @@ public class BrowserSecurityConfig extends WebSecurityConfigurerAdapter { */ @Bean public PasswordEncoder passwordEncoder(){ - return new MsPasswordEncode(); + return new BCryptPasswordEncoder(); } diff --git a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/service/MsPasswordEncode.java b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/service/MsPasswordEncode.java deleted file mode 100644 index d9120ec..0000000 --- a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/service/MsPasswordEncode.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.micro.fast.security.browser.service; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; - - -/** - * Created by root on 12/4/17. - * 处理密码的校验 - */ -@Service -public class MsPasswordEncode implements PasswordEncoder { - private static final Logger log = LoggerFactory.getLogger(PasswordEncoder.class); - /** - * 在注册用户的时候进行密码的加密,这个方法是自己调的spring security不会自己调用,需要自己在合适的地方调用 - * @param charSequence - * @return - */ - @Override - public String encode(CharSequence charSequence) { - log.info("encode{}",charSequence.toString()); - return charSequence.toString()+"1"; - } - - /** - * 定义自己的密码校验逻辑，这个方法spring security会在登录的时候自己调用 - * @param charSequence 用户输入的密码 - * @param s 从根据用户名获取密码的逻辑中返回的密码 - */ - @Override - public boolean matches(CharSequence charSequence, String s) { - if (encode(charSequence).equals(s)){ - return true; - } - return false; - } -} diff --git a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/service/MsUserDetialsService.java b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/service/MsUserDetialsService.java index 05ef677..c26434c 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/service/MsUserDetialsService.java +++ b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/service/MsUserDetialsService.java @@ -9,14 +9,13 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; - +import org.springframework.stereotype.Component; /** * Created by root on 12/4/17. * */ -@Service +@Component public class MsUserDetialsService implements UserDetailsService { private static final Logger log = LoggerFactory.getLogger(MsUserDetialsService.class); @@ -32,7 +31,9 @@ public class MsUserDetialsService implements UserDetailsService { @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { log.info("根据username:{}获取密码",username); - //从数据库中去查找用户的密码 1112 是从数据库中查询出来的用户的密码 + //从数据库中去查找用户的密码 1112 是从数据库中查询出来的用户的密 return new User(username,passwordEncoder.encode("1112"), AuthorityUtils.commaSeparatedStringToAuthorityList("admin")); } + + } diff --git a/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/resources/application.yml b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/resources/application.yml index 7b839c1..fc798c7 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/resources/application.yml +++ b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/resources/application.yml @@ -13,3 +13,4 @@ spring: # basic: # enabled: true +