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

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

@@ -24,6 +24,7 @@ import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.enums.im.ClientEnum;
 import com.ym.mec.biz.dal.wrapper.ImGroupMemberWrapper;
+import com.ym.mec.biz.dal.wrapper.ImGroupWrapper;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.biz.service.im.ImGroupCoreService;
 import com.ym.mec.common.page.QueryInfo;
@@ -760,7 +761,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
                     username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
                 }
 
-                imGroupCoreService.register(String.valueOf(userInfo.getId()), "", username, sysUserService.getImAvatar(userInfo));
+                ImGroupWrapper.ImUserInfo imUserInfo = imGroupCoreService.register(String.valueOf(userInfo.getId()), "",
+                    username, sysUserService.getImAvatar(userInfo));
+                log.info("用户更新信息同步到三方成功，userId={}, ret={}", userInfo.getId(), JSON.toJSONString(imUserInfo));
             } catch (Exception e) {
                 log.error("用户更新信息同步到三方失败，userId：{}", userInfo.getId(), e);
             }

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

@@ -306,7 +306,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		messageDto.setObjectName("RC:ImgMsg");
         if (StringUtils.isNotBlank(messageDto.getTargetIds())) {
             ImMessageDto imMessageDto = this.getImGroupMessage(messageDto);
-            imMessageDto.setMessageContent(imageToBase64(bufferedImage, "png"));
+            //imMessageDto.setMessageContent(imageToBase64(bufferedImage, "png"));
             imMessageDto.setFileUrl(messageDto.getFileUrl());
             this.sendGroupMessage(imMessageDto);
         }
@@ -315,7 +315,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
             messageDto.setTargetIds(messageDto.getUserTargetIds());
             ImMessageDto imMessageDto = this.getImGroupMessage(messageDto);
             messageDto.setTargetIds(targetIds);
-            imMessageDto.setMessageContent(imageToBase64(bufferedImage, "png"));
+            //imMessageDto.setMessageContent(imageToBase64(bufferedImage, "png"));
             imMessageDto.setFileUrl(messageDto.getFileUrl());
             imMessageDto.setObjectName(messageDto.getObjectName());
             this.sendImMessage(imMessageDto);