Merge branch 'feature_protocol' into 'master'

Feature protocol

See merge request mall/arch/matrix!55

matrix-protocol/matrix-protocol-core/pom.xml

@@ -43,5 +43,13 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/static/</directory>
+                <targetPath>META-INF/resources/</targetPath>
+            </resource>
+        </resources>
+    </build>
 
 </project>
\ No newline at end of file

matrix-protocol/matrix-protocol-web-core/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter

-exception=com.secoo.mall.dubbo.filter.ResponseExceptionFilter
\ No newline at end of file

matrix-protocol/matrix-protocol-web-core/src/main/resources/META-INF/spring.factories

-# Auto Configure
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-com.secoo.mall.common.config.MatrixSwaggerAutoConfiguration
\ No newline at end of file

matrix-protocol/matrix-protocol-web-starter/src/main/java/com/secoo/mall/web/spring/boot/autoconfigure/MatrixWebAutoConfiguration.java

@@ -6,7 +6,6 @@ import com.secoo.mall.common.util.sys.SystemUtil;
 import com.secoo.mall.web.annotation.ApiController;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -30,7 +29,7 @@ public class MatrixWebAutoConfiguration {
     private String appVersion;
 
     @Bean
-    @ConditionalOnMissingBean(Docket.class)
+    //屏蔽，不考虑程序自定义的情况 @ConditionalOnMissingBean(Docket.class)
     public Docket createWebApi() {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo()).enable(SystemUtil.isBetaEnv())

matrix-protocol/pom.xml

@@ -161,12 +161,6 @@
     </dependencyManagement>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/static/</directory>
-                <targetPath>META-INF/resources/</targetPath>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>