wangwei 7 gadi atpakaļ
vecāks
revīzija
ee9bf68eb1
13 mainītis faili ar 22 papildinājumiem un 22 dzēšanām
  1. 1 1
      examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamController.java
  2. 1 1
      examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamCourseController.java
  3. 1 1
      examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamOrgTimeController.java
  4. 1 1
      examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamPaperTypController.java
  5. 1 1
      examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamScoreController.java
  6. 1 1
      examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamStudentController.java
  7. 1 1
      examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/provider/ExamCloudServiceProvider.java
  8. 1 1
      examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/provider/ExamStudentCloudServiceProvider.java
  9. 2 2
      examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/client/CourseClient.java
  10. 2 2
      examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/client/OrgClient.java
  11. 1 1
      examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/client/SpecialtyClient.java
  12. 5 5
      examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/client/StudentClient.java
  13. 4 4
      examcloud-core-examwork-starter/src/main/resources/application.properties

+ 1 - 1
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamController.java

@@ -56,7 +56,7 @@ import io.swagger.annotations.ApiOperation;
  * 考试服务API Created by songyue on 17/1/13.
  */
 @RestController
-@RequestMapping("${app.api.root}")
+@RequestMapping("${$rmp.ctr.examwork}")
 public class ExamController extends ControllerSupport {
 
 	@Autowired

+ 1 - 1
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamCourseController.java

@@ -14,7 +14,7 @@ import java.util.List;
  * Created by yuanpan on 2017/4/12.
  */
 @RestController
-@RequestMapping("${app.api.root}/exam_course")
+@RequestMapping("${$rmp.ctr.examwork}/exam_course")
 public class ExamCourseController {
 
     @Autowired

+ 1 - 1
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamOrgTimeController.java

@@ -19,7 +19,7 @@ import java.util.List;
  * Created by songyue on 17/1/13.
  */
 @RestController
-@RequestMapping("${app.api.root}")
+@RequestMapping("${$rmp.ctr.examwork}")
 public class ExamOrgTimeController {
 
     @Autowired

+ 1 - 1
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamPaperTypController.java

@@ -16,7 +16,7 @@ import java.util.List;
  * Created by yuanpan on 2017/4/12.
  */
 @RestController
-@RequestMapping("${app.api.root}/exam_paper_type")
+@RequestMapping("${$rmp.ctr.examwork}/exam_paper_type")
 public class ExamPaperTypController {
 
     @Autowired

+ 1 - 1
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamScoreController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
  * Created by songyue on 17/1/13.
  */
 @RestController
-@RequestMapping("${app.api.root}")
+@RequestMapping("${$rmp.ctr.examwork}")
 public class ExamScoreController {
 
     @Autowired

+ 1 - 1
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamStudentController.java

@@ -59,7 +59,7 @@ import io.swagger.annotations.ApiOperation;
  * Created by songyue on 17/1/13.
  */
 @RestController
-@RequestMapping("${app.api.root}/exam_student")
+@RequestMapping("${$rmp.ctr.examwork}/exam_student")
 public class ExamStudentController extends ControllerSupport{
 
     private static final Logger log = LoggerFactory.getLogger(ExamStudentController.class);

+ 1 - 1
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/provider/ExamCloudServiceProvider.java

@@ -26,7 +26,7 @@ import io.swagger.annotations.ApiOperation;
  * @description ExamProvider.java
  */
 @RestController
-@RequestMapping("${$rmp}" + "exam")
+@RequestMapping("${$rmp.cloud.examwork}" + "exam")
 public class ExamCloudServiceProvider extends ControllerSupport implements ExamCloudService {
 
 	private static final long serialVersionUID = 6850508158980856785L;

+ 1 - 1
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/provider/ExamStudentCloudServiceProvider.java

@@ -23,7 +23,7 @@ import cn.com.qmth.examcloud.examwork.api.request.SaveExamStudentReq;
  * @description ExamStudentProvider.java
  */
 @RestController
-@RequestMapping("${$rmp}" + "examStudent")
+@RequestMapping("${$rmp.cloud.examwork}" + "examStudent")
 public class ExamStudentCloudServiceProvider extends ControllerSupport
 		implements
 			ExamStudentCloudService {

+ 2 - 2
examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/client/CourseClient.java

@@ -15,11 +15,11 @@ import org.springframework.web.bind.annotation.RequestParam;
 @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")
 	String findByOrgIdAndCode(@RequestHeader("user_token") String token,@RequestParam("orgId") Long orgId,@RequestParam("code") String code);
 
 
-	@RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/course/org/{orgId}")
+	@RequestMapping(method = RequestMethod.GET, value = "${$rmp.ctr.basic}/course/org/{orgId}")
 	String findByOrgId(@RequestHeader("user_token") String token,@PathVariable("orgId") Long orgId);
 
 }

+ 2 - 2
examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/client/OrgClient.java

@@ -11,10 +11,10 @@ import org.springframework.web.bind.annotation.*;
 @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")
 	String findByParentIdAndCode(@RequestHeader("user_token") String token,@RequestParam("parentId") Long parentId,@RequestParam("code") String code);
 
-	@RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/org/sub/{parentId}")
+	@RequestMapping(method = RequestMethod.GET, value = "${$rmp.ctr.basic}/org/sub/{parentId}")
 	String findByParentId(@RequestHeader("user_token") String token,
 						  @PathVariable("parentId") Long parentId);
 

+ 1 - 1
examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/client/SpecialtyClient.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 @FeignClient(value = "ExamCloud-service-core")
 public interface SpecialtyClient {
 
-	@RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/specialty")
+	@RequestMapping(method = RequestMethod.GET, value = "${$rmp.ctr.basic}/specialty")
 	String findByOrgIdAndCode(@RequestHeader("user_token") String token,@RequestParam("orgId") Long orgId, @RequestParam("code") String code);
 
 }

+ 5 - 5
examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/client/StudentClient.java

@@ -13,19 +13,19 @@ import cn.com.qmth.examcloud.common.dto.core.Student;
 @FeignClient(value = "ExamCloud-service-core")
 public interface StudentClient {
 
-	@RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/student")
+	@RequestMapping(method = RequestMethod.GET, value = "${$rmp.ctr.basic}/student")
 	String updatePhoto(@RequestHeader("user_token") String token,@RequestParam("identityNumber") String identityNumber);
 
-	@RequestMapping(method = RequestMethod.POST, value = "${app.api.core}/student")
+	@RequestMapping(method = RequestMethod.POST, value = "${$rmp.ctr.basic}/student")
 	String addStudent(@RequestHeader("user_token") String token,@RequestBody Student student);
 
-	@RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/student/{id}")
+	@RequestMapping(method = RequestMethod.GET, value = "${$rmp.ctr.basic}/student/{id}")
 	String getStudent(@RequestHeader("user_token") String token,@PathVariable("id") Long id);
 
-	@RequestMapping(method = RequestMethod.PUT, value = "${app.api.core}/student")
+	@RequestMapping(method = RequestMethod.PUT, value = "${$rmp.ctr.basic}/student")
 	String updateStudent(@RequestHeader("user_token") String token,@RequestBody Student student);
 
-	@RequestMapping(method = RequestMethod.DELETE, value = "${app.api.core}/student/{id}")
+	@RequestMapping(method = RequestMethod.DELETE, value = "${$rmp.ctr.basic}/student/{id}")
 	void deleteStudent(@RequestHeader("user_token") String token,@PathVariable("id") Long id);
 
 }

+ 4 - 4
examcloud-core-examwork-starter/src/main/resources/application.properties

@@ -21,10 +21,10 @@ hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 600000
 ribbon.ReadTimeout=800000
 ribbon.ConnectTimeout=800000
 
-app.api.root=/api/ecs_exam_work
-app.api.core=/api/ecs_core
-app.api.oe=/api/ecs_oe
-$rmp=/api/core/examwork/
+$rmp.ctr.examwork=/api/ecs_exam_work
+$rmp.cloud.examwork=/api/core/examwork/
+$rmp.ctr.basic=/api/ecs_core
+$rmp.ctr.oe=/api/ecs_oe
 
 app.em.photo.path=/Users/ting.yin/Downloads
 app.em.facepp.key=e94d4a6a1ea8749144328be96a40e388