diff --git a/pom.xml b/pom.xml index 58a3ac1..239d6fa 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ cn.cloudowr sdk - 1.2.3 + 1.2.4 \ No newline at end of file diff --git a/src/main/java/cn/cloudowr/dict/Controller.java b/src/main/java/cn/cloudowr/dict/Controller.java index 35e1d15..c4c1837 100644 --- a/src/main/java/cn/cloudowr/dict/Controller.java +++ b/src/main/java/cn/cloudowr/dict/Controller.java @@ -1,7 +1,7 @@ package cn.cloudowr.dict; import cn.cloudowr.sdk.FastJSONUtil; -import cn.cloudowr.sdk.IdInterceptor; +import cn.cloudowr.sdk.jfinal.IdInterceptor; import cn.cloudowr.sdk.jfinal.RestfulStyle; import com.jfinal.aop.Before; import com.mongodb.client.MongoCollection; @@ -85,28 +85,20 @@ public class Controller extends cn.cloudowr.sdk.jfinal.Controller implements Res return; } - Document filterDoc = document.get("filter", Document.class); - List filterOps = new ArrayList<>(); - filterDoc.forEach((key, value) -> { - if ("id".equals(key) || "_id".equals(key)) return; - filterOps.add(Filters.eq(key, value)); - }); - - Document updateDoc = document.get("update", Document.class); List updateOps = new ArrayList<>(); - Document $set = updateDoc.get("$set", Document.class); + Document $set = document.get("$set", Document.class); if ($set != null) { $set.forEach((key, value) -> { updateOps.add(Updates.set(key, value)); }); } - List $unset = updateDoc.get("$unset", List.class); + List $unset = document.get("$unset", List.class); if ($unset != null) { for (Object o : $unset) { updateOps.add(Updates.unset(o.toString())); } } - Document $rename = updateDoc.get("$rename", Document.class); + Document $rename = document.get("$rename", Document.class); if ($rename != null) { $rename.forEach((oldKey, newKey) -> { updateOps.add(Updates.rename(oldKey, newKey.toString())); @@ -143,7 +135,7 @@ public class Controller extends cn.cloudowr.sdk.jfinal.Controller implements Res - + public void dict() { Map paraMap = getParaMap(); List ops = new ArrayList<>(); diff --git a/src/main/webapp/doc/api.txt b/src/main/webapp/doc/api.txt index 2dcdb56..4e986b9 100644 --- a/src/main/webapp/doc/api.txt +++ b/src/main/webapp/doc/api.txt @@ -13,12 +13,9 @@ save (json required) { } update (id required, json required) { json { - filter: {k:v...}, - update: { - $set: {k,v...}, - $unset: [k1,k2...], - $rename: {k,newK...} - } + $set: {k,v...}, + $unset: [k1,k2...], + $rename: {k,newK...} } return {result : true or false} }