merge from release_v4.1.2

examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/pipeline/ClearExamDataCacheExecutor.java

@@ -98,8 +98,7 @@ public class ClearExamDataCacheExecutor implements NodeExecuter<Long, ExamRecord
                 redisClient.delete(RedisKeyHelper.getBuilder().studentPaperKey(examRecordDataId));
 
                 //清除考试记录缓存(设置缓存的过期时间)
-                Long defaultExpiredSeconds = PropertyHolder.getLong("oe.student.cache.expiredSeconds", 60);//缓存默认过期时间
-                //                redisClient.delete(RedisKeyHelper.getBuilder().examRecordDataKey(examRecordDataId));
+                Long defaultExpiredSeconds = PropertyHolder.getLong("oe.student.cache.expiredSeconds", 180);//缓存默认过期时间
                 redisClient.expire(RedisKeyHelper.getBuilder().examRecordDataKey(examRecordDataId),
                         defaultExpiredSeconds, TimeUnit.SECONDS);
 

examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/pipeline/SyncExamDataExecutor.java

@@ -98,24 +98,18 @@ public class SyncExamDataExecutor implements NodeExecuter<Long, ExamRecordData,
 
         Long studentId = examRecordData.getStudentId();
         String sequenceLockKey = Constants.EXAM_CONTROL_LOCK_PREFIX + studentId;
-
         long st = System.currentTimeMillis();
 
         try {
-            debugLog("enter executor...", examRecordData.getId());
-
             //添加考试控制全局锁
             SequenceLockHelper.getLockSimple(sequenceLockKey);
 
-            debugLog("get locker success...", examRecordData.getId());
-
             //如果已同步，直接交给下一节点
             if (SyncStatus.SYNCED == examRecordData.getSyncStatus()) {
-
                 outList.add(new KeyValuePair<>(key, examRecordData));
 
-                this.debugLog("already synced,will go to next node...", examRecordData.getId());
-
+                LOG.info("syncExamData already synced, tempExamRecordDataId = {}, examStudentId = {}",
+                        examRecordData.getId(), examRecordData.getExamStudentId());
                 return;
             }
 
@@ -178,13 +172,10 @@ public class SyncExamDataExecutor implements NodeExecuter<Long, ExamRecordData,
                 syncReq.setExamRecordData(copyExamRecordDataFrom(examRecordData));
 
                 long startTime = System.currentTimeMillis();
-
                 //同步数据
                 syncExamDataCloudService.syncExamData(syncReq);
-
-                this.debugLog("T002.同步数据rpc耗时:" + (System.currentTimeMillis() - startTime) + " ms", examRecordDataId);
-
-                this.debugLog("sync data success,and to be change status...", examRecordDataId);
+                LOG.info("syncExamData ok, tempExamRecordDataId = {}, examStudentId = {}, cost {} ms",
+                        examRecordDataId, examRecordData.getExamStudentId(), System.currentTimeMillis() - startTime);
 
                 //考试完结次数加1
                 ExamBoss examBoss = examBossService.getExamBoss(examRecordData.getExamStudentId());

examcloud-core-oe-task-starter/pom.xml

@@ -54,6 +54,7 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
                     <finalName>examcloud-core-oe-task</finalName>
+                    <skipAssembly>${skipAssembly}</skipAssembly>
                     <descriptors>
                         <descriptor>assembly.xml</descriptor>
                     </descriptors>

examcloud-core-oe-task-starter/src/main/resources/log4j2.xml

@@ -36,6 +36,7 @@
 
     <Loggers>
         <logger name="springfox.documentation" level="WARN"/>
+        <logger name="org.mongodb.driver" level="WARN"/>
         <logger name="org.springframework" level="WARN"/>
         <logger name="org.hibernate" level="WARN"/>
         <logger name="org.apache" level="WARN"/>