Merge branch 'master' of http://git.dayaedu.com/yonge/mec into test

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/AuthenticationFailureListener.java

@@ -41,7 +41,7 @@ public class AuthenticationFailureListener implements ApplicationListener<Authen
         	if(username.startsWith(SecurityConstants.USERNAME_PRINCIPAL_PREFIX)){
                 sysUser = sysUserService.queryByUsername(username.split(":")[1]);
             }else {
-                sysUser = sysUserService.queryByPhone(username.split(":")[1]);
+                sysUser = sysUserService.queryLockByPhone(username.split(":")[1]);
             }
         }
         if(sysUser != null){

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

@@ -82,7 +82,7 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 		if(username.startsWith(SecurityConstants.USERNAME_PRINCIPAL_PREFIX)){
 			sysUser = sysUserService.queryByUsername(username.split(":")[1]);
 		}else {
-			sysUser = sysUserService.queryByPhone(username.split(":")[1]);
+			sysUser = sysUserService.queryLockByPhone(username.split(":")[1]);
 		}
 		if(StringUtils.isEmpty(sysUser.getImToken())){
 			String name = sysUser.getRealName();

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysUserDao.java

@@ -30,6 +30,13 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @param phone
 	 * @return
 	 */
+	SysUser queryLockByPhone(String phone);
+
+	/**
+	 * 根据手机号查询对象
+	 * @param phone
+	 * @return
+	 */
 	SysUser queryByPhoneAndClient(@Param("phone") String phone, @Param("client") String client);
 
 	/**

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysUserService.java

@@ -26,6 +26,13 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * @param phone
 	 * @return
 	 */
+	SysUser queryLockByPhone(String phone);
+
+	/**
+	 * 根据手机号查询对象
+	 * @param phone
+	 * @return
+	 */
 	SysUser queryByPhoneAndClient(String phone,String client);
 
 	/**

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -62,6 +62,10 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	public SysUser queryByPhone(String phone) {
 		return sysUserDao.queryByPhone(phone);
 	}
+	@Override
+	public SysUser queryLockByPhone(String phone) {
+		return sysUserDao.queryLockByPhone(phone);
+	}
 
 	@Override
 	public SysUser queryByPhoneAndClient(String phone,String client) {
@@ -75,7 +79,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 
 	@Override
 	public SysUserInfo queryUserInfoByPhone(String phone) {
-		return getSysUserInfo(queryByPhone(phone));
+		return getSysUserInfo(queryLockByPhone(phone));
 	}
 
 	@Override

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -92,6 +92,11 @@ public class UserController extends BaseController {
 		return succeed(sysUserService.getBasic(userId));
 	}
 
+	@GetMapping(value = "/findByPhone")
+	public Object findByPhone(String mobile) {
+		return succeed(sysUserService.queryByPhone(mobile));
+	}
+
 	@GetMapping(value = "/queryUserByPhone")
 	public SysUser queryUserByPhone(String mobile) {
 		return sysUserService.queryByPhone(mobile);

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -190,6 +190,10 @@
 	</select>
 
     <select id="queryByPhone" resultMap="SysUser">
+		select * from sys_user where phone_ = #{phone} OR username_ = #{phone} LIMIT 1
+	</select>
+
+    <select id="queryLockByPhone" resultMap="SysUser">
 		select * from sys_user where phone_ = #{phone} OR username_ = #{phone} LIMIT 1 FOR UPDATE
 	</select>
     <resultMap id="ImUserModel" type="com.ym.mec.common.entity.ImUserModel">

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupMemberServiceImpl.java

@@ -73,9 +73,9 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 		imGroupMember.setUpdateTime(date);
 		imGroupMember.setUserId(userId);
 		if (StringUtils.isBlank(roleType)) {
-			imGroupMember.setNickname(user.getUsername());
+			imGroupMember.setNickname(user.getUsername()==null?user.getRealName():user.getUsername());
 		} else {
-			imGroupMember.setNickname(user.getRealName());
+			imGroupMember.setNickname(user.getRealName()==null?user.getUsername():user.getRealName());
 		}
 
 		imGroupMemberDao.insert(imGroupMember);