Merge branch 'dev' of gitlab.secoo.com:mall/arch/matrix into dev

README.md

-简介 
+# 简介 
 
 Matrix (矩阵)是一套组件增强套件，包括redis、rocketmq等中间件以及提供通用util工具类，以利于提高代码的规范性，提高开发效率，对业务无侵入等
 
@@ -22,8 +22,7 @@ Matrix (矩阵)是一套组件增强套件，包括redis、rocketmq等中间件
     -   Maven:需要在自己项目的pom.xml增加,以下配置。
         
       **注意：**
-  
-    1. **Last Version为最新的版本号，最新版本请查看[此处](http://gitlab.secoo.com:8090/mall/arch/matrix/tags  )**  
+  1. **Last Version为最新的版本号，当前最新版本请查看[此处](http://gitlab.secoo.com:8090/mall/arch/matrix/tags  )**  
     2. **<font color=red>此依赖为前置条件，否则其它组件将无法引入</font>**
   
   ```xml

common-core/pom.xml

@@ -5,49 +5,11 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.12.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-core</artifactId>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-        </dependency>
-
-        <!--防止编译出现错误提示-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-    </dependencies>
-
 
 </project>
\ No newline at end of file

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

 package com.secoo.mall.common.core.bean;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import java.io.Serializable;
 
 public abstract class AbsBaseBean<T> implements Serializable {
 
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
 }

common-core/src/main/java/com/secoo/mall/common/core/exception/BusinessException.java

@@ -2,7 +2,6 @@ package com.secoo.mall.common.core.exception;
 
 
 import com.secoo.mall.common.core.errorcode.ErrorCode;
-import org.apache.commons.lang3.StringUtils;
 
 public class BusinessException extends RuntimeException {
     private ErrorCode errorCode;
@@ -71,7 +70,7 @@ public class BusinessException extends RuntimeException {
 
 
     public String getMsg() {
-        if (StringUtils.isNotEmpty(this.msg)) {
+        if (!(this.msg == null || this.msg.length() == 0)) {
             return String.format(this.msg, this.args);
         }
         return msg;

common-util/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.12.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -31,10 +31,6 @@
             <artifactId>common-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
@@ -42,6 +38,19 @@
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+
     </dependencies>
 
 

common-util/src/main/java/com/secoo/mall/common/util/checker/BeanChecker.java

@@ -5,8 +5,8 @@ import com.secoo.mall.common.core.errorcode.ErrorCode;
 import com.secoo.mall.common.core.exception.ParameterException;
 import com.secoo.mall.common.util.colletion.MapUtil;
 import com.secoo.mall.common.util.decimal.DecimalUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.Collection;

config-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.12.RELEASE</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.0-SNAPSHOT</version>
+        <version>1.0.12.RELEASE</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.0-SNAPSHOT</version>
+        <version>1.0.12.RELEASE</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.0-SNAPSHOT</version>
+        <version>1.0.12.RELEASE</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.0-SNAPSHOT</version>
+        <version>1.0.12.RELEASE</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.0-SNAPSHOT</version>
+        <version>1.0.12.RELEASE</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.0-SNAPSHOT</version>
+        <version>1.0.12.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,6 +14,10 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>

mybatis-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.12.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,5 +28,13 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

common-core/src/main/java/com/secoo/mall/common/core/aop/AopTransaction.java → mybatis-starter/src/main/java/com/secoo/mall/mybatis/aop/AopTransaction.java

-package com.secoo.mall.common.core.aop;
+package com.secoo.mall.mybatis.aop;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;

openfeign-starter/pom.xml

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

pom.xml

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

protocol-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.12.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,6 +16,13 @@
             <groupId>com.secoo.mall</groupId>
             <artifactId>common-util</artifactId>
         </dependency>
+
+        <!--防止编译出现错误提示-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

common-core/src/main/java/com/secoo/mall/common/core/condition/BateEnvCondition.java → protocol-starter/src/main/java/com/secoo/mall/common/condition/BateEnvCondition.java

-package com.secoo.mall.common.core.condition;
+package com.secoo.mall.common.condition;
 
 
 import com.secoo.mall.common.constant.CommonConstant;

protocol-starter/src/main/java/com/secoo/mall/common/config/MatrixSwaggerAutoConfiguration.java

 package com.secoo.mall.common.config;
 
 import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
-import com.secoo.mall.common.core.condition.BateEnvCondition;
+import com.secoo.mall.common.condition.BateEnvCondition;
 import com.secoo.mall.dubbo.swagger.annotations.EnableDubboSwagger;
 import com.secoo.mall.web.annotation.ApiController;
 import org.springframework.beans.factory.annotation.Value;

redis-starter/pom.xml

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