From d0dd90adb4f35d0a36fc064fc5dbb805ea4e974d Mon Sep 17 00:00:00 2001
From: liuzhihang <liuzhihangs@vip.qq.com>
Date: Wed, 29 Jul 2020 20:35:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=202018.3=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=20=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                              | 2 +-
 parts/changeNotes.html                                    | 8 +++++---
 .../com/liuzhihang/toolkit/action/CopyAsJsonAction.java   | 5 +++--
 src/main/resources/META-INF/plugin.xml                    | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index a524361..09f3f71 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'com.liuzhihang.toolkit'
-version '1.0.3'
+version '1.0.4'
 
 sourceCompatibility = 1.8
 
diff --git a/parts/changeNotes.html b/parts/changeNotes.html
index 5813c13..c72c8d0 100644
--- a/parts/changeNotes.html
+++ b/parts/changeNotes.html
@@ -1,11 +1,13 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf8">
 <ul>
-    <li>1.0.3
+    <li>1.0.4
         <ol>
-            <li>优化代码</li>
+            <li>修复部分字段丢失的bug</li>
+            <li>修改支持 2018.3 及以上版本</li>
         </ol>
         <ol>
-            <li>Optimized code</li>
+            <li>Fix the bug that some fields are missing</li>
+            <li>Modified support 2018.3 and above</li>
         </ol>
     </li>
 
diff --git a/src/main/java/com/liuzhihang/toolkit/action/CopyAsJsonAction.java b/src/main/java/com/liuzhihang/toolkit/action/CopyAsJsonAction.java
index ca16088..8586aed 100644
--- a/src/main/java/com/liuzhihang/toolkit/action/CopyAsJsonAction.java
+++ b/src/main/java/com/liuzhihang/toolkit/action/CopyAsJsonAction.java
@@ -23,6 +23,7 @@ import org.jetbrains.annotations.Nullable;
 import java.awt.*;
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.StringSelection;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.*;
 
@@ -52,7 +53,7 @@ public class CopyAsJsonAction extends AnAction {
         PROPERTIES_TYPES.put("Boolean", false);
         // 其他
         PROPERTIES_TYPES.put("String", "");
-        PROPERTIES_TYPES.put("BigDecimal", null);
+        PROPERTIES_TYPES.put("BigDecimal", BigDecimal.ZERO);
         PROPERTIES_TYPES.put("Date", null);
         PROPERTIES_TYPES.put("LocalDate", null);
         PROPERTIES_TYPES.put("LocalTime", null);
@@ -85,7 +86,7 @@ public class CopyAsJsonAction extends AnAction {
         try {
             Map<String, Object> fieldsMap = getFields(selectedClass);
 
-            Gson gson = new GsonBuilder().create();
+            Gson gson = new GsonBuilder().serializeNulls().create();
             String json = GsonFormatUtil.gsonFormat(gson, fieldsMap);
 
             // 使用自定义缩进格式 String json = new GsonBuilder().setPrettyPrinting().create().toJson(fieldsMap);
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index ebb04c8..4dddef7 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -18,7 +18,7 @@
 
     <actions>
         <action id="Toolkit.Json.CopyAsJsonAction" class="com.liuzhihang.toolkit.action.CopyAsJsonAction"
-                text="CopyAsJsonAction" description="Copy As Json">
+                text="Copy As Json" description="Copy Java Bean as json string">
             <add-to-group group-id="EditorPopupMenu" anchor="first"/>
             <keyboard-shortcut keymap="$default" first-keystroke="shift meta J"/>
         </action>