!47 优化合并

Merge pull request !47 from OceansDeep/feature/pg

consumer/src/main/resources/application.yml

@@ -35,8 +35,7 @@ spring:
   # mongodb
   data:
     mongodb:
-      host: 127.0.0.1
-      port: 27017
+      uri: 127.0.0.1:27017
       database: lilishop
       username: root
       password: lilishop

consumer/src/main/resources/logback-spring.xml

@@ -7,6 +7,7 @@
     <springProperty scope="context" name="APP_NAME" source="spring.application.name"/>
     <!--日志文件保存路径-->
     <springProperty scope="context" name="LOG_FILE_PATH" source="logging.file.path"/>
+    <springProperty scope="context" name="LOGSTASH_SERVER" source="lili.data.logstash.server"/>
     <contextName>${APP_NAME}</contextName>
 
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -22,7 +23,7 @@
     <!--输出到elk的LOGSTASH-->
     <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <!-- 配置elk日志收集 配饰的是 LOGSTASH 的地址-->
-        <destination>127.0.0.1:4560</destination>
+        <destination>${LOGSTASH_SERVER}</destination>
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
             <providers>
                 <timestamp>