Merge branch 'feature/0529-live' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/event/listener/CourseEventListener.java

@@ -26,7 +26,6 @@ public class CourseEventListener {
     public void courseStatusChangeMonitor(CourseStatusChangeEvent courseStatusChangeEvent){
         List<Long> courseIds = courseStatusChangeEvent.getCourseIds();
         if(CollectionUtils.isNotEmpty(courseIds)){
-            ExecutorService executor = Executors.newCachedThreadPool();
             CompletableFuture.runAsync(()->{
                 try {
                     //更新课程营收
@@ -34,7 +33,7 @@ public class CourseEventListener {
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-            },executor);
+            });
         }
     }
 }

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

@@ -284,7 +284,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
         //更新用户与机构的关系
         sysUserTenantService.deleteByUserId(employee.getId());
         addUserTenant(employee.getTenantIds(), employee.getTenantId(), employee.getId());
-        ExecutorService executor = Executors.newCachedThreadPool();
+        //ExecutorService executor = Executors.newCachedThreadPool();
         CompletableFuture.runAsync(()->{
             try {
                 //更新OA信息
@@ -292,7 +292,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
             } catch (Exception e) {
                 e.printStackTrace();
             }
-        },executor);
+        });
     }
 
     @Override

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

@@ -246,10 +246,8 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	public void batchSendImMessage(MessageTypeEnum type, String senderId,String extra, String[] targetIds, String url, Object... args) {
 		String messageContent = checkMessageConfig(type);
 		String content = getContent(messageContent,url, args);
-		ExecutorService executor = Executors.newCachedThreadPool();
-		CompletableFuture.runAsync(()->{
-			imFeignService.privateSend(getImGroupMessage("RC:TxtMsg",senderId,targetIds,content,extra));
-		},executor);
+		//ExecutorService executor = Executors.newCachedThreadPool();
+		CompletableFuture.runAsync(()-> imFeignService.privateSend(getImGroupMessage("RC:TxtMsg",senderId,targetIds,content,extra)));
 	}
 
 	@Override
@@ -276,10 +274,8 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 
 	@Override
 	public void batchSendImGroupMessage(String messageContent, String senderId,String extra, String[] targetIds,String objectName) {
-		ExecutorService executor = Executors.newCachedThreadPool();
-		CompletableFuture.runAsync(()->{
-			imFeignService.groupSend(getImGroupMessage(objectName,senderId,targetIds,messageContent,extra));
-		},executor);
+		//ExecutorService executor = Executors.newCachedThreadPool();
+		CompletableFuture.runAsync(()-> imFeignService.groupSend(getImGroupMessage(objectName,senderId,targetIds,messageContent,extra)));
 	}
 
 	public static String imageToBase64(BufferedImage bufferedImage,String suffix) {
@@ -326,18 +322,15 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	public void sendGroupMessage(ImMessageDto imMessageDto){
-		ExecutorService executor = Executors.newCachedThreadPool();
+		//ExecutorService executor = Executors.newCachedThreadPool();
 		CompletableFuture.runAsync(()->{
 			imFeignService.groupSend(imMessageDto);
-		},executor);
+		});
 	}
 
 
     public void sendImMessage(ImMessageDto imMessageDto){
-        ExecutorService executor = Executors.newCachedThreadPool();
-        CompletableFuture.runAsync(()->{
-            imFeignService.privateSend(imMessageDto);
-        },executor);
+        CompletableFuture.runAsync(()-> imFeignService.privateSend(imMessageDto));
     }
 
 	@Override
@@ -418,10 +411,11 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if(sysUser == null){
 			throw new BizException("用户信息获取失败");
 		}
-		ExecutorService executor = Executors.newCachedThreadPool();
+		//ExecutorService executor = Executors.newCachedThreadPool();
 		CompletableFuture.runAsync(()->{
 			imFeignService.privateSend(getImGroupMessage("RC:TxtMsg",sysUser.getId().toString(),studentId.split(","),content,null));
-		},executor);
+		});
+		//executor.shutdown();
 	}
 
 	@Override