From cf9207aaae84e5ed868e1c920e87eeb951400389 Mon Sep 17 00:00:00 2001
From: author <chusifeng526@163.com>
Date: Thu, 23 Nov 2017 15:59:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/cloudowr/dict/Config.java | 28 ++++------------------
 src/main/java/cn/cloudowr/dict/Main.java   | 28 +++++++++++++++++++++-
 src/main/resources/config.properties       |  3 ++-
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/main/java/cn/cloudowr/dict/Config.java b/src/main/java/cn/cloudowr/dict/Config.java
index 2d17e5b..78cf4af 100644
--- a/src/main/java/cn/cloudowr/dict/Config.java
+++ b/src/main/java/cn/cloudowr/dict/Config.java
@@ -9,23 +9,18 @@ import com.mongodb.MongoCredential;
 import com.mongodb.ServerAddress;
 import com.mongodb.client.MongoDatabase;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.util.Arrays;
 import java.util.Properties;
 
+import static cn.cloudowr.dict.Main.*;
+
 /**
  * Created by lyf66 on 2017/2/16.
  */
 public class Config extends com.jfinal.config.JFinalConfig{
 
     private static MongoDatabase mongoDatabase;
-    private static String username;
-    private static String database;
-    private static String password;
-    private static String host;
-    private static int port;
-    private static String dabaseName;
+
 
     @Override
     public void configConstant(Constants me) {
@@ -59,7 +54,6 @@ public class Config extends com.jfinal.config.JFinalConfig{
 
     @Override
     public void afterJFinalStart() {
-        read();
         MongoCredential mongoCredential = MongoCredential.createCredential(username, database, password.toCharArray());
         MongoClient mongoClient = new MongoClient(new ServerAddress(host, port), Arrays.asList(mongoCredential));
         mongoDatabase = mongoClient.getDatabase(dabaseName);
@@ -68,19 +62,5 @@ public class Config extends com.jfinal.config.JFinalConfig{
     public static MongoDatabase getMongoDataBase() {
         return mongoDatabase;
     }
-    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");
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.exit(0);
-        }
-    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/cn/cloudowr/dict/Main.java b/src/main/java/cn/cloudowr/dict/Main.java
index 123de29..3f21634 100644
--- a/src/main/java/cn/cloudowr/dict/Main.java
+++ b/src/main/java/cn/cloudowr/dict/Main.java
@@ -2,11 +2,37 @@ package cn.cloudowr.dict;
 
 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", 4200, "/");
+        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
index 1c4f5f5..2aca077 100644
--- a/src/main/resources/config.properties
+++ b/src/main/resources/config.properties
@@ -3,4 +3,5 @@ database=admin
 password=CoWR1111
 host=120.24.5.249
 port=3717
-dabaseName=dict
\ No newline at end of file
+dabaseName=dict
+AppPort=4202
\ No newline at end of file