merge from release_v3.0

examcloud-core-oe-task-api-provider/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud</groupId>
 		<artifactId>examcloud-core-oe-task</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-oe-task-api-provider</artifactId>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-core-oe-task</artifactId>
-        <version>2019-SNAPSHOT</version>
+        <version>v3.0-RELEASE</version>
     </parent>
     <artifactId>examcloud-core-oe-task-base</artifactId>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-core-oe-task</artifactId>
-        <version>2019-SNAPSHOT</version>
+        <version>v3.0-RELEASE</version>
     </parent>
     <artifactId>examcloud-core-oe-task-dao</artifactId>
 

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud</groupId>
 		<artifactId>examcloud-core-oe-task</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-oe-task-service</artifactId>
 

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

@@ -66,8 +66,6 @@ public class HandInExamExecutor implements NodeExecuter<Long, ExamRecordData, Lo
 
         String sequenceLockKey = Constants.EXAM_CONTROL_LOCK_PREFIX + uncertainExamRecordData.getStudentId();
 
-        long st = System.currentTimeMillis();
-
         try {
 
             this.debugLog("enter executor...", uncertainExamRecordData.getId());
@@ -156,8 +154,6 @@ public class HandInExamExecutor implements NodeExecuter<Long, ExamRecordData, Lo
                     "'.do nothing and go to the next node...", examRecordDataId);
         } finally {
             SequenceLockHelper.releaseLockSimple(sequenceLockKey);
-            this.debugLog("T999 HandInExamExecutor合计耗时:" +
-                    (System.currentTimeMillis() - st) + " ms", uncertainExamRecordData.getId());
         }
     }
 

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

@@ -12,11 +12,7 @@ import cn.com.qmth.examcloud.core.oe.admin.api.bean.*;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.SyncExamDataReq;
 import cn.com.qmth.examcloud.core.oe.student.api.ExamRecordDataCloudService;
 import cn.com.qmth.examcloud.core.oe.student.api.bean.StuExamQuestionBean;
-import cn.com.qmth.examcloud.core.oe.student.api.request.GetExamFaceLivenessVerifiesReq;
-import cn.com.qmth.examcloud.core.oe.student.api.request.GetExamRecordPaperStructReq;
-import cn.com.qmth.examcloud.core.oe.student.api.request.GetExamRecordQuestionsReq;
-import cn.com.qmth.examcloud.core.oe.student.api.request.GetFaceBiopsyReq;
-import cn.com.qmth.examcloud.core.oe.student.api.request.UpdatePartialExamRecordReq;
+import cn.com.qmth.examcloud.core.oe.student.api.request.*;
 import cn.com.qmth.examcloud.core.oe.student.api.response.GetExamFaceLivenessVerifiesResp;
 import cn.com.qmth.examcloud.core.oe.student.api.response.GetExamRecordPaperStructResp;
 import cn.com.qmth.examcloud.core.oe.student.api.response.GetExamRecordQuestionsResp;
@@ -188,7 +184,7 @@ public class SyncExamDataExecutor implements NodeExecuter<Long, ExamRecordData,
                     "'.do nothing and go to the next node...", examRecordData.getId());
         } finally {
             SequenceLockHelper.releaseLockSimple(sequenceLockKey);
-            this.debugLog("T999 SyncExamDataExecutor合计耗时:" + (System.currentTimeMillis() - st) + " ms", examRecordData.getId());
+            this.debugLog("T999 同步数据合计耗时:" + (System.currentTimeMillis() - st) + " ms", examRecordData.getId());
         }
     }
 

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

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud</groupId>
 		<artifactId>examcloud-core-oe-task</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-oe-task-starter</artifactId>
 

examcloud-core-oe-task-starter/shell/start.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-APP_MAIN_JAR="examcloud-core-oe-task-starter-2019-SNAPSHOT.jar"
+APP_MAIN_JAR="examcloud-core-oe-task-starter-v3.0-RELEASE.jar"
 
 FILE_PATH=$(cd `dirname $0`; pwd)
 

examcloud-core-oe-task-starter/shell/stop.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-APP_MAIN_JAR="examcloud-core-oe-task-starter-2019-SNAPSHOT.jar"
+APP_MAIN_JAR="examcloud-core-oe-task-starter-v3.0-RELEASE.jar"
 
 FILE_PATH=$(cd `dirname $0`; pwd)
 

examcloud-core-oe-task-starter/src/main/resources/limited.properties

@@ -5,17 +5,15 @@
 # [E] \u76d1\u63a7\u9650\u6d41\u8868\u8fbe\u5f0f
 # [S] \u9650\u6d41\u540e\u6700\u5c0f
 
-[${app.api.oe.student.face}/examCaptureQueue][/compareFaceSync][POST][S] : 500
-[${app.api.oe.student.face}/examCaptureQueue][/compareFaceSync][POST][E] : mean>2000 && oneMinRate>10
-[${app.api.oe.student.face}/examCaptureQueue][/compareFaceSync][POST][R] : 10
-
-[${app.api.oe.student.face}/examCaptureQueue][/getExamCaptureResult][GET][S] : 300
-[${app.api.oe.student.face}/examCaptureQueue][/getExamCaptureResult][GET][E] : mean>1000 && oneMinRate>10
-[${app.api.oe.student.face}/examCaptureQueue][/getExamCaptureResult][GET][R] : 10
-
-[${app.api.oe.student.face}/examCaptureQueue][/uploadExamCapture][POST][S] : 300
-[${app.api.oe.student.face}/examCaptureQueue][/uploadExamCapture][POST][E] : mean>1000 && oneMinRate>10
-[${app.api.oe.student.face}/examCaptureQueue][/uploadExamCapture][POST][GET][R] : 10
-
-
+#[${app.api.oe.student.face}/examCaptureQueue][/compareFaceSync][POST][S] : 500
+#[${app.api.oe.student.face}/examCaptureQueue][/compareFaceSync][POST][E] : mean>2000 && oneMinRate>10
+#[${app.api.oe.student.face}/examCaptureQueue][/compareFaceSync][POST][R] : 10
+#
+#[${app.api.oe.student.face}/examCaptureQueue][/getExamCaptureResult][GET][S] : 300
+#[${app.api.oe.student.face}/examCaptureQueue][/getExamCaptureResult][GET][E] : mean>1000 && oneMinRate>10
+#[${app.api.oe.student.face}/examCaptureQueue][/getExamCaptureResult][GET][R] : 10
+#
+#[${app.api.oe.student.face}/examCaptureQueue][/uploadExamCapture][POST][S] : 300
+#[${app.api.oe.student.face}/examCaptureQueue][/uploadExamCapture][POST][E] : mean>1000 && oneMinRate>10
+#[${app.api.oe.student.face}/examCaptureQueue][/uploadExamCapture][POST][GET][R] : 10
 

pom.xml

@@ -3,10 +3,10 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud</groupId>
 		<artifactId>examcloud-parent</artifactId>
-		<version>2019</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-oe-task</artifactId>
-	<version>2019-SNAPSHOT</version>
+	<version>v3.0-RELEASE</version>
 	<packaging>pom</packaging>