Merge branch 'master' into gxhy

# Conflicts:
#	src/main/java/cn/cloudowr/dict/Config.java
gxhy
lyf666 2018-03-02 10:14:23 +08:00
commit 42701b3976
2 changed files with 12 additions and 4 deletions

View File

@ -1,11 +1,11 @@
package cn.cloudowr.dict; package cn.cloudowr.dict;
import cn.cloudowr.sdk.jfinal.JQueryParameterFilter;
import cn.cloudowr.sdk.jfinal.ErrorInterceptor; import cn.cloudowr.sdk.jfinal.ErrorInterceptor;
import cn.cloudowr.sdk.jfinal.JQueryParameterFilter;
import com.jfinal.config.*; import com.jfinal.config.*;
import com.jfinal.template.Engine; import com.jfinal.template.Engine;
import com.mongodb.MongoClient; import com.mongodb.MongoClient;
import com.mongodb.MongoClientURI;
import com.mongodb.MongoCredential; import com.mongodb.MongoCredential;
import com.mongodb.ServerAddress; import com.mongodb.ServerAddress;
import com.mongodb.client.MongoDatabase; import com.mongodb.client.MongoDatabase;
@ -51,8 +51,10 @@ public class Config extends com.jfinal.config.JFinalConfig{
@Override @Override
public void afterJFinalStart() { public void afterJFinalStart() {
MongoCredential mongoCredential = MongoCredential.createCredential("root", "admin", "CoWR1111".toCharArray()); // MongoCredential mongoCredential = MongoCredential.createCredential("root", "admin", "CoWR1111".toCharArray());
MongoClient mongoClient = new MongoClient(new ServerAddress("dds-wz9ecb93d844f6342.mongodb.rds.aliyuncs.com", 3717), Arrays.asList(mongoCredential)); // MongoClient mongoClient = new MongoClient(new ServerAddress("120.24.5.249", 3717), Arrays.asList(mongoCredential));
MongoClientURI connectionString = new MongoClientURI("mongodb://root:CoWR1111@dds-wz9ceed1f19591041.mongodb.rds.aliyuncs.com:3717,dds-wz9ceed1f19591042.mongodb.rds.aliyuncs.com:3717/admin?replicaSet=mgset-5320915");
MongoClient mongoClient = new MongoClient(connectionString);
mongoDatabase = mongoClient.getDatabase("gxhy"); mongoDatabase = mongoClient.getDatabase("gxhy");
} }

View File

@ -0,0 +1,6 @@
username=root
database=admin
password=CoWR1111
host=120.24.5.249
port=3717
dabaseName=dict