Merge branch 'feature/1020-tencent-im' of http://git.dayaedu.com/yonge/mec into feature/1020-tencent-im

mec-application/src/main/java/com/ym/mec/student/controller/ImGroupController.java

@@ -105,7 +105,7 @@ public class ImGroupController extends BaseController {
 			List<String> userTypes = Lists.newArrayList(user.getUserType().split(","));
 			if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
 				// 增加用户身份数量 > 1 或者包含老师身份，统一使用实名
-				dto.setFriendNickname(Optional.ofNullable(user.getRealName()).orElse(user.getUsername()));
+				dto.setFriendNickname(Optional.ofNullable(user.getRealName()).filter(StringUtils::isNotBlank).orElse(user.getUsername()));
 			} else if (user.getUserType().contains("STUDENT") || user.getUserType().contains("SCHOOL")) {
 				dto.setFriendNickname(user.getUsername());
 			} else {

mec-application/src/main/java/com/ym/mec/teacher/controller/ImGroupController.java

@@ -126,7 +126,7 @@ public class ImGroupController extends BaseController {
 			List<String> userTypes = Lists.newArrayList(user.getUserType().split(","));
 			if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
 				// 增加用户身份数量 > 1 或者包含老师身份，统一使用实名
-				dto.setFriendNickname(Optional.ofNullable(user.getRealName()).orElse(user.getUsername()));
+				dto.setFriendNickname(Optional.ofNullable(user.getRealName()).filter(StringUtils::isNotBlank).orElse(user.getUsername()));
 			} else if (user.getUserType().contains("STUDENT") || user.getUserType().contains("SCHOOL")) {
 				dto.setFriendNickname(user.getUsername());
 			} else {

mec-application/src/main/java/com/ym/mec/web/controller/ImGroupController.java

@@ -140,7 +140,7 @@ public class ImGroupController extends BaseController {
 			List<String> userTypes = Lists.newArrayList(user.getUserType().split(","));
 			if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
 				// 增加用户身份数量 > 1 或者包含老师身份，统一使用实名
-				dto.setFriendNickname(Optional.ofNullable(user.getRealName()).orElse(user.getUsername()));
+				dto.setFriendNickname(Optional.ofNullable(user.getRealName()).filter(StringUtils::isNotBlank).orElse(user.getUsername()));
 			} else if (user.getUserType().contains("STUDENT") || user.getUserType().contains("SCHOOL")) {
 				dto.setFriendNickname(user.getUsername());
 			} else {

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

@@ -734,7 +734,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
                 String username = userInfo.getUsername();
                 List<String> userTypes = Lists.newArrayList(userInfo.getUserType().split(","));
                 if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
-                    username = Optional.ofNullable(userInfo.getRealName()).orElse(username);
+                    username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
                 }
 
                 imGroupCoreService.register(String.valueOf(userInfo.getId()), "", username, userInfo.getAvatar());

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

@@ -339,7 +339,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 List<String> userTypes = Lists.newArrayList(imGroupMemberDto.getUser().getUserType().split(","));
                 if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
                     // 增加用户身份数量 > 1 或者包含老师身份，统一使用实名
-                    imGroupMemberDto.setGroupNickname(imGroupMemberDto.getUser().getRealName());
+                    imGroupMemberDto.setGroupNickname(Optional.ofNullable(imGroupMemberDto.getUser().getRealName()).filter(StringUtils::isNotBlank).orElse(imGroupMemberDto.getUser().getUsername()));
                 }
             }
 
@@ -1006,7 +1006,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             // 老师默认使用真实姓名
             List<String> userTypes = Lists.newArrayList(user.getUserType().split(","));
             if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
-                username = Optional.ofNullable(user.getRealName()).orElse(username);
+                username = Optional.ofNullable(user.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
             }
             // 自动激活学生IM帐号
             imGroupCoreService.register(userId,clientType, username, avatar);

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

@@ -152,7 +152,7 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
 
                 List<String> userTypes = Lists.newArrayList(item.getFriend().getUserType().split(","));
                 if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
-                    username = Optional.ofNullable(item.getFriend().getRealName()).orElse(username);
+                    username = Optional.ofNullable(item.getFriend().getRealName()).filter(StringUtils::isNotBlank).orElse(username);
                 }
                 // 用户好友默认用户名
                 if (StringUtils.isNotBlank(username)) {
@@ -173,7 +173,7 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
             if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
                 // 增加用户身份数量 > 1 或者包含老师身份，统一使用实名
                 imUserFriendDto.setFriendNickname(Optional.ofNullable(imUserFriendDto.getFriend().getRealName())
-                    .orElse(imUserFriendDto.getFriend().getUsername()));
+                    .filter(StringUtils::isNotBlank).orElse(imUserFriendDto.getFriend().getUsername()));
             }
 
             imUserFriendDto.setImUserId(imGroupCoreService.getImUserId(String.valueOf(imUserFriendDto.getUserId()),""));

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

@@ -760,7 +760,7 @@ public class StudentManageServiceImpl implements StudentManageService {
                 String username = userInfo.getUsername();
                 List<String> userTypes = Lists.newArrayList(userInfo.getUserType().split(","));
                 if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
-                    username = Optional.ofNullable(userInfo.getRealName()).orElse(username);
+                    username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
                 }
 
                 imGroupCoreService.register(String.valueOf(userInfo.getId()), "", username, userInfo.getAvatar());

mec-im/src/main/java/com/ym/controller/UserController.java

@@ -93,7 +93,7 @@ public class UserController {
                 String username = userInfo.getUsername();
                 List<String> userTypes = Lists.newArrayList(userInfo.getUserType().split(","));
                 if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
-                    username = Optional.ofNullable(userInfo.getRealName()).orElse(username);
+                    username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
                 }
 
                 ImGroupWrapper.ImUserInfo register = imGroupCoreService.register(userModel.getId(), clientType, username, userInfo.getAvatar());
@@ -130,7 +130,7 @@ public class UserController {
             String username = userInfo.getUsername();
             List<String> userTypes = Lists.newArrayList(userInfo.getUserType().split(","));
             if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
-                username = Optional.ofNullable(userInfo.getRealName()).orElse(username);
+                username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
             }
 
             try {
@@ -164,7 +164,7 @@ public class UserController {
                 String username = userInfo.getUsername();
                 List<String> userTypes = Lists.newArrayList(userInfo.getUserType().split(","));
                 if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
-                    username = Optional.ofNullable(userInfo.getRealName()).orElse(username);
+                    username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
                 }
 
                 try {