modify config

config-starter/pom.xml

@@ -19,7 +19,6 @@
         <dependency>
             <groupId>com.ctrip.framework.apollo</groupId>
             <artifactId>apollo-client</artifactId>
-            <version>1.4.0</version>
         </dependency>
     </dependencies>
 

config-starter/src/main/java/com/secoo/mall/config/internals/ApolloContextInitializer.java

@@ -26,6 +26,7 @@ public class ApolloContextInitializer implements ApplicationContextInitializer<C
         if (!StringUtils.isEmpty(appId)) {
             System.setProperty("app.id", appId);
             System.setProperty("apollo.cacheDir", cacheDir);
+            System.setProperty("apollo.bootstrap.enabled","true");
         }
     }
 

logger-starter/secoo-log-starter/src/main/resources/logback-spring.xml

@@ -14,9 +14,14 @@
 
     <!-- 控制台输出 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
+            <!-- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}|%msgno|%thread|%-5level|%logger{20}-%msg%n</pattern> -->
             <pattern>${PATTERN}</pattern>
-        </layout>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>DEBUG</level>
+        </filter>
     </appender>
 
     <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -54,6 +59,13 @@
         </layout>
     </appender>
 
+    <appender name="ASYN_STDOUT" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="STDOUT"/>
+        <queueSize>256</queueSize>
+        <neverBlock>true</neverBlock>
+        <includeCallerData>true</includeCallerData>
+    </appender>
+
     <appender name="ASYN_APP" class="ch.qos.logback.classic.AsyncAppender">
         <appender-ref ref="APP"/>
         <queueSize>1024</queueSize>
@@ -79,6 +91,9 @@
     <logger name="org.logicalcobwebs.proxool" level="error"/>
     <!--统一日志输出级别，其他appender中如果有高于此处等级设置的也会被输出 -->
     <root level="${logLevel}">
+        <springProfile name="test,dev,local">
+            <appender-ref ref="ASYN_STDOUT"/>
+        </springProfile>
         <appender-ref ref="ASYN_APP"/>
         <appender-ref ref="ASYN_ERROR"/>
     </root>

pom.xml

@@ -299,8 +299,15 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!--appollo-->
+            <dependency>
+                <groupId>com.ctrip.framework.apollo</groupId>
+                <artifactId>apollo-client</artifactId>
+                <version>1.4.0</version>
+            </dependency>
         </dependencies>
 
+
     </dependencyManagement>
 
     <build>

rocketmq-starter/pom.xml

@@ -15,12 +15,6 @@
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-spring-boot-starter</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.ctrip.framework.apollo</groupId>
-            <artifactId>apollo-client</artifactId>
-            <version>1.4.0</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

rocketmq-starter/src/main/java/com/secoo/mall/mq/config/MatrixRocketMQAutoConfiguration.java

-package com.secoo.mall.mq.config;
-
-import com.secoo.mall.mq.hook.MatrixProducerHook;
-import com.secoo.mall.mq.producer.MartixProducer;
-import org.apache.rocketmq.acl.common.AclClientRPCHook;
-import org.apache.rocketmq.acl.common.SessionCredentials;
-import org.apache.rocketmq.client.AccessChannel;
-import org.apache.rocketmq.client.producer.DefaultMQProducer;
-import org.apache.rocketmq.spring.autoconfigure.RocketMQProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-/**
- * @author qianglu
- */
-@Configuration
-@Import(MatrixListenerContainerConfiguration.class)
-public class MatrixRocketMQAutoConfiguration {
-
-    @Bean
-    public DefaultMQProducer defaultMQProducer(RocketMQProperties rocketMQProperties) {
-        RocketMQProperties.Producer producerConfig = rocketMQProperties.getProducer();
-        String nameServer = rocketMQProperties.getNameServer();
-        String groupName = producerConfig.getGroup();
-        Assert.hasText(nameServer, "[rocketmq.name-server] must not be null");
-        Assert.hasText(groupName, "[rocketmq.producer.group] must not be null");
-
-        String accessChannel = rocketMQProperties.getAccessChannel();
-
-        MartixProducer producer;
-        String ak = rocketMQProperties.getProducer().getAccessKey();
-        String sk = rocketMQProperties.getProducer().getSecretKey();
-        MatrixProducerHook matrixProducerHook = new MatrixProducerHook();
-        if (!StringUtils.isEmpty(ak) && !StringUtils.isEmpty(sk)) {
-            producer = new MartixProducer(groupName, new AclClientRPCHook(new SessionCredentials(ak, sk)),
-                    rocketMQProperties.getProducer().isEnableMsgTrace(),
-                    rocketMQProperties.getProducer().getCustomizedTraceTopic(),matrixProducerHook);
-            producer.setVipChannelEnabled(false);
-        } else {
-            producer = new MartixProducer(groupName, rocketMQProperties.getProducer().isEnableMsgTrace(),
-                    rocketMQProperties.getProducer().getCustomizedTraceTopic(),matrixProducerHook);
-        }
-        producer.setNamesrvAddr(nameServer);
-        if (!StringUtils.isEmpty(accessChannel)) {
-            producer.setAccessChannel(AccessChannel.valueOf(accessChannel));
-        }
-        producer.setSendMsgTimeout(producerConfig.getSendMessageTimeout());
-        producer.setRetryTimesWhenSendFailed(producerConfig.getRetryTimesWhenSendFailed());
-        producer.setRetryTimesWhenSendAsyncFailed(producerConfig.getRetryTimesWhenSendAsyncFailed());
-        producer.setMaxMessageSize(producerConfig.getMaxMessageSize());
-        producer.setCompressMsgBodyOverHowmuch(producerConfig.getCompressMessageBodyThreshold());
-        producer.setRetryAnotherBrokerWhenNotStoreOK(producerConfig.isRetryNextServer());
-        return producer;
-    }
-
-
-
-}

rocketmq-starter/src/main/resources/META-INF/spring.factories

-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-com.secoo.mall.mq.config.MatrixRocketMQAutoConfiguration
\ No newline at end of file