diff --git a/jpress-commons/src/main/java/io/jpress/commons/utils/JPressJson.java b/jpress-commons/src/main/java/io/jpress/commons/utils/JPressJson.java index 68319c229eabcc2c39804fc97cd31a7c685b5aff..23e0be9f5b7d961e0a16f4d0fbea3076b7648768 100644 --- a/jpress-commons/src/main/java/io/jpress/commons/utils/JPressJson.java +++ b/jpress-commons/src/main/java/io/jpress/commons/utils/JPressJson.java @@ -18,6 +18,7 @@ package io.jpress.commons.utils; import com.google.common.collect.Lists; import com.jfinal.json.JFinalJsonKit; import com.jfinal.plugin.activerecord.CPI; +import com.jfinal.plugin.activerecord.Model; import io.jboot.db.model.JbootModel; import io.jboot.utils.StrUtil; import io.jboot.web.JbootJson; @@ -36,41 +37,19 @@ import java.util.Map; public class JPressJson extends JbootJson { private static final List needAddDomainAttrs = Lists.newArrayList("avatar", "thumbnail"); - String resDomain = JPressOptions.getResDomain(); + private static final String resDomain = JPressOptions.getResDomain(); public JPressJson() { - super(); - - setToJsonFactory(o -> { - if (o instanceof JbootModel) { - return jbootModelJson; - } else { - return null; - } - }); } - - private JFinalJsonKit.ToJson jbootModelJson = (value, depth, ret) -> { - - if (JFinalJsonKit.checkDepth(depth--, ret)) { - return; - } - - Map attrs = CPI.getAttrs(value.copy()); - optimizeMapAttrs(attrs); - - JFinalJsonKit.modelAndRecordToJson(attrs, depth, ret); - }; - - /** * 优化 map 的属性 * * @param map */ - private void optimizeMapAttrs(Map map) { + @Override + protected void optimizeMapAttrs(Model model, Map map) { if (map == null || map.isEmpty()) { return; } diff --git a/pom.xml b/pom.xml index 7c7cf45cc66ed6f5e7c09c86ac5622d6d65bd188..e3bf72f08ac609befd85612c59f60852e3214cc9 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 1.8 - 3.2.1 + 3.2.3 2.5 0.9.1 1.2.3