Merge remote-tracking branch 'origin/master'

src/main/resources/logback-spring.xml

@@ -15,7 +15,7 @@
 
 	<!-- 按照每天生成日志文件 -->
 	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${LOG_HOME}/serviceProject.log</file>
+		<file>${LOG_HOME}/knowBase.log</file>
 		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
 			<!--日志文件输出的文件名 -->
 			<FileNamePattern>${LOG_HOME}/knowBase-%d{yyyy-MM-dd}.%i.log</FileNamePattern>