Merge remote-tracking branch 'remotes/origin/master' into gxhy
# Conflicts: # src/main/java/cn/cloudowr/attach/Config.javagxhy
commit
c8b94228b2
|
|
@ -6,6 +6,7 @@ import com.aliyun.oss.OSSClient;
|
|||
import com.jfinal.config.*;
|
||||
import com.jfinal.template.Engine;
|
||||
import com.mongodb.MongoClient;
|
||||
import com.mongodb.MongoClientURI;
|
||||
import com.mongodb.MongoCredential;
|
||||
import com.mongodb.ServerAddress;
|
||||
import com.mongodb.client.MongoDatabase;
|
||||
|
|
@ -18,8 +19,8 @@ import java.util.Arrays;
|
|||
public class Config extends JFinalConfig{
|
||||
|
||||
public static final String AccessKey = "LTAI7tcTTMuROink";
|
||||
public static final String BukketName = "gxhy-attach";
|
||||
public static final String OssUrl = "http://gxhy-attach.oss-cn-shenzhen.aliyuncs.com/";
|
||||
public static final String BukketName = "cowr-attach";
|
||||
public static final String OssUrl = "http://cowr-attach.oss-cn-shenzhen.aliyuncs.com/";
|
||||
private static MongoDatabase mongoDatabase;
|
||||
private static OSSClient ossClient;
|
||||
|
||||
|
|
@ -62,8 +63,8 @@ public class Config extends JFinalConfig{
|
|||
}
|
||||
@Override
|
||||
public void afterJFinalStart() {
|
||||
MongoCredential mongoCredential = MongoCredential.createCredential("root", "admin", "CoWR1111".toCharArray());
|
||||
MongoClient mongoClient = new MongoClient(new ServerAddress("dds-wz9ecb93d844f6342.mongodb.rds.aliyuncs.com", 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");
|
||||
|
||||
String endpoint = "oss-cn-shenzhen.aliyuncs.com";
|
||||
|
|
|
|||
Loading…
Reference in New Issue