Merge branch 'feature/1020-tencent-im' into test

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

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

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

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

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

@@ -138,7 +138,9 @@ public class ImGroupController extends BaseController {
 			//这里由原来的优先取老师的realName改成了优先取学员的username，
 			// 因为管理员在修改通讯录备注的时候，如果是多角色，优先改的是学员的username
 			List<String> userTypes = Lists.newArrayList(user.getUserType().split(","));
-			if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
+			if (userTypes.size() > 1
+				|| userTypes.contains(ClientEnum.TEACHER.getCode())
+				|| userTypes.contains(ClientEnum.SYSTEM.getCode())) {
 				// 增加用户身份数量 > 1 或者包含老师身份，统一使用实名
 				dto.setFriendNickname(Optional.ofNullable(user.getRealName()).filter(StringUtils::isNotBlank).orElse(user.getUsername()));
 			} else if (user.getUserType().contains("STUDENT") || user.getUserType().contains("SCHOOL")) {

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

@@ -757,13 +757,15 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
             try {
                 String username = userInfo.getUsername();
                 List<String> userTypes = Lists.newArrayList(userInfo.getUserType().split(","));
-                if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
+                if (userTypes.size() > 1
+                    || userTypes.contains(ClientEnum.TEACHER.getCode())
+                    || userTypes.contains(ClientEnum.SYSTEM.getCode())) {
                     username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
                 }
 
                 ImGroupWrapper.ImUserInfo imUserInfo = imGroupCoreService.register(String.valueOf(userInfo.getId()), "",
                     username, sysUserService.getImAvatar(userInfo));
-                log.info("用户更新信息同步到三方成功，userId={}, ret={}", userInfo.getId(), JSON.toJSONString(imUserInfo));
+                log.info("用户更新信息同步到三方成功，userId={}, username={}, ret={}", userInfo.getId(), username, JSON.toJSONString(imUserInfo));
             } catch (Exception e) {
                 log.error("用户更新信息同步到三方失败，userId：{}", userInfo.getId(), e);
             }

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

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

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

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

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

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

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

@@ -69,7 +69,9 @@ public class SysUserServiceImpl implements SysUserService {
         }
         String username = sysUser.getUsername();
         List<String> userTypes = Lists.newArrayList(sysUser.getUserType().split(","));
-        if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
+        if (userTypes.size() > 1
+            || userTypes.contains(ClientEnum.TEACHER.getCode())
+            || userTypes.contains(ClientEnum.SYSTEM.getCode())) {
             username = Optional.ofNullable(sysUser.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
         }
         return username;

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

@@ -92,7 +92,9 @@ public class UserController {
 
                 String username = userInfo.getUsername();
                 List<String> userTypes = Lists.newArrayList(userInfo.getUserType().split(","));
-                if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
+                if (userTypes.size() > 1
+                    || userTypes.contains(ClientEnum.TEACHER.getCode())
+                    || userTypes.contains(ClientEnum.SYSTEM.getCode())) {
                     username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
                 }
 
@@ -130,7 +132,9 @@ public class UserController {
 
             String username = userInfo.getUsername();
             List<String> userTypes = Lists.newArrayList(userInfo.getUserType().split(","));
-            if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
+            if (userTypes.size() > 1
+                || userTypes.contains(ClientEnum.TEACHER.getCode())
+                || userTypes.contains(ClientEnum.SYSTEM.getCode())) {
                 username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
             }
 
@@ -164,7 +168,9 @@ public class UserController {
 
                 String username = userInfo.getUsername();
                 List<String> userTypes = Lists.newArrayList(userInfo.getUserType().split(","));
-                if (userTypes.size() > 1 || userTypes.contains(ClientEnum.TEACHER.getCode())) {
+                if (userTypes.size() > 1
+                    || userTypes.contains(ClientEnum.TEACHER.getCode())
+                    || userTypes.contains(ClientEnum.SYSTEM.getCode())) {
                     username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
                 }
 
@@ -173,7 +179,7 @@ public class UserController {
                     ImGroupWrapper.ImUserInfo register = imGroupCoreService.register(userModel.getId(), "",
                         username,  sysUserService.getImAvatar(teacherDao.getUser(userInfo.getUserId().intValue())));
 
-                    log.info("update IM_USER register: {}", JSONObject.toJSONString(register));
+                    log.info("update IM_USER userId={}, username={} register: {}", userModel.getId(), username, JSONObject.toJSONString(register));
                 } catch (Exception e) {
                     log.error("更新注册IM用户信息", e);
                 }