Browse Source

修改mongo的配置

郭超 4 years ago
parent
commit
f024a97ae6

+ 4 - 4
pom.xml

@@ -169,10 +169,10 @@
 <!--            </exclusions>-->
 <!--        </dependency>-->
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-zookeeper-config</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-zookeeper-config</artifactId>-->
+<!--        </dependency>-->
 
         <!-- Aliyun OSS -->
         <dependency>

+ 8 - 13
src/main/java/com/mooctest/config/AbstractMongoConfig.java

@@ -1,25 +1,20 @@
 package com.mooctest.config;
 
+import com.google.common.collect.ImmutableList;
 import com.mongodb.MongoClient;
+import com.mongodb.MongoCredential;
+import com.mongodb.ServerAddress;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public abstract class AbstractMongoConfig {
 
-    private String host, database;
-    private int port;
-    //Setter methods go here..
-    /*
-     * 创建MongoDBFactory的方法
-     * 两个MongoDB连接共用
-     */
-    public MongoDbFactory mongoDbFactory() throws Exception {
-        return new SimpleMongoDbFactory(new MongoClient(host, port), database);
-    }
-    /*
-     * Factory method to create the MongoTemplate
-     */
+    abstract public MongoDbFactory mongoDbFactory() throws Exception;
+
     abstract public MongoTemplate getMongoTemplate() throws Exception;
 
 }

+ 15 - 16
src/main/java/com/mooctest/config/MongoOneConfig.java

@@ -1,9 +1,7 @@
 package com.mooctest.config;
 
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientOptions;
-import com.mongodb.MongoCredential;
-import com.mongodb.ServerAddress;
+import com.google.common.collect.ImmutableList;
+import com.mongodb.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -32,34 +30,35 @@ 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;
+    @Value("${mongodb1.username}")
+    private String username;
+    @Value("${mongodb1.password}")
+    private String password;
     //Setter methods go here..
     /*
      * 创建MongoDBFactory的方法
      * 两个MongoDB连接共用
      */
 
-
     public MongoDbFactory mongoDbFactory() throws Exception {
+        String uriStr="mongodb://"+username+":"+password+"@"+host+":"+port+"/"+database;
+        System.out.println(uriStr);
+        MongoClientURI mongoClientURI=new MongoClientURI(uriStr);
+        MongoDbFactory mongoDbFactory=new SimpleMongoDbFactory(mongoClientURI);
+        return mongoDbFactory;
+//        System.out.println(host + port + username);
 //        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);
-
-
+//        MongoClient mongoClient = new MongoClient(new ServerAddress(), ImmutableList.of(MongoCredential.createCredential(username, database, password.toCharArray())));
+//        return new SimpleMongoDbFactory(mongoClient, database);
+//        return new SimpleMongoDbFactory(new MongoClient(host, port), database);
     }
 
-
     @Primary
     public @Bean(name = "mongoTemplate1") MongoTemplate getMongoTemplate() throws Exception {
         return new MongoTemplate(mongoDbFactory());
     }
-
-
 }

+ 12 - 13
src/main/java/com/mooctest/config/MongoTwoConfig.java

@@ -1,9 +1,6 @@
 package com.mooctest.config;
 
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientOptions;
-import com.mongodb.MongoCredential;
-import com.mongodb.ServerAddress;
+import com.mongodb.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -34,31 +31,33 @@ public class MongoTwoConfig{
     private String database;
     @Value("${mongodb2.port}")
     private int port;
-//    @Value("${mongodb2.username}")
-//    private String username;
-//    @Value("${mongodb2.password}")
-//    private String password;
+    @Value("${mongodb2.username}")
+    private String username;
+    @Value("${mongodb2.password}")
+    private String password;
     //Setter methods go here..
     /*
      * 创建MongoDBFactory的方法
      * 两个MongoDB连接共用
      */
     public MongoDbFactory mongoDbFactory2() throws Exception {
+        String uriStr="mongodb://"+username+":"+password+"@"+host+":"+port+"/"+database;
+        System.out.println(uriStr);
+        MongoClientURI mongoClientURI=new MongoClientURI(uriStr);
+        MongoDbFactory mongoDbFactory=new SimpleMongoDbFactory(mongoClientURI);
+        return mongoDbFactory;
+//        System.out.println(host + port + username);
 //        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);
+//        return new SimpleMongoDbFactory(new MongoClient(host, port), database);
     }
 
-
-
     public @Bean(name = "mongoTemplate2") MongoTemplate getMongoTemplate() throws Exception {
         return new MongoTemplate(mongoDbFactory2());
     }
-
-
 }
 

+ 1 - 1
src/main/java/com/mooctest/dao3/BugMirrorDao.java

@@ -16,7 +16,7 @@ import java.util.Set;
 
 @Repository
 public class BugMirrorDao {
-	
+
 	@Autowired
 	@Qualifier(value = "mongoTemplate2")
 	private MongoTemplate mongoOperations;

+ 1 - 1
src/main/java/com/mooctest/dao3/BugPageDao.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 @Repository
 public class BugPageDao {
-	
+
 	@Autowired
 	@Qualifier(value = "mongoTemplate2")
 	private MongoTemplate mongoOperations;

+ 1 - 1
src/main/java/com/mooctest/dao3/BugScoreDao.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 @Repository
 public class BugScoreDao {
-	
+
 	@Autowired
 	@Qualifier(value = "mongoTemplate2")
 	private MongoTemplate mongoOperations;

+ 1 - 1
src/main/java/com/mooctest/dao3/CTBDao.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 @Repository
 public class CTBDao {
-	
+
 	@Autowired
 	@Qualifier(value = "mongoTemplate2")
 	private MongoTemplate mongoOperations;

+ 1 - 1
src/main/java/com/mooctest/dao3/StuInfoDao.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 @Repository
 public class StuInfoDao {
-	
+
 	@Autowired
 	@Qualifier(value = "mongoTemplate2")
 	private MongoTemplate mongoOperations;

+ 68 - 68
src/main/java/com/mooctest/listener/SaveEventListener.java

@@ -1,68 +1,68 @@
-package com.mooctest.listener;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-
-import com.mooctest.annotation.AutoValue;
-import com.mooctest.model.SequenceId;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.mongodb.core.FindAndModifyOptions;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener;
-import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
-import org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.core.query.Update;
-import org.springframework.stereotype.Component;
-import org.springframework.util.ReflectionUtils;
-
-import javax.annotation.Resource;
-
-@Component
-public class SaveEventListener extends AbstractMongoEventListener<Object> {
-    @Resource(name = "mongoTemplate1")
-    private MongoTemplate mongo;
-
-    @Override
-    public void onBeforeConvert(BeforeConvertEvent<Object> event) {
-        Object source = event.getSource();
-        if (source != null) {
-            ReflectionUtils.doWithFields(source.getClass(), new ReflectionUtils.FieldCallback() {
-                public void doWith(Field field) throws IllegalArgumentException, IllegalAccessException {
-                    ReflectionUtils.makeAccessible(field);
-                    // 如果字段添加了我们自定义的AutoValue注解
-                    if (field.isAnnotationPresent(AutoValue.class) && field.get(source) instanceof Number
-                            && field.getLong(source) == 0) {
-                        // field.get(source) instanceof Number &&
-                        // field.getLong(source)==0
-                        // 判断注解的字段是否为number类型且值是否等于0.如果大于0说明有ID不需要生成ID
-                        // 设置自增ID
-
-                        field.set(source, getNextId(event.getCollectionName()));
-
-                    }
-                }
-            });
-        }
-    }
-
-    /**
-     * 获取下一个自增ID
-     *
-     * @param collName
-     *            集合(这里用类名,就唯一性来说最好还是存放长类名)名称
-     * @return 序列值
-     */
-    private Long getNextId(String collName) {
-        Query query = new Query(Criteria.where("collName").is(collName));
-        Update update = new Update();
-        update.inc("seqId", 1);
-        FindAndModifyOptions options = new FindAndModifyOptions();
-        options.upsert(true);
-        options.returnNew(true);
-        SequenceId seq = mongo.findAndModify(query, update, options, SequenceId.class);
-        return seq.getSeqId();
-    }
-}
+//package com.mooctest.listener;
+//
+//import java.lang.annotation.Annotation;
+//import java.lang.reflect.Field;
+//
+//import com.mooctest.annotation.AutoValue;
+//import com.mooctest.model.SequenceId;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+//import org.springframework.data.mongodb.core.FindAndModifyOptions;
+//import org.springframework.data.mongodb.core.MongoTemplate;
+//import org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener;
+//import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
+//import org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent;
+//import org.springframework.data.mongodb.core.query.Criteria;
+//import org.springframework.data.mongodb.core.query.Query;
+//import org.springframework.data.mongodb.core.query.Update;
+//import org.springframework.stereotype.Component;
+//import org.springframework.util.ReflectionUtils;
+//
+//import javax.annotation.Resource;
+//
+//@Component
+//public class SaveEventListener extends AbstractMongoEventListener<Object> {
+//    @Resource(name = "mongoTemplate1")
+//    private MongoTemplate mongo;
+//
+//    @Override
+//    public void onBeforeConvert(BeforeConvertEvent<Object> event) {
+//        Object source = event.getSource();
+//        if (source != null) {
+//            ReflectionUtils.doWithFields(source.getClass(), new ReflectionUtils.FieldCallback() {
+//                public void doWith(Field field) throws IllegalArgumentException, IllegalAccessException {
+//                    ReflectionUtils.makeAccessible(field);
+//                    // 如果字段添加了我们自定义的AutoValue注解
+//                    if (field.isAnnotationPresent(AutoValue.class) && field.get(source) instanceof Number
+//                            && field.getLong(source) == 0) {
+//                        // field.get(source) instanceof Number &&
+//                        // field.getLong(source)==0
+//                        // 判断注解的字段是否为number类型且值是否等于0.如果大于0说明有ID不需要生成ID
+//                        // 设置自增ID
+//
+//                        field.set(source, getNextId(event.getCollectionName()));
+//
+//                    }
+//                }
+//            });
+//        }
+//    }
+//
+//    /**
+//     * 获取下一个自增ID
+//     *
+//     * @param collName
+//     *            集合(这里用类名,就唯一性来说最好还是存放长类名)名称
+//     * @return 序列值
+//     */
+//    private Long getNextId(String collName) {
+//        Query query = new Query(Criteria.where("collName").is(collName));
+//        Update update = new Update();
+//        update.inc("seqId", 1);
+//        FindAndModifyOptions options = new FindAndModifyOptions();
+//        options.upsert(true);
+//        options.returnNew(true);
+//        SequenceId seq = mongo.findAndModify(query, update, options, SequenceId.class);
+//        return seq.getSeqId();
+//    }
+//}

+ 1 - 1
src/main/java/com/mooctest/service/BugDataService.java

@@ -14,7 +14,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service
-public class    BugDataService {
+public class BugDataService {
 
     @Autowired
     BugDataDao bugDataDao ;

+ 0 - 0
src/main/resources/apidoc/V1.0/apidoc.log.lck


+ 76 - 19
src/main/resources/application.yml

@@ -1,4 +1,4 @@
-spring.profiles.active: dev-xc
+spring.profiles.active: dev-online
 spring:
   mvc:
     favicon:
@@ -14,6 +14,20 @@ spring:
     mode: HTML5
     cache: false   #避免改了模版还要重启服务器
 
+mongodb1:
+  database: test
+  host: 121.196.124.158
+  port: 27117
+  username: mooctest
+  password: mooctest
+
+mongodb2:
+  database: test
+  host: 121.196.124.158
+  port: 27117
+  username: mooctest
+  password: mooctest
+
 report.host: 127.0.0.1:8090
 
 ---
@@ -22,13 +36,19 @@ spring:
   thymeleaf:
     cache: false
 
-#mongodb1.database: test
-#mongodb1.host: 121.196.124.158
-#mongodb1.port: 27017
-#
-#mongodb2.database: test
-#mongodb2.host: 121.196.124.158
-#mongodb2.port: 27017
+mongodb1:
+  database: test
+  host: 121.196.124.158
+  port: 27117
+  username: mooctest
+  password: mooctest
+
+mongodb2:
+  database: test
+  host: 121.196.124.158
+  port: 27117
+  username: mooctest
+  password: mooctest
 
 report.export.addr: http://47.99.140.117:9002/generateReport
 report.export.excel.addr: http://47.99.140.117:9003/generateReport
@@ -48,17 +68,24 @@ spring:
   thymeleaf:
     cache: false
 
-mongodb1.database: test
-mongodb1.host: 127.0.0.1
-mongodb1.port: 27017
+mongodb1:
+  database: test
+  host: 121.196.124.158
+  port: 27117
+  username: mooctest
+  password: mooctest
 
-mongodb2.database: test
-mongodb2.host: 127.0.0.1
-mongodb2.port: 27017
+mongodb2:
+  database: test
+  host: 121.196.124.158
+  port: 27117
+  username: mooctest
+  password: mooctest
 
 report.export.addr: http://47.99.140.117:9002/generateReport
 report.export.excel.addr: http://47.99.140.117:9003/generateReport
-task.info.addr: http://47.99.140.117:9001/Bug/api/extra/getExamList
+task.info.addr: http://127.0.0.1:8090/Bug/api/extra/getExamList
+#task.info.addr: http://47.99.140.117:9001/Bug/api/extra/getExamList
 
 server:
   port: 9004
@@ -105,10 +132,10 @@ 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.port: 27117
 mongodb2.database: co-enterprise
 mongodb2.host: 47.98.174.59
-mongodb2.port: 27017
+mongodb2.port: 27117
 useOss: false
 filePath: /xinchuang/data/
 urlPath: http://47.98.174.59:8100/resourcesXinchuang/
@@ -118,7 +145,37 @@ logging:
       mooctest: debug
   pattern:
     console: "%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] [%c] %m%n"
+---
+spring:
+  profiles: dev-online
+#  data:
+#    mongodb:
+#      uri: mongodb://mooctest:mooctest@121.196.124.158:27117/test
 
+server.port: 9004
+spring.profiles: dev-online
+spring.thymeleaf.cache: false
 
-
----
+audit.distribute.addr: http://129.211.185.102:8082/
+filePath: /Users/insomnialee/Desktop/now/
+foo: bar
+logging.level.com.mooctest: debug
+logging.pattern.console: "%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] [%c] %m%n"
+mongodb1.database: test
+mongodb1.host: 121.196.124.158
+mongodb1.password: mooctest
+mongodb1.port: 27117
+mongodb1.username: mooctest
+mongodb2.database: test
+mongodb2.host: 121.196.124.158
+mongodb2.password: mooctest
+mongodb2.port: 27117
+mongodb2.username: mooctest
+mooctest.host: http://101.37.175.111:8191
+report.export.addr: http://47.99.140.117:9002/generateReport
+report.export.excel.addr: http://localhost:9003/generateReport
+report.host: 127.0.0.1:8090
+task.distribute.url: http://47.102.206.109:6379/
+task.info.addr: http://127.0.0.1:8090/Bug/api/extra/getExamList
+urlPath: localhost:9004/
+useOss: true

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

@@ -1,14 +1,14 @@
-spring.profiles.active: dev-xc
+#spring.profiles.active: dev-xc
 #spring.profiles.active: dev
-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
+#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