Selaa lähdekoodia

个人账号切换企业账号失败问题

wangmh 7 vuotta sitten
vanhempi
commit
8084c4fb82

+ 2 - 1
sso-common/src/main/java/com/uas/sso/entity/UserAccount.java

@@ -131,7 +131,7 @@ public class UserAccount implements Serializable {
         this.lastLoginTime = lastLoginTime;
     }
 
-    public UserAccount(Long userUU, String vipName, String mobile, String mobileArea, Short mobileValidCode, String password, String salt, String email, Short emailValidCode, Short identityValidCode, Short lock, Date lastLoginTime) {
+    public UserAccount(Long userUU, String vipName, String mobile, String mobileArea, Short mobileValidCode, String password, String salt, String email, Short emailValidCode, Short identityValidCode, Short lock, String appId, Date lastLoginTime) {
         this.userUU = userUU;
         this.vipName = vipName;
         this.mobile = mobile;
@@ -143,6 +143,7 @@ public class UserAccount implements Serializable {
         this.emailValidCode = emailValidCode;
         this.identityValidCode = identityValidCode;
         this.lock = lock;
+        this.appId = appId;
         this.lastLoginTime = lastLoginTime;
     }
 

+ 1 - 1
sso-server/src/main/java/com/uas/sso/service/impl/PersonalAccountServiceImpl.java

@@ -26,7 +26,7 @@ public class PersonalAccountServiceImpl implements PersonalAccountService {
      */
     private static final String JPQL= "select new com.uas.sso.entity.UserAccount(user.userUU, user.vipName, user.mobile, user.mobileArea, " +
             "user.mobileValidCode, user.password, user.salt, user.email, user.emailValidCode, " +
-            "user.identityValidCode, user.lock, ur.lastLoginTime) from UserRecord ur, User user where user.userRecord.id = ur.id ";
+            "user.identityValidCode, user.lock, app.uid, ur.lastLoginTime) from UserRecord ur, User user, App app where user.userRecord.id = ur.id ";
 
     @Override
     public List<UserAccount> findAll() {

+ 1 - 1
sso-server/src/main/resources/dev/account.properties

@@ -4,7 +4,7 @@ sso.app=sso
 sso.secretkey=0taQcW073Z7G628g5H
 #sso.cookie.domain=ubtob.com
 sso.cookie.secure=false
-sso.front.url=http://10.1.51.37:3001
+sso.front.url=http://192.168.253.118:3001
 
 ### crossdomain verify
 sso.authcookie.secretkey=Z318866alN6gA0piuO