From 6d342bd44c3dc1dd51a28fe456793c49ec397d4d Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Thu, 20 Jun 2019 17:13:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E5=BB=B6=E9=95=BF=20=E8=87=B3=205=20?=
 =?UTF-8?q?=E5=88=86=E9=92=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.properties  |   2 +-
 .../main/resources/application-docker.properties   |   6 +-
 .../src/main/resources/application-prod.properties |   2 +-
 .../src/main/resources/application-test.properties |   4 +-
 .../src/main/resources/log4j2-spring-prod.xml      |  55 ---------
 .../src/main/resources/log4j2-spring-prod.xml.bak  | 137 +++++++++++++++++++++
 .../{log4j2-spring-test.xml => log4j2-spring.xml}  |  13 +-
 7 files changed, 152 insertions(+), 67 deletions(-)
 delete mode 100644 modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-prod.xml
 create mode 100644 modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-prod.xml.bak
 rename modules/i3plus-core-apiservice/src/main/resources/{log4j2-spring-test.xml => log4j2-spring.xml} (82%)

diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
index 94cb0d0..9d71756 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
@@ -53,7 +53,7 @@ spring.datasource.max-wait=10000
 spring.datasource.validation-query=SELECT 1
 spring.datasource.test-on-borrow=false
 spring.datasource.test-while-idle=true
-spring.datasource.time-between-eviction-runs-millis=18800
+spring.datasource.time-between-eviction-runs-millis=300000
 
 ##主数据源，读写
 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties b/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties
index 57d0e95..c9e8e8f 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties
@@ -7,7 +7,7 @@ impp.console.ip=http://console:8010
 #服务注册中心(多注册中心逗号分隔)
 impp.cluster.regist.center=http://register:8000/eureka/
 #日志默认使用log4j2
-logging.config=classpath:log4j2-spring-prod.xml
+logging.config=classpath:log4j2-spring.xml
 
 ########平台相关参数##########
 #是否开启redis缓存
@@ -53,7 +53,7 @@ spring.datasource.max-wait=10000
 spring.datasource.validation-query=SELECT 1
 spring.datasource.test-on-borrow=false
 spring.datasource.test-while-idle=true
-spring.datasource.time-between-eviction-runs-millis=18800
+spring.datasource.time-between-eviction-runs-millis=300000
 
 ##主数据源，读写
 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource
@@ -65,7 +65,7 @@ impp.write.datasource.password=impp_i3_core_pwd
 ##辅数据源，只读
 #impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource
 impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.read.datasource.jdbc-url=jdbc:mysql://dbslave:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+impp.read.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
 impp.read.datasource.username=impp_i3_core_user
 impp.read.datasource.password=impp_i3_core_pwd
 
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
index 9b6e8d3..450f9f9 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
@@ -53,7 +53,7 @@ spring.datasource.max-wait=10000
 spring.datasource.validation-query=SELECT 1
 spring.datasource.test-on-borrow=false
 spring.datasource.test-while-idle=true
-spring.datasource.time-between-eviction-runs-millis=18800
+spring.datasource.time-between-eviction-runs-millis=300000
 
 ##主数据源，读写
 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
index cf31ed6..ec6000b 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
@@ -7,7 +7,7 @@ impp.console.ip=http://192.168.1.241:58010
 #服务注册中心(多注册中心逗号分隔)
 impp.cluster.regist.center=http://192.168.1.241:58000/eureka/
 #日志默认使用log4j2
-logging.config=classpath:log4j2-spring-test.xml
+logging.config=classpath:log4j2-spring.xml
 
 ########平台相关参数##########
 #是否开启redis缓存
@@ -53,7 +53,7 @@ spring.datasource.max-wait=10000
 spring.datasource.validation-query=SELECT 1
 spring.datasource.test-on-borrow=false
 spring.datasource.test-while-idle=true
-spring.datasource.time-between-eviction-runs-millis=18800
+spring.datasource.time-between-eviction-runs-millis=300000
 
 ##主数据源，读写
 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource
diff --git a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-prod.xml b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-prod.xml
deleted file mode 100644
index c58e8a4..0000000
--- a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-prod.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<configuration status="WARN">
-    <!--全局参数-->
-    <Properties>
-        <Property name="log4j2.level" value="INFO"/>
-        <Property name="logoInfoFilePath" value="/data/application/java/logs/prod-${project.name}"/>
-        <Property name="logoErrorFilePath" value="/data/application/java/logs/prod-${project.name}-error"/>
-        <Property name="pattern">[%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %l 信息:%m%n</Property>
-        <Property name="info_pattern">[%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %c(%M:%L) 信息:%m%n</Property>
-        <Property name="system_log_pattern">[SYS-%p] %d{yyyy-MM-dd HH:mm:ss-SSS} 系统:%m ( %F -> %M:%L)%n</Property>
-    </Properties>
-    <Loggers>
-        <Root level="${log4j2.level}">
-            <AppenderRef ref="console"></AppenderRef>
-            <AppenderRef ref="rolling_file"></AppenderRef>
-            <AppenderRef ref="error_file"></AppenderRef>
-        </Root>
-        <!--系统提示信息-->
-        <Logger name="system_log" level="${log4j2.level}" additivity="false">
-            <AppenderRef ref="system_log_console"></AppenderRef>
-        </Logger>
-    </Loggers>
-    <Appenders>
-        <Console name="console" target="SYSTEM_OUT" follow="true">
-            <!--控制台只输出level及以上级别的信息-->
-            <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout>
-                <Pattern>${info_pattern}</Pattern>
-            </PatternLayout>
-        </Console>
-        <Console name="system_log_console" target="SYSTEM_OUT" follow="true">
-            <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout>
-                <Pattern>${system_log_pattern}</Pattern>
-            </PatternLayout>
-        </Console>
-        <RollingFile name="rolling_file"
-                     fileName="${logoInfoFilePath}.log"
-                     filePattern="${logoInfoFilePath}_%d{yyyy-MM-dd}.log">
-            <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout>
-                <Pattern>${pattern}</Pattern>
-            </PatternLayout>
-            <Policies>
-                <TimeBasedTriggeringPolicy interval="1"/>
-            </Policies>
-        </RollingFile>
-        <File name="error_file" fileName="${logoErrorFilePath}.log">
-            <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout>
-                <Pattern>${pattern}</Pattern>
-            </PatternLayout>
-        </File>
-    </Appenders>
-</configuration>
\ No newline at end of file
diff --git a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-prod.xml.bak b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-prod.xml.bak
new file mode 100644
index 0000000..5dfcb6c
--- /dev/null
+++ b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-prod.xml.bak
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--日志级别以及优先级排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL -->
+<!--Configuration后面的status,这个用于设置log4j2自身内部的信息输出,可以不设置,当设置成trace时,你会看到log4j2内部各种详细输出 -->
+<!--monitorInterval：Log4j能够自动检测修改配置 文件和重新配置本身,设置间隔秒数 -->
+<configuration status="WARN" monitorInterval="1800">
+    <Properties>
+        <!-- 日志默认存放的位置,这里设置为项目根路径下,也可指定绝对路径 -->
+        <!-- ${web:rootDir}是web项目根路径,java项目没有这个变量,需要删掉,否则会报异常 -->
+        <property name="basePath">../logs/log4j2Logs</property>
+        <!-- <property name="basePath">d:/qfxSpringMVCMybaitsDemoLogs</property> -->
+
+        <!-- 控制台默认输出格式,"%-5level":日志级别,"%l":输出完整的错误位置,是小写的L,因为有行号显示,所以影响日志输出的性能 -->
+        <property name="console_log_pattern">%d{yyyy-MM-dd HH:mm:ss} [%-5level] %l - %m%n</property>
+        <!-- 日志文件默认输出格式,不带行号输出(行号显示会影响日志输出性能);%C:大写,类名;%M:方法名;%m:错误信息;%n:换行 -->
+        <property name="log_pattern">%d{yyyy-MM-dd HH:mm:ss} [%-5level] %c(%M:%L) - %m%n</property>
+
+        <!-- 日志默认切割的最小单位 -->
+        <property name="every_file_size">20MB</property>
+        <!-- 日志默认输出级别 -->
+        <property name="output_log_level">DEBUG</property>
+
+        <!-- 日志默认存放路径(所有级别日志) -->
+        <property name="rolling_fileName">${basePath}/all.log</property>
+        <!-- 日志默认压缩路径,将超过指定文件大小的日志,自动存入按"年月"建立的文件夹下面并进行压缩,作为存档 -->
+        <property name="rolling_filePattern">${basePath}/%d{yyyy-MM}/all-%d{yyyy-MM-dd}-%i.log.gz
+        </property>
+        <!-- 日志默认同类型日志,同一文件夹下可以存放的数量,不设置此属性则默认为7个 -->
+        <property name="rolling_max">50</property>
+
+        <!-- Info日志默认存放路径(Info级别日志) -->
+        <property name="info_fileName">${basePath}/info.log</property>
+        <!-- Info日志默认压缩路径,将超过指定文件大小的日志,自动存入按"年月"建立的文件夹下面并进行压缩,作为存档 -->
+        <property name="info_filePattern">${basePath}/%d{yyyy-MM}/info-%d{yyyy-MM-dd}-%i.log.gz
+        </property>
+        <!-- Info日志默认同一文件夹下可以存放的数量,不设置此属性则默认为7个 -->
+        <property name="info_max">10</property>
+
+        <!-- Warn日志默认存放路径(Warn级别日志) -->
+        <property name="warn_fileName">${basePath}/warn.log</property>
+        <!-- Warn日志默认压缩路径,将超过指定文件大小的日志,自动存入按"年月"建立的文件夹下面并进行压缩,作为存档 -->
+        <property name="warn_filePattern">${basePath}/%d{yyyy-MM}/warn-%d{yyyy-MM-dd}-%i.log.gz
+        </property>
+        <!-- Warn日志默认同一文件夹下可以存放的数量,不设置此属性则默认为7个 -->
+        <property name="warn_max">10</property>
+
+        <!-- Error日志默认存放路径(Error级别日志) -->
+        <property name="error_fileName">${basePath}/error.log</property>
+        <!-- Error日志默认压缩路径,将超过指定文件大小的日志,自动存入按"年月"建立的文件夹下面并进行压缩,作为存档 -->
+        <property name="error_filePattern">${basePath}/%d{yyyy-MM}/error-%d{yyyy-MM-dd}-%i.log.gz
+        </property>
+        <!-- Error日志默认同一文件夹下可以存放的数量,不设置此属性则默认为7个 -->
+        <property name="error_max">10</property>
+
+        <!-- 控制台显示的日志最低级别 -->
+        <property name="console_print_level">INFO</property>
+
+    </Properties>
+
+    <!--定义appender -->
+    <appenders>
+        <!-- 用来定义输出到控制台的配置 -->
+        <Console name="Console" target="SYSTEM_OUT">
+            <!-- 设置控制台只输出level及以上级别的信息(onMatch),其他的直接拒绝(onMismatch) -->
+            <ThresholdFilter level="${console_print_level}" onMatch="ACCEPT" onMismatch="DENY" />
+            <!-- 设置输出格式,不设置默认为:%m%n -->
+            <PatternLayout pattern="${console_log_pattern}" />
+        </Console>
+
+        <!-- 打印root中指定的level级别以上的日志到文件 -->
+        <RollingFile name="RollingFile" fileName="${rolling_fileName}"
+                     filePattern="${rolling_filePattern}">
+            <PatternLayout pattern="${log_pattern}" />
+            <SizeBasedTriggeringPolicy size="${every_file_size}" />
+            <!-- 设置同类型日志,同一文件夹下可以存放的数量,如果不设置此属性则默认存放7个文件 -->
+            <DefaultRolloverStrategy max="${rolling_max}" />
+            <!-- 匹配INFO以及以上级别 -->
+            <Filters>
+                <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY" />
+            </Filters>
+        </RollingFile>
+
+        <!-- 打印INFO级别的日志到文件 -->
+        <RollingFile name="InfoFile" fileName="${info_fileName}"
+                     filePattern="${info_filePattern}">
+            <PatternLayout pattern="${log_pattern}" />
+            <SizeBasedTriggeringPolicy size="${every_file_size}" />
+            <DefaultRolloverStrategy max="${info_max}" />
+            <!-- 匹配INFO级别 -->
+            <Filters>
+                <ThresholdFilter level="WARN" onMatch="DENY" onMismatch="NEUTRAL" />
+                <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY" />
+            </Filters>
+        </RollingFile>
+
+        <!-- 打印WARN级别的日志到文件 -->
+        <RollingFile name="WarnFile" fileName="${warn_fileName}"
+                     filePattern="${warn_filePattern}">
+            <PatternLayout pattern="${log_pattern}" />
+            <SizeBasedTriggeringPolicy size="${every_file_size}" />
+            <DefaultRolloverStrategy max="${warn_max}" />
+            <!-- 匹配WARN级别 -->
+            <Filters>
+                <ThresholdFilter level="ERROR" onMatch="DENY" onMismatch="NEUTRAL" />
+                <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY" />
+            </Filters>
+        </RollingFile>
+
+        <!-- 打印ERROR级别的日志到文件 -->
+        <RollingFile name="ErrorFile" fileName="${error_fileName}"
+                     filePattern="${error_filePattern}">
+            <PatternLayout pattern="${log_pattern}" />
+            <SizeBasedTriggeringPolicy size="${every_file_size}" />
+            <DefaultRolloverStrategy max="${error_max}" />
+            <!-- 匹配ERROR级别 -->
+            <Filters>
+                <ThresholdFilter level="FATAL" onMatch="DENY" onMismatch="NEUTRAL" />
+                <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY" />
+            </Filters>
+        </RollingFile>
+    </appenders>
+
+    <!--然后定义logger,只有定义了logger并引入的appender,appender才会生效 -->
+    <loggers>
+        <!-- 设置对打印sql语句的支持 -->
+        <logger name="java.sql" level="debug" additivity="false">
+            <appender-ref ref="Console" />
+        </logger>
+        <!--建立一个默认的root的logger -->
+        <root level="${output_log_level}">
+            <appender-ref ref="RollingFile" />
+            <appender-ref ref="Console" />
+            <appender-ref ref="InfoFile" />
+            <appender-ref ref="WarnFile" />
+            <appender-ref ref="ErrorFile" />
+        </root>
+    </loggers>
+</configuration>
\ No newline at end of file
diff --git a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-test.xml b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml
similarity index 82%
rename from modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-test.xml
rename to modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml
index 8e00937..2796f82 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-test.xml
+++ b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml
@@ -3,8 +3,9 @@
     <!--全局参数-->
     <Properties>
         <Property name="log4j2.level" value="INFO"/>
-        <Property name="logoInfoFilePath" value="/data/application/java/logstest-${project.name}"/>
-        <Property name="logoErrorFilePath" value="/data/application/java/logs/test-${project.name}-error"/>
+        <Property name="logoSystemFilePath" value="../logs/${project.name}-system"/>
+        <Property name="logoInfoFilePath" value="../logs/${project.name}-info"/>
+        <Property name="logoErrorFilePath" value="../logs/${project.name}-error"/>
         <Property name="pattern">[%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %l 信息:%m%n</Property>
         <Property name="info_pattern">[%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %c(%M:%L) 信息:%m%n</Property>
         <Property name="system_log_pattern">[SYS-%p] %d{yyyy-MM-dd HH:mm:ss-SSS} 系统:%m ( %F -> %M:%L)%n</Property>
@@ -19,7 +20,7 @@
         <Logger name="system_log" level="${log4j2.level}" additivity="false">
             <AppenderRef ref="system_log_console"></AppenderRef>
         </Logger>
-</Loggers>
+    </Loggers>
     <Appenders>
         <Console name="console" target="SYSTEM_OUT" follow="true">
             <!--控制台只输出level及以上级别的信息-->
@@ -28,12 +29,14 @@
                 <Pattern>${info_pattern}</Pattern>
             </PatternLayout>
         </Console>
-        <Console name="system_log_console" target="SYSTEM_OUT" follow="true">
+        <File name="system_log_console" target="SYSTEM_OUT" follow="true"
+              fileName="${logoSystemFilePath}.log"
+              filePattern="${logoSystemFilePath}_%d{yyyy-MM-dd}.log">
             <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout>
                 <Pattern>${system_log_pattern}</Pattern>
             </PatternLayout>
-        </Console>
+        </File>
         <RollingFile name="rolling_file"
                      fileName="${logoInfoFilePath}.log"
                      filePattern="${logoInfoFilePath}_%d{yyyy-MM-dd}.log">