From 22ecbfd872dca1909081efeb0d992af102e583d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=9E=B3?= <litongpro@163.com>
Date: Mon, 15 Jun 2020 20:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20jboot=E7=89=88=E6=9C=AC=20?=
 =?UTF-8?q?3.2.3=20=20fixed:=20Model=20=E7=9A=84=20getter=20=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E4=B8=8D=E8=BE=93=E5=87=BA=20json=20=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/jpress/commons/utils/JPressJson.java   | 29 +++----------------
 pom.xml                                       |  2 +-
 2 files changed, 5 insertions(+), 26 deletions(-)

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 68319c229..23e0be9f5 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<String> 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<JbootModel> jbootModelJson = (value, depth, ret) -> {
-
-        if (JFinalJsonKit.checkDepth(depth--, ret)) {
-            return;
-        }
-
-        Map<String, Object> 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 7c7cf45cc..e3bf72f08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
         <jdk.version>1.8</jdk.version>
-        <jboot.version>3.2.1</jboot.version>
+        <jboot.version>3.2.3</jboot.version>
         <jfinal-weixin.version>2.5</jfinal-weixin.version>
         <jjwt.version>0.9.1</jjwt.version>
         <logback.version>1.2.3</logback.version>
-- 
Gitee