Merge branch 'dev' into 'master'

Dev

Closes #12

See merge request mall/arch/matrix!15

common-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.12.RELEASE</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common-core/src/main/java/com/secoo/mall/common/core/bean/Response.java

@@ -39,4 +39,13 @@ public class Response<T> implements Serializable {
     public void setData(T data) {
         this.data = data;
     }
+
+    @Override
+    public String toString() {
+        return "Response{" +
+                "code=" + code +
+                ", msg='" + msg +
+                ", data=" + data +
+                '}';
+    }
 }

common-util/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.12.RELEASE</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common-util/src/main/java/com/secoo/mall/common/util/object/ObjectUtils.java

+package com.secoo.mall.common.util.object;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Created by liumingming on 2018/6/13.
+ */
+public class ObjectUtils {
+
+    /**
+     * 方法描述 如果对象为非空返回true 否则返回false
+     */
+    public static <T> boolean isNotNull(T obj) {
+        if (null != obj) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 方法描述 如果对象为空返回 true 否则返回false
+     */
+    public static <T> boolean isNull(T obj) {
+        if (null != obj) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 方法描述 判断Set集合非null 非空 返回true 否则返回false
+     */
+    public static <T> boolean isNotNull(Set<T> list) {
+        if (null != list && !list.isEmpty()) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 方法描述 判断Set集合是null或者空 非空 返回true 否则返回false
+     */
+    public static <T> boolean isNull(Set<T> list) {
+        if (null == list || list.isEmpty()) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 方法描述 判断List集合非null 非空 返回true 否则返回false
+     */
+    public static <T> boolean isNotNull(List<T> list) {
+        if (null != list && !list.isEmpty()) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 方法描述 判断List集合是null或者空 非空 返回true 否则返回false
+     */
+    public static <T> boolean isNull(List<T> list) {
+        if (null == list || list.isEmpty()) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 方法描述 判断Map集合非null 非空 返回true 否则返回false
+     */
+    public static <T, O> boolean isNotNull(Map<T, O> map) {
+        if (null != map && !map.isEmpty()) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 方法描述 判断Map集合是null或者空 返回true 否则返回false
+     */
+    public static <T, O> boolean isNull(Map<T, O> map) {
+        if (null == map || map.isEmpty()) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 方法描述 判断数组集合非null 非空 返回true 否则返回false
+     */
+    public static <T> boolean isNotNull(T[] list) {
+        if (null != list && !(list.length == 0)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 方法描述 判断数组集合是null或者空 返回true 否则返回false
+     */
+    public static <T> boolean isNull(T[] list) {
+        if (null == list || list.length == 0) {
+            return true;
+        }
+        return false;
+    }
+
+}

common-util/src/main/java/com/secoo/mall/common/util/response/ResponseUtil.java

@@ -20,4 +20,8 @@ public interface ResponseUtil {
         response.setData(data);
         return response;
     }
+
+    static boolean isSuccess(Response response) {
+        return response != null && response.getCode() == CommonConstant.Success.CODE;
+    }
 }

config-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.12.RELEASE</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

elasticsearch-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.12.RELEASE</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

logger-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.12.RELEASE</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

logger-starter/secoo-log-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>logger-starter</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.12.RELEASE</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

logger-starter/secoo-log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>logger-starter</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.12.RELEASE</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mongodb-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.12.RELEASE</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

monitor-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.12.RELEASE</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mybatis-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.12.RELEASE</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

openfeign-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.12.RELEASE</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.secoo.mall</groupId>
     <artifactId>matrix</artifactId>
-    <version>1.0.12.RELEASE</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
 
@@ -45,67 +45,67 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>secoo-log-starter</artifactId>
-                <version>1.0.12.RELEASE</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>secoo-log</artifactId>
-                <version>1.0.12.RELEASE</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>monitor-starter</artifactId>
-                <version>1.0.12.RELEASE</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>common-core</artifactId>
-                <version>1.0.12.RELEASE</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>config-starter</artifactId>
-                <version>1.0.12.RELEASE</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>common-util</artifactId>
-                <version>1.0.12.RELEASE</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>redis-starter</artifactId>
-                <version>1.0.12.RELEASE</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>mybatis-starter</artifactId>
-                <version>1.0.12.RELEASE</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>mongodb-starter</artifactId>
-                <version>1.0.12.RELEASE</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>elasticsearch-starter</artifactId>
-                <version>1.0.12.RELEASE</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>protocol-starter</artifactId>
-                <version>1.0.12.RELEASE</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>rocketmq-starter</artifactId>
-                <version>1.0.12.RELEASE</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>openfeign-starter</artifactId>
-                <version>1.0.12.RELEASE</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -131,7 +131,7 @@
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
-                <version>1.2.52</version>
+                <version>1.2.58</version>
             </dependency>
             <dependency>
                 <groupId>com.esotericsoftware</groupId>

protocol-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.12.RELEASE</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

redis-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.12.RELEASE</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

rocketmq-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.12.RELEASE</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>