Commit 0e1b6dca02f4a8e0df5664987dadc70d248252fa
1 parent
895496f3
feature(*): 更新依赖
- 更新依赖 - 优化日志打印
Showing
5 changed files
with
6 additions
and
7 deletions
fw-hestia-server/src/main/java/cn/fw/hestia/server/Application.java
| ... | ... | @@ -26,7 +26,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; |
| 26 | 26 | @EnableAutoConfiguration |
| 27 | 27 | @Configuration |
| 28 | 28 | @EnableRedisRepositories |
| 29 | -@MapperScan("cn.fw.**.dao") | |
| 29 | +@MapperScan("cn.fw.hestia.**.dao") | |
| 30 | 30 | @ComponentScan({"cn.fw.hestia.*"}) |
| 31 | 31 | @EnableFeignClients({"cn.fw.**.sdk"}) |
| 32 | 32 | public class Application { | ... | ... |
fw-hestia-server/src/main/resources/application-local.yml
fw-hestia-server/src/main/resources/application.yml
| ... | ... | @@ -92,7 +92,6 @@ mybatis-plus: |
| 92 | 92 | log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl |
| 93 | 93 | map-underscore-to-camel-case: true |
| 94 | 94 | mapper-locations: classpath*:mapper/*.xml |
| 95 | - type-aliases-package: cn.fw.data.base.db,cn.fw.common.attachment.domain | |
| 96 | 95 | type-enums-package: cn.fw.hestia.domain.enums.**,cn.fw.hestia.sdk.enums.** |
| 97 | 96 | type-handlers-package: cn.fw.common.data.mybatis.handler |
| 98 | 97 | nacos: | ... | ... |
fw-hestia-server/src/main/resources/logfile.xml
| ... | ... | @@ -15,7 +15,7 @@ |
| 15 | 15 | <totalSizeCap>${logTotalSizeCap}</totalSizeCap> |
| 16 | 16 | </rollingPolicy> |
| 17 | 17 | <encoder> |
| 18 | - <pattern>[%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%c] - %m%n</pattern> | |
| 18 | + <pattern>[%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%X{X-APP}/%X{X-IP}/%X{X-TRACE-ID}] [%t] [%c] - %m%n</pattern> | |
| 19 | 19 | <charset>${charSet}</charset> |
| 20 | 20 | </encoder> |
| 21 | 21 | </appender> |
| ... | ... | @@ -41,7 +41,7 @@ |
| 41 | 41 | <totalSizeCap>${logTotalSizeCap}</totalSizeCap> |
| 42 | 42 | </rollingPolicy> |
| 43 | 43 | <encoder> |
| 44 | - <pattern>[%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%c] - %m%n</pattern> | |
| 44 | + <pattern>[%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%X{X-APP}/%X{X-IP}/%X{X-TRACE-ID}] [%t] [%c] - %m%n</pattern> | |
| 45 | 45 | <charset>${charSet}</charset> |
| 46 | 46 | </encoder> |
| 47 | 47 | </appender> |
| ... | ... | @@ -55,7 +55,7 @@ |
| 55 | 55 | |
| 56 | 56 | <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> |
| 57 | 57 | <encoder> |
| 58 | - <pattern>%highlight([%-1p]) %highlight(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %boldMagenta(%logger) %cyan(%msg%n)</pattern> | |
| 58 | + <pattern>%highlight([%-1p]) %highlight(%d{yyyy-MM-dd HH:mm:ss} [%X{X-APP}/%X{X-IP}/%X{X-TRACE-ID}]) %green([%thread]) %boldMagenta(%logger) %cyan(%msg%n)</pattern> | |
| 59 | 59 | <charset>${charSet}</charset> |
| 60 | 60 | </encoder> |
| 61 | 61 | </appender> | ... | ... |