Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentPreRegistration.java

@@ -157,11 +157,11 @@ public class StudentPreRegistration extends BaseStudentDto {
 		this.parentName = parentName;
 	}
 
-	public String getRemake() {
+	public String getRemark() {
 		return remark;
 	}
 
-	public void setRemake(String remake) {
+	public void setRemark(String remark) {
 		this.remark = remark;
 	}
 

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

@@ -122,8 +122,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     @Autowired
     private OrganizationService organizationService;
     @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
     private SysUserCashAccountDao sysUserCashAccountDao;
     @Autowired
     private ImFeignService imFeignService;
@@ -186,7 +184,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         student.setCurrentGradeNum(studentPreRegistration.getCurrentGradeNum());
         student.setSubjectIdList(studentPreRegistration.getSelectionSubjectId().toString());
         student.setCurrentClass(studentPreRegistration.getCurrentClass());
-        student.setRemark(studentPreRegistration.getRemake());
+        student.setRemark(studentPreRegistration.getRemark());
         student.setUnitName(studentPreRegistration.getUnitName());
         studentDao.insert(student);
         TenantContextHolder.clearTenantId();

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

@@ -309,7 +309,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
-	@Async
 	public void batchSendMessage(Integer senderTenantId, MessageSender messageSender, MessageTypeEnum type, Map<Integer, String> receivers, Date triggerTime, Integer readStatus,
 			String url,String jpushType, Object... args) {
 		LOGGER.info("batchSendMessage tenantId {} msgSender {}, type {}, receivers {} ", senderTenantId, messageSender, type, receivers);
@@ -394,16 +393,11 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	@Override
 	public void batchSendMessage(MessageSender messageSender, MessageTypeEnum type, Map<Integer, String> receivers, Date triggerTime, Integer readStatus,
 			String url,String jpushType, Object... args) {
-		ExecutorService executor = Executors.newFixedThreadPool(5);
-		CompletableFuture.runAsync(()->{
-			batchSendMessage(TenantContextHolder.getTenantId(), messageSender, type, receivers, triggerTime, readStatus, url, jpushType, args);
-		},executor);
-		executor.shutdown();
+		batchSendMessage(TenantContextHolder.getTenantId(), messageSender, type, receivers, triggerTime, readStatus, url, jpushType, args);
 	}
 
 
 	@Override
-	@Async
 	public void batchPushMessage(MessageTypeEnum type, Map<Integer, String> receivers, Date triggerTime, Integer readStatus,
 			String url,String jpushType,String sound,String channelId, Object... args) {
 		if (receivers == null || receivers.size() == 0) {
@@ -469,7 +463,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
-	@Async
 	public void sendMessage(MessageSender messageSender, Integer userId, String title, String content, String receiver, Date triggerTime, Integer readStatus, String url, String group,String jpushType) {
 		LOGGER.info("batchSendMessage {}, userId {}, receivers {} ", messageSender, userId, receiver);
 		if (StringUtils.isBlank(receiver)) {

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/MessageSenderPluginContext.java

@@ -3,6 +3,9 @@ package com.ym.mec.thirdparty.message;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import com.ym.mec.thirdparty.entity.SysEmail;
 import com.ym.mec.thirdparty.message.provider.*;
@@ -65,10 +68,18 @@ public class MessageSenderPluginContext implements ApplicationContextAware {
 	 * @throws IOException
 	 */
 	public boolean send(MessageSender messageSender, String subject, String content, String receiver, String url, String jpushType,String sound,String channelId) throws Exception {
-
-		messageSenderPlugin = getMessageSenderPlugin(messageSender);
-
-		return messageSenderPlugin.send(subject, content, receiver, url, jpushType,sound,channelId);
+		ExecutorService executor = Executors.newFixedThreadPool(5);
+		CompletableFuture<Boolean> future = CompletableFuture.supplyAsync(()->{
+			messageSenderPlugin = getMessageSenderPlugin(messageSender);
+			try {
+				return messageSenderPlugin.send(subject, content, receiver, url, jpushType,sound,channelId);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			return false;
+		},executor);
+		executor.shutdown();
+		return future.join();
 	}
 
 	/**
@@ -82,10 +93,18 @@ public class MessageSenderPluginContext implements ApplicationContextAware {
 	 * @throws IOException
 	 */
 	public boolean batchSend(MessageSender messageSender, String subject, String content, String[] receivers, String url, String jpushType,String sound,String channelId) throws Exception {
-
-		messageSenderPlugin = getMessageSenderPlugin(messageSender);
-
-		return messageSenderPlugin.batchSend(subject, content, receivers, url, jpushType,sound,channelId);
+		ExecutorService executor = Executors.newFixedThreadPool(5);
+		CompletableFuture<Boolean> future = CompletableFuture.supplyAsync(()->{
+			messageSenderPlugin = getMessageSenderPlugin(messageSender);
+			try {
+				return messageSenderPlugin.batchSend(subject, content, receivers, url, jpushType,sound,channelId);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			return false;
+		},executor);
+		executor.shutdown();
+		return future.join();
 	}
 
 	@Override