jelly 3 лет назад
Родитель
Сommit
be6f781926

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

@@ -373,8 +373,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if (triggerTime == null || date.after(triggerTime)) {
 			status = SendStatusEnum.SENDING;
 			try {
-				if (debugMode == true
-						|| messageSenderPluginContext.batchSend(messageSender, messageConfig.getDescription(),
+				if (messageSenderPluginContext.batchSend(messageSender, messageConfig.getDescription(),
 								MessageFormatter.arrayFormat(messageConfig.getContent(), args), tos, url,jpushType,"default",null)) {
 					status = SendStatusEnum.SUCCESSED;
 				} else {

+ 3 - 2
mec-web/src/main/java/com/ym/mec/web/controller/education/EduSendNoticeController.java

@@ -39,8 +39,9 @@ public class EduSendNoticeController extends BaseController {
         for (Integer userId : pushInfo.getUserIds()) {
             userMap.put(userId, userId.toString());
         }
-        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.EDU_TEACHER_BASE_URL);
-        String workOrderUrl = "8?" + baseApiUrl + pushInfo.getWorkOrderUrl();
+        //String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.EDU_TEACHER_BASE_URL);
+        //String workOrderUrl = "8?" + baseApiUrl + pushInfo.getWorkOrderUrl();
+        String workOrderUrl = pushInfo.getWorkOrderUrl();
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, pushInfo.getMessageType(), userMap, null, 0, workOrderUrl, "SYSTEM");
         return succeed();
     }