Merge branch 'feature_protocol' into 'master'

Feature protocol

See merge request mall/arch/matrix!50

matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/factory/EncryptorFactory.java

@@ -104,6 +104,7 @@ public class EncryptorFactory<T> {
          * 如果无法从远程创建解密对象，则进行降级处理
          */
         if (Objects.isNull(encryptor)) {
+            log.warn("load remote encryptor fail.use default encryptor");
             encryptor = new Encryptor<T>() {
                 @Override
                 public T encrypt(T value) {

matrix-datasource/pom.xml

@@ -33,11 +33,6 @@
                 <artifactId>app-security-api</artifactId>
                 <version>1.0.6.RELEASE</version>
             </dependency>
-            <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>5.1.47</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>

matrix-mybatis/matrix-mybatis-starter/src/main/java/com/secoo/mall/mybatis/spring/boot/autoconfigure/MatrixMybatisAutoConfiguration.java

@@ -58,7 +58,7 @@ public class MatrixMybatisAutoConfiguration {
     @Bean
     @ConditionalOnMissingBean(DataSource.class)
     public DataSource dataSource() {
-        return new MatrixDataSource("01-rw");
+        return new MatrixDataSource("default");
     }
 
 

pom.xml

@@ -33,7 +33,13 @@
 
 
     <dependencyManagement>
+        <!--在spring boot相关包前置,规定引入顺序 -->
         <dependencies>
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>5.1.47</version>
+            </dependency>
             <!-- Spring Boot -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>