From 6ddb3b48d8ba4fd049ac7ad796b73cceffce561c Mon Sep 17 00:00:00 2001
From: limqhz <lmq540344226@163.com>
Date: Thu, 30 Jan 2020 16:24:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Redis=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/application-development.yml        |  4 +-
 api/src/main/resources/logback.xml            | 40 +++++--------------
 .../config/application-development.yml        |  4 +-
 oms/src/main/resources/logback.xml            | 40 +++++--------------
 4 files changed, 24 insertions(+), 64 deletions(-)

diff --git a/api/src/main/resources/config/application-development.yml b/api/src/main/resources/config/application-development.yml
index eef636c..5ce3888 100644
--- a/api/src/main/resources/config/application-development.yml
+++ b/api/src/main/resources/config/application-development.yml
@@ -4,8 +4,8 @@ spring:
     username: yingdd
     password: Yingdd2015
   redis:
-    host: 47.96.15.192
-    password:
+    host: 127.0.0.1
+    password: 123456
     timeout: 6000
     port: 6379
 
diff --git a/api/src/main/resources/logback.xml b/api/src/main/resources/logback.xml
index 8149b0e..0978731 100644
--- a/api/src/main/resources/logback.xml
+++ b/api/src/main/resources/logback.xml
@@ -1,33 +1,18 @@
 <?xml version="1.0" encoding="UTF8"?>
 <configuration>
     <jmxConfigurator />
-    <property name="LOG_HOME" value="/tmp/log/sv/api"/>
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-            </pattern>
+    <property name="LOG_HOME" value="/home/log/svapi"/>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
         </encoder>
     </appender>
 
-    <appender name="webLogFile"
-              class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_HOME}/api.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_HOME}/api-sys.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-
-        <encoder>
-            <pattern>%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-
     <appender name="springLogFile"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${LOG_HOME}/api-spring.log</file>
-
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${LOG_HOME}/api-spring-%d{yyyy-MM-dd_HH}.%i.log
             </fileNamePattern>
@@ -38,22 +23,17 @@
         </rollingPolicy>
 
         <encoder>
-            <pattern>%d{HH:mm:ss.SSS},%msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
         </encoder>
     </appender>
 
     <logger name="org.springframework" level="info" additivity="false">
-        <appender-ref ref="webLogFile" />
-        <appender-ref ref="console" />
+        <appender-ref ref="springLogFile" />
     </logger>
 
-
-    <root level="debug">
-        <appender-ref ref="console" />
-    </root>
     <!-- root -->
     <root level="info">
-        <appender-ref ref="console" />
-        <appender-ref ref="webLogFile" />
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="springLogFile" />
     </root>
 </configuration>
\ No newline at end of file
diff --git a/oms/src/main/resources/config/application-development.yml b/oms/src/main/resources/config/application-development.yml
index 75dad1b..92decc8 100644
--- a/oms/src/main/resources/config/application-development.yml
+++ b/oms/src/main/resources/config/application-development.yml
@@ -4,8 +4,8 @@ spring:
     username: yingdd
     password: Yingdd2015
   redis:
-    host: 192.168.1.200
-    password: yingdiandian2015
+    host: 127.0.0.1
+    password: 123456
     timeout: 6000
     port: 6379
 
diff --git a/oms/src/main/resources/logback.xml b/oms/src/main/resources/logback.xml
index 8fa510c..5c413e1 100644
--- a/oms/src/main/resources/logback.xml
+++ b/oms/src/main/resources/logback.xml
@@ -1,33 +1,18 @@
 <?xml version="1.0" encoding="UTF8"?>
 <configuration>
     <jmxConfigurator />
-    <property name="LOG_HOME" value="/tmp/log/sv/oms"/>
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-            </pattern>
+    <property name="LOG_HOME" value="/home/log/svoms"/>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
         </encoder>
     </appender>
 
-    <appender name="webLogFile"
-              class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_HOME}/oms.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_HOME}/oms-sys.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-
-        <encoder>
-            <pattern>%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-
     <appender name="springLogFile"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${LOG_HOME}/oms-spring.log</file>
-
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${LOG_HOME}/oms-spring-%d{yyyy-MM-dd_HH}.%i.log
             </fileNamePattern>
@@ -38,22 +23,17 @@
         </rollingPolicy>
 
         <encoder>
-            <pattern>%d{HH:mm:ss.SSS},%msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
         </encoder>
     </appender>
 
     <logger name="org.springframework" level="info" additivity="false">
-        <appender-ref ref="webLogFile" />
-        <appender-ref ref="console" />
+        <appender-ref ref="springLogFile" />
     </logger>
 
-
-    <root level="debug">
-        <appender-ref ref="console" />
-    </root>
     <!-- root -->
     <root level="info">
-        <appender-ref ref="console" />
-        <appender-ref ref="webLogFile" />
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="springLogFile" />
     </root>
 </configuration>
\ No newline at end of file