提交代码

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ImportPaperService.java

@@ -116,13 +116,13 @@ public class ImportPaperService {
     @Autowired
 	QuestionAudioService questionAudioService;
     
-    @Value("${upyun.bucketName}")
+    @Value("${$upyun.site.2.bucketName}")
 	protected String bucketName;
 	
-	@Value("${upyun.userName}")
+	@Value("${$upyun.site.2.userName}")
 	protected String userName;
 	
-	@Value("${upyun.password}")
+	@Value("${$upyun.site.2.password}")
 	protected String password;
 	
 	@Value("${upyun.audio.uploadUrl}")

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/UpYunService.java

@@ -18,11 +18,11 @@ import java.util.UUID;
 @Service
 public class UpYunService {
     protected static final Logger log = LoggerFactory.getLogger(UpYunService.class);
-    @Value("${upyun.bucketName}")
+    @Value("${$upyun.site.2.bucketName}")
     private String bucketName;
-    @Value("${upyun.userName}")
+    @Value("${$upyun.site.2.userName}")
     private String userName;
-    @Value("${upyun.password}")
+    @Value("${$upyun.site.2.password}")
     private String password;
     @Value("${upyun.audio.uploadUrl}")
     private String upYunRadioPath;

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ExportPaperAbstractService.java

@@ -240,13 +240,13 @@ public abstract class ExportPaperAbstractService {
 	//原卷word A4 模板
 	public static Template ORIGINAL_PAPER;
 
-	@Value("${upyun.bucketName}")
+	@Value("${$upyun.site.2.bucketName}")
 	protected String bucketName;
 	
-	@Value("${upyun.userName}")
+	@Value("${$upyun.site.2.userName}")
 	protected String userName;
 	
-	@Value("${upyun.password}")
+	@Value("${$upyun.site.2.password}")
 	protected String password;
 	
 	@Value("${upyun.uploadUrl}")

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/InitPaperExpService.java

@@ -103,13 +103,13 @@ public  class InitPaperExpService {
 	
 	public static final String ENCODING = "UTF-8";
 	
-	@Value("${upyun.bucketName}")
+	@Value("${$upyun.site.2.bucketName}")
 	public String bucketName;
 	
-	@Value("${upyun.userName}")
+	@Value("${$upyun.site.2.userName}")
 	public String userName;
 	
-	@Value("${upyun.password}")
+	@Value("${$upyun.site.2.password}")
 	public String password;
 	
 	@Value("${upyun.uploadUrl}")

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExamFileServiceImpl.java

@@ -34,13 +34,13 @@ public class ExamFileServiceImpl implements ExamFileService{
 	@Autowired
 	private MongoTemplate MongoTemplate;
 	
-	@Value("${upyun.bucketName}")
+	@Value("${$upyun.site.2.bucketName}")
 	protected String bucketName;
 	
-	@Value("${upyun.userName}")
+	@Value("${$upyun.site.2.userName}")
 	protected String userName;
 	
-	@Value("${upyun.password}")
+	@Value("${$upyun.site.2.password}")
 	protected String password;
 	
 	@Override

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExportPaperServiceImpl.java

@@ -91,13 +91,13 @@ public class ExportPaperServiceImpl implements ExportPaperService {
     @Autowired
 	protected QuesPkgPathRepo quesPkgPathRepo;
 
-    @Value("${upyun.bucketName}")
+    @Value("${$upyun.site.2.bucketName}")
     protected String bucketName;
 
-    @Value("${upyun.userName}")
+    @Value("${$upyun.site.2.userName}")
     protected String userName;
 
-    @Value("${upyun.password}")
+    @Value("${$upyun.site.2.password}")
     protected String password;
 
     @Override

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExportStructureServiceImpl.java

@@ -52,13 +52,13 @@ public class ExportStructureServiceImpl implements ExportStructureService {
 	@Autowired
 	private MongoTemplate mongoTemplate;
 	
-	@Value("${upyun.bucketName}")
+	@Value("${$upyun.site.2.bucketName}")
 	protected String bucketName;
 	
-	@Value("${upyun.userName}")
+	@Value("${$upyun.site.2.userName}")
 	protected String userName;
 	
-	@Value("${upyun.password}")
+	@Value("${$upyun.site.2.password}")
 	protected String password;
 	
 	@Override

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExtractConfigFileServiceImpl.java

@@ -109,13 +109,13 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
     @Value("${upyun.zipDirectory}")
     private String zipDirectory;
 
-    @Value("${upyun.bucketName}")
+    @Value("${$upyun.site.2.bucketName}")
     protected String bucketName;
 
-    @Value("${upyun.userName}")
+    @Value("${$upyun.site.2.userName}")
     protected String userName;
 
-    @Value("${upyun.password}")
+    @Value("${$upyun.site.2.password}")
     protected String password;
 
     @Override

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/PaperServiceImpl.java

@@ -172,13 +172,13 @@ public class PaperServiceImpl implements PaperService{
     @Value("${upyun.audio.uploadUrl}")
     private String upyunRadioPath;
     
-    @Value("${upyun.bucketName}")
+    @Value("${$upyun.site.2.bucketName}")
     private String bucketName;
 	
-	@Value("${upyun.userName}")
+	@Value("${$upyun.site.2.userName}")
 	private String userName;
 	
-	@Value("${upyun.password}")
+	@Value("${$upyun.site.2.password}")
 	private String password;
 	
 	@Autowired

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/QuestionAudioServiceImpl.java

@@ -40,13 +40,13 @@ public class QuestionAudioServiceImpl implements QuestionAudioService{
 	@Autowired
 	private QuesRepo quesRepo;
 	
-	@Value("${upyun.bucketName}")
+	@Value("${$upyun.site.2.bucketName}")
 	protected String bucketName;
 	
-	@Value("${upyun.userName}")
+	@Value("${$upyun.site.2.userName}")
 	protected String userName;
 	
-	@Value("${upyun.password}")
+	@Value("${$upyun.site.2.password}")
 	protected String password;
 	
 	@Override

examcloud-core-questions-starter/src/main/java/cn/com/qmth/examcloud/core/questions/starter/Application.java

@@ -2,7 +2,6 @@ package cn.com.qmth.examcloud.core.questions.starter;
 
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
@@ -28,9 +27,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 //import com.qmth.commons.query.dao.impl.BaseQueryDaoImpl;
 
 
+
 import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
 import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.base.logging.SLF4JImpl;
+import cn.com.qmth.examcloud.commons.web.boot.ExamCloudApp;
 import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.commons.web.redis.RedisClientImpl;
 import cn.com.qmth.examcloud.commons.web.support.CustomResponseErrorHandler;
@@ -62,7 +63,8 @@ public class Application {
 			MDC.put("TRACE_ID", Thread.currentThread().getName());
 		}
 
-		SpringApplication.run(Application.class, args);
+		//SpringApplication.run(Application.class, args);
+		ExamCloudApp.run(Application.class, "questions", args);
 	}
 	
 	@Bean

examcloud-core-questions-starter/src/main/java/cn/com/qmth/examcloud/core/questions/starter/config/AppSelfInspection.java

@@ -0,0 +1,39 @@
+package cn.com.qmth.examcloud.core.questions.starter.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import cn.com.qmth.examcloud.commons.web.support.RemoteProcedureCallTester;
+
+/**
+ * 应用自检
+ *
+ * @author WANGWEI
+ * @date 2018年6月21日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+@Component
+@Order(1)
+public class AppSelfInspection implements ApplicationRunner {
+
+	@Autowired
+	private RemoteProcedureCallTester remoteCallTester;
+
+	/**
+	 * 自检
+	 *
+	 * @author WANGWEI
+	 */
+	private void inspect() {
+		remoteCallTester.testRestTemplate("EC-CORE-BASIC", "EC-CORE-EXAMWORK");
+	}
+
+	@Override
+	public void run(ApplicationArguments args) throws Exception {
+		inspect();
+	}
+
+}

examcloud-core-questions-starter/src/main/resources/application-dev.properties

@@ -1,51 +0,0 @@
-#spring.data.mongodb.uri=mongodb://root:Qmth87863577@127.0.0.1:6600/comm-ques-bank?authSource=admin&authMechanism=SCRAM-SHA-1
-spring.data.mongodb.uri=mongodb://192.168.10.30:27017/exam_cloud_question_kf
-#spring.data.mongodb.grid-fs-database=comm-ques-bank
-#spring.data.mongodb.database=comm-ques-bank
-spring.data.mongodb.grid-fs-database=exam_cloud_question_kf
-spring.data.mongodb.database=exam_cloud_question_kf
-eureka.client.serviceUrl.defaultZone=http://192.168.10.39:1111/eureka/
-spring.application.name=WWH-EC-CORE-QUESTION
-
-spring.redis.host=192.168.10.39
-spring.redis.port=6379
-
-upyun.bucketName=exam-cloud-test
-upyun.userName=examcloud
-upyun.password=ecs87863577!@#
-upyun.uploadUrl=/comm-ques-bank/dev/exam-paper-file/
-upyun.audio.uploadUrl=/comm-ques-bank/dev/audio/
-upyun.audio.maxsize=10
-upyun.downloadUrl=http://exam-cloud-test.b0.upaiyun.com
-upyun.downloadDirectory=paperDirectory
-upyun.zipDirectory=paperZipDirectory
-upyun.radioType=mp3,wma
-
-spring.datasource.url=jdbc:mysql://192.168.10.30:3306/exam_cloud_kf?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=root
-spring.datasource.validation-query=SELECT 1 FROM DUAL
-spring.datasource.test-on-borrow=true
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.jpa.show-sql=false
-spring.jpa.hibernate.ddl-auto=update
-
-#spring.datasource.primary.url=jdbc:mysql://192.168.10.30:3306/exam_cloud_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-#spring.datasource.primary.username=root
-#spring.datasource.primary.password=root
-#spring.datasource.primary.validation-query=SELECT 1 FROM DUAL
-#spring.datasource.primary.test-on-borrow=true
-#spring.datasource.primary.driver-class-name=com.mysql.jdbc.Driver
-#spring.jpa.show-sql=false
-#spring.jpa.hibernate.ddl-auto=update
-
-#spring.datasource.secondary.url=jdbc:oracle:thin:@127.0.0.1:1521:orcl
-#spring.datasource.secondary.username=wwh
-#spring.datasource.secondary.password=wwh
-#spring.datasource.secondary.driver-class-name=oracle.jdbc.OracleDriver
-
-spring.rabbitmq.host=192.168.10.30
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=examcloud
-spring.rabbitmq.password=examcloud
-spring.rabbitmq.listener.acknowledgeMode=MANUAL

examcloud-core-questions-starter/src/main/resources/application-k12.properties

@@ -1,28 +0,0 @@
-spring.data.mongodb.uri=mongodb://db-host:27017/exam_cloud_question_kf
-spring.data.mongodb.grid-fs-database=exam_cloud_question_kf
-spring.data.mongodb.database=exam_cloud_question_kf
-eureka.client.serviceUrl.defaultZone=http://eureka-host:1111/eureka/
-
-spring.redis.host=redis-host
-spring.redis.port=6379
-
-upyun.bucketName=exam-cloud-test
-upyun.userName=examcloud
-upyun.password=examcloud123456
-upyun.uploadUrl=/comm-ques-bank/test/exam-paper-file/
-upyun.audio.uploadUrl=/comm-ques-bank/test/audio/
-upyun.audio.maxsize=10
-upyun.downloadUrl=http://exam-cloud-test.b0.upaiyun.com
-upyun.downloadDirectory=paperDirectory
-upyun.zipDirectory=paperZipDirectory
-upyun.radioType=mp3
-
-
-spring.datasource.url=jdbc:mysql://db-host:3306/exam_cloud_test?useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=root
-spring.datasource.password=root
-spring.datasource.validation-query=SELECT 1 FROM DUAL
-spring.datasource.test-on-borrow=true
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.jpa.show-sql=false
-spring.jpa.hibernate.ddl-auto=update

examcloud-core-questions-starter/src/main/resources/application-prac.properties

@@ -1,37 +0,0 @@
-#spring.data.mongodb.uri=mongodb://root:Qmth87863577@119.23.127.95:3717/?authSource=admin&authMechanism=SCRAM-SHA-1
-spring.data.mongodb.uri=mongodb://localhost: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
-
-upyun.bucketName=exam-cloud-test
-upyun.userName=examcloud
-upyun.password=ecs87863577!@#
-upyun.uploadUrl=/comm-ques-bank/dev/exam-paper-file/
-upyun.audio.uploadUrl=/comm-ques-bank/dev/audio/
-upyun.audio.maxsize=5
-upyun.downloadUrl=http://exam-cloud-test.b0.upaiyun.com
-upyun.downloadDirectory=paperDirectory
-upyun.zipDirectory=paperZipDirectory
-upyun.radioType=mp3,wma
-
-
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/exam_cloud_test?useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=root
-spring.datasource.password=root
-spring.datasource.validation-query=SELECT 1 FROM DUAL
-spring.datasource.test-on-borrow=true
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.jpa.show-sql=false
-spring.jpa.hibernate.ddl-auto=update
-
-
-spring.rabbitmq.host=127.0.0.1
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=examcloud
-spring.rabbitmq.password=examcloud
-spring.rabbitmq.listener.acknowledgeMode=MANUAL

examcloud-core-questions-starter/src/main/resources/application-prod.properties

@@ -1,54 +0,0 @@
-#spring.data.mongodb.uri=mongodb://root:Qmth87863577@119.23.127.95:3717/?authSource=admin&authMechanism=SCRAM-SHA-1
-#spring.data.mongodb.uri=mongodb://root:Qmth87863577@dds-wz93958e4b3d8b142.mongodb.rds.aliyuncs.com:3717/?authSource=admin&authMechanism=SCRAM-SHA-1
-spring.data.mongodb.database=comm-ques-bank
-spring.data.mongodb.grid-fs-database=comm-ques-bank
-#mongo
-#eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
-hystrix.command.default.execution.timeout.enabled=false
-hystrix.threadpool.default.coreSize = 500
-#spring.application.name=ExamCloud-service-question
-
-spring.redis.host=r-wz97e520d2701e54555.redis.rds.aliyuncs.com
-spring.redis.port=6379
-spring.redis.password=Qmth87863577
-#spring.redis.pool.max-active=200
-
-upyun.bucketName=exam-cloud-test
-upyun.userName=examcloud
-upyun.password=ecs87863577!@#
-upyun.uploadUrl=/comm-ques-bank/prod/exam-paper-file/
-upyun.audio.uploadUrl=/comm-ques-bank/prod/audio/
-upyun.audio.maxsize=5
-upyun.downloadUrl=http://exam-cloud-test.b0.upaiyun.com
-upyun.downloadDirectory=paperDirectory
-upyun.zipDirectory=paperZipDirectory
-upyun.radioType=mp3
-
-
-spring.datasource.url=jdbc:mysql://rds7b2sll8un5kz99s0i122.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
-spring.jpa.show-sql=false
-spring.jpa.hibernate.ddl-auto=update
-
-
-
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=examcloud
-spring.rabbitmq.password=examcloud123
-spring.rabbitmq.listener.acknowledgeMode=MANUAL
-
-server.tomcat.max-threads=2000
-eureka.client.serviceUrl.defaultZone=http://192.168.1.70:1111/eureka/
-spring.rabbitmq.host=192.168.1.70 
-spring.redis.pool.max-active=2000
-#spring.datasource.tomcat.max-active=100
-spring.datasource.initialSize=50
-spring.datasource.minIdle=50
-spring.datasource.maxActive=100
-#spring.data.mongodb.uri=mongodb://root:Qmth87863577@dds-wz93958e4b3d8b141100.mongodb.rds.aliyuncs.com:3717/?authSource=admin&authMechanism=SCRAM-SHA-1&replicaSet=mgset-2892097&maxPoolSize=200
-spring.data.mongodb.uri=mongodb://root:Qmth87863577@dds-wz93958e4b3d8b141100.mongodb.rds.aliyuncs.com:3717,dds-wz93958e4b3d8b142846.mongodb.rds.aliyuncs.com:3717/admin?replicaSet=mgset-2892097
-

examcloud-core-questions-starter/src/main/resources/application-test.properties

@@ -1,28 +0,0 @@
-spring.data.mongodb.uri=mongodb://db-host:27017/exam_cloud_question_kf
-spring.data.mongodb.grid-fs-database=exam_cloud_question_kf
-spring.data.mongodb.database=exam_cloud_question_kf
-eureka.client.serviceUrl.defaultZone=http://eureka-host:1111/eureka/
-
-spring.redis.host=redis-host
-spring.redis.port=6379
-
-upyun.bucketName=exam-cloud-test
-upyun.userName=examcloud
-upyun.password=ecs87863577!@#
-upyun.uploadUrl=/comm-ques-bank/test/exam-paper-file/
-upyun.audio.uploadUrl=/comm-ques-bank/test/audio/
-upyun.audio.maxsize=10
-upyun.downloadUrl=http://exam-cloud-test.b0.upaiyun.com
-upyun.downloadDirectory=paperDirectory
-upyun.zipDirectory=paperZipDirectory
-upyun.radioType=mp3
-
-
-spring.datasource.url=jdbc:mysql://db-host:3306/exam_cloud_kf?useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=root
-spring.datasource.password=root
-spring.datasource.validation-query=SELECT 1 FROM DUAL
-spring.datasource.test-on-borrow=true
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.jpa.show-sql=false
-spring.jpa.hibernate.ddl-auto=update

examcloud-core-questions-starter/src/main/resources/application.properties

@@ -1,30 +1,4 @@
 spring.profiles.active=dev
-server.port=8008
-logging.config=classpath:logback-spring.xml
-spring.application.name=EC-CORE-QUESTION
-hystrix.command.default.execution.timeout.enabled=false
-api_cqb=/api/ecs_ques
-app.api.core=/api/ecs_core
-app.api.exam=/api/ecs_exam_work
-question.reduplicate.similarity=0.95
-hystrix.command.default.execution.timeout.enabled=false
-# Increase the Hystrix timeout to 600s (globally)
-hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 600000
-ribbon.ReadTimeout=800000
-ribbon.ConnectTimeout=800000
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
+$config.server.host=config-host
 
-$rmp.cloud.questions=/api/core/questions/
-
-eureka.instance.lease-renewal-interval-in-seconds=5
-eureka.instance.lease-expiration-duration-in-seconds=15
-eureka.instance.prefer-ip-address=true
-eureka.instance.instance-id=${spring.cloud.client.ipAddress}:${server.port}
-eureka.client.healthcheck.enabled=true
-info.app=${spring.application.name}
-
-$redis.paper.prefix =$_DATA_PROCESS_PJ_PAPERID
-$dir=
-$tempDir=