Merge branch 'feature_protocol' into 'master'

删除maxidle

See merge request mall/arch/matrix!60

matrix-datasource/matrix-datasource-druid/src/main/java/com/secoo/mall/datasource/properties/MatrixDruidDataSourceProperties.java

@@ -14,7 +14,8 @@ public class MatrixDruidDataSourceProperties extends MatrixDataSourceProperties
     private Long timeBetweenEvictionRunsMillis = DruidAbstractDataSource.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS;
     private Long timeBetweenLogStatsMillis;
     private Integer minIdle=5;
-    private Integer maxIdle=20;
+    @Deprecated
+    private Integer maxIdle;
     private Long maxWait = TimeUnit.SECONDS.toMillis(3L);
     private Integer statSqlMaxSize;
     private Long minEvictableIdleTimeMillis;