Procházet zdrojové kódy

Merge branch 'DEV' into mongo-config

# Conflicts:
#	mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/util/mongodb/MongoAPIUtils.java
梅杰 před 7 roky
rodič
revize
346736a63a

+ 1 - 1
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/configure/ApplicationStartup.java

@@ -14,7 +14,7 @@ public class ApplicationStartup implements ApplicationListener<ContextRefreshedE
         System.out.println("-----------------------------------------------------------------------------------------");
         System.out.println("listener");
         ExamController examController = event.getApplicationContext().getBean(ExamController.class);
-//        examController.updateStatusForAllTask();
+        examController.updateStatusForAllTask();
         examController.startInitExamSchedulerMap();
         System.out.println("exam scheduler map initialized");
         System.out.println("-----------------------------------------------------------------------------------------");

+ 14 - 3
mooctest-site-server/src/main/resources/application.yaml

@@ -80,7 +80,7 @@ featureSwitch:
 mongodb:
       host: 114.55.91.27
       port: 80
-      db: testdb
+      db: testGragh
       reportCollection: report
       mutationCollection: mutation
       caseGraghCollection: caseGraph
@@ -139,6 +139,17 @@ featureSwitch:
         rpcKibugService: true
         rpcSourceService: true
 
+mongodb:
+      host: 114.55.91.27
+      port: 80
+      db: testGragh
+      reportCollection: report
+      mutationCollection: mutation
+      caseGraghCollection: caseGraph
+      caughtNodeCollection: caughtNode
+      userCatchCollection: userCatch
+      sumCatchCollection: sumCatch
+      base64Auth: Basic YWRtaW46Y2hhbmdlaXQ=
 server:
     port: 9001
 
@@ -245,14 +256,14 @@ featureSwitch:
 mongodb:
       host: 114.55.91.27
       port: 80
-      db: mooctest
+      db: testdb
       reportCollection: report
       mutationCollection: mutation
       caseGraghCollection: caseGraph
       caughtNodeCollection: caughtNode
       userCatchCollection: userCatch
       sumCatchCollection: sumCatch
-      base64Auth: Basic YWRtaW46Y2hhbmdlaXQ=
+      base64Auth:
 
 server:
     port: 9001