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

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

@@ -10,6 +10,7 @@ import java.util.Random;
 import java.util.Set;
 
 
+import com.qmth.cqb.base.dao.CourseRepo;
 import com.qmth.cqb.base.model.Course;
 import org.apache.commons.lang3.StringUtils;
 import org.nlpcn.commons.lang.util.StringUtil;
@@ -104,6 +105,9 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
     
     @Autowired
     private ExamCourseClient examCourseClient;
+
+	@Autowired
+	private CourseRepo courseRepo;
     
 	@Override
 	public ExtractConfig findConfig(ExtractConfig condition) {
@@ -127,6 +131,8 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 			examPaper.setPaper(paper);
 		}
 		extractConfig.setOrgName(orgName);
+		Course course = courseRepo.findFirstByCodeAndOrgId(extractConfig.getCourseCode(),extractConfig.getOrgId());
+		extractConfig.setCourse(course);
 		return makePaperByConfig(extractConfig);
 	}
 
@@ -613,6 +619,8 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 			ExtractConfig extractConfig = this.findConfig(condition);
 			if(extractConfig==null){
 				extractConfig = new ExtractConfig(examCourseDto);
+				Course course = courseRepo.findFirstByCodeAndOrgId(examCourseDto.getCourseCode(),examCourseDto.getOrgId().toString());
+				extractConfig.setCourse(course);
 			}
 			extractConfigs.add(extractConfig);
 		}

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

@@ -19,9 +19,9 @@ upyun.zipDirectory=paperZipDirectory
 upyun.radioType=mp3,wma
 
 
-spring.datasource.url=jdbc:mysql://192.168.1.99:3306/exam_cloud_test?useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.url=jdbc:mysql://qmthmysql.mysql.rds.aliyuncs.com:3306/exam_cloud?useUnicode=true&characterEncoding=UTF-8
+spring.datasource.username=exam_cloud
+spring.datasource.password=examcloud123!@#
 spring.datasource.validation-query=SELECT 1 FROM DUAL
 spring.datasource.test-on-borrow=true
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
@@ -29,8 +29,8 @@ spring.jpa.show-sql=false
 spring.jpa.hibernate.ddl-auto=update
 
 
-spring.rabbitmq.host=192.168.1.99
+spring.rabbitmq.host=localhost
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=examcloud
-spring.rabbitmq.password=examcloud
+spring.rabbitmq.password=examcloud123
 spring.rabbitmq.listener.acknowledgeMode=MANUAL