wms / wms4_hh · Commits

Commit 80aa81b993e2daacc978b654df3050bae5f6e8b8

Authored by 谭毅彬
1 parent 504dcba3

英文windows系统日志字符集支持 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 2 changed files with 4 additions and 37 deletions
ant-design-vue-jeecg/src/views/system/UserList.vue
  View file @80aa81b
@@ -289,7 +289,8 @@ export default { @@ -289,7 +289,8 @@ export default {
289 { 289 {
290 title: '所属仓库', 290 title: '所属仓库',
291 align: "center", 291 align: "center",
292 - dataIndex: 'selectedWarehouses', key: 'selectedWarehouses', 292 + dataIndex: 'selectedWarehouses',
  293 + key: 'selectedWarehouses',
293 scopedSlots: {customRender: 'selectedWarehouses'}, 294 scopedSlots: {customRender: 'selectedWarehouses'},
294 width: 200 295 width: 200
295 }, 296 },
huaheng-wms-core/src/main/resources/logback-spring.xml
  View file @80aa81b
@@ -8,14 +8,13 @@ @@ -8,14 +8,13 @@
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 <springProperty name="appName" scope="context" source="spring.application.name" />
10 10
11 - <!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(  
12 - %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" /> -->  
13 <!-- 控制台输出 --> 11 <!-- 控制台输出 -->
14 <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> 12 <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
15 <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> 13 <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
16 <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L 14 <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L
17 - %msg%n</pattern> --> 15 - %msg%n</pattern> -->
18 <pattern>[%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger:%L - %msg%n</pattern> 16 <pattern>[%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger:%L - %msg%n</pattern>
  17 + <charset class="java.nio.charset.Charset">UTF-8</charset>
19 </encoder> 18 </encoder>
20 </appender> 19 </appender>
21 20
@@ -33,43 +32,10 @@ @@ -33,43 +32,10 @@
33 <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> 32 <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
34 <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 --> 33 <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
35 <pattern>[%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{50}:%L - %msg%n</pattern> 34 <pattern>[%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{50}:%L - %msg%n</pattern>
  35 + <charset class="java.nio.charset.Charset">UTF-8</charset>
36 </encoder> 36 </encoder>
37 </appender> 37 </appender>
38 38
39 - <!-- 生成 error html格式日志开始 -->  
40 -<!-- <appender name="HTML" class="ch.qos.logback.core.FileAppender"> -->  
41 -<!-- <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> -->  
42 -<!-- 设置日志级别,过滤掉info日志,只输入error日志 -->  
43 -<!-- <level>ERROR</level> -->  
44 -<!-- </filter> -->  
45 -<!-- <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder"> -->  
46 -<!-- <layout class="ch.qos.logback.classic.html.HTMLLayout"> -->  
47 -<!-- <pattern>%p%d%msg%M%F{32}%L</pattern> -->  
48 -<!-- </layout> -->  
49 -<!-- </encoder> -->  
50 -<!-- <file>${LOG_HOME}/${appName}.error.html</file> -->  
51 -<!-- </appender> -->  
52 - <!-- 生成 error html格式日志结束 -->  
53 -  
54 - <!-- 每天生成一个html格式的日志开始 -->  
55 -<!-- <appender name="FILE_HTML" class="ch.qos.logback.core.rolling.RollingFileAppender"> -->  
56 -<!-- <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> -->  
57 -<!-- 日志文件输出的文件名 -->  
58 -<!-- <FileNamePattern>${LOG_HOME}/${appName}.%d{yyyy-MM-dd}.%i.html</FileNamePattern> -->  
59 -<!-- 日志文件保留天数 -->  
60 -<!-- <MaxHistory>30</MaxHistory> -->  
61 -<!-- <MaxFileSize>100MB</MaxFileSize> -->  
62 -<!-- <totalSizeCap>10GB</totalSizeCap> -->  
63 -<!-- <cleanHistoryOnStart>true</cleanHistoryOnStart> -->  
64 -<!-- </rollingPolicy> -->  
65 -<!-- <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder"> -->  
66 -<!-- <layout class="ch.qos.logback.classic.html.HTMLLayout"> -->  
67 -<!-- <pattern>%p%d%msg%M%F{32}%L</pattern> -->  
68 -<!-- </layout> -->  
69 -<!-- </encoder> -->  
70 -<!-- </appender> -->  
71 - <!-- 每天生成一个html格式的日志结束 -->  
72 -  
73 <!--myibatis log configure --> 39 <!--myibatis log configure -->
74 <!-- <logger name="com.apache.ibatis" level="TRACE" /> --> 40 <!-- <logger name="com.apache.ibatis" level="TRACE" /> -->
75 <!-- <logger name="java.sql.Connection" level="DEBUG" /> --> 41 <!-- <logger name="java.sql.Connection" level="DEBUG" /> -->