wms / wms4_fuleixi · Commits

Commit 34a09f4780f8116e86874513919cf99ca760450c

Authored by 李泰瑜
2 parents bd32955e 0981db21

Merge branch 'develop4' of http://172.16.29.40:8010/wms/wms4 into develop4

Inline Side-by-side
Showing 2 changed files with 5 additions and 4 deletions
huaheng-wms-core/src/main/resources/application.yml
  View file @34a09f4
1 spring: 1 spring:
2 application: 2 application:
3 - name: jeecg-system 3 + name: huaheng-wms-core
4 profiles: 4 profiles:
5 active: dev 5 active: dev
huaheng-wms-core/src/main/resources/logback-spring.xml
  View file @34a09f4
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 6
7 <!--定义日志文件的存储地址 --> 7 <!--定义日志文件的存储地址 -->
8 <property name="LOG_HOME" value="${LOG_PATH}/logs" /> 8 <property name="LOG_HOME" value="${LOG_PATH}/logs" />
  9 + <springProperty name="appName" scope="context" source="spring.application.name" />
9 10
10 <!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( 11 <!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(
11 %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" /> --> 12 %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" /> -->
@@ -22,7 +23,7 @@ @@ -22,7 +23,7 @@
22 <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> 23 <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
23 <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> 24 <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
24 <!--日志文件输出的文件名 --> 25 <!--日志文件输出的文件名 -->
25 - <FileNamePattern>${LOG_HOME}/wms.%d{yyyy-MM-dd}.%i.log</FileNamePattern> 26 + <FileNamePattern>${LOG_HOME}/${appName}.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
26 <!--日志文件保留天数 --> 27 <!--日志文件保留天数 -->
27 <MaxHistory>30</MaxHistory> 28 <MaxHistory>30</MaxHistory>
28 <maxFileSize>100MB</maxFileSize> 29 <maxFileSize>100MB</maxFileSize>
@@ -46,7 +47,7 @@ @@ -46,7 +47,7 @@
46 <pattern>%p%d%msg%M%F{32}%L</pattern> 47 <pattern>%p%d%msg%M%F{32}%L</pattern>
47 </layout> 48 </layout>
48 </encoder> 49 </encoder>
49 - <file>${LOG_HOME}/wms.error.html</file> 50 + <file>${LOG_HOME}/${appName}.error.html</file>
50 </appender> 51 </appender>
51 <!-- 生成 error html格式日志结束 --> 52 <!-- 生成 error html格式日志结束 -->
52 53
@@ -54,7 +55,7 @@ @@ -54,7 +55,7 @@
54 <appender name="FILE_HTML" class="ch.qos.logback.core.rolling.RollingFileAppender"> 55 <appender name="FILE_HTML" class="ch.qos.logback.core.rolling.RollingFileAppender">
55 <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> 56 <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
56 <!--日志文件输出的文件名 --> 57 <!--日志文件输出的文件名 -->
57 - <FileNamePattern>${LOG_HOME}/wms.%d{yyyy-MM-dd}.%i.html</FileNamePattern> 58 + <FileNamePattern>${LOG_HOME}/${appName}.%d{yyyy-MM-dd}.%i.html</FileNamePattern>
58 <!--日志文件保留天数 --> 59 <!--日志文件保留天数 -->
59 <MaxHistory>30</MaxHistory> 60 <MaxHistory>30</MaxHistory>
60 <MaxFileSize>100MB</MaxFileSize> 61 <MaxFileSize>100MB</MaxFileSize>