wangwei 7 years ago
parent
commit
5b2f0645aa
15 changed files with 29 additions and 31 deletions
  1. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/CommonGainScoreController.java
  2. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ExamController.java
  3. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ExamVerifyPhotoController.java
  4. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/FaceppController.java
  5. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ScorePushController.java
  6. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/StudentInfoController.java
  7. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/sydx/ScoreController.java
  8. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/sydx/StudentExamInfoController.java
  9. 2 2
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/CourseClient.java
  10. 4 4
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/ExamClient.java
  11. 4 4
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/ExamStudentClient.java
  12. 2 2
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/OrgClient.java
  13. 3 3
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/StudentClient.java
  14. 3 3
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/StudentFaceInfoClient.java
  15. 3 5
      examcloud-exchange-starter/src/main/resources/application.properties

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

@@ -35,7 +35,7 @@ import java.util.List;
  * @description ScoreController.java
  */
 @RestController
-@RequestMapping("${app.api.root}/score")
+@RequestMapping("${$rmp.cloud.exchange.outer}/score")
 public class CommonGainScoreController  extends ControllerSupport{
 
     @Autowired

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

@@ -28,7 +28,7 @@ import cn.com.qmth.examcloud.exchange.outer.service.ExamService;
  * @description ExamController.java
  */
 @RestController
-@RequestMapping("${app.api.root}/exam")
+@RequestMapping("${$rmp.cloud.exchange.outer}/exam")
 public class ExamController  extends ControllerSupport{
 	
     @Autowired

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

@@ -24,7 +24,7 @@ import cn.com.qmth.examcloud.exchange.outer.service.client.OeClient;
  * @description ExamVerifyPhotoController.java
  */
 @RestController
-@RequestMapping("${app.api.root}/examVerifyPhotos")
+@RequestMapping("${$rmp.cloud.exchange.outer}/examVerifyPhotos")
 public class ExamVerifyPhotoController  extends ControllerSupport{
 	
 	@Autowired

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

@@ -44,7 +44,7 @@ import java.util.zip.ZipInputStream;
  * @description FaceppController.java
  */
 @RestController
-@RequestMapping("${app.api.root}/facepp")
+@RequestMapping("${$rmp.cloud.exchange.outer}/facepp")
 public class FaceppController  extends ControllerSupport{
 
     private static final Logger LOG = LoggerFactory.getLogger(FaceppController.class);

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

@@ -27,7 +27,7 @@ import cn.com.qmth.examcloud.exchange.outer.service.ScorePushService;
  * @description ScorePushController.java
  */
 @RestController
-@RequestMapping("${app.api.root}/score-push")
+@RequestMapping("${$rmp.cloud.exchange.outer}/score-push")
 @ConditionalOnProperty("app.pushscore.enable")
 public class ScorePushController {
 	

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

@@ -28,7 +28,7 @@ import cn.com.qmth.examcloud.exchange.outer.service.StudentInfoService;
  * @description StudentInfoController.java
  */
 @RestController
-@RequestMapping("${app.api.root}/studentInfo")
+@RequestMapping("${$rmp.cloud.exchange.outer}/studentInfo")
 public class StudentInfoController extends ControllerSupport{
 	
 	@Autowired

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

@@ -29,7 +29,7 @@ import java.util.List;
  * @description ScoreController.java
  */
 @RestController
-@RequestMapping("${app.api.root}/sydx/score")
+@RequestMapping("${$rmp.cloud.exchange.outer}/sydx/score")
 public class ScoreController  extends ControllerSupport{
 
     @Autowired

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

@@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletRequest;
  * @description StudentExamInfoController.java
  */
 @RestController
-@RequestMapping("${app.api.root}/sydx/import_exam_student_info")
+@RequestMapping("${$rmp.cloud.exchange.outer}/sydx/import_exam_student_info")
 public class StudentExamInfoController  extends ControllerSupport{
 
     private static final Logger LOG = LoggerFactory.getLogger(StudentExamInfoController.class);

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

@@ -17,9 +17,9 @@ import cn.com.qmth.examcloud.exchange.dao.bean.OutletCourse;
 @FeignClient(value = "ExamCloud-service-core")
 public interface CourseClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/course")
+    @RequestMapping(method = RequestMethod.GET, value = "${$rmp.ctr.basic}/course")
     ResponseEntity<OutletCourse> getCourseByCode(@RequestHeader("user_token") String token, @RequestParam(value = "orgId") Long orgId, @RequestParam(value = "code") String code);
 
-    @RequestMapping(method = RequestMethod.POST, value = "${app.api.core}/course")
+    @RequestMapping(method = RequestMethod.POST, value = "${$rmp.ctr.basic}/course")
     ResponseEntity<OutletCourse> save(@RequestHeader("user_token") String token, @RequestBody OutletCourse course);
 }

+ 4 - 4
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/ExamClient.java

@@ -14,15 +14,15 @@ import java.util.List;
 @FeignClient(value = "ExamCloud-service-exam-work")
 public interface ExamClient {
 
-    @RequestMapping(method = RequestMethod.POST, value = "${app.api.exam}/exam")
+    @RequestMapping(method = RequestMethod.POST, value = "${$rmp.ctr.examwork}/exam")
     ResponseEntity<OutletExam> save(@RequestHeader("user_token") String token, @RequestBody OutletExam exam);
 
-    @RequestMapping(method = RequestMethod.GET, value = "${app.api.exam}/exam/{id}")
+    @RequestMapping(method = RequestMethod.GET, value = "${$rmp.ctr.examwork}/exam/{id}")
     ResponseEntity<OutletExam> getOne(@RequestHeader("user_token") String token, @PathVariable(value = "id") Long id);
 
-    @RequestMapping(method = RequestMethod.GET, value = "${app.api.exam}/exam/all")
+    @RequestMapping(method = RequestMethod.GET, value = "${$rmp.ctr.examwork}/exam/all")
     ResponseEntity<List<OutletExam>> queryByRemark(@RequestHeader("user_token") String token, @RequestParam(value = "remark") String remark);
     
-    @RequestMapping(method = RequestMethod.GET, value = "${app.api.exam}/exam/name")
+    @RequestMapping(method = RequestMethod.GET, value = "${$rmp.ctr.examwork}/exam/name")
     ResponseEntity<List<OutletExam>> queryByName(@RequestHeader("user_token") String token, @RequestParam(value = "name") String name);
 }

+ 4 - 4
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/ExamStudentClient.java

@@ -18,16 +18,16 @@ import java.util.List;
 @FeignClient(value = "ExamCloud-service-exam-work")
 public interface ExamStudentClient {
 
-    @RequestMapping(method = RequestMethod.POST, value = "${app.api.exam}/exam_student")
+    @RequestMapping(method = RequestMethod.POST, value = "${$rmp.ctr.examwork}/exam_student")
     ResponseEntity<OutletExamStudent> save(@RequestHeader("user_token") String token, @RequestBody OutletExamStudent examStudent);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "${app.api.exam}/exam_student")
+    @RequestMapping(method = RequestMethod.PUT, value = "${$rmp.ctr.examwork}/exam_student")
     ResponseEntity<OutletExamStudent> updateExamStudent(@RequestHeader("user_token") String token, @RequestBody OutletExamStudent examStudent);
 
-    @RequestMapping(method = RequestMethod.GET, value = "${app.api.exam}/exam_student/all")
+    @RequestMapping(method = RequestMethod.GET, value = "${$rmp.ctr.examwork}/exam_student/all")
     String getExamStudentByIdentityNumber(@RequestHeader("user_token") String token, @RequestParam("identityNumber") String identityNumber);
 
-    @RequestMapping(method = RequestMethod.GET, value = "${app.api.exam}/exam_student/all")
+    @RequestMapping(method = RequestMethod.GET, value = "${$rmp.ctr.examwork}/exam_student/all")
     ResponseEntity<List<OutletExamStudent>> queryExamStudent(@RequestHeader("user_token") String token, @RequestParam("identityNumber") String identityNumber, @RequestParam("examId") Long examId, @RequestParam("courseCode") String courseCode);
 }

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

@@ -10,10 +10,10 @@ import cn.com.qmth.examcloud.exchange.dao.bean.OutletOrg;
 @FeignClient(value = "ExamCloud-service-core")
 public interface OrgClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/org")
+    @RequestMapping(method = RequestMethod.GET, value = "${$rmp.ctr.basic}/org")
     ResponseEntity<OutletOrg> findByParentIdAndCode(@RequestHeader("user_token") String token, @RequestParam("parentId") Long parentId, @RequestParam("code") String code);
 
-    @RequestMapping(method = RequestMethod.POST, value = "${app.api.core}/org")
+    @RequestMapping(method = RequestMethod.POST, value = "${$rmp.ctr.basic}/org")
     ResponseEntity<OutletOrg> save(@RequestHeader("user_token") String token, @RequestBody OutletOrg org);
 
 }

+ 3 - 3
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/StudentClient.java

@@ -14,12 +14,12 @@ import java.util.List;
 @FeignClient(value = "ExamCloud-service-core")
 public interface StudentClient {
 
-    @RequestMapping(method = RequestMethod.POST, value = "${app.api.core}/student")
+    @RequestMapping(method = RequestMethod.POST, value = "${$rmp.ctr.basic}/student")
     ResponseEntity<OutletStudent> save(@RequestHeader("user_token") String token, @RequestBody OutletStudent student);
 
-    @RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/student")
+    @RequestMapping(method = RequestMethod.GET, value = "${$rmp.ctr.basic}/student")
     ResponseEntity<List<OutletStudent>> getStudentByIdentityNumber(@RequestHeader("user_token") String token, @RequestParam("identityNumber") String identityNumber);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "${app.api.core}/student")
+    @RequestMapping(method = RequestMethod.PUT, value = "${$rmp.ctr.basic}/student")
     ResponseEntity<OutletStudent> updateStudent(@RequestHeader("user_token") String token, @RequestBody OutletStudent student);
 }

+ 3 - 3
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/client/StudentFaceInfoClient.java

@@ -11,15 +11,15 @@ import cn.com.qmth.examcloud.common.dto.core.StudentFaceInfo;
  */
 @FeignClient(value = "ExamCloud-service-core")
 public interface StudentFaceInfoClient {
-    @RequestMapping(method = RequestMethod.POST, value = "${app.api.core}/studentFaceInfo")
+    @RequestMapping(method = RequestMethod.POST, value = "${$rmp.ctr.basic}/studentFaceInfo")
     ResponseEntity<StudentFaceInfo> save(@RequestHeader("user_token") String token, @RequestBody StudentFaceInfo studentFaceInfo);
 
-    @RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/studentFaceInfo/identityNumber")
+    @RequestMapping(method = RequestMethod.GET, value = "${$rmp.ctr.basic}/studentFaceInfo/identityNumber")
     ResponseEntity<StudentFaceInfo> getByIdentityNumber(@RequestHeader("user_token") String token, @RequestParam("identityNumber") String identityNumber, @RequestParam("orgId") Long orgId);
     /**
      * 获取faceSetToken(人脸集合)
      * @return
      */
-    @RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/faceSet/enableFaceSet")
+    @RequestMapping(method = RequestMethod.GET, value = "${$rmp.ctr.basic}/faceSet/enableFaceSet")
     String getFaceSet();
 }

+ 3 - 5
examcloud-exchange-starter/src/main/resources/application.properties

@@ -16,13 +16,11 @@ spring.jpa.hibernate.ddl-auto=update
 
 hystrix.command.default.execution.timeout.enabled=false
 
-
 $rmp.cloud.exchange.inner=/api/exchange/inner
 $rmp.cloud.exchange.outer=/api/ecs_outlet
-app.api.root=/api/ecs_outlet
-app.api.exam=/api/ecs_exam_work
-app.api.core=/api/ecs_core
-app.api.cqb=/api/ecs_ques
+$rmp.ctr.examwork=/api/ecs_exam_work
+$rmp.ctr.basic=/api/ecs_core
+
 
 app.upyun.path=/student_base_photo
 app.upyun.bucket=exam-cloud-test