feature(*): 更新依赖

- 更新依赖 - 优化日志打印

feature(*): 更新依赖
- 更新依赖 - 优化日志打印
张志伟
1 parent 895496f3
Showing 5 changed files with 6 additions and 7 deletions
fw-hestia-server/src/main/java/cn/fw/hestia/server/Application.java
fw-hestia-server/src/main/resources/application-local.yml
fw-hestia-server/src/main/resources/application.yml
fw-hestia-server/src/main/resources/logfile.xml
pom.xml
@@ -26,7 +26,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableAutoConfiguration
 @Configuration
 @EnableRedisRepositories
-@MapperScan("cn.fw.**.dao")
+@MapperScan("cn.fw.hestia.**.dao")
 @ComponentScan({"cn.fw.hestia.*"})
 @EnableFeignClients({"cn.fw.**.sdk"})
 public class Application {
@@ -11,7 +11,7 @@ nacos:
     namespace: df959b8c-de58-4b02-b9fb-d65ca3be05f3
 spring:
   application:
-    name: fw-hestia-local
+    name: fw-hestia
 task:
   switch: 'off'
@@ -92,7 +92,6 @@ mybatis-plus:
     log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
     map-underscore-to-camel-case: true
   mapper-locations: classpath*:mapper/*.xml
-  type-aliases-package: cn.fw.data.base.db,cn.fw.common.attachment.domain
   type-enums-package: cn.fw.hestia.domain.enums.**,cn.fw.hestia.sdk.enums.**
   type-handlers-package: cn.fw.common.data.mybatis.handler
 nacos:
@@ -15,7 +15,7 @@
             <totalSizeCap>${logTotalSizeCap}</totalSizeCap>
         </rollingPolicy>
         <encoder>
-            <pattern>[%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%c] - %m%n</pattern>
+            <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>
             <charset>${charSet}</charset>
         </encoder>
     </appender>
@@ -41,7 +41,7 @@
             <totalSizeCap>${logTotalSizeCap}</totalSizeCap>
         </rollingPolicy>
         <encoder>
-            <pattern>[%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%c] - %m%n</pattern>
+            <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>
             <charset>${charSet}</charset>
         </encoder>
     </appender>
@@ -55,7 +55,7 @@
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%highlight([%-1p]) %highlight(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %boldMagenta(%logger) %cyan(%msg%n)</pattern>
+            <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>
             <charset>${charSet}</charset>
         </encoder>
     </appender>
@@ -12,7 +12,7 @@
     <parent>
         <groupId>cn.fw</groupId>
         <artifactId>fw-common-dependencies</artifactId>
-        <version>3.2.4</version>
+        <version>3.3.0</version>
     </parent>
     <modules>