From 2d359bf8db8a12a5428d59c7b0c97c9c6bb0ad7d Mon Sep 17 00:00:00 2001
From: winLsy <18332763730@163.com>
Date: Wed, 17 Jan 2018 20:46:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=93=E7=B3=BB=E5=86=85?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E8=BF=94=E5=9B=9E=E7=9A=84?=
 =?UTF-8?q?user=E4=B8=BASocialUser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UpmsUserAuthenticationServiceImpl.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserAuthenticationServiceImpl.java b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserAuthenticationServiceImpl.java
index 67afce8..d99839e 100644
--- a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserAuthenticationServiceImpl.java
+++ b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserAuthenticationServiceImpl.java
@@ -31,7 +31,11 @@ public class UpmsUserAuthenticationServiceImpl implements UserService,SocialUser
     public User getUserByUsername(String username) {
         UpmsUser upmsUser = upmsUserMapper.selectByUsername(username);
         //将根据用户名查询出来的用户信息填入springSecurity的User对象中，默认是admin权限 todo 需要进行完善
-        User user = new User(username,upmsUser.getPassword(), AuthorityUtils.commaSeparatedStringToAuthorityList("admin"));
+       /* User user = new User(username,upmsUser.getPassword(), AuthorityUtils.commaSeparatedStringToAuthorityList("admin"));*/
+       //使用socialUser替换user.只有socialUser在才有getUserId方法，这样使用connect获取绑定第三方账号信息的时候才能用
+        SocialUser user = new SocialUser(username, upmsUser.getPassword()
+                , true, true, true, true
+                , AuthorityUtils.commaSeparatedStringToAuthorityList("admin"));
         return user;
     }
 
@@ -45,6 +49,7 @@ public class UpmsUserAuthenticationServiceImpl implements UserService,SocialUser
     public SocialUserDetails loadUserByUserId(String username) throws UsernameNotFoundException {
         //使用upmsUserMapper获取到用户的
         UpmsUser upmsUser = upmsUserMapper.selectByUsername(username);
+        //todo 需要完善
         SocialUser socialUser = new SocialUser(username, upmsUser.getPassword()
                 , true, true, true, true
                 , AuthorityUtils.commaSeparatedStringToAuthorityList("admin"));