debug

src/main/java/com/cmeeting/email/EmailSender.java

@@ -72,7 +72,7 @@ public class EmailSender {
      * @param emailPushBuilder
      * @return
      */
-    public boolean sendEmailWithAttachment(EmailPush emailPushBuilder) {
+    public Boolean sendEmailWithAttachment(EmailPush emailPushBuilder) {
         log.info("sendEmailWithAttachment start, sender -> {}", SENDER);
 
         if(!pushSwitch){
@@ -80,7 +80,7 @@ public class EmailSender {
             return false;
         }
         AtomicInteger retryCount = new AtomicInteger(0);
-        boolean isSent = false;
+        Boolean isSent = false;
         String toEmail = "test".equals(environment) ? testReceiver : emailPushBuilder.getToEmail();
         String subject = emailPushBuilder.getSubject();
         String meetingId = emailPushBuilder.getMeetingId();
@@ -103,7 +103,7 @@ public class EmailSender {
             return false;
         }
         log.info("准备开始邮件推送...");
-        while (retryCount.intValue() < MAX_RETRY && !isSent){
+        while (retryCount.intValue() < MAX_RETRY &&  isSent != null && !isSent){
             try {
                  ClientSecretCredential clientSecretCredential = new ClientSecretCredentialBuilder()
                         .clientId(CLIENT_ID)
@@ -139,7 +139,7 @@ public class EmailSender {
                     long expireTimestamp = ZonedDateTime.now().plusDays(2).toInstant().toEpochMilli();
                     body.content = MessageFormat.format(email_content_template,meetingInstanceId,toUserCode,String.valueOf(expireTimestamp));
                 }else{
-                    isSent = false;
+                    isSent = null;
                     processLogService.log(meetingId,subMeetingId,"【邮件推送异常】:邮件模板未设置");
                     throw new RobotBaseException("邮件模板未设置");
                 }

src/main/java/com/cmeeting/job/CmeetingJob.java

@@ -66,7 +66,7 @@ public class CmeetingJob {
      */
     @Scheduled(cron = "0 30 6 * * ?")
     public void weComUserSync() {
-        if (redisUtils.setnx("weComUserSync", "weComUserSync", 20 * 60 * 60)){
+        if (!redisUtils.setnx("weComUserSync", "weComUserSync", 20 * 60 * 60)){
             return;
         }
         try {
@@ -88,7 +88,7 @@ public class CmeetingJob {
     @Scheduled(cron = "0 0 7 * * ?")
 //    @Scheduled(fixedRate = 5 * 60 * 1000)
     public void TencentUserSync() {
-        if (redisUtils.setnx("TencentUserSync", "TencentUserSync", 20 * 60 * 60)){
+        if (!redisUtils.setnx("TencentUserSync", "TencentUserSync", 20 * 60 * 60)){
             return;
         }
         try {
@@ -109,7 +109,7 @@ public class CmeetingJob {
      */
     @Scheduled(cron = "0 20 7 * * ?")
     public void userBind() {
-        if (redisUtils.setnx("userBind", "userBind", 20 * 60 * 60)){
+        if (!redisUtils.setnx("userBind", "userBind", 20 * 60 * 60)){
             return;
         }
         try {
@@ -129,7 +129,7 @@ public class CmeetingJob {
         if (isDev) {
             return;
         }
-        if (redisUtils.setnx("Scheduled-All", "Scheduled-All", 18 * 60)){
+        if (!redisUtils.setnx("Scheduled-All", "Scheduled-All", 18 * 60)){
             return;
         }
         try {
@@ -177,7 +177,7 @@ public class CmeetingJob {
         if (isDev) {
             return;
         }
-        if (redisUtils.setnx("Scheduled-retry", "Scheduled-retry", 28 * 60)){
+        if (!redisUtils.setnx("Scheduled-retry", "Scheduled-retry", 28 * 60)){
             return;
         }
         try {
@@ -227,12 +227,12 @@ public class CmeetingJob {
     /**
      * 定时扫描早于一小时之前的，所有邮件推送未重试过的会议，重新推送邮件
      */
-    @Scheduled(fixedRate = 30 * 60 * 1000,initialDelay = 15 * 60 * 1000)
+    @Scheduled(fixedRate = 10 * 60 * 1000,initialDelay = 15 * 60 * 1000)
     public void emailPushRetry() {
         if (isDev) {
             return;
         }
-        if (redisUtils.setnx("Scheduled-email-retry", "Scheduled-email-retry", 28 * 60)){
+        if (!redisUtils.setnx("Scheduled-email-retry", "Scheduled-email-retry", 28 * 60)){
             return;
         }
         try {

src/main/java/com/cmeeting/job/EmailPushTask.java

@@ -55,17 +55,20 @@ public class EmailPushTask {
 
     // 实际处理逻辑
     public void process() {
-        String key = "meet_process" + meetingId + "_" + (subMeetingId == null ? "" : "subMeetingId");
+        String key = "meet_process" + meetingId + "_" + (subMeetingId == null ? "" : subMeetingId);
         if (!redisUtils.setnx(key, 1, 120)) {
             log.warn("key already exists in redis!, key: {}", key);
             return;
         }
-        Boolean isSuccess = Boolean.FALSE;
+        Boolean isSuccess = false;
         AtomicInteger retryCount = new AtomicInteger(0);
         MeetingInfo meetingInfo = meetingInfoMapper.selectOne(new LambdaQueryWrapper<MeetingInfo>()
                 .eq(MeetingInfo::getMeetingId,meetingId)
                 .eq(subMeetingId != null, MeetingInfo::getSubMeetingId, subMeetingId));
-
+        if (meetingInfo.getIsPushed()) {
+            log.warn("邮件已推送, meetingId: {}", meetingId);
+            return;
+        }
         while (retryCount.intValue() <= MAX_RETRY && !isSuccess) {
             String hostUid = meetingInfo.getHostUid();
             if(!tidWidRelations.containsKey(hostUid)){
@@ -145,14 +148,16 @@ public class EmailPushTask {
                 }
             }
         }
-        meetingInfoMapper.update(meetingInfo,
-                new LambdaUpdateWrapper<MeetingInfo>()
-                        .eq(MeetingInfo::getMeetingId,meetingId)
-                        .eq(subMeetingId != null,MeetingInfo::getSubMeetingId,subMeetingId)
-                        .set(MeetingInfo::getIsPushed,isSuccess)
-                        .set(MeetingInfo::getStatus, isSuccess ? MeetingState.PUSH_SUCCESS.getCode() : MeetingState.PUSH_ERROR.getCode())
-                        .set(MeetingInfo::getPushRetry,Boolean.TRUE)
-        );
+        if (isSuccess != null) {
+            meetingInfoMapper.update(meetingInfo,
+                    new LambdaUpdateWrapper<MeetingInfo>()
+                            .eq(MeetingInfo::getMeetingId,meetingId)
+                            .eq(subMeetingId != null,MeetingInfo::getSubMeetingId,subMeetingId)
+                            .set(MeetingInfo::getIsPushed,isSuccess)
+                            .set(MeetingInfo::getStatus, isSuccess ? MeetingState.PUSH_SUCCESS.getCode() : MeetingState.PUSH_ERROR.getCode())
+                            .set(MeetingInfo::getPushRetry, Boolean.TRUE)
+            );
+        }
         redisUtils.del(key);
     }
 

src/main/java/com/cmeeting/job/FileProcessTask.java

@@ -111,7 +111,7 @@ public class FileProcessTask {
     // 实际处理逻辑
     public void process() {
         boolean isSuccess = false;
-        String key = "meet_process" + meetingId + "_" + (subMeetingId == null ? "" : "subMeetingId");
+        String key = "meet_process" + meetingId + "_" + (subMeetingId == null ? "" : subMeetingId);
         if (!redisUtils.setnx(key, 1, 240)) {
             log.warn("key already exists in redis!, key: {}", key);
             return;