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

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/provider/AbstractAuthenticationProvider.java

@@ -156,11 +156,14 @@ public abstract class AbstractAuthenticationProvider implements AuthenticationPr
 
 		public void check(UserDetails user) {
 			if (!user.isAccountNonLocked()) {
-				throw new LockedException("User account is locked");
+				// User account is locked
+				throw new LockedException("当前账号已锁定");
 			} else if (!user.isEnabled()) {
-				throw new DisabledException("User account is disabled");
+				// User account is disabled
+				throw new DisabledException("当前账号已禁用");
 			} else if (!user.isAccountNonExpired()) {
-				throw new AccountExpiredException("User account is expired");
+				// User account is expired
+				throw new AccountExpiredException("当前账号已失效");
 			}
 		}
 	}

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

@@ -3,13 +3,14 @@ package com.ym.mec.biz.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.biz.dal.entity.ImGroupMemberPlus;
 import com.ym.mec.biz.service.ImGroupMemberPlusService;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import org.springframework.stereotype.Service;
 import lombok.extern.slf4j.Slf4j;
-import com.ym.mec.biz.dal.entity.ImGroupMember;
 import com.ym.mec.biz.dal.mapper.ImGroupMemberPlusMapper;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 群成员表
@@ -33,6 +34,12 @@ public class ImGroupMemberPlusServiceImpl extends ServiceImpl<ImGroupMemberPlusM
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void insertBatch(List<ImGroupMemberPlus> imGroupMemberEntity) {
+        // 添加机构ID
+        for (ImGroupMemberPlus item : imGroupMemberEntity) {
+            if (Objects.isNull(item.getTenantId())) {
+                item.setTenantId(TenantContextHolder.getTenantId());
+            }
+        }
         baseMapper.insertBatch(imGroupMemberEntity);
     }
 

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

@@ -291,6 +291,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 
 	@Override
 	public void batchSendImGroupImgMessage(ImSendGroupMessage messageDto) throws Exception {
+		LOGGER.info("batchSendImGroupImgMessage messageDto={}", messageDto);
 		URL url = new URL(messageDto.getFileUrl());
 		BufferedImage bufferedImage = Thumbnails.of(url).scale(0.1f).outputQuality(0.25f).asBufferedImage();
 		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -322,6 +323,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	public void sendGroupMessage(ImMessageDto imMessageDto){
+		LOGGER.info("sendGroupMessage groupSend ret={}", imMessageDto);
 		//ExecutorService executor = Executors.newCachedThreadPool();
 		CompletableFuture.runAsync(()->{
 			imFeignService.groupSend(imMessageDto);
@@ -330,6 +332,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 
 
     public void sendImMessage(ImMessageDto imMessageDto){
+		LOGGER.info("sendImMessage privateSend ret={}", imMessageDto);
         CompletableFuture.runAsync(()-> imFeignService.privateSend(imMessageDto));
     }