Merge branch 'master' of http://git.qmth.com.cn/examcloud-DevOps/examcloud-oe-tool.git

src/main/java/cn/com/qmth/dp/examcloud/oe/Task.java

@@ -1,20 +1,5 @@
 package cn.com.qmth.dp.examcloud.oe;
 
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.RandomUtils;
-import org.bson.Document;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
-
-import com.mongodb.client.FindIterable;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoCursor;
-
-import cn.com.qmth.dp.examcloud.oe.modules.load_question_cache.LoadQuestionsCacheService;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.util.JsonUtil;
@@ -22,6 +7,18 @@ import cn.com.qmth.examcloud.web.support.SpringContextHolder;
 import cn.com.qmth.examcloud.web.upyun.UpYunPathInfo;
 import cn.com.qmth.examcloud.web.upyun.UpyunPathEnvironmentInfo;
 import cn.com.qmth.examcloud.web.upyun.UpyunService;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoCursor;
+import org.apache.commons.lang3.RandomUtils;
+import org.bson.Document;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 任务
@@ -55,8 +52,8 @@ public class Task {
             // UpdateQuestionScoreService  bean = SpringContextHolder.getBean(UpdateQuestionScoreService.class);
             // bean.start();
 
-        	LoadQuestionsCacheService bean = SpringContextHolder.getBean(LoadQuestionsCacheService.class);
-             bean.start();
+            // LoadQuestionsCacheService bean = SpringContextHolder.getBean(LoadQuestionsCacheService.class);
+            // bean.start();
         } catch (Exception e) {
             log.error("unexpected", e);
             throw new RuntimeException(e);

src/main/resources/application.properties

@@ -6,11 +6,11 @@ spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 
 #datasource
-dsurl.host=qmth-db1.mysql.rds.aliyuncs.com
+dsurl.host=qmth-db4.mysql.rds.aliyuncs.com
 dsurl.port=3306
-dsurl.database=exam_cloud
-spring.datasource.username=exam_cloud_view
-spring.datasource.password=dldkfs-596zcv-WslCv5
+dsurl.database=exam_cloud_test
+spring.datasource.username=exam_cloud_test
+spring.datasource.password=Examcloud123
 spring.datasource.url=jdbc:mysql://${dsurl.host}:${dsurl.port}/${dsurl.database}?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2b8&rewriteBatchedStatements=true
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
@@ -28,25 +28,25 @@ spring.datasource.druid.test-on-return=false
 spring.datasource.druid.test-while-idle=true
 
 #mongodb
-mguri.hostAndPortGroup=dds-wz93958e4b3d8b141100.mongodb.rds.aliyuncs.com:3717
-mguri.username=reader
-mguri.password=vqd2uq-5zuxcm-ge4fn3
+mguri.hostAndPortGroup=dds-wz972dde5d2d78e433270.mongodb.rds.aliyuncs.com:3717
+mguri.username=exam-cloud-dev
+mguri.password=Examcloud123
 mguri.database=admin
 spring.data.mongodb.uri=mongodb://${mguri.username}:${mguri.password}@${mguri.hostAndPortGroup}/${mguri.database}
 spring.data.mongodb.grid-fs-database=examcloud-core-oe
 spring.data.mongodb.database=examcloud-core-oe
 
 #redis test env
-spring.redis.host=qmth-redis3.redis.rds.aliyuncs.com
+spring.redis.host=192.168.1.91
 spring.redis.port=6379
-spring.redis.database=0
 spring.redis.password=jkhm45-UO8rFc-q2Eb90
+spring.redis.database=0
 
 #exchange
-qmth.rootOrgId=17196
-qmth.secretKey=lkjfjnioeweJI9IOnifasfe
-qmth.appId=jhun
-qmth.server.host=ecs.qmth.com.cn
+qmth.rootOrgId=0
+qmth.secretKey=123456
+qmth.appId=11
+qmth.server.host=192.168.1.91
 qmth.server.port=8007
 
 #fixParam's path
@@ -55,7 +55,7 @@ fixAnswer.data.path=/home/admin/project/temp1.txt
 #获取断点续考的考试id
 getContiuedCount.examId=19
 #通用文件导出目录
-file.export.path=D:/Temp
+file.export.path=/home/admin/project/