Merge branch 'dev0410' of

https://git.oschina.net/songyue123456/comm-ques-bank.git into dev0410

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

cqb-paper/src/main/java/com/qmth/cqb/paper/service/ExtractConfigServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 
+import com.qmth.cqb.paper.dao.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
@@ -16,10 +17,6 @@ import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
 
-import com.qmth.cqb.paper.dao.ExtractConfigRepo;
-import com.qmth.cqb.paper.dao.PaperDetailRepo;
-import com.qmth.cqb.paper.dao.PaperDetailUnitRepo;
-import com.qmth.cqb.paper.dao.PaperRepo;
 import com.qmth.cqb.paper.model.ExamPaper;
 import com.qmth.cqb.paper.model.ExtractConfig;
 import com.qmth.cqb.paper.model.Paper;
@@ -59,6 +56,9 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
     
     @Autowired
     QuesRepo quesRepo;
+
+	@Autowired
+	ExamPaperRepo examPaperRepo;
     
 	@Override
 	public ExtractConfig findConfig(ExtractConfig condition) {
@@ -86,6 +86,9 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 			Paper paper = examPaper.getPaper();
 			paper = paperRepo.findOne(paper.getId());
 			examPaper.setPaper(paper);
+			examPaper.setExamId(extractConfig.getExamId());
+			examPaper.setCourseCode(extractConfig.getCourseCode());
+			examPaperRepo.save(examPaper);
 		}
 		extractConfigRepo.save(extractConfig);
 	}

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

@@ -55,33 +55,25 @@ public class ExtractConfigController {
 	
 	@ApiOperation(value = "保存调卷规则", notes = "保存调卷规则")
     @PutMapping(value = "/extractConfig")
-	public Map<String,Object> saveExtractConfig(HttpServletRequest request,@RequestBody ExtractConfig extractConfig){
-		Map<String,Object> paramsMap = new HashedMap<String,Object>();
+	public ResponseEntity saveExtractConfig(HttpServletRequest request,@RequestBody ExtractConfig extractConfig){
 		try{
 			AccessUser user = (AccessUser) request.getAttribute("accessUser");
 			extractConfig.setOrgId(user.getOrgId()+"");
 			extractConfigService.saveExtractConfig(extractConfig);
-			paramsMap.put("errMsg", "保存成功");
-			paramsMap.put("status", "success");
+			return new ResponseEntity(HttpStatus.OK);
 		}catch(Exception e){
-			paramsMap.put("errMsg", "保存失败");
-			paramsMap.put("status", "failed");
+			return new ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-		return paramsMap;
 	}
 	
 	@ApiOperation(value = "根据调卷规则生成试卷", notes = "根据调卷规则生成试卷")
     @PutMapping(value = "/makePaperByConfig")
-	public Map<String,Object> makePaperByConfig(String id){
-		Map<String,Object> paramsMap = new HashedMap<String,Object>();
+	public ResponseEntity makePaperByConfig(String id){
 		try{
 			extractConfigService.makePaperByConfig(id);
-			paramsMap.put("errMsg", "试卷生成成功");
-			paramsMap.put("status", "success");
+			return new ResponseEntity(HttpStatus.OK);
 		}catch(Exception e){
-			paramsMap.put("errMsg", "试卷生成失败");
-			paramsMap.put("status", "failed");
+			return new ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-		return paramsMap;
 	}
 }	

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

@@ -87,9 +87,9 @@ public class PaperDetailUnitController {
      * @return
      */
     @ApiOperation(value = "删除小题", notes = "删除小题")
-    @DeleteMapping(value = "/paperDetailUnit/{unit_id}")
-    public ResponseEntity removePaperDetailUnit(@PathVariable String unit_id) {
-        unitService.deletePaperDetailUnit(unit_id);
+    @DeleteMapping(value = "/paperDetailUnit/{unitId}")
+    public ResponseEntity removePaperDetailUnit(@PathVariable String unitId) {
+        unitService.deletePaperDetailUnit(unitId);
         return new ResponseEntity(HttpStatus.OK);
     }
 

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

@@ -2,6 +2,7 @@ package com.qmth.cqb;
 
 import cn.com.qmth.examcloud.common.uac.AccessCtrlInterceptor;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
@@ -24,4 +25,12 @@ public class AccessControlConfig extends WebMvcConfigurerAdapter {
                 .addPathPatterns("/**")
                 .excludePathPatterns("/**/swagger-ui.html#/**");
     }
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowedMethods("GET", "HEAD", "POST", "PUT", "PATCH", "DELETE", "OPTIONS", "TRACE")
+                .allowedHeaders("*");
+    }
 }

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

@@ -50,16 +50,6 @@ public class App {
 
             public void addCorsMappings(CorsRegistry registry) {
                 registry.addMapping("/**");
-
-                // registry.addMapping("/**")
-                // .allowedOrigins("*")
-                // .allowedMethods("GET", "HEAD", "POST", "PUT", "PATCH",
-                // "DELETE", "OPTIONS", "TRACE")
-                // .allowedHeaders("*")
-                // .exposedHeaders("access_token", "credentials",
-                // "refresh_token")
-                // .allowCredentials(true).maxAge(3600);
-            }
         };
     }
 }

cqb-starter/src/main/resources/application-dev.properties

@@ -1,3 +1,3 @@
 spring.data.mongodb.uri=mongodb://192.168.1.99:27017/comm-ques-bank
 spring.data.mongodb.grid-fs-database=comm-ques-bank
-eureka.client.serviceUrl.defaultZone=http://192.168.1.161:1111/eureka/
+eureka.client.serviceUrl.defaultZone=http://192.168.1.99:1111/eureka/

cqb-starter/src/main/resources/log4j2.xml

@@ -12,7 +12,7 @@
         <Root level="info">
             <AppenderRef ref="Console" />
         </Root>
-        <Logger name="org.docx4j" level="debug" />
+        <Logger name="org.docx4j" level="off" />
 
     </Loggers>
 </Configuration>