Quellcode durchsuchen

修改私有云配置

insomniaLee vor 4 Jahren
Ursprung
Commit
f5c74113b5

+ 20 - 1
src/main/java/com/mooctest/config/MongoOneConfig.java

@@ -2,6 +2,8 @@ package com.mooctest.config;
 
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientOptions;
+import com.mongodb.MongoCredential;
+import com.mongodb.ServerAddress;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -16,6 +18,9 @@ import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 import org.springframework.core.env.Environment;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Configuration
 @EnableMongoRepositories(
         basePackages = "com.mooctest.dao",
@@ -27,13 +32,27 @@ public class MongoOneConfig extends AbstractMongoConfig {
     private String database;
     @Value("${mongodb1.port}")
     private int port;
+    @Value("${mongodb1.username}")
+    private String username;
+    @Value("${mongodb1.password}")
+    private String password;
     //Setter methods go here..
     /*
      * 创建MongoDBFactory的方法
      * 两个MongoDB连接共用
      */
+
+
     public MongoDbFactory mongoDbFactory() throws Exception {
-        return new SimpleMongoDbFactory(new MongoClient(host, port), database);
+        List<ServerAddress> seeds = new ArrayList<>();
+        ServerAddress serverAddress = new ServerAddress(host, port);
+        seeds.add(serverAddress);
+        List<MongoCredential> mongoCredentialList = new ArrayList<>();
+        mongoCredentialList.add(MongoCredential.createCredential(username, database, password.toCharArray()));
+        return new SimpleMongoDbFactory(new MongoClient(seeds, mongoCredentialList), database);
+//        return new SimpleMongoDbFactory(new MongoClient(host, port), database);
+
+
     }
 
 

+ 16 - 1
src/main/java/com/mooctest/config/MongoTwoConfig.java

@@ -2,6 +2,8 @@ package com.mooctest.config;
 
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientOptions;
+import com.mongodb.MongoCredential;
+import com.mongodb.ServerAddress;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -16,6 +18,9 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 @Configuration
 @EnableMongoRepositories(
@@ -29,13 +34,23 @@ public class MongoTwoConfig{
     private String database;
     @Value("${mongodb2.port}")
     private int port;
+    @Value("${mongodb2.username}")
+    private String username;
+    @Value("${mongodb2.password}")
+    private String password;
     //Setter methods go here..
     /*
      * 创建MongoDBFactory的方法
      * 两个MongoDB连接共用
      */
     public MongoDbFactory mongoDbFactory2() throws Exception {
-        return new SimpleMongoDbFactory(new MongoClient(host, port), database);
+        List<ServerAddress> seeds = new ArrayList<>();
+        ServerAddress serverAddress = new ServerAddress(host, port);
+        seeds.add(serverAddress);
+        List<MongoCredential> mongoCredentialList = new ArrayList<>();
+        mongoCredentialList.add(MongoCredential.createCredential(username, database, password.toCharArray()));
+        return new SimpleMongoDbFactory(new MongoClient(seeds, mongoCredentialList), database);
+//        return new SimpleMongoDbFactory(new MongoClient(host, port), database);
     }
 
 

+ 39 - 14
src/main/resources/application.yml

@@ -1,4 +1,4 @@
-spring.profiles.active: test
+spring.profiles.active: private-cloud
 spring:
   mvc:
     favicon:
@@ -46,18 +46,6 @@ spring:
   thymeleaf:
     cache: false
 
-
-mongodb1.database: ${MONGODB_REVIEW_DB}
-mongodb1.host: ${MONGODB_REVIEW_HOST}
-mongodb1.port: ${MONGODB_REVIEW_PORT}
-
-mongodb2.database: ${MONGODB_REPORT_DB}
-mongodb2.host: ${MONGODB_REPORT_HOST}
-mongodb2.port: ${MONGODB_REPORT_PORT}
-
-report.export.addr: ${EXPORT_ADDR}
-task.info.addr: ${TASK_ADDR}
-
 server:
   port: 9004
 #    port: 8090
@@ -65,4 +53,41 @@ logging:
   level:
     com.mooctest: debug
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] [%c] %m%n"
+    console: "%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] [%c] %m%n"
+---
+spring:
+  profiles: private-cloud
+  thymeleaf:
+    cache: false
+
+task:
+  info:
+    addr: http://47.98.174.59:8100/Bug/api/extra/getExamList
+server:
+  port: 9004
+report.host: 47.98.174.59:8100
+report.export.addr: http://47.99.140.117:9002/generateReport
+report.export.excel.addr: http://47.98.174.59:8095/generateReport
+mongodb1.database: crowd_review_enterprise
+mongodb1.host: 47.98.174.59
+mongodb1.port: 27017
+mongodb1.username: root
+mongodb1.password: 123456
+mongodb2.database: co-enterprise
+mongodb2.host: 47.98.174.59
+mongodb2.port: 27017
+mongodb2.username: root
+mongodb2.password: 123456
+useOss: true
+filePath: /Users/insomnialee/Desktop/now/
+urlPath: localhost:9004/
+logging:
+  level:
+    com:
+      mooctest: debug
+  pattern:
+    console: "%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] [%c] %m%n"
+
+
+
+---

+ 0 - 13
src/main/resources/bootstrap.yml

@@ -1,13 +0,0 @@
-spring.profiles.active: test
-spring:
-  application:
-    name: mooctest-crowd-review
-  cloud:
-    zookeeper:
-      enabled: true  # true:开启zookeeper外部化配置, false:读取本地配置;
-      connect-string: 101.37.175.111:2181
-      config:
-        root: /config
-        enabled: true
-        watcher:
-          enabled: true