Merge branch 'dev0410' of https://git.oschina.net/songyue123456/comm-ques-bank into dev0410

cqb-paper/src/main/java/com/qmth/cqb/paper/web/ExtractConfigController.java

@@ -114,7 +114,7 @@ public class ExtractConfigController {
 	
 	@ApiOperation(value = "判断试卷中的题是否都为客观题(单选、多选、判断)，包括套题中的小题", 
 				  notes = "判断试卷中的题是否都为客观题(单选、多选、判断)，包括套题中的小题")
-    @GetMapping(value = "/checkIsAllQbjectiveQuestion/{paperId}")
+    @GetMapping(value = "/checkObjective/{paperId}")
 	public ResponseEntity<Map<String, Object>> checkIsAllQbjectiveQuestion(@PathVariable String paperId){
 		Map<String, Object> quesMap = new HashMap<String, Object>();
 		try{

cqb-starter/src/main/java/com/qmth/cqb/App.java

@@ -17,7 +17,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartResolver;
  *
  */
 @SpringBootApplication
-//@EnableEurekaClient
+@EnableEurekaClient
 @EnableFeignClients
 @EnableAutoConfiguration(exclude = {MultipartAutoConfiguration.class})
 public class App {

pom.xml

@@ -42,7 +42,7 @@
       <dependency>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-dependencies</artifactId>
-        <version>Brixton.RELEASE</version>
+        <version>Camden.SR3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>