wangwei 7 anni fa
parent
commit
4ca1c85ca2
69 ha cambiato i file con 165 aggiunte e 246 eliminazioni
  1. 7 2
      examcloud-exchange-base/pom.xml
  2. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/enums/OrgIdServiceEnum.java
  3. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/enums/OutletOrgType.java
  4. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/DetectNoFaceException.java
  5. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/ExamStudentNotExistException.java
  6. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/FaceppException.java
  7. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/InvalidJpgException.java
  8. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/NoSuchCourseLevelException.java
  9. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/NoSuchExamException.java
  10. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/NoSuchExamStudentException.java
  11. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/SaveExamException.java
  12. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/SaveExamStudentException.java
  13. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/UpYunException.java
  14. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/response/BaseResponse.java
  15. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/response/FailureBaseResponse.java
  16. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/response/IBaseResponse.java
  17. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/response/SuccessBaseResponse.java
  18. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/util/OutletUtils.java
  19. 1 1
      examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/util/SpringContextUtils.java
  20. 4 4
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/CommonGainScoreController.java
  21. 5 5
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ExamController.java
  22. 3 3
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ExamVerifyPhotoController.java
  23. 8 8
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/FaceppController.java
  24. 4 4
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ScorePushController.java
  25. 4 4
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/StudentInfoController.java
  26. 3 3
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/sydx/ScoreController.java
  27. 8 8
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/sydx/StudentExamInfoController.java
  28. 0 26
      examcloud-exchange-outer-client/pom.xml
  29. 1 1
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/ExamRecordDao.java
  30. 1 1
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/ExamScoreDao.java
  31. 4 3
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/ExamScoreRepo.java
  32. 2 2
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/OutletScoreDao.java
  33. 1 1
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/CreateFacesetResponse.java
  34. 1 1
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/ExamReq.java
  35. 3 3
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/ExamScore.java
  36. 1 4
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/ExamStudentImportDTO.java
  37. 1 1
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/Face.java
  38. 1 1
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/FaceDetectResponse.java
  39. 1 1
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/FaceRectangle.java
  40. 1 1
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletCourse.java
  41. 1 1
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletExam.java
  42. 1 1
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletExamStudent.java
  43. 2 2
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletOrg.java
  44. 1 1
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletScore.java
  45. 1 1
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletStudent.java
  46. 1 1
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/StudentInfoReq.java
  47. 2 2
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/impl/ExamRecordDaoImpl.java
  48. 2 2
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/impl/ExamScoreDaoImpl.java
  49. 3 3
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/impl/OutletScoreDaoImpl.java
  50. 2 2
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/ExamService.java
  51. 16 16
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/ExamStudentImportService.java
  52. 8 4
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/FaceppService.java
  53. 1 1
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/OutletScoreService.java
  54. 1 1
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/StudentInfoService.java
  55. 2 2
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/CourseClient.java
  56. 2 2
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/ExamClient.java
  57. 2 2
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/ExamStudentClient.java
  58. 1 1
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/OeClient.java
  59. 2 2
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/OrgClient.java
  60. 2 2
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/StudentClient.java
  61. 1 1
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/StudentFaceInfoClient.java
  62. 4 4
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/ExamServiceImpl.java
  63. 4 4
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/OutletScoreServiceImpl.java
  64. 14 14
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/StudentInfoServiceImpl.java
  65. 3 3
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/scorePush/SydxScorePushServiceImpl.java
  66. 3 3
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/scorePush/XncdScorePushServiceImpl.java
  67. 0 23
      examcloud-outlet-api/pom.xml
  68. 0 36
      examcloud-outlet-domain/pom.xml
  69. 1 4
      pom.xml

+ 7 - 2
examcloud-exchange-base/pom.xml

@@ -10,8 +10,13 @@
 
 
 	<dependencies>
 	<dependencies>
 		<dependency>
 		<dependency>
-			<groupId>cn.com.qmth.examcloud.exchange</groupId>
-			<artifactId>examcloud-outlet-api</artifactId>
+			<groupId>cn.com.qmth.examcloud.commons</groupId>
+			<artifactId>examcloud-commons-web</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud.commons</groupId>
+			<artifactId>examcloud-commons-dto</artifactId>
 			<version>${examcloud.version}</version>
 			<version>${examcloud.version}</version>
 		</dependency>
 		</dependency>
 
 

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/enums/OrgIdServiceEnum.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/enums/OrgIdServiceEnum.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.enums;
+package cn.com.qmth.examcloud.exchange.base.enums;
 /**
 /**
  * @author  	chenken
  * @author  	chenken
  * @date    	2018年5月17日 下午2:56:03
  * @date    	2018年5月17日 下午2:56:03

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/enums/OutletOrgType.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/enums/OutletOrgType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.enums;
+package cn.com.qmth.examcloud.exchange.base.enums;
 
 
 public enum OutletOrgType {
 public enum OutletOrgType {
 	SCHOOL("学校"),
 	SCHOOL("学校"),

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/exception/DetectNoFaceException.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/DetectNoFaceException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.exception;
+package cn.com.qmth.examcloud.exchange.base.exception;
 
 
 /**
 /**
  * Created by yuanpan on 2017/5/15.
  * Created by yuanpan on 2017/5/15.

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/exception/ExamStudentNotExistException.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/ExamStudentNotExistException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.exception;
+package cn.com.qmth.examcloud.exchange.base.exception;
 
 
 /**
 /**
  * Created by yuanpan on 2017/8/2.
  * Created by yuanpan on 2017/8/2.

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/exception/FaceppException.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/FaceppException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.exception;
+package cn.com.qmth.examcloud.exchange.base.exception;
 
 
 /**
 /**
  * Created by yuanpan on 2017/5/15.
  * Created by yuanpan on 2017/5/15.

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/exception/InvalidJpgException.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/InvalidJpgException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.exception;
+package cn.com.qmth.examcloud.exchange.base.exception;
 
 
 /**
 /**
  * Created by yuanpan on 2017/5/11.
  * Created by yuanpan on 2017/5/11.

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/exception/NoSuchCourseLevelException.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/NoSuchCourseLevelException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.exception;
+package cn.com.qmth.examcloud.exchange.base.exception;
 
 
 /**
 /**
  * Created by yuanpan on 2017/4/25.
  * Created by yuanpan on 2017/4/25.

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/exception/NoSuchExamException.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/NoSuchExamException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.exception;
+package cn.com.qmth.examcloud.exchange.base.exception;
 
 
 /**
 /**
  * Created by yuanpan on 2017/4/25.
  * Created by yuanpan on 2017/4/25.

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/exception/NoSuchExamStudentException.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/NoSuchExamStudentException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.exception;
+package cn.com.qmth.examcloud.exchange.base.exception;
 
 
 /**
 /**
  * Created by yuanpan on 2017/5/11.
  * Created by yuanpan on 2017/5/11.

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/exception/SaveExamException.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/SaveExamException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.exception;
+package cn.com.qmth.examcloud.exchange.base.exception;
 
 
 /**
 /**
  * Created by yuanpan on 2017/4/25.
  * Created by yuanpan on 2017/4/25.

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/exception/SaveExamStudentException.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/SaveExamStudentException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.exception;
+package cn.com.qmth.examcloud.exchange.base.exception;
 
 
 /**
 /**
  * Created by yuanpan on 2017/5/8.
  * Created by yuanpan on 2017/5/8.

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/exception/UpYunException.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/UpYunException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.exception;
+package cn.com.qmth.examcloud.exchange.base.exception;
 
 
 /**
 /**
  * Created by yuanpan on 2017/8/2.
  * Created by yuanpan on 2017/8/2.

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/response/BaseResponse.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/response/BaseResponse.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.response;
+package cn.com.qmth.examcloud.exchange.base.response;
 
 
 public class BaseResponse implements IBaseResponse {
 public class BaseResponse implements IBaseResponse {
     /**
     /**

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/response/FailureBaseResponse.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/response/FailureBaseResponse.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.response;
+package cn.com.qmth.examcloud.exchange.base.response;
 
 
 public class FailureBaseResponse implements IBaseResponse {
 public class FailureBaseResponse implements IBaseResponse {
 
 

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/response/IBaseResponse.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/response/IBaseResponse.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.response;
+package cn.com.qmth.examcloud.exchange.base.response;
 
 
 public interface IBaseResponse {
 public interface IBaseResponse {
     boolean isSuccess();
     boolean isSuccess();

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/response/SuccessBaseResponse.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/response/SuccessBaseResponse.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.response;
+package cn.com.qmth.examcloud.exchange.base.response;
 
 
 public class SuccessBaseResponse implements IBaseResponse {
 public class SuccessBaseResponse implements IBaseResponse {
 
 

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/utils/OutletUtils.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/util/OutletUtils.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.utils;
+package cn.com.qmth.examcloud.exchange.base.util;
 
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.HashMap;

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/utils/SpringContextUtils.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/util/SpringContextUtils.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.utils;
+package cn.com.qmth.examcloud.exchange.base.util;
 
 
 import java.util.Map;
 import java.util.Map;
 
 

+ 4 - 4
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/CommonGainScoreController.java

@@ -2,11 +2,11 @@ package cn.com.qmth.examcloud.exchange.outer.api.provider;
 
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.exchange.base.response.FailureBaseResponse;
+import cn.com.qmth.examcloud.exchange.base.response.SuccessBaseResponse;
+import cn.com.qmth.examcloud.exchange.dao.ExamScoreRepo;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
 import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
 import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
-import cn.com.qmth.examcloud.outlet.dto.OutletScore;
-import cn.com.qmth.examcloud.outlet.repo.ExamScoreRepo;
-import cn.com.qmth.examcloud.outlet.response.FailureBaseResponse;
-import cn.com.qmth.examcloud.outlet.response.SuccessBaseResponse;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;

+ 5 - 5
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ExamController.java

@@ -14,12 +14,12 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.exchange.base.exception.SaveExamException;
+import cn.com.qmth.examcloud.exchange.base.response.FailureBaseResponse;
+import cn.com.qmth.examcloud.exchange.base.response.SuccessBaseResponse;
+import cn.com.qmth.examcloud.exchange.dao.bean.ExamReq;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletExam;
 import cn.com.qmth.examcloud.exchange.outer.service.ExamService;
 import cn.com.qmth.examcloud.exchange.outer.service.ExamService;
-import cn.com.qmth.examcloud.outlet.dto.ExamReq;
-import cn.com.qmth.examcloud.outlet.entity.OutletExam;
-import cn.com.qmth.examcloud.outlet.exception.SaveExamException;
-import cn.com.qmth.examcloud.outlet.response.FailureBaseResponse;
-import cn.com.qmth.examcloud.outlet.response.SuccessBaseResponse;
 
 
 /**
 /**
  * @author  	chenken
  * @author  	chenken

+ 3 - 3
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ExamVerifyPhotoController.java

@@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.RestController;
 import cn.com.qmth.examcloud.common.dto.oe.marking.ExamPhotoVerifyData;
 import cn.com.qmth.examcloud.common.dto.oe.marking.ExamPhotoVerifyData;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
-import cn.com.qmth.examcloud.outlet.client.OeClient;
-import cn.com.qmth.examcloud.outlet.response.FailureBaseResponse;
-import cn.com.qmth.examcloud.outlet.response.SuccessBaseResponse;
+import cn.com.qmth.examcloud.exchange.base.response.FailureBaseResponse;
+import cn.com.qmth.examcloud.exchange.base.response.SuccessBaseResponse;
+import cn.com.qmth.examcloud.exchange.outer.service.client.OeClient;
 
 
 /**
 /**
  * @author  	chenken
  * @author  	chenken

+ 8 - 8
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/FaceppController.java

@@ -3,16 +3,16 @@ package cn.com.qmth.examcloud.exchange.outer.api.provider;
 import cn.com.qmth.examcloud.commons.base.util.GsonUtil;
 import cn.com.qmth.examcloud.commons.base.util.GsonUtil;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.exchange.base.exception.DetectNoFaceException;
+import cn.com.qmth.examcloud.exchange.base.exception.ExamStudentNotExistException;
+import cn.com.qmth.examcloud.exchange.base.exception.InvalidJpgException;
+import cn.com.qmth.examcloud.exchange.base.response.FailureBaseResponse;
+import cn.com.qmth.examcloud.exchange.base.response.IBaseResponse;
+import cn.com.qmth.examcloud.exchange.base.response.SuccessBaseResponse;
 import cn.com.qmth.examcloud.exchange.outer.service.FaceppService;
 import cn.com.qmth.examcloud.exchange.outer.service.FaceppService;
 import cn.com.qmth.examcloud.exchange.outer.service.UpyunService;
 import cn.com.qmth.examcloud.exchange.outer.service.UpyunService;
-import cn.com.qmth.examcloud.outlet.client.ExamStudentClient;
-import cn.com.qmth.examcloud.outlet.client.StudentFaceInfoClient;
-import cn.com.qmth.examcloud.outlet.exception.DetectNoFaceException;
-import cn.com.qmth.examcloud.outlet.exception.ExamStudentNotExistException;
-import cn.com.qmth.examcloud.outlet.exception.InvalidJpgException;
-import cn.com.qmth.examcloud.outlet.response.FailureBaseResponse;
-import cn.com.qmth.examcloud.outlet.response.IBaseResponse;
-import cn.com.qmth.examcloud.outlet.response.SuccessBaseResponse;
+import cn.com.qmth.examcloud.exchange.outer.service.client.ExamStudentClient;
+import cn.com.qmth.examcloud.exchange.outer.service.client.StudentFaceInfoClient;
 import cn.com.qmth.examcloud.common.dto.core.StudentFaceInfo;
 import cn.com.qmth.examcloud.common.dto.core.StudentFaceInfo;
 import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
 import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
 
 

+ 4 - 4
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ScorePushController.java

@@ -13,11 +13,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import cn.com.qmth.examcloud.common.dto.oe.marking.ExamRecordDto;
 import cn.com.qmth.examcloud.common.dto.oe.marking.ExamRecordDto;
+import cn.com.qmth.examcloud.exchange.base.enums.OrgIdServiceEnum;
+import cn.com.qmth.examcloud.exchange.base.response.FailureBaseResponse;
+import cn.com.qmth.examcloud.exchange.base.response.SuccessBaseResponse;
+import cn.com.qmth.examcloud.exchange.base.util.SpringContextUtils;
 import cn.com.qmth.examcloud.exchange.outer.service.ScorePushService;
 import cn.com.qmth.examcloud.exchange.outer.service.ScorePushService;
-import cn.com.qmth.examcloud.outlet.enums.OrgIdServiceEnum;
-import cn.com.qmth.examcloud.outlet.response.FailureBaseResponse;
-import cn.com.qmth.examcloud.outlet.response.SuccessBaseResponse;
-import cn.com.qmth.examcloud.outlet.utils.SpringContextUtils;
 
 
 /**
 /**
  * 推送成绩公共接口
  * 推送成绩公共接口

+ 4 - 4
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/StudentInfoController.java

@@ -16,11 +16,11 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.exchange.base.exception.SaveExamStudentException;
+import cn.com.qmth.examcloud.exchange.base.response.FailureBaseResponse;
+import cn.com.qmth.examcloud.exchange.base.response.SuccessBaseResponse;
+import cn.com.qmth.examcloud.exchange.dao.bean.StudentInfoReq;
 import cn.com.qmth.examcloud.exchange.outer.service.StudentInfoService;
 import cn.com.qmth.examcloud.exchange.outer.service.StudentInfoService;
-import cn.com.qmth.examcloud.outlet.dto.StudentInfoReq;
-import cn.com.qmth.examcloud.outlet.exception.SaveExamStudentException;
-import cn.com.qmth.examcloud.outlet.response.FailureBaseResponse;
-import cn.com.qmth.examcloud.outlet.response.SuccessBaseResponse;
 /**
 /**
  * @author  	chenken
  * @author  	chenken
  * @date    	2018年5月7日 下午4:30:29
  * @date    	2018年5月7日 下午4:30:29

+ 3 - 3
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/sydx/ScoreController.java

@@ -2,10 +2,10 @@ package cn.com.qmth.examcloud.exchange.outer.api.provider.sydx;
 
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.exchange.base.response.FailureBaseResponse;
+import cn.com.qmth.examcloud.exchange.dao.ExamScoreRepo;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
 import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
 import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
-import cn.com.qmth.examcloud.outlet.dto.OutletScore;
-import cn.com.qmth.examcloud.outlet.repo.ExamScoreRepo;
-import cn.com.qmth.examcloud.outlet.response.FailureBaseResponse;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;

+ 8 - 8
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/sydx/StudentExamInfoController.java

@@ -3,15 +3,15 @@ package cn.com.qmth.examcloud.exchange.outer.api.provider.sydx;
 
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.exchange.base.exception.NoSuchCourseLevelException;
+import cn.com.qmth.examcloud.exchange.base.exception.NoSuchExamException;
+import cn.com.qmth.examcloud.exchange.base.exception.SaveExamException;
+import cn.com.qmth.examcloud.exchange.base.exception.SaveExamStudentException;
+import cn.com.qmth.examcloud.exchange.base.response.FailureBaseResponse;
+import cn.com.qmth.examcloud.exchange.base.response.IBaseResponse;
+import cn.com.qmth.examcloud.exchange.base.response.SuccessBaseResponse;
+import cn.com.qmth.examcloud.exchange.dao.bean.ExamStudentImportDTO;
 import cn.com.qmth.examcloud.exchange.outer.service.ExamStudentImportService;
 import cn.com.qmth.examcloud.exchange.outer.service.ExamStudentImportService;
-import cn.com.qmth.examcloud.outlet.dto.ExamStudentImportDTO;
-import cn.com.qmth.examcloud.outlet.exception.NoSuchCourseLevelException;
-import cn.com.qmth.examcloud.outlet.exception.NoSuchExamException;
-import cn.com.qmth.examcloud.outlet.exception.SaveExamException;
-import cn.com.qmth.examcloud.outlet.exception.SaveExamStudentException;
-import cn.com.qmth.examcloud.outlet.response.FailureBaseResponse;
-import cn.com.qmth.examcloud.outlet.response.SuccessBaseResponse;
-import cn.com.qmth.examcloud.outlet.response.IBaseResponse;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 
 

+ 0 - 26
examcloud-exchange-outer-client/pom.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>cn.com.qmth.examcloud.exchange</groupId>
-    <artifactId>examcloud-exchange</artifactId>
-    <version>2.0-SNAPSHOT</version>
-  </parent>
-  <groupId>cn.com.qmth.examcloud.exchange</groupId>
-  <artifactId>examcloud-exchange-outer-client</artifactId>
-  <version>2.0-SNAPSHOT</version>
-  <name>examcloud-exchange-outer-client</name>
-  <url>http://maven.apache.org</url>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/dao/ExamRecordDao.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/ExamRecordDao.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.dao;
+package cn.com.qmth.examcloud.exchange.dao;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/dao/ExamScoreDao.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/ExamScoreDao.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.dao;
+package cn.com.qmth.examcloud.exchange.dao;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 4 - 3
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/repo/ExamScoreRepo.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/ExamScoreRepo.java

@@ -1,10 +1,11 @@
-package cn.com.qmth.examcloud.outlet.repo;
+package cn.com.qmth.examcloud.exchange.dao;
 
 
-import cn.com.qmth.examcloud.outlet.dto.ExamScore;
-import cn.com.qmth.examcloud.outlet.dto.OutletScore;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
+import cn.com.qmth.examcloud.exchange.dao.bean.ExamScore;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
+
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**

+ 2 - 2
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/dao/OutletScoreDao.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/OutletScoreDao.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.outlet.dao;
+package cn.com.qmth.examcloud.exchange.dao;
 
 
 import java.util.List;
 import java.util.List;
 
 
 import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
 import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
-import cn.com.qmth.examcloud.outlet.dto.OutletScore;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
 
 
 /**
 /**
  * @author  	chenken
  * @author  	chenken

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/entity/CreateFacesetResponse.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/CreateFacesetResponse.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.entity;
+package cn.com.qmth.examcloud.exchange.dao.bean;
 
 
 /**
 /**
  * Created by yuanpan on 2017/5/15.
  * Created by yuanpan on 2017/5/15.

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/dto/ExamReq.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/ExamReq.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.dto;
+package cn.com.qmth.examcloud.exchange.dao.bean;
 
 
 import java.util.Date;
 import java.util.Date;
 
 

+ 3 - 3
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/dto/ExamScore.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/ExamScore.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.outlet.dto;
-
-import cn.com.qmth.examcloud.outlet.dto.OutletScore;
+package cn.com.qmth.examcloud.exchange.dao.bean;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
 
 
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
+
 /**
 /**
  * Created by yuanpan on 2017/4/27.
  * Created by yuanpan on 2017/4/27.
  */
  */

+ 1 - 4
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/dto/ExamStudentImportDTO.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/ExamStudentImportDTO.java

@@ -1,11 +1,8 @@
-package cn.com.qmth.examcloud.outlet.dto;
+package cn.com.qmth.examcloud.exchange.dao.bean;
 
 
 
 
 import java.util.List;
 import java.util.List;
 
 
-import cn.com.qmth.examcloud.outlet.entity.OutletExam;
-import cn.com.qmth.examcloud.outlet.entity.OutletExamStudent;
-
 /**
 /**
  * Created by yuanpan on 2017/4/25.
  * Created by yuanpan on 2017/4/25.
  */
  */

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/entity/Face.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/Face.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.entity;
+package cn.com.qmth.examcloud.exchange.dao.bean;
 
 
 /**
 /**
  * Created by yuanpan on 2017/5/15.
  * Created by yuanpan on 2017/5/15.

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/entity/FaceDetectResponse.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/FaceDetectResponse.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.entity;
+package cn.com.qmth.examcloud.exchange.dao.bean;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/entity/FaceRectangle.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/FaceRectangle.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.entity;
+package cn.com.qmth.examcloud.exchange.dao.bean;
 
 
 /**
 /**
  * Created by yuanpan on 2017/5/15.
  * Created by yuanpan on 2017/5/15.

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/entity/OutletCourse.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletCourse.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.entity;
+package cn.com.qmth.examcloud.exchange.dao.bean;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/entity/OutletExam.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletExam.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.entity;
+package cn.com.qmth.examcloud.exchange.dao.bean;
 
 
 
 
 import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
 import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/entity/OutletExamStudent.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletExamStudent.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.entity;
+package cn.com.qmth.examcloud.exchange.dao.bean;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 
 

+ 2 - 2
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/entity/OutletOrg.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletOrg.java

@@ -1,8 +1,8 @@
-package cn.com.qmth.examcloud.outlet.entity;
+package cn.com.qmth.examcloud.exchange.dao.bean;
 
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 
 
-import cn.com.qmth.examcloud.outlet.enums.OutletOrgType;
+import cn.com.qmth.examcloud.exchange.base.enums.OutletOrgType;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/dto/OutletScore.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletScore.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.dto;
+package cn.com.qmth.examcloud.exchange.dao.bean;
 
 
 import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
 import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
 
 

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/entity/OutletStudent.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletStudent.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.entity;
+package cn.com.qmth.examcloud.exchange.dao.bean;
 
 
 import cn.com.qmth.examcloud.common.dto.core.User;
 import cn.com.qmth.examcloud.common.dto.core.User;
 
 

+ 1 - 1
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/dto/StudentInfoReq.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/StudentInfoReq.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.dto;
+package cn.com.qmth.examcloud.exchange.dao.bean;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 
 

+ 2 - 2
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/dao/impl/ExamRecordDaoImpl.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/impl/ExamRecordDaoImpl.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.dao.impl;
+package cn.com.qmth.examcloud.exchange.dao.impl;
 
 
 import java.sql.ResultSet;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLException;
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
 
 
 import cn.com.qmth.examcloud.common.dto.em.ExamRecord;
 import cn.com.qmth.examcloud.common.dto.em.ExamRecord;
 import cn.com.qmth.examcloud.common.dto.em.enums.ExamRecordStatus;
 import cn.com.qmth.examcloud.common.dto.em.enums.ExamRecordStatus;
-import cn.com.qmth.examcloud.outlet.dao.ExamRecordDao;
+import cn.com.qmth.examcloud.exchange.dao.ExamRecordDao;
 
 
 /**
 /**
  * @author  	chenken
  * @author  	chenken

+ 2 - 2
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/dao/impl/ExamScoreDaoImpl.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/impl/ExamScoreDaoImpl.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.dao.impl;
+package cn.com.qmth.examcloud.exchange.dao.impl;
 
 
 import java.sql.ResultSet;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLException;
@@ -10,7 +10,7 @@ import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import cn.com.qmth.examcloud.common.dto.em.ExamScore;
 import cn.com.qmth.examcloud.common.dto.em.ExamScore;
-import cn.com.qmth.examcloud.outlet.dao.ExamScoreDao;
+import cn.com.qmth.examcloud.exchange.dao.ExamScoreDao;
 
 
 /**
 /**
  * @author  	chenken
  * @author  	chenken

+ 3 - 3
examcloud-outlet-domain/src/main/java/cn/com/qmth/examcloud/outlet/dao/impl/OutletScoreDaoImpl.java → examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/impl/OutletScoreDaoImpl.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.dao.impl;
+package cn.com.qmth.examcloud.exchange.dao.impl;
 
 
 import java.sql.ResultSet;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLException;
@@ -15,8 +15,8 @@ import org.springframework.stereotype.Repository;
 import cn.com.qmth.examcloud.common.dto.em.Exam;
 import cn.com.qmth.examcloud.common.dto.em.Exam;
 import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
 import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
 import cn.com.qmth.examcloud.common.dto.em.enums.MarkingType;
 import cn.com.qmth.examcloud.common.dto.em.enums.MarkingType;
-import cn.com.qmth.examcloud.outlet.dao.OutletScoreDao;
-import cn.com.qmth.examcloud.outlet.dto.OutletScore;
+import cn.com.qmth.examcloud.exchange.dao.OutletScoreDao;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
 
 
 /**
 /**
  * @author  	chenken
  * @author  	chenken

+ 2 - 2
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/ExamService.java

@@ -1,7 +1,7 @@
 package cn.com.qmth.examcloud.exchange.outer.service;
 package cn.com.qmth.examcloud.exchange.outer.service;
 
 
-import cn.com.qmth.examcloud.outlet.dto.ExamReq;
-import cn.com.qmth.examcloud.outlet.entity.OutletExam;
+import cn.com.qmth.examcloud.exchange.dao.bean.ExamReq;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletExam;
 
 
 /**
 /**
  * @author  	chenken
  * @author  	chenken

+ 16 - 16
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/ExamStudentImportService.java

@@ -12,22 +12,22 @@ import org.springframework.stereotype.Service;
 
 
 import cn.com.qmth.examcloud.common.dto.core.User;
 import cn.com.qmth.examcloud.common.dto.core.User;
 import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
 import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
-import cn.com.qmth.examcloud.outlet.client.CourseClient;
-import cn.com.qmth.examcloud.outlet.client.ExamClient;
-import cn.com.qmth.examcloud.outlet.client.ExamStudentClient;
-import cn.com.qmth.examcloud.outlet.client.OrgClient;
-import cn.com.qmth.examcloud.outlet.client.StudentClient;
-import cn.com.qmth.examcloud.outlet.dto.ExamStudentImportDTO;
-import cn.com.qmth.examcloud.outlet.entity.OutletCourse;
-import cn.com.qmth.examcloud.outlet.entity.OutletExam;
-import cn.com.qmth.examcloud.outlet.entity.OutletExamStudent;
-import cn.com.qmth.examcloud.outlet.entity.OutletOrg;
-import cn.com.qmth.examcloud.outlet.entity.OutletStudent;
-import cn.com.qmth.examcloud.outlet.enums.OutletOrgType;
-import cn.com.qmth.examcloud.outlet.exception.NoSuchCourseLevelException;
-import cn.com.qmth.examcloud.outlet.exception.NoSuchExamException;
-import cn.com.qmth.examcloud.outlet.exception.SaveExamException;
-import cn.com.qmth.examcloud.outlet.exception.SaveExamStudentException;
+import cn.com.qmth.examcloud.exchange.base.enums.OutletOrgType;
+import cn.com.qmth.examcloud.exchange.base.exception.NoSuchCourseLevelException;
+import cn.com.qmth.examcloud.exchange.base.exception.NoSuchExamException;
+import cn.com.qmth.examcloud.exchange.base.exception.SaveExamException;
+import cn.com.qmth.examcloud.exchange.base.exception.SaveExamStudentException;
+import cn.com.qmth.examcloud.exchange.dao.bean.ExamStudentImportDTO;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletCourse;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletExam;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletExamStudent;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletOrg;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletStudent;
+import cn.com.qmth.examcloud.exchange.outer.service.client.CourseClient;
+import cn.com.qmth.examcloud.exchange.outer.service.client.ExamClient;
+import cn.com.qmth.examcloud.exchange.outer.service.client.ExamStudentClient;
+import cn.com.qmth.examcloud.exchange.outer.service.client.OrgClient;
+import cn.com.qmth.examcloud.exchange.outer.service.client.StudentClient;
 
 
 /**
 /**
  * Created by yuanpan on 2017/4/25.
  * Created by yuanpan on 2017/4/25.

+ 8 - 4
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/FaceppService.java

@@ -5,11 +5,15 @@ import cn.com.qmth.examcloud.common.dto.core.StudentFaceInfo;
 import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
 import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
+import cn.com.qmth.examcloud.exchange.base.exception.DetectNoFaceException;
+import cn.com.qmth.examcloud.exchange.base.exception.ExamStudentNotExistException;
+import cn.com.qmth.examcloud.exchange.base.exception.FaceppException;
+import cn.com.qmth.examcloud.exchange.base.exception.InvalidJpgException;
+import cn.com.qmth.examcloud.exchange.base.exception.UpYunException;
+import cn.com.qmth.examcloud.exchange.dao.bean.FaceDetectResponse;
+import cn.com.qmth.examcloud.exchange.outer.service.client.ExamStudentClient;
+import cn.com.qmth.examcloud.exchange.outer.service.client.StudentFaceInfoClient;
 import cn.com.qmth.examcloud.commons.base.util.GsonUtil;
 import cn.com.qmth.examcloud.commons.base.util.GsonUtil;
-import cn.com.qmth.examcloud.outlet.client.ExamStudentClient;
-import cn.com.qmth.examcloud.outlet.client.StudentFaceInfoClient;
-import cn.com.qmth.examcloud.outlet.entity.FaceDetectResponse;
-import cn.com.qmth.examcloud.outlet.exception.*;
 
 
 import com.google.gson.Gson;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.GsonBuilder;

+ 1 - 1
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/OutletScoreService.java

@@ -2,7 +2,7 @@ package cn.com.qmth.examcloud.exchange.outer.service;
 
 
 import java.util.List;
 import java.util.List;
 
 
-import cn.com.qmth.examcloud.outlet.dto.OutletScore;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
 
 
 /**
 /**
  * @author  	chenken
  * @author  	chenken

+ 1 - 1
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/StudentInfoService.java

@@ -2,7 +2,7 @@ package cn.com.qmth.examcloud.exchange.outer.service;
 
 
 import java.util.List;
 import java.util.List;
 
 
-import cn.com.qmth.examcloud.outlet.dto.StudentInfoReq;
+import cn.com.qmth.examcloud.exchange.dao.bean.StudentInfoReq;
 
 
 
 
 /**
 /**

+ 2 - 2
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/client/CourseClient.java → examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/CourseClient.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.client;
+package cn.com.qmth.examcloud.exchange.outer.service.client;
 
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 
 
-import cn.com.qmth.examcloud.outlet.entity.OutletCourse;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletCourse;
 
 
 
 
 /**
 /**

+ 2 - 2
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/client/ExamClient.java → examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/ExamClient.java

@@ -1,10 +1,10 @@
-package cn.com.qmth.examcloud.outlet.client;
+package cn.com.qmth.examcloud.exchange.outer.service.client;
 
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
-import cn.com.qmth.examcloud.outlet.entity.OutletExam;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletExam;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 2 - 2
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/client/ExamStudentClient.java → examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/ExamStudentClient.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.client;
+package cn.com.qmth.examcloud.exchange.outer.service.client;
 
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 
 
-import cn.com.qmth.examcloud.outlet.entity.OutletExamStudent;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletExamStudent;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/client/OeClient.java → examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/OeClient.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.client;
+package cn.com.qmth.examcloud.exchange.outer.service.client;
 
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestHeader;

+ 2 - 2
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/client/OrgClient.java → examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/OrgClient.java

@@ -1,10 +1,10 @@
-package cn.com.qmth.examcloud.outlet.client;
+package cn.com.qmth.examcloud.exchange.outer.service.client;
 
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
-import cn.com.qmth.examcloud.outlet.entity.OutletOrg;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletOrg;
 
 
 
 
 @FeignClient(value = "ExamCloud-service-core")
 @FeignClient(value = "ExamCloud-service-core")

+ 2 - 2
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/client/StudentClient.java → examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/StudentClient.java

@@ -1,10 +1,10 @@
-package cn.com.qmth.examcloud.outlet.client;
+package cn.com.qmth.examcloud.exchange.outer.service.client;
 
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
-import cn.com.qmth.examcloud.outlet.entity.OutletStudent;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletStudent;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/client/StudentFaceInfoClient.java → examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/StudentFaceInfoClient.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.client;
+package cn.com.qmth.examcloud.exchange.outer.service.client;
 
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;

+ 4 - 4
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/ExamServiceImpl.java

@@ -7,11 +7,11 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
 import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
+import cn.com.qmth.examcloud.exchange.base.exception.SaveExamException;
+import cn.com.qmth.examcloud.exchange.dao.bean.ExamReq;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletExam;
 import cn.com.qmth.examcloud.exchange.outer.service.ExamService;
 import cn.com.qmth.examcloud.exchange.outer.service.ExamService;
-import cn.com.qmth.examcloud.outlet.client.ExamClient;
-import cn.com.qmth.examcloud.outlet.dto.ExamReq;
-import cn.com.qmth.examcloud.outlet.entity.OutletExam;
-import cn.com.qmth.examcloud.outlet.exception.SaveExamException;
+import cn.com.qmth.examcloud.exchange.outer.service.client.ExamClient;
 
 
 /**
 /**
  * @author  	chenken
  * @author  	chenken

+ 4 - 4
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/OutletScoreServiceImpl.java

@@ -16,11 +16,11 @@ import cn.com.qmth.examcloud.common.dto.em.ExamScore;
 import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
 import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
 import cn.com.qmth.examcloud.common.dto.em.enums.ExamRecordStatus;
 import cn.com.qmth.examcloud.common.dto.em.enums.ExamRecordStatus;
 import cn.com.qmth.examcloud.common.dto.em.enums.MarkingType;
 import cn.com.qmth.examcloud.common.dto.em.enums.MarkingType;
+import cn.com.qmth.examcloud.exchange.dao.ExamRecordDao;
+import cn.com.qmth.examcloud.exchange.dao.ExamScoreDao;
+import cn.com.qmth.examcloud.exchange.dao.OutletScoreDao;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
 import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
 import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
-import cn.com.qmth.examcloud.outlet.dao.ExamRecordDao;
-import cn.com.qmth.examcloud.outlet.dao.ExamScoreDao;
-import cn.com.qmth.examcloud.outlet.dao.OutletScoreDao;
-import cn.com.qmth.examcloud.outlet.dto.OutletScore;
 
 
 /**
 /**
  * @author  	chenken
  * @author  	chenken

+ 14 - 14
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/StudentInfoServiceImpl.java

@@ -13,21 +13,21 @@ import org.springframework.stereotype.Service;
 
 
 import cn.com.qmth.examcloud.common.dto.core.User;
 import cn.com.qmth.examcloud.common.dto.core.User;
 import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
 import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
+import cn.com.qmth.examcloud.exchange.base.enums.OutletOrgType;
+import cn.com.qmth.examcloud.exchange.base.exception.NoSuchCourseLevelException;
+import cn.com.qmth.examcloud.exchange.base.exception.SaveExamStudentException;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletCourse;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletExam;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletExamStudent;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletOrg;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletStudent;
+import cn.com.qmth.examcloud.exchange.dao.bean.StudentInfoReq;
 import cn.com.qmth.examcloud.exchange.outer.service.StudentInfoService;
 import cn.com.qmth.examcloud.exchange.outer.service.StudentInfoService;
-import cn.com.qmth.examcloud.outlet.client.CourseClient;
-import cn.com.qmth.examcloud.outlet.client.ExamClient;
-import cn.com.qmth.examcloud.outlet.client.ExamStudentClient;
-import cn.com.qmth.examcloud.outlet.client.OrgClient;
-import cn.com.qmth.examcloud.outlet.client.StudentClient;
-import cn.com.qmth.examcloud.outlet.dto.StudentInfoReq;
-import cn.com.qmth.examcloud.outlet.entity.OutletCourse;
-import cn.com.qmth.examcloud.outlet.entity.OutletExam;
-import cn.com.qmth.examcloud.outlet.entity.OutletExamStudent;
-import cn.com.qmth.examcloud.outlet.entity.OutletOrg;
-import cn.com.qmth.examcloud.outlet.entity.OutletStudent;
-import cn.com.qmth.examcloud.outlet.enums.OutletOrgType;
-import cn.com.qmth.examcloud.outlet.exception.NoSuchCourseLevelException;
-import cn.com.qmth.examcloud.outlet.exception.SaveExamStudentException;
+import cn.com.qmth.examcloud.exchange.outer.service.client.CourseClient;
+import cn.com.qmth.examcloud.exchange.outer.service.client.ExamClient;
+import cn.com.qmth.examcloud.exchange.outer.service.client.ExamStudentClient;
+import cn.com.qmth.examcloud.exchange.outer.service.client.OrgClient;
+import cn.com.qmth.examcloud.exchange.outer.service.client.StudentClient;
 
 
 /**
 /**
  * @author  	chenken
  * @author  	chenken

+ 3 - 3
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/scorePush/SydxScorePushServiceImpl.java

@@ -21,11 +21,11 @@ import org.springframework.stereotype.Service;
 
 
 import cn.com.qmth.examcloud.common.dto.oe.marking.ExamRecordDto;
 import cn.com.qmth.examcloud.common.dto.oe.marking.ExamRecordDto;
 import cn.com.qmth.examcloud.commons.base.util.GsonUtil;
 import cn.com.qmth.examcloud.commons.base.util.GsonUtil;
+import cn.com.qmth.examcloud.exchange.dao.ExamScoreRepo;
+import cn.com.qmth.examcloud.exchange.dao.OutletScoreDao;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
 import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
 import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
 import cn.com.qmth.examcloud.exchange.outer.service.ScorePushService;
 import cn.com.qmth.examcloud.exchange.outer.service.ScorePushService;
-import cn.com.qmth.examcloud.outlet.dao.OutletScoreDao;
-import cn.com.qmth.examcloud.outlet.dto.OutletScore;
-import cn.com.qmth.examcloud.outlet.repo.ExamScoreRepo;
 
 
 /**
 /**
  * @author  	chenken
  * @author  	chenken

+ 3 - 3
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/scorePush/XncdScorePushServiceImpl.java

@@ -22,11 +22,11 @@ import org.springframework.stereotype.Service;
 
 
 import cn.com.qmth.examcloud.common.dto.oe.marking.ExamRecordDto;
 import cn.com.qmth.examcloud.common.dto.oe.marking.ExamRecordDto;
 import cn.com.qmth.examcloud.common.dto.oe.marking.PushScoreActionEnum;
 import cn.com.qmth.examcloud.common.dto.oe.marking.PushScoreActionEnum;
+import cn.com.qmth.examcloud.exchange.base.util.OutletUtils;
+import cn.com.qmth.examcloud.exchange.dao.ExamScoreRepo;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
 import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
 import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
 import cn.com.qmth.examcloud.exchange.outer.service.ScorePushService;
 import cn.com.qmth.examcloud.exchange.outer.service.ScorePushService;
-import cn.com.qmth.examcloud.outlet.dto.OutletScore;
-import cn.com.qmth.examcloud.outlet.repo.ExamScoreRepo;
-import cn.com.qmth.examcloud.outlet.utils.OutletUtils;
 
 
 /**
 /**
  * @author  	chenken
  * @author  	chenken

+ 0 - 23
examcloud-outlet-api/pom.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>cn.com.qmth.examcloud.exchange</groupId>
-		<artifactId>examcloud-exchange</artifactId>
-		<version>2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>examcloud-outlet-api</artifactId>
-	<packaging>jar</packaging>
-
-
-	<dependencies>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.exchange</groupId>
-			<artifactId>examcloud-outlet-domain</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-
-	</dependencies>
-
-
-</project>

+ 0 - 36
examcloud-outlet-domain/pom.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>cn.com.qmth.examcloud.exchange</groupId>
-		<artifactId>examcloud-exchange</artifactId>
-		<version>2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>examcloud-outlet-domain</artifactId>
-	<packaging>jar</packaging>
-
-
-	<dependencies>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.commons</groupId>
-			<artifactId>examcloud-commons-web</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.commons</groupId>
-			<artifactId>examcloud-commons-dto</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.upyun</groupId>
-			<artifactId>java-sdk</artifactId>
-			<version>3.14</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-		</dependency>
-	</dependencies>
-
-</project>

+ 1 - 4
pom.xml

@@ -21,9 +21,6 @@
 		<module>examcloud-exchange-outer-api-provider</module>
 		<module>examcloud-exchange-outer-api-provider</module>
 		<module>examcloud-exchange-outer-service</module>
 		<module>examcloud-exchange-outer-service</module>
 		<module>examcloud-exchange-outer-dao</module>
 		<module>examcloud-exchange-outer-dao</module>
+	</modules>
 
 
-		<module>examcloud-outlet-api</module>
-		<module>examcloud-outlet-domain</module>
-    <module>examcloud-exchange-outer-client</module>
-  </modules>
 </project>
 </project>