diff --git a/fw-hestia-server/src/main/java/cn/fw/hestia/server/Application.java b/fw-hestia-server/src/main/java/cn/fw/hestia/server/Application.java index 93fe896..b01f974 100644 --- a/fw-hestia-server/src/main/java/cn/fw/hestia/server/Application.java +++ b/fw-hestia-server/src/main/java/cn/fw/hestia/server/Application.java @@ -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 { diff --git a/fw-hestia-server/src/main/resources/application-local.yml b/fw-hestia-server/src/main/resources/application-local.yml index 1136546..b359b8a 100644 --- a/fw-hestia-server/src/main/resources/application-local.yml +++ b/fw-hestia-server/src/main/resources/application-local.yml @@ -11,7 +11,7 @@ nacos: namespace: df959b8c-de58-4b02-b9fb-d65ca3be05f3 spring: application: - name: fw-hestia-local + name: fw-hestia task: switch: 'off' diff --git a/fw-hestia-server/src/main/resources/application.yml b/fw-hestia-server/src/main/resources/application.yml index fd136b8..b5c430e 100644 --- a/fw-hestia-server/src/main/resources/application.yml +++ b/fw-hestia-server/src/main/resources/application.yml @@ -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: diff --git a/fw-hestia-server/src/main/resources/logfile.xml b/fw-hestia-server/src/main/resources/logfile.xml index ce176d7..dc48ded 100644 --- a/fw-hestia-server/src/main/resources/logfile.xml +++ b/fw-hestia-server/src/main/resources/logfile.xml @@ -15,7 +15,7 @@ ${logTotalSizeCap} - [%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%c] - %m%n + [%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%X{X-APP}/%X{X-IP}/%X{X-TRACE-ID}] [%t] [%c] - %m%n ${charSet} @@ -41,7 +41,7 @@ ${logTotalSizeCap} - [%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%c] - %m%n + [%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%X{X-APP}/%X{X-IP}/%X{X-TRACE-ID}] [%t] [%c] - %m%n ${charSet} @@ -55,7 +55,7 @@ - %highlight([%-1p]) %highlight(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %boldMagenta(%logger) %cyan(%msg%n) + %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) ${charSet} diff --git a/pom.xml b/pom.xml index f4fa5ee..e86f618 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ cn.fw fw-common-dependencies - 3.2.4 + 3.3.0