Browse Source

优先考虑user_uu获取用户信息

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@5966 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
yingp 9 years ago
parent
commit
ca6091ae32
1 changed files with 7 additions and 4 deletions
  1. 7 4
      src/main/java/com/uas/platform/b2b/filter/SSOInterceptor.java

+ 7 - 4
src/main/java/com/uas/platform/b2b/filter/SSOInterceptor.java

@@ -77,12 +77,15 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 		User authedUser = null;
 		if (token.getData() != null) {
 			com.uas.account.entity.User tokenUser = FlexJsonUtils.fromJson(token.getData(), com.uas.account.entity.User.class);
-			if (tokenUser.getUid() != null) {
-				// UID表示所有系统公认的唯一标识,这里统一使用手机号
-				authedUser = userService.findUserByUserTel(tokenUser.getUid());
-			} else if (tokenUser.getDialectUID() != null) {
+			if (!StringUtils.isEmpty(tokenUser.getDialectUID())) {
 				// dialectUID表示client系统自己的唯一标识,比如user_uu,手机号没设置的情况下使用
 				authedUser = userService.findUserByUserUU(Long.parseLong(tokenUser.getDialectUID()));
+			} else if (!StringUtils.isEmpty(tokenUser.getUid())) {
+				// UID表示所有系统公认的唯一标识,这里统一使用手机号
+				authedUser = userService.findUserByUserTel(tokenUser.getUid());
+			} else if (!StringUtils.isEmpty(tokenUser.getSecondUID())) {
+				// UID表示所有系统公认的唯一标识,这里统一使用手机号
+				authedUser = userService.findUserByUserEmail(tokenUser.getSecondUID());
 			} else {
 				logger.error(String.format("invalid user %s, please set uid or dialectUID", tokenUser.getName()));
 			}