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

# Conflicts:
#	cqb-starter/src/main/resources/application-dev.properties

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

@@ -2,10 +2,10 @@
 spring.data.mongodb.uri=mongodb://192.168.1.99:27017/comm-ques-bank
 spring.data.mongodb.grid-fs-database=comm-ques-bank
 spring.data.mongodb.database=comm-ques-bank
-eureka.client.serviceUrl.defaultZone=http://192.168.1.99:1111/eureka/
-spring.application.name=chenken-ExamCloud-service-question
+eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
+spring.application.name=ExamCloud-service-question
 
-spring.redis.host=192.168.1.99
+spring.redis.host=localhost
 spring.redis.port=6379
 
 upyun.bucketName=exam-cloud-test

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

@@ -12,6 +12,8 @@ upyun.bucketName=exam-cloud-test
 upyun.userName=examcloud
 upyun.password=examcloud123456
 upyun.uploadUrl=/comm-ques-bank/exam-paper-file/
+upyun.audio.uploadUrl=/comm-ques-bank/audio/
 upyun.downloadUrl=http://exam-cloud-test.b0.upaiyun.com
 upyun.downloadDirectory=paperDirectory
-upyun.zipDirectory=paperZipDirectory
+upyun.zipDirectory=paperZipDirectory
+upyun.radioType=mp3,wma

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

@@ -1,6 +1,18 @@
-spring.data.mongodb.uri=mongodb://192.168.1.74:27017/comm-ques-bank
+spring.data.mongodb.uri=mongodb://192.168.1.99:27017/comm-ques-bank
 spring.data.mongodb.grid-fs-database=comm-ques-bank
+spring.data.mongodb.database=comm-ques-bank
 eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
 spring.application.name=ExamCloud-service-question
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
+
+spring.redis.host=localhost
+spring.redis.port=6379
+
+upyun.bucketName=exam-cloud-test
+upyun.userName=examcloud
+upyun.password=examcloud123456
+upyun.uploadUrl=/comm-ques-bank/exam-paper-file/
+upyun.audio.uploadUrl=/comm-ques-bank/audio/
+upyun.downloadUrl=http://exam-cloud-test.b0.upaiyun.com
+upyun.downloadDirectory=paperDirectory
+upyun.zipDirectory=paperZipDirectory
+upyun.radioType=mp3,wma