diff --git a/pom.xml b/pom.xml
index e821cf5..6c8246e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,9 @@
cn.cloudowr
sdk
- 1.3.4
+ 1.4.16
+ system
+ ${basedir}/lib/sdk-1.4.16.jar
\ No newline at end of file
diff --git a/src/main/java/cn/cloudowr/ywxj/shangbao/Config.java b/src/main/java/cn/cloudowr/ywxj/shangbao/Config.java
index 5a5f53e..5eb063f 100644
--- a/src/main/java/cn/cloudowr/ywxj/shangbao/Config.java
+++ b/src/main/java/cn/cloudowr/ywxj/shangbao/Config.java
@@ -1,7 +1,7 @@
package cn.cloudowr.ywxj.shangbao;
-import cn.cloudowr.sdk.JQueryParameterFilter;
import cn.cloudowr.sdk.jfinal.ErrorInterceptor;
+import cn.cloudowr.sdk.jfinal.JQueryParameterFilter;
import com.jfinal.config.*;
import com.jfinal.template.Engine;
import com.mongodb.MongoClient;
@@ -11,12 +11,15 @@ import com.mongodb.client.MongoDatabase;
import java.util.Arrays;
+import static cn.cloudowr.ywxj.shangbao.Main.*;
+
/**
* Created by lyf66 on 2017/2/18.
*/
public class Config extends JFinalConfig{
private static MongoDatabase mongoDatabase;
+
public static MongoDatabase getMongoDatabase() {
return mongoDatabase;
}
@@ -80,9 +83,9 @@ public class Config extends JFinalConfig{
@Override
public void afterJFinalStart() {
- MongoCredential mongoCredential = MongoCredential.createCredential("root", "admin", "CoWR1111".toCharArray());
- MongoClient mongoClient = new MongoClient(new ServerAddress("120.24.5.249", 3717), Arrays.asList(mongoCredential));
- mongoDatabase = mongoClient.getDatabase("dict");
+ MongoCredential mongoCredential = MongoCredential.createCredential(username, database, password.toCharArray());
+ MongoClient mongoClient = new MongoClient(new ServerAddress(host, port), Arrays.asList(mongoCredential));
+ mongoDatabase = mongoClient.getDatabase(dabaseName);
}
}
diff --git a/src/main/java/cn/cloudowr/ywxj/shangbao/Main.java b/src/main/java/cn/cloudowr/ywxj/shangbao/Main.java
index 03e25c9..d0fc0cd 100644
--- a/src/main/java/cn/cloudowr/ywxj/shangbao/Main.java
+++ b/src/main/java/cn/cloudowr/ywxj/shangbao/Main.java
@@ -2,11 +2,38 @@ package cn.cloudowr.ywxj.shangbao;
import com.jfinal.core.JFinal;
+import java.util.Properties;
+
/**
* Created by lyf66 on 2017/2/16.
*/
public class Main {
+ public static String username;
+ public static String database;
+ public static String password;
+ public static String host;
+ public static int port;
+ public static String dabaseName;
+ private static int AppPort;
public static void main(String[] args) {
- JFinal.start("src/main/webapp", 4206, "/");
+ read();
+ JFinal.start("src/main/webapp", AppPort, "/");
+ }
+
+ public static void read(){
+ try{
+ Properties pro = new Properties();
+ pro.load(Config.class.getResourceAsStream("/config.properties"));
+ username = pro.getProperty("username");
+ database = pro.getProperty("database");
+ password = pro.getProperty("password");
+ host = pro.getProperty("host");
+ port = Integer.parseInt(pro.getProperty("port"));
+ dabaseName = pro.getProperty("dabaseName");
+ AppPort = Integer.parseInt(pro.getProperty("AppPort"));
+ } catch (Exception e) {
+ e.printStackTrace();
+ System.exit(0);
+ }
}
}
diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties
new file mode 100644
index 0000000..4c4924d
--- /dev/null
+++ b/src/main/resources/config.properties
@@ -0,0 +1,7 @@
+username=root
+database=admin
+password=CoWR1111
+host=120.24.5.249
+port=3717
+dabaseName=dict
+AppPort=4206
\ No newline at end of file
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
new file mode 100644
index 0000000..a0b58fd
--- /dev/null
+++ b/web/WEB-INF/web.xml
@@ -0,0 +1,6 @@
+
+
+
\ No newline at end of file