Compare commits

...

3 Commits
master ... gxhy

Author SHA1 Message Date
lyf666 0b11fa8b7c Merge remote-tracking branch 'remotes/origin/master' into gxhy
# Conflicts:
#	src/main/java/cn/cloudowr/ywxj/shangbao/Config.java
2018-03-02 10:18:13 +08:00
lyf666 5cf64060ab . 2017-05-05 00:48:12 +08:00
lyf666 d1e33a4f21 . 2017-05-05 00:42:20 +08:00
2 changed files with 1 additions and 18 deletions

17
pom.xml
View File

@ -18,23 +18,6 @@
<target>1.8</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.0.v20161208</version>
<configuration>
<stopKey>stop</stopKey>
<stopPort>5206</stopPort>
<webApp>
<contextPath>/</contextPath>
</webApp>
<scanIntervalSeconds>5</scanIntervalSeconds>
<httpConnector>
<port>4206</port>
<idleTimeout>60000</idleTimeout>
</httpConnector>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>

View File

@ -81,7 +81,7 @@ public class Config extends JFinalConfig {
// MongoClient mongoClient = new MongoClient(new ServerAddress("120.24.5.249", 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"); 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); MongoClient mongoClient = new MongoClient(connectionString);
mongoDatabase = mongoClient.getDatabase("dict"); mongoDatabase = mongoClient.getDatabase("gxhy");
} }
} }