From 3ce770bbfb03074c8d5aeb70d64b8e9c6c22a5a9 Mon Sep 17 00:00:00 2001
From: cjl <qiankunpingtai@163.com>
Date: Fri, 22 Feb 2019 14:38:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E8=B7=AF?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E5=BE=84=E8=87=AA=E5=AE=9A=E4=B9=89=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.properties | 2 +-
 src/main/resources/log4j.xml              | 4 ++++
 src/main/resources/logback-spring.xml     | 9 ++-------
 3 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 src/main/resources/log4j.xml

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 6afb2970..b1d0eac9 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,7 +2,7 @@ server.port=8080
 spring.datasource.url=jdbc:mysql://127.0.0.1:3306/jsh_erp?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&defaultFetchSize=500&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
 spring.datasource.username=root
-spring.datasource.password=1234
+spring.datasource.password=123456
 #generatorConfig专用属性
 project=src/main/java
 resource=src/main/resources
diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml
new file mode 100644
index 00000000..d5d833cc
--- /dev/null
+++ b/src/main/resources/log4j.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--日志的自定义输出路径-->
+<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
+<property name="log.path" value="../logs/jshERP" />
\ No newline at end of file
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 2545d59f..c300ab40 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -4,13 +4,8 @@
 <!-- scanPeriod:设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
 <!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
 <configuration  scan="true" scanPeriod="10 seconds">
-
-    <!--<include resource="org/springframework/boot/logging/logback/base.xml" />-->
-
-    <contextName>logback</contextName>
-    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-    <property name="log.path" value="logs/jshERP" />
-
+     <include resource="log4j.xml" />
+     <!--<contextName>logback</contextName>-->
     <!-- 彩色日志 -->
     <!-- 彩色日志依赖的渲染类 -->
     <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />