wangwei 5 年之前
父节点
当前提交
eefd9eb11d
共有 33 个文件被更改,包括 77 次插入76 次删除
  1. 4 4
      examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/controller/ExamCaptureController.java
  2. 3 3
      examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/controller/ExamCaptureQueueController.java
  3. 1 1
      examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/controller/bean/GetExamCaptureResultDomain.java
  4. 1 1
      examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/controller/bean/UpyunDomain.java
  5. 4 4
      examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/provider/ExamCaptureCloudServiceProvider.java
  6. 7 7
      examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/provider/ExamCaptureQueueProvider.java
  7. 2 2
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/ExamCaptureCommonService.java
  8. 1 1
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/ExamCaptureQueueFailedService.java
  9. 2 2
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/ExamCaptureQueueService.java
  10. 4 3
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/ExamCaptureService.java
  11. 1 1
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/FaceCompareService.java
  12. 1 1
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/bean/CallType.java
  13. 1 1
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/bean/CompareFaceSyncInfo.java
  14. 1 1
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/bean/ExamCaptureQueueInfo.java
  15. 1 1
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/bean/SaveExamCaptureQueueInfo.java
  16. 4 4
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/BaiduFaceLivenessWorker.java
  17. 3 3
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/ExamCaptureCommonServiceImpl.java
  18. 1 1
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/ExamCaptureProcessStatisticController.java
  19. 3 3
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/ExamCaptureQueueFailedServiceImpl.java
  20. 3 3
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/ExamCaptureQueueServiceImpl.java
  21. 7 7
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/ExamCaptureServiceImpl.java
  22. 2 2
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/FaceCompareServiceImpl.java
  23. 4 4
      examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/FacePPCompareWorker.java
  24. 1 1
      examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/OEFaceApp.java
  25. 1 1
      examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/Tester.java
  26. 1 1
      examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/ExamCloudResourceManager.java
  27. 1 1
      examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/ExamCloudWebMvcConfigurer.java
  28. 2 2
      examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/ProcessBaiduFaceLivenessAlarmTask.java
  29. 3 3
      examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/ProcessBaiduFacelivenessTask.java
  30. 2 2
      examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/ProcessFaceCompareAlarmTask.java
  31. 3 3
      examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/ProcessFaceCompareQueueTask.java
  32. 1 1
      examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/SwaggerConfig.java
  33. 1 1
      examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/SystemStartup.java

+ 4 - 4
examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/controller/ExamCaptureController.java → examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/controller/ExamCaptureController.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.controller;
+package cn.com.qmth.examcloud.core.oe.task.api.controller;
 
 import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.StudentCacheBean;
@@ -19,9 +19,9 @@ import cn.com.qmth.examcloud.core.basic.api.response.GetStudentFaceResp;
 import cn.com.qmth.examcloud.core.oe.common.base.Constants;
 import cn.com.qmth.examcloud.core.oe.common.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.common.entity.ExamCaptureEntity;
-import cn.com.qmth.examcloud.core.oe.student.face.controller.bean.GetExamCaptureResultDomain;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.bean.CompareFaceSyncInfo;
+import cn.com.qmth.examcloud.core.oe.task.api.controller.bean.GetExamCaptureResultDomain;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureService;
+import cn.com.qmth.examcloud.core.oe.task.service.bean.CompareFaceSyncInfo;
 import cn.com.qmth.examcloud.web.redis.RedisClient;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.web.upyun.UpYunHttpRequest;

+ 3 - 3
examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/controller/ExamCaptureQueueController.java → examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/controller/ExamCaptureQueueController.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.controller;
+package cn.com.qmth.examcloud.core.oe.task.api.controller;
 
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
@@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RestController;
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.oe.common.base.Constants;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureQueueService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.bean.SaveExamCaptureQueueInfo;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureQueueService;
+import cn.com.qmth.examcloud.core.oe.task.service.bean.SaveExamCaptureQueueInfo;
 import cn.com.qmth.examcloud.web.redis.RedisClient;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.web.upyun.UpYunHttpRequest;

+ 1 - 1
examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/controller/bean/GetExamCaptureResultDomain.java → examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/controller/bean/GetExamCaptureResultDomain.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.controller.bean;
+package cn.com.qmth.examcloud.core.oe.task.api.controller.bean;
 
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 

+ 1 - 1
examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/controller/bean/UpyunDomain.java → examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/controller/bean/UpyunDomain.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.controller.bean;
+package cn.com.qmth.examcloud.core.oe.task.api.controller.bean;
 
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 

+ 4 - 4
examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/provider/ExamCaptureCloudServiceProvider.java → examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/provider/ExamCaptureCloudServiceProvider.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.core.oe.student.face.provider;
+package cn.com.qmth.examcloud.core.oe.task.api.provider;
 
 
-import cn.com.qmth.examcloud.core.oe.student.face.api.ExamCaptureCloudService;
-import cn.com.qmth.examcloud.core.oe.student.face.api.request.SaveExamCaptureSyncCompareResultReq;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureService;
+import cn.com.qmth.examcloud.core.oe.task.api.ExamCaptureCloudService;
+import cn.com.qmth.examcloud.core.oe.task.api.request.SaveExamCaptureSyncCompareResultReq;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureService;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

+ 7 - 7
examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/provider/ExamCaptureQueueProvider.java → examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/provider/ExamCaptureQueueProvider.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.provider;
+package cn.com.qmth.examcloud.core.oe.task.api.provider;
 
 
 import java.util.List;
@@ -11,12 +11,12 @@ import org.springframework.web.bind.annotation.RestController;
 
 import cn.com.qmth.examcloud.core.oe.common.entity.ExamCaptureQueueEntity;
 import cn.com.qmth.examcloud.core.oe.common.repository.ExamCaptureQueueRepo;
-import cn.com.qmth.examcloud.core.oe.student.face.api.ExamCaptureQueueCloudService;
-import cn.com.qmth.examcloud.core.oe.student.face.api.request.ExamCaptureQueueReq;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureQueueFailedService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureQueueService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.bean.CallType;
+import cn.com.qmth.examcloud.core.oe.task.api.ExamCaptureQueueCloudService;
+import cn.com.qmth.examcloud.core.oe.task.api.request.ExamCaptureQueueReq;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureQueueFailedService;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureQueueService;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureService;
+import cn.com.qmth.examcloud.core.oe.task.service.bean.CallType;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
 

+ 2 - 2
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/ExamCaptureCommonService.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/ExamCaptureCommonService.java

@@ -1,7 +1,7 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service;
+package cn.com.qmth.examcloud.core.oe.task.service;
 
 import cn.com.qmth.examcloud.core.oe.common.entity.ExamCaptureQueueEntity;
-import cn.com.qmth.examcloud.core.oe.student.face.service.bean.CallType;
+import cn.com.qmth.examcloud.core.oe.task.service.bean.CallType;
 
 /**
  * 

+ 1 - 1
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/ExamCaptureQueueFailedService.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/ExamCaptureQueueFailedService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service;
+package cn.com.qmth.examcloud.core.oe.task.service;
 
 /**
  * 

+ 2 - 2
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/ExamCaptureQueueService.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/ExamCaptureQueueService.java

@@ -1,7 +1,7 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service;
+package cn.com.qmth.examcloud.core.oe.task.service;
 
 import cn.com.qmth.examcloud.core.oe.common.enums.ExamCaptureQueueStatus;
-import cn.com.qmth.examcloud.core.oe.student.face.service.bean.SaveExamCaptureQueueInfo;
+import cn.com.qmth.examcloud.core.oe.task.service.bean.SaveExamCaptureQueueInfo;
 
 /**
  * @author chenken

+ 4 - 3
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/ExamCaptureService.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/ExamCaptureService.java

@@ -1,8 +1,9 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service;
+package cn.com.qmth.examcloud.core.oe.task.service;
 
 import cn.com.qmth.examcloud.core.oe.common.entity.ExamCaptureEntity;
-import cn.com.qmth.examcloud.core.oe.student.face.service.bean.CompareFaceSyncInfo;
-import cn.com.qmth.examcloud.core.oe.student.face.service.bean.ExamCaptureQueueInfo;
+import cn.com.qmth.examcloud.core.oe.task.service.bean.CompareFaceSyncInfo;
+import cn.com.qmth.examcloud.core.oe.task.service.bean.ExamCaptureQueueInfo;
+
 import org.json.JSONException;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;

+ 1 - 1
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/FaceCompareService.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/FaceCompareService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service;
+package cn.com.qmth.examcloud.core.oe.task.service;
 
 import com.alibaba.fastjson.JSONObject;
 

+ 1 - 1
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/bean/CallType.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/bean/CallType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service.bean;
+package cn.com.qmth.examcloud.core.oe.task.service.bean;
 
 public enum CallType {
 

+ 1 - 1
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/bean/CompareFaceSyncInfo.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/bean/CompareFaceSyncInfo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service.bean;
+package cn.com.qmth.examcloud.core.oe.task.service.bean;
 
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 

+ 1 - 1
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/bean/ExamCaptureQueueInfo.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/bean/ExamCaptureQueueInfo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service.bean;
+package cn.com.qmth.examcloud.core.oe.task.service.bean;
 
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import cn.com.qmth.examcloud.core.oe.common.enums.ExamCaptureQueueStatus;

+ 1 - 1
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/bean/SaveExamCaptureQueueInfo.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/bean/SaveExamCaptureQueueInfo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service.bean;
+package cn.com.qmth.examcloud.core.oe.task.service.bean;
 
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import io.swagger.annotations.ApiModelProperty;

+ 4 - 4
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/impl/BaiduFaceLivenessWorker.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/BaiduFaceLivenessWorker.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service.impl;
+package cn.com.qmth.examcloud.core.oe.task.service.impl;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.helpers.concurrency.simple.Worker;
@@ -6,9 +6,9 @@ import cn.com.qmth.examcloud.commons.helpers.concurrency.simple.WorkerController
 import cn.com.qmth.examcloud.commons.util.Util;
 import cn.com.qmth.examcloud.core.oe.common.base.Constants;
 import cn.com.qmth.examcloud.core.oe.common.enums.ExamCaptureQueueStatus;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureQueueService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.bean.ExamCaptureQueueInfo;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureQueueService;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureService;
+import cn.com.qmth.examcloud.core.oe.task.service.bean.ExamCaptureQueueInfo;
 import cn.com.qmth.examcloud.web.support.SpringContextHolder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

+ 3 - 3
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/impl/ExamCaptureCommonServiceImpl.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/ExamCaptureCommonServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service.impl;
+package cn.com.qmth.examcloud.core.oe.task.service.impl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,8 +10,8 @@ import cn.com.qmth.examcloud.core.oe.common.base.Constants;
 import cn.com.qmth.examcloud.core.oe.common.entity.ExamCaptureQueueEntity;
 import cn.com.qmth.examcloud.core.oe.common.enums.ExamCaptureQueueStatus;
 import cn.com.qmth.examcloud.core.oe.common.repository.ExamCaptureQueueRepo;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureCommonService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.bean.CallType;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureCommonService;
+import cn.com.qmth.examcloud.core.oe.task.service.bean.CallType;
 
 /**
  * 

+ 1 - 1
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/impl/ExamCaptureProcessStatisticController.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/ExamCaptureProcessStatisticController.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service.impl;
+package cn.com.qmth.examcloud.core.oe.task.service.impl;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

+ 3 - 3
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/impl/ExamCaptureQueueFailedServiceImpl.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/ExamCaptureQueueFailedServiceImpl.java

@@ -1,12 +1,12 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service.impl;
+package cn.com.qmth.examcloud.core.oe.task.service.impl;
 
 import cn.com.qmth.examcloud.core.oe.common.repository.ExamCaptureQueueRepo;
 import cn.com.qmth.examcloud.core.oe.common.repository.ExamCaptureRepo;
 import cn.com.qmth.examcloud.core.oe.common.repository.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.common.service.GainBaseDataService;
 import cn.com.qmth.examcloud.core.oe.student.api.OeHandleByExamCaptureQueueFailedDisposeService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureQueueFailedService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureService;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureQueueFailedService;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureService;
 import cn.com.qmth.examcloud.exchange.inner.api.SmsCloudService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 3 - 3
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/impl/ExamCaptureQueueServiceImpl.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/ExamCaptureQueueServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service.impl;
+package cn.com.qmth.examcloud.core.oe.task.service.impl;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.util.AES;
@@ -8,8 +8,8 @@ import cn.com.qmth.examcloud.core.oe.common.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.common.entity.ExamCaptureQueueEntity;
 import cn.com.qmth.examcloud.core.oe.common.enums.ExamCaptureQueueStatus;
 import cn.com.qmth.examcloud.core.oe.common.repository.ExamCaptureQueueRepo;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureQueueService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.bean.SaveExamCaptureQueueInfo;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureQueueService;
+import cn.com.qmth.examcloud.core.oe.task.service.bean.SaveExamCaptureQueueInfo;
 import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.StudentCacheBean;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;

+ 7 - 7
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/impl/ExamCaptureServiceImpl.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/ExamCaptureServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service.impl;
+package cn.com.qmth.examcloud.core.oe.task.service.impl;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.helpers.JsonHttpResponseHolder;
@@ -10,12 +10,12 @@ import cn.com.qmth.examcloud.core.oe.common.enums.ExamProperties;
 import cn.com.qmth.examcloud.core.oe.common.repository.ExamCaptureQueueRepo;
 import cn.com.qmth.examcloud.core.oe.common.repository.ExamCaptureRepo;
 import cn.com.qmth.examcloud.core.oe.common.service.GainBaseDataService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureCommonService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureQueueService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.FaceCompareService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.bean.CompareFaceSyncInfo;
-import cn.com.qmth.examcloud.core.oe.student.face.service.bean.ExamCaptureQueueInfo;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureCommonService;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureQueueService;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureService;
+import cn.com.qmth.examcloud.core.oe.task.service.FaceCompareService;
+import cn.com.qmth.examcloud.core.oe.task.service.bean.CompareFaceSyncInfo;
+import cn.com.qmth.examcloud.core.oe.task.service.bean.ExamCaptureQueueInfo;
 import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.ExamRecordPropertyCacheBean;
 import cn.com.qmth.examcloud.support.cache.bean.SysPropertyCacheBean;

+ 2 - 2
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/impl/FaceCompareServiceImpl.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/FaceCompareServiceImpl.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service.impl;
+package cn.com.qmth.examcloud.core.oe.task.service.impl;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.oe.common.base.Constants;
 import cn.com.qmth.examcloud.core.oe.common.base.utils.HttpPoolUtil;
-import cn.com.qmth.examcloud.core.oe.student.face.service.FaceCompareService;
+import cn.com.qmth.examcloud.core.oe.task.service.FaceCompareService;
 import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.SysPropertyCacheBean;
 import com.alibaba.fastjson.JSONObject;

+ 4 - 4
examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/service/impl/FacePPCompareWorker.java → examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/FacePPCompareWorker.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.service.impl;
+package cn.com.qmth.examcloud.core.oe.task.service.impl;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.helpers.concurrency.simple.Worker;
@@ -6,9 +6,9 @@ import cn.com.qmth.examcloud.commons.helpers.concurrency.simple.WorkerController
 import cn.com.qmth.examcloud.commons.util.Util;
 import cn.com.qmth.examcloud.core.oe.common.base.Constants;
 import cn.com.qmth.examcloud.core.oe.common.enums.ExamCaptureQueueStatus;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureQueueService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.ExamCaptureService;
-import cn.com.qmth.examcloud.core.oe.student.face.service.bean.ExamCaptureQueueInfo;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureQueueService;
+import cn.com.qmth.examcloud.core.oe.task.service.ExamCaptureService;
+import cn.com.qmth.examcloud.core.oe.task.service.bean.ExamCaptureQueueInfo;
 import cn.com.qmth.examcloud.web.support.SpringContextHolder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

+ 1 - 1
examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/starter/OEFaceApp.java → examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/OEFaceApp.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.starter;
+package cn.com.qmth.examcloud.core.oe.task.starter;
 
 import cn.com.qmth.examcloud.core.oe.common.UniqueRuleHolder;
 import cn.com.qmth.examcloud.web.jpa.DataIntegrityViolationTransverter;

+ 1 - 1
examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/starter/Tester.java → examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/Tester.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.starter;
+package cn.com.qmth.examcloud.core.oe.task.starter;
 
 import org.springframework.stereotype.Component;
 

+ 1 - 1
examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/starter/config/ExamCloudResourceManager.java → examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/ExamCloudResourceManager.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.starter.config;
+package cn.com.qmth.examcloud.core.oe.task.starter.config;
 
 import java.util.List;
 import java.util.Set;

+ 1 - 1
examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/starter/config/ExamCloudWebMvcConfigurer.java → examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/ExamCloudWebMvcConfigurer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.starter.config;
+package cn.com.qmth.examcloud.core.oe.task.starter.config;
 
 import cn.com.qmth.examcloud.web.interceptor.ApiFlowLimitedInterceptor;
 import cn.com.qmth.examcloud.web.interceptor.ApiStatisticInterceptor;

+ 2 - 2
examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/starter/config/ProcessBaiduFaceLivenessAlarmTask.java → examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/ProcessBaiduFaceLivenessAlarmTask.java

@@ -1,10 +1,10 @@
-package cn.com.qmth.examcloud.core.oe.student.face.starter.config;
+package cn.com.qmth.examcloud.core.oe.task.starter.config;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.util.Util;
-import cn.com.qmth.examcloud.core.oe.student.face.service.impl.ExamCaptureProcessStatisticController;
+import cn.com.qmth.examcloud.core.oe.task.service.impl.ExamCaptureProcessStatisticController;
 import cn.com.qmth.examcloud.exchange.inner.api.SmsCloudService;
 import cn.com.qmth.examcloud.exchange.inner.api.request.SendSmsReq;
 import cn.com.qmth.examcloud.support.cache.CacheHelper;

+ 3 - 3
examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/starter/config/ProcessBaiduFacelivenessTask.java → examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/ProcessBaiduFacelivenessTask.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.starter.config;
+package cn.com.qmth.examcloud.core.oe.task.starter.config;
 
 import cn.com.qmth.examcloud.commons.helpers.concurrency.simple.ConcurrentTask;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
@@ -6,8 +6,8 @@ import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.util.Util;
 import cn.com.qmth.examcloud.core.oe.common.entity.ExamCaptureQueueEntity;
 import cn.com.qmth.examcloud.core.oe.common.repository.ExamCaptureQueueRepo;
-import cn.com.qmth.examcloud.core.oe.student.face.service.bean.ExamCaptureQueueInfo;
-import cn.com.qmth.examcloud.core.oe.student.face.service.impl.BaiduFaceLivenessWorker;
+import cn.com.qmth.examcloud.core.oe.task.service.bean.ExamCaptureQueueInfo;
+import cn.com.qmth.examcloud.core.oe.task.service.impl.BaiduFaceLivenessWorker;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import org.apache.logging.log4j.ThreadContext;
 import org.springframework.beans.factory.annotation.Autowired;

+ 2 - 2
examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/starter/config/ProcessFaceCompareAlarmTask.java → examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/ProcessFaceCompareAlarmTask.java

@@ -1,10 +1,10 @@
-package cn.com.qmth.examcloud.core.oe.student.face.starter.config;
+package cn.com.qmth.examcloud.core.oe.task.starter.config;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.util.Util;
-import cn.com.qmth.examcloud.core.oe.student.face.service.impl.ExamCaptureProcessStatisticController;
+import cn.com.qmth.examcloud.core.oe.task.service.impl.ExamCaptureProcessStatisticController;
 import cn.com.qmth.examcloud.exchange.inner.api.SmsCloudService;
 import cn.com.qmth.examcloud.exchange.inner.api.request.SendSmsReq;
 import cn.com.qmth.examcloud.support.cache.CacheHelper;

+ 3 - 3
examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/starter/config/ProcessFaceCompareQueueTask.java → examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/ProcessFaceCompareQueueTask.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.starter.config;
+package cn.com.qmth.examcloud.core.oe.task.starter.config;
 
 import cn.com.qmth.examcloud.commons.helpers.concurrency.simple.ConcurrentTask;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
@@ -6,8 +6,8 @@ import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.util.Util;
 import cn.com.qmth.examcloud.core.oe.common.entity.ExamCaptureQueueEntity;
 import cn.com.qmth.examcloud.core.oe.common.repository.ExamCaptureQueueRepo;
-import cn.com.qmth.examcloud.core.oe.student.face.service.bean.ExamCaptureQueueInfo;
-import cn.com.qmth.examcloud.core.oe.student.face.service.impl.FacePPCompareWorker;
+import cn.com.qmth.examcloud.core.oe.task.service.bean.ExamCaptureQueueInfo;
+import cn.com.qmth.examcloud.core.oe.task.service.impl.FacePPCompareWorker;
 import cn.com.qmth.examcloud.exchange.inner.api.SmsCloudService;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import org.apache.logging.log4j.ThreadContext;

+ 1 - 1
examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/starter/config/SwaggerConfig.java → examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/SwaggerConfig.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.student.face.starter.config;
+package cn.com.qmth.examcloud.core.oe.task.starter.config;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.context.annotation.Bean;

+ 1 - 1
examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/starter/config/SystemStartup.java → examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/SystemStartup.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.student.face.starter.config;
+package cn.com.qmth.examcloud.core.oe.task.starter.config;
 
 import java.util.List;