Merge branch 'master' into dev

logger-starter/src/main/java/com/secoo/mall/logs/endpoint/LogEndpoint.java

@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * @author qianglu
  */
-@Endpoint(id = "matrixlog")
+//@Endpoint(id = "matrixlog")
 public class LogEndpoint {
 
     @ReadOperation

pom.xml

@@ -159,6 +159,13 @@
                 <artifactId>matrix-client-openfeign-starter</artifactId>
                 <version>2.0.2.RELEASE</version>
             </dependency>
+
+            <!-- bus -->
+            <dependency>
+                <groupId>com.secoo.mall</groupId>
+                <artifactId>matrix-bus-canal-starter</artifactId>
+                <version>2.0.1.RELEASE</version>
+            </dependency>
             <!--普通jar-->
 
             <dependency>