Merge branch 'master' into gxhy

# Conflicts:
#	src/main/java/cn/cloudowr/dict/Config.java

pom.xml

@@ -19,40 +19,6 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>8.1.8.v20121106</version>
-                <configuration>
-                    <stopKey>stop</stopKey>
-                    <stopPort>5200</stopPort>
-                    <webAppConfig>
-                        <contextPath>/</contextPath>
-                    </webAppConfig>
-                    <scanIntervalSeconds>5</scanIntervalSeconds>
-                    <connectors>
-                        <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
-                            <port>4200</port>
-                            <maxIdleTime>60000</maxIdleTime>
-                        </connector>
-                    </connectors>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <mainClass>cn.cloudowr.dict.Main</mainClass>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
     <dependencies>

src/main/java/cn/cloudowr/dict/Config.java

@@ -15,7 +15,7 @@ import java.util.Arrays;
 /**
  * Created by lyf66 on 2017/2/16.
  */
-public class Config extends com.jfinal.config.JFinalConfig {
+public class Config extends com.jfinal.config.JFinalConfig{
 
     private static MongoDatabase mongoDatabase;
 
@@ -55,7 +55,7 @@ public class Config extends com.jfinal.config.JFinalConfig {
 //        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("dict");
+        mongoDatabase = mongoClient.getDatabase("gxhy");
     }
 
     public static MongoDatabase getMongoDataBase() {

src/main/java/cn/cloudowr/dict/Controller.java

@@ -1,8 +1,8 @@
 package cn.cloudowr.dict;
 
 import cn.cloudowr.sdk.FastJSONUtil;
+import cn.cloudowr.sdk.jfinal.AbsController;
 import cn.cloudowr.sdk.jfinal.IdInterceptor;
-import cn.cloudowr.sdk.jfinal.RestfulStyle;
 import com.jfinal.aop.Before;
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.MongoCollection;
@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
 /**
  * Created by lyf66 on 2017/2/16.
  */
-public class Controller extends cn.cloudowr.sdk.jfinal.Controller implements RestfulStyle {
+public class Controller extends AbsController {
 
     @Override
     public void index() {
@@ -322,7 +322,7 @@ public class Controller extends cn.cloudowr.sdk.jfinal.Controller implements Res
         renderJson("result", result.getDeletedCount() == 1);
     }
 
-    private MongoCollection<Document> getCollection() {
+    public MongoCollection<Document> getCollection() {
         MongoDatabase mongoDataBase = Config.getMongoDataBase();
         MongoCollection<Document> collection = mongoDataBase.getCollection("dict");
         return collection;