From 70c4fb67b100aba6e3263f964adce79ff554a42b Mon Sep 17 00:00:00 2001
From: maxf <1107047387@qq.com>
Date: Fri, 11 Jan 2019 13:28:38 +0800
Subject: [PATCH] =?UTF-8?q?1.3.8=20ToUeProperty=20=E5=A2=9E=E5=8A=A0=20ign?=
 =?UTF-8?q?ore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UPDATE.md                                             |  7 +++++++
 pom.xml                                               |  2 +-
 src/main/java/com/yexuejc/base/util/ObjUtil.java      | 11 +++++++----
 src/main/java/com/yexuejc/base/util/ToUeProperty.java |  6 ++++++
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/UPDATE.md b/UPDATE.md
index dd6c38e..3f18143 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -1,6 +1,13 @@
 yexuejc-base 更新记录
 ------------------
 
+#### version ：1.3.8
+**time：2019-1-11 13:28:12** <br/>
+**branch：** master    <br/>
+**update：**     <br/>
+>1. [ToUeProperty](src/main/java/com/yexuejc/base/util/ToUeProperty.java) 增加 ignore
+#
+
 #### version ：1.3.7
 **time：2019-1-11 10:02:03** <br/>
 **branch：** master    <br/>
diff --git a/pom.xml b/pom.xml
index 39bbe15..9d26ffd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>top.yexuejc</groupId>
     <artifactId>yexuejc-base</artifactId>
-    <version>1.3.7</version>
+    <version>1.3.8</version>
 
     <name>${project.artifactId}</name>
     <url>https://github.com/yexuejc/yexuejc-base</url>
diff --git a/src/main/java/com/yexuejc/base/util/ObjUtil.java b/src/main/java/com/yexuejc/base/util/ObjUtil.java
index 1c180fd..2943974 100644
--- a/src/main/java/com/yexuejc/base/util/ObjUtil.java
+++ b/src/main/java/com/yexuejc/base/util/ObjUtil.java
@@ -109,13 +109,19 @@ public class ObjUtil {
                     fName = StrUtil.camelToUnderline(f.getName());
                 }
                 boolean annotationPresent = f.isAnnotationPresent(ToUeProperty.class);
+                boolean ignore = false;
                 if (annotationPresent) {
                     ToUeProperty annotation = f.getAnnotation(ToUeProperty.class);
+                    ignore = annotation.ignore();
                     String value = annotation.value();
                     if (StrUtil.isNotEmpty(value)) {
                         fName = value;
                     }
                 }
+                //忽略
+                if (ignore) {
+                    continue;
+                }
                 Object o = f.get(obj);
                 if (null == o || isPrimitive(o) || o instanceof String || o instanceof Enum) {
                     if (null == o && !putNull) {
@@ -175,15 +181,13 @@ public class ObjUtil {
         boolean b = obj.getClass().isPrimitive()
                 || obj instanceof Integer || obj instanceof Character || obj instanceof Boolean
                 || obj instanceof Number || obj instanceof String || obj instanceof Double || obj instanceof Float
-                || obj instanceof Short || obj instanceof Long || obj instanceof Byte || obj instanceof Date
-                ;
+                || obj instanceof Short || obj instanceof Long || obj instanceof Byte || obj instanceof Date;
         if (b) {
             return true;
         }
         return false;
     }
 
-
     public static void main(String[] args) {
         B a = new B();
         a.nameFirst = "张三";
@@ -251,7 +255,6 @@ public class ObjUtil {
         }
     }
 
-
     /**
      * <h2>深度克隆对象</h2>
      * <p>
diff --git a/src/main/java/com/yexuejc/base/util/ToUeProperty.java b/src/main/java/com/yexuejc/base/util/ToUeProperty.java
index 4398c63..63d7fdd 100644
--- a/src/main/java/com/yexuejc/base/util/ToUeProperty.java
+++ b/src/main/java/com/yexuejc/base/util/ToUeProperty.java
@@ -11,4 +11,10 @@ public @interface ToUeProperty {
      * @return
      */
     String value() default "";
+
+    /**
+     * 是否忽略该字段，默认false
+     * @return
+     */
+    boolean ignore() default false;
 }
\ No newline at end of file