From 5f579582d36acc22ff66f471943a226346094a69 Mon Sep 17 00:00:00 2001
From: lyf666 <lyf666@gmail.com>
Date: Sun, 19 Feb 2017 09:51:44 +0800
Subject: [PATCH] jquery para _ filter

---
 pom.xml                                       |  5 +++++
 src/main/java/cn/cloudowr/dict/Config.java    |  3 ++-
 .../java/cn/cloudowr/dict/Controller.java     |  5 ++---
 .../java/cn/cloudowr/dict/IdInterceptor.java  | 20 -----------------
 src/main/java/sdk/FastJSONUtil.java           | 17 --------------
 src/main/java/sdk/ObjectIdSerializer.java     | 22 -------------------
 6 files changed, 9 insertions(+), 63 deletions(-)
 delete mode 100644 src/main/java/cn/cloudowr/dict/IdInterceptor.java
 delete mode 100644 src/main/java/sdk/FastJSONUtil.java
 delete mode 100644 src/main/java/sdk/ObjectIdSerializer.java

diff --git a/pom.xml b/pom.xml
index 9c49e05..6b32722 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,5 +81,10 @@
             <artifactId>mongo-java-driver</artifactId>
             <version>3.4.2</version>
         </dependency>
+        <dependency>
+            <groupId>cn.cloudowr</groupId>
+            <artifactId>sdk</artifactId>
+            <version>1.1.0</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/src/main/java/cn/cloudowr/dict/Config.java b/src/main/java/cn/cloudowr/dict/Config.java
index a8d95d7..155a043 100644
--- a/src/main/java/cn/cloudowr/dict/Config.java
+++ b/src/main/java/cn/cloudowr/dict/Config.java
@@ -1,5 +1,6 @@
 package cn.cloudowr.dict;
 
+import cn.cloudowr.sdk.JQueryParameterFilter;
 import com.jfinal.config.*;
 import com.jfinal.template.Engine;
 import com.mongodb.MongoClient;
@@ -38,7 +39,7 @@ public class Config extends com.jfinal.config.JFinalConfig{
 
     @Override
     public void configInterceptor(Interceptors me) {
-
+        me.add(new JQueryParameterFilter());
     }
 
     @Override
diff --git a/src/main/java/cn/cloudowr/dict/Controller.java b/src/main/java/cn/cloudowr/dict/Controller.java
index 723bfab..dbc9f32 100644
--- a/src/main/java/cn/cloudowr/dict/Controller.java
+++ b/src/main/java/cn/cloudowr/dict/Controller.java
@@ -1,7 +1,8 @@
 package cn.cloudowr.dict;
 
+import cn.cloudowr.sdk.FastJSONUtil;
+import cn.cloudowr.sdk.IdInterceptor;
 import com.jfinal.aop.Before;
-import com.jfinal.render.ContentType;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.Filters;
@@ -12,10 +13,8 @@ import com.mongodb.client.result.UpdateResult;
 import org.bson.Document;
 import org.bson.conversions.Bson;
 import org.bson.types.ObjectId;
-import sdk.FastJSONUtil;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/main/java/cn/cloudowr/dict/IdInterceptor.java b/src/main/java/cn/cloudowr/dict/IdInterceptor.java
deleted file mode 100644
index 4426baa..0000000
--- a/src/main/java/cn/cloudowr/dict/IdInterceptor.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.cloudowr.dict;
-
-import com.jfinal.aop.Interceptor;
-import com.jfinal.aop.Invocation;
-
-/**
- * Created by lyf66 on 2017/2/16.
- */
-public class IdInterceptor implements Interceptor {
-
-    @Override
-    public void intercept(Invocation inv) {
-        String id = inv.getController().getPara("id");
-        if (id != null && !id.isEmpty()) {
-            inv.invoke();
-        } else {
-            inv.getController().renderError(400);
-        }
-    }
-}
diff --git a/src/main/java/sdk/FastJSONUtil.java b/src/main/java/sdk/FastJSONUtil.java
deleted file mode 100644
index 09f02d5..0000000
--- a/src/main/java/sdk/FastJSONUtil.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package sdk;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializeConfig;
-
-/**
- * Created by lyf66 on 2017/2/18.
- */
-public class FastJSONUtil {
-    private static ObjectIdSerializer serializer = new ObjectIdSerializer();
-
-    public static String bsonToJSON(Object object) {
-        SerializeConfig mapping = new SerializeConfig();
-        mapping.put(org.bson.types.ObjectId.class, serializer);
-        return JSON.toJSONString(object, mapping);
-    }
-}
diff --git a/src/main/java/sdk/ObjectIdSerializer.java b/src/main/java/sdk/ObjectIdSerializer.java
deleted file mode 100644
index 9df131e..0000000
--- a/src/main/java/sdk/ObjectIdSerializer.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package sdk;
-
-import com.alibaba.fastjson.serializer.JSONSerializer;
-import com.alibaba.fastjson.serializer.ObjectSerializer;
-import org.bson.types.ObjectId;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-/**
- * Created by lisai on 17/2/9.
- */
-public class ObjectIdSerializer implements ObjectSerializer {
-    @Override
-    public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType, int features) throws IOException {
-        if(object == null) {
-            serializer.getWriter().writeNull();
-        } else {
-            serializer.write(((ObjectId)object).toString());
-        }
-    }
-}